Skip to content

Commit

Permalink
port from j/soares
Browse files Browse the repository at this point in the history
adds soares test case

clima formatter

replace detrainment limiter with default

cleans up ci plots

Increase reference counter for buildkite job
  • Loading branch information
Julians42 committed Dec 10, 2024
1 parent 898cf2e commit dddf648
Show file tree
Hide file tree
Showing 5 changed files with 52 additions and 2 deletions.
10 changes: 10 additions & 0 deletions .buildkite/pipeline.yml
Original file line number Diff line number Diff line change
Expand Up @@ -828,6 +828,16 @@ steps:
agents:
slurm_mem: 20GB

- label: ":genie: Prognostic EDMFX Soares in a column"
command: >
julia --color=yes --project=examples examples/hybrid/driver.jl
--config_file $CONFIG_PATH/prognostic_edmfx_soares_column.yml
--job_id prognostic_edmfx_soares_column
artifact_paths: "prognostic_edmfx_soares_column/output_active/*"
agents:
slurm_mem: 20GB
soft_fail: true

- group: "GPU"
steps:

Expand Down
35 changes: 35 additions & 0 deletions config/model_configs/prognostic_edmfx_soares_column.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,35 @@
initial_condition: "Soares"
surface_setup: "Soares"
rayleigh_sponge: true
turbconv: "prognostic_edmfx"
implicit_diffusion: true
implicit_sgs_advection: false
approximate_linear_solve_iters: 2
edmfx_upwinding: "first_order"
edmfx_entr_model: "Generalized"
edmfx_detr_model: "SmoothArea"
edmfx_sgs_mass_flux: true
edmfx_sgs_diffusive_flux: true
edmfx_nh_pressure: true
edmfx_filter: true
prognostic_tke: false # should we set this as true or false?
moist: "equil"
config: "column"
hyperdiff: false
z_max: 3750
z_elem: 75
z_stretch: false
perturb_initstate: false
dt: "5secs"
t_end: "8hours"
dt_save_state_to_disk: "14hours"
toml: [toml/prognostic_edmfx.toml]
netcdf_interpolation_num_points: [2, 2, 100]
diagnostics:
- short_name: [ts, ta, thetaa, ha, pfull, rhoa, ua, va, wa, hur, hus, cl, clw, cli, hussfc, evspsbl, pr]
period: 10mins
- short_name: [arup, waup, taup, thetaaup, haup, husup, hurup, clwup, cliup, waen, taen, thetaaen, haen, husen, huren, clwen, clien, tke]
period: 10mins
- short_name: [entr, detr, lmix, bgrad, strain, edt, evu]
period: 10mins
ode_algo: ARS343
1 change: 1 addition & 0 deletions post_processing/ci_plots.jl
Original file line number Diff line number Diff line change
Expand Up @@ -1181,6 +1181,7 @@ EDMFBoxPlots = Union{
Val{:prognostic_edmfx_gcmdriven_column},
Val{:prognostic_edmfx_bomex_box},
Val{:rcemipii_box_diagnostic_edmfx},
Val{:prognostic_edmfx_soares_column},
}

EDMFBoxPlotsWithPrecip = Union{
Expand Down
5 changes: 4 additions & 1 deletion reproducibility_tests/ref_counter.jl
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
188
189

# **README**
#
Expand All @@ -21,6 +21,9 @@

#=
189
- Added soares dry convective boundary layer test case
188
- Updated dependencies
Expand Down
3 changes: 2 additions & 1 deletion src/surface_conditions/surface_setups.jl
Original file line number Diff line number Diff line change
Expand Up @@ -91,8 +91,9 @@ function (::Soares)(params)
z0 = FT(0.16) # 0.16 is taken from the Nieuwstadt paper.
θ_flux = FT(0.06)
q_flux = FT(2.5e-5)
ustar::FT = 0.28 # just to initilize grid mean covariances
parameterization =
MoninObukhov(; z0, fluxes = θAndQFluxes(; θ_flux, q_flux))
MoninObukhov(; z0, fluxes = θAndQFluxes(; θ_flux, q_flux), ustar)
return SurfaceState(; parameterization, T, p, q_vap)
end

Expand Down

0 comments on commit dddf648

Please sign in to comment.