Merge branch 'main' into ss-nc/fix-climatoloy-experiment

Author: navidcy

src/Bathymetry.jl

@@ -189,11 +189,7 @@ function regrid_bathymetry(target_grid;
                                                 passes = interpolation_passes)
 
     if minimum_depth > 0
-        zi = interior(target_z, :, :, 1)
-
-        # Set the height of cells with z > -mininum_depth to z=0.
-        # (In-place + GPU-friendly)
-        zi .*= zi .<= - minimum_depth
+        launch!(arch, target_grid, :xy, _enforce_minimum_depth!, target_z, minimum_depth)
     end
 
     if major_basins < Inf
@@ -205,6 +201,17 @@ function regrid_bathymetry(target_grid;
     return target_z
 end
 
+@kernel function _enforce_minimum_depth!(target_z, minimum_depth)
+    i, j = @index(Global, NTuple)
+    z = @inbounds target_z[i, j, 1]
+
+    # Fix active cells to be at least `-minimum_depth`.
+    active = z < 0 # it's a wet cell
+    z = ifelse(active, min(z, -minimum_depth), z)
+
+    @inbounds target_z[i, j, 1] = z
+end
+
 # Here we can either use `regrid!` (three dimensional version) or `interpolate!`.
 function interpolate_bathymetry_in_passes(native_z, target_grid;
                                           passes = 10)
@@ -462,4 +469,4 @@ end
 retrieve_bathymetry(grid, ::Nothing; kw...) = regrid_bathymetry(grid; kw...)
 retrieve_bathymetry(grid; kw...)            = regrid_bathymetry(grid; kw...)
 
-end # module
+end # module