Skip to content

Commit 589ce95

Browse files
Change advection defaults (#550)
* Update ocean_simulation.jl * run examples
1 parent 3360293 commit 589ce95

File tree

1 file changed

+4
-13
lines changed

1 file changed

+4
-13
lines changed

src/OceanSimulations/ocean_simulation.jl

Lines changed: 4 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -82,18 +82,9 @@ default_vertical_coordinate(::MutableGridOfSomeKind) = Oceananigans.Models.ZStar
8282
function default_ocean_closure(FT=Oceananigans.defaults.FloatType)
8383
mixing_length = CATKEMixingLength(Cᵇ=0.01)
8484
turbulent_kinetic_energy_equation = CATKEEquation(Cᵂϵ=1.0)
85-
8685
return CATKEVerticalDiffusivity(VerticallyImplicitTimeDiscretization(), FT; mixing_length, turbulent_kinetic_energy_equation)
8786
end
8887

89-
default_momentum_advection() = VectorInvariant(; vorticity_scheme = WENO(order=9),
90-
vertical_scheme = Centered(),
91-
divergence_scheme = WENO(order=5))
92-
93-
default_tracer_advection() = FluxFormAdvection(WENO(order=7),
94-
WENO(order=7),
95-
Centered())
96-
9788
function default_radiative_forcing(grid)
9889
ϵʳ = 0.6 # red fraction
9990
λʳ = 1 # red decay scale
@@ -121,10 +112,10 @@ end
121112
biogeochemistry = nothing,
122113
timestepper = :QuasiAdamsBashforth2,
123114
coriolis = Default(HydrostaticSphericalCoriolis(; rotation_rate)),
124-
momentum_advection = default_momentum_advection(),
115+
momentum_advection = WENOVectorInvariant(),
116+
tracer_advection = WENO(order=7),
125117
equation_of_state = TEOS10EquationOfState(; reference_density),
126118
boundary_conditions::NamedTuple = NamedTuple(),
127-
tracer_advection = default_tracer_advection(),
128119
vertical_coordinate = default_vertical_coordinate(grid),
129120
radiative_forcing = default_radiative_forcing(grid),
130121
warn = true,
@@ -145,10 +136,10 @@ function ocean_simulation(grid;
145136
biogeochemistry = nothing,
146137
timestepper = :QuasiAdamsBashforth2,
147138
coriolis = Default(HydrostaticSphericalCoriolis(; rotation_rate)),
148-
momentum_advection = default_momentum_advection(),
139+
momentum_advection = WENOVectorInvariant(),
140+
tracer_advection = WENO(order=7),
149141
equation_of_state = TEOS10EquationOfState(; reference_density),
150142
boundary_conditions::NamedTuple = NamedTuple(),
151-
tracer_advection = default_tracer_advection(),
152143
vertical_coordinate = default_vertical_coordinate(grid),
153144
radiative_forcing = default_radiative_forcing(grid),
154145
warn = true,

0 commit comments

Comments
 (0)