remove conflicting identifier

CliMA · Jun 12, 2024 · 8daa578 · 8daa578
1 parent 8624a2f
commit 8daa578
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/src/OrthogonalSphericalShellGrids.jl b/src/OrthogonalSphericalShellGrids.jl
@@ -23,7 +23,7 @@ using KernelAbstractions.Extras.LoopInfo: @unroll
 using Oceananigans.Grids: generate_coordinate
 
 using Oceananigans.BoundaryConditions
-using CUDA
+using CUDA: @allowscalar
 
 @inline convert_to_0_360(x) = ((x % 360) + 360) % 360
 

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