From bdc91aa162be3973bffd6bb506bc27136c9aa9a9 Mon Sep 17 00:00:00 2001 From: Simone Silvestri Date: Fri, 30 May 2025 09:24:25 +0200 Subject: [PATCH 1/2] Update ocean_simulation.jl --- src/OceanSimulations/ocean_simulation.jl | 16 ++++------------ 1 file changed, 4 insertions(+), 12 deletions(-) diff --git a/src/OceanSimulations/ocean_simulation.jl b/src/OceanSimulations/ocean_simulation.jl index 666f9b68..16352523 100644 --- a/src/OceanSimulations/ocean_simulation.jl +++ b/src/OceanSimulations/ocean_simulation.jl @@ -86,14 +86,6 @@ function default_ocean_closure(FT=Oceananigans.defaults.FloatType) return CATKEVerticalDiffusivity(VerticallyImplicitTimeDiscretization(), FT; mixing_length, turbulent_kinetic_energy_equation) end -default_momentum_advection() = VectorInvariant(; vorticity_scheme = WENO(order=9), - vertical_scheme = Centered(), - divergence_scheme = WENO(order=5)) - -default_tracer_advection() = FluxFormAdvection(WENO(order=7), - WENO(order=7), - Centered()) - function default_radiative_forcing(grid) ϵʳ = 0.6 # red fraction λʳ = 1 # red decay scale @@ -121,10 +113,10 @@ end biogeochemistry = nothing, timestepper = :QuasiAdamsBashforth2, coriolis = Default(HydrostaticSphericalCoriolis(; rotation_rate)), - momentum_advection = default_momentum_advection(), + momentum_advection = WENOVectorInvariant(), + tracer_advection = WENO(order=7), equation_of_state = TEOS10EquationOfState(; reference_density), boundary_conditions::NamedTuple = NamedTuple(), - tracer_advection = default_tracer_advection(), vertical_coordinate = default_vertical_coordinate(grid), radiative_forcing = default_radiative_forcing(grid), warn = true, @@ -145,10 +137,10 @@ function ocean_simulation(grid; biogeochemistry = nothing, timestepper = :QuasiAdamsBashforth2, coriolis = Default(HydrostaticSphericalCoriolis(; rotation_rate)), - momentum_advection = default_momentum_advection(), + momentum_advection = WENOVectorInvariant(), + tracer_advection = WENO(order=7), equation_of_state = TEOS10EquationOfState(; reference_density), boundary_conditions::NamedTuple = NamedTuple(), - tracer_advection = default_tracer_advection(), vertical_coordinate = default_vertical_coordinate(grid), radiative_forcing = default_radiative_forcing(grid), warn = true, From 0c45b126d72089221404453ba37807d04a38bd7b Mon Sep 17 00:00:00 2001 From: Simone Silvestri Date: Fri, 30 May 2025 09:26:51 +0200 Subject: [PATCH 2/2] run examples --- src/OceanSimulations/ocean_simulation.jl | 1 - 1 file changed, 1 deletion(-) diff --git a/src/OceanSimulations/ocean_simulation.jl b/src/OceanSimulations/ocean_simulation.jl index 16352523..3786a689 100644 --- a/src/OceanSimulations/ocean_simulation.jl +++ b/src/OceanSimulations/ocean_simulation.jl @@ -82,7 +82,6 @@ default_vertical_coordinate(::MutableGridOfSomeKind) = Oceananigans.Models.ZStar function default_ocean_closure(FT=Oceananigans.defaults.FloatType) mixing_length = CATKEMixingLength(Cᵇ=0.01) turbulent_kinetic_energy_equation = CATKEEquation(Cᵂϵ=1.0) - return CATKEVerticalDiffusivity(VerticallyImplicitTimeDiscretization(), FT; mixing_length, turbulent_kinetic_energy_equation) end