Merge branch 'main' into ss/double-distributed

CliMA · Sep 16, 2024 · 793ff5c · 793ff5c
2 parents 0b79a07 + b5dc705
commit 793ff5c
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 8 deletions.
diff --git a/Project.toml b/Project.toml
@@ -1,11 +1,10 @@
 name = "OrthogonalSphericalShellGrids"
 uuid = "c2be9673-fb75-4747-82dc-aa2bb9f4aed0"
 authors = ["Climate Modeling Alliance and contributors"]
-version = "0.1.2"
+version = "0.1.3"
 
 [deps]
 Adapt = "79e6a3ab-5dfb-504d-930d-738a2a938a0e"
-CUDA = "052768ef-5323-5732-b1bb-66c8b64840ba"
 JLD2 = "033835bb-8acc-5ee8-8aae-3f567f8a3819"
 KernelAbstractions = "63c18a36-062a-441e-b654-da1e3ab1ce7c"
 MPI = "da04e1cc-30fd-572f-bb4f-1f8673147195"
@@ -14,7 +13,6 @@ OffsetArrays = "6fe1bfb0-de20-5000-8ca7-80f57d26f881"
 
 [compat]
 Adapt = "4"
-CUDA = "5"
 JLD2 = "0.4"
 KernelAbstractions = "0.9"
 MPI = "0.20"

diff --git a/src/grid_extensions.jl b/src/grid_extensions.jl
@@ -16,13 +16,9 @@ import Oceananigans.Grids: x_domain, y_domain
 import Oceananigans.Fields: Field
 import Oceananigans.Fields: tupled_fill_halo_regions!
 
-# Horrible, just for this allowscalar!
-# we should remove this dependency
-using CUDA: @allowscalar
-
 # A tripolar grid is always between 0 and 360 in longitude!
 x_domain(grid::TRG) = 0, 360
-y_domain(grid::TRG) = @allowscalar minimum(grid.φᶠᶠᵃ), 90
+y_domain(grid::TRG) = minimum(parent(grid.φᶠᶠᵃ)), 90
 
 # a `TripolarGrid` needs a `ZipperBoundaryCondition` for the north boundary
 # The `sign` 1 for regular tracers and -1 for velocities and signed vectors

diff --git a/test/runtests.jl b/test/runtests.jl
@@ -1,5 +1,6 @@
 using OrthogonalSphericalShellGrids
 using OrthogonalSphericalShellGrids.Oceananigans
+using Oceananigans: GPU, CPU
 using Oceananigans.CUDA
 using Test