diff --git a/src/bathymetry_and_forcings.jl b/src/bathymetry_and_forcings.jl index 9519875..d82ccdf 100644 --- a/src/bathymetry_and_forcings.jl +++ b/src/bathymetry_and_forcings.jl @@ -1,6 +1,6 @@ using Oceananigans.Grids: φnode -using Oceananigans.Distributed -using Oceananigans.Distributed: DistributedGrid, partition_global_array +using Oceananigans.DistributedComputations +using Oceananigans.DistributedComputations: DistributedGrid, partition_global_array using Oceananigans.Operators using DataDeps diff --git a/src/boundary_and_initial_conditions.jl b/src/boundary_and_initial_conditions.jl index 902e118..7fb6bec 100644 --- a/src/boundary_and_initial_conditions.jl +++ b/src/boundary_and_initial_conditions.jl @@ -2,7 +2,7 @@ using Oceananigans.Units using Oceananigans.Utils using Oceananigans.Grids: halo_size using Oceananigans.Architectures: arch_array, architecture -using Oceananigans.Distributed: partition_global_array +using Oceananigans.DistributedComputations: partition_global_array initialize_model!(model, ::Val{:Quiescent}; kw...) = nothing diff --git a/src/near_global_simulation.jl b/src/near_global_simulation.jl index 6d346c4..3e8a572 100644 --- a/src/near_global_simulation.jl +++ b/src/near_global_simulation.jl @@ -73,7 +73,11 @@ function scaling_test_simulation(resolution, ranks, Δt, stop_time; vertical_diffusivity = VerticalScalarDiffusivity(VerticallyImplicitTimeDiscretization(), precision; ν=νz, κ=κz) - tracer_advection = WENO(grid; order = 7) + tracer_advection = Oceananigans.Advection.ThreeDimensionalTracerAdvection(; + x = WENO(precision; order = 7), + y = WENO(precision; order = 7), + z = Centered(precision)) + momentum_advection = best_momentum_advection(grid, precision) free_surface = SplitExplicitFreeSurface(precision; substeps = barotropic_substeps(max_Δt, grid))