some updates

simone-silvestri · Feb 27, 2024 · 3a0c451 · 3a0c451
1 parent 55b2484
commit 3a0c451
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 7 deletions.
diff --git a/src/bathymetry_and_forcings.jl b/src/bathymetry_and_forcings.jl
@@ -142,19 +142,19 @@ end
 @inline v_linear_bottom_drag(i, j, grid, c, Φ, μ) = @inbounds - μ * Φ.v[i, j, 1]
 
 @inline function surface_stress_x(i, j, grid, clock, fields, p)
-    φ = φnode(j, grid, Center())
+    φ = φnode(j, grid.underlying_grid, Center())
     return wind_stress(φ, p)
 end
 
 @inline function surface_salinity_flux(i, j, grid, clock, fields, p)
-    φ = φnode(j, grid, Center())
+    φ = φnode(j, grid.underlying_grid, Center())
     return salinity_flux(φ, p)
 end
 
 @inline T_reference(φ) = max(0.0, 30.0 * cos(1.2 * π * φ / 180))
 
 @inline function T_relaxation(i, j, grid, clock, fields, λ)
-    φ = φnode(j, grid, Center())
+    φ = φnode(j, grid.underlying_grid, Center())
     return @inbounds λ * (fields.T[i, j, grid.Nz] - T_reference(φ))
 end
 

diff --git a/src/grid_load_balance.jl b/src/grid_load_balance.jl
@@ -28,7 +28,7 @@ function load_balanced_grid(arch, precision, N, latitude, z_faces, resolution,
     return experiment == :RealisticOcean ? 
     	   ImmersedBoundaryGrid(underlying_grid, Bottom(realistic_bathymetry(underlying_grid, resolution)), active_cells_map = true) :
            experiment == :DoubleDrake ?
-           ImmersedBoundaryGrid(underlying_grid, GridFittedBottom(double_drake_bathymetry)) :
+           ImmersedBoundaryGrid(underlying_grid, GridFittedBottom(double_drake_bathymetry), active_cells_map = true) :
            underlying_grid
 end
 

diff --git a/src/near_global_simulation.jl b/src/near_global_simulation.jl
@@ -49,8 +49,7 @@ function scaling_test_simulation(resolution, ranks, Δt, stop_time;
                                  boundary_layer_parameterization = RiBasedVerticalDiffusivity(precision)
                                  )
 
-    topo = (Periodic, Bounded, Bounded)
-    arch = Distributed(child_arch; topology = topo, partition = Partition(ranks...))
+    arch = Distributed(child_arch; partition = Partition(ranks...))
 
     min_Δt, max_Δt = Δt isa Number ? (Δt, Δt) : Δt
 
@@ -73,7 +72,7 @@ function scaling_test_simulation(resolution, ranks, Δt, stop_time;
 
     vertical_diffusivity = VerticalScalarDiffusivity(VerticallyImplicitTimeDiscretization(), precision; ν=νz, κ=κz)
 
-    tracer_advection   = Oceananigans.Advection.ThreeDimensionalTracerAdvection(;
+    tracer_advection   = Oceananigans.Advection.TracerAdvection(;
                                 x = WENO(precision; order = 7),
                                 y = WENO(precision; order = 7),
                                 z = Centered(precision))