Skip to content

Commit

Permalink
use a higher model top
Browse files Browse the repository at this point in the history
  • Loading branch information
szy21 committed Sep 20, 2024
1 parent 6493b68 commit d8bf303
Show file tree
Hide file tree
Showing 18 changed files with 68 additions and 48 deletions.
9 changes: 6 additions & 3 deletions config/model_configs/diagnostic_edmfx_aquaplanet.yml
Original file line number Diff line number Diff line change
@@ -1,3 +1,7 @@
z_max: 75000.0
z_elem: 31
dz_bottom: 50.0
rayleigh_sponge: true
surface_setup: DefaultMoninObukhov
rad: clearsky
turbconv: diagnostic_edmfx
Expand All @@ -13,9 +17,8 @@ edmfx_sgs_diffusive_flux: true
moist: equil
cloud_model: "quadrature_sgs"
precip_model: 1M
dt: 100secs
t_end: 12hours
dt_save_state_to_disk: 12hours
dt: 120secs
t_end: 3hours
regression_test: true
toml: [toml/diagnostic_edmfx.toml]
ode_algo: ARS343
6 changes: 4 additions & 2 deletions config/model_configs/diagnostic_edmfx_aquaplanet_gpu.yml
Original file line number Diff line number Diff line change
@@ -1,3 +1,6 @@
z_max: 75000.0
z_elem: 31
dz_bottom: 50.0
surface_setup: DefaultMoninObukhov
rad: clearsky
turbconv: diagnostic_edmfx
Expand All @@ -13,8 +16,7 @@ edmfx_sgs_diffusive_flux: true
moist: equil
cloud_model: "quadrature_sgs"
precip_model: 1M
dt: 100secs
dt: 120secs
t_end: 12hours
dt_save_state_to_disk: 12hours
toml: [toml/diagnostic_edmfx.toml]
ode_algo: ARS343
10 changes: 7 additions & 3 deletions config/model_configs/prognostic_edmfx_aquaplanet.yml
Original file line number Diff line number Diff line change
@@ -1,3 +1,7 @@
z_max: 75000.0
z_elem: 31
dz_bottom: 50.0
rayleigh_sponge: true
surface_setup: DefaultMoninObukhov
rad: clearsky
turbconv: prognostic_edmfx
Expand All @@ -13,15 +17,15 @@ moist: equil
cloud_model: "quadrature_sgs"
precip_model: 1M
dt: 10secs
t_end: 1hours
t_end: 1800secs
dt_save_state_to_disk: 600secs
toml: [toml/prognostic_edmfx.toml]
output_default_diagnostics: false
diagnostics:
- short_name: [ts, ta, thetaa, ha, pfull, rhoa, ua, va, wa, hfes, hur, hus, cl, clw, cli, evspsbl, pr, rsd, rsu, rld, rlu]
reduction_time: average
period: 1hours
period: 1800secs
- short_name: [arup, waup, taup, thetaaup, haup, husup, hurup, clwup, cliup, waen, tke, lmix]
reduction_time: average
period: 1hours
period: 1800secs
ode_algo: ARS343
Original file line number Diff line number Diff line change
@@ -1,9 +1,10 @@
z_max: 75000.0
z_elem: 63
dz_bottom: 30.0
dt_save_state_to_disk: "5days"
initial_condition: "IsothermalProfile"
config: "column"
hyperdiff: false
z_elem: 45
dt: "3hours"
FLOAT_TYPE: "Float64"
dt_save_to_sol: "3hours"
Original file line number Diff line number Diff line change
@@ -1,16 +1,16 @@
z_max: 75000.0
z_elem: 63
dz_bottom: 30.0
dt_save_state_to_disk: "100days"
initial_condition: "IsothermalProfile"
hyperdiff: false
z_elem: 63
dt: "3hours"
dt_rad: "3hours"
idealized_h2o: true
t_end: "654days"
idealized_clouds: true
dz_bottom: 30.0
config: "column"
insolation: "timevarying"
z_max: 70000.0
dt_save_to_sol: "30hours"
rad: "allskywithclear"
diagnostics:
Expand Down
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
z_max: 75000.0
z_elem: 63
dz_bottom: 30.0
dt_save_state_to_disk: "100days"
initial_condition: "IsothermalProfile"
hyperdiff: false
z_elem: 63
dt: "3hours"
dt_rad: "3hours"
idealized_h2o: true
t_end: "654days"
dz_bottom: 30.0
config: "column"
z_max: 70000.0
dt_save_to_sol: "30hours"
rad: "clearsky"
Original file line number Diff line number Diff line change
@@ -1,12 +1,11 @@

z_max: 75000.0
z_elem: 63
dz_bottom: 30.0
rad: "clearsky"
idealized_h2o: true
hyperdiff: false
config: "column"
initial_condition: "IsothermalProfile"
z_max: 70000
z_elem: 63
dz_bottom: 30
t_end: "654days"
dt: "3hours"
dt_rad: "3hours"
Expand Down
Original file line number Diff line number Diff line change
@@ -1,15 +1,15 @@
dt_save_state_to_disk: "3months"
initial_condition: "IsothermalProfile"
hyperdiff: false
# It seems radiative equilibrium needs a larger dz near the top
# to be stable, so we use a smaller z_elem
# It seems radiative equilibrium needs a lower top and a larger dz
# near the top (smaller z_elem) to be stable
z_max: 70000.0
z_elem: 50
dt: "3hours"
dt_rad: "3hours"
t_end: "654days"
dz_bottom: 30.0
config: "column"
z_max: 70000.0
dt_save_to_sol: "30hours"
rad: "gray"
# [2, 2, 80] instead of [1, 1, 80] because Julia ranges are inclusive of the
Expand Down
Original file line number Diff line number Diff line change
@@ -1,16 +1,16 @@
z_max: 75000.0
z_elem: 31
dz_bottom: 50.0
rad: "allskywithclear"
dt_save_state_to_disk: "1days"
rayleigh_sponge: true
orographic_gravity_wave: "raw_topo"
z_elem: 25
dt: "400secs"
surface_setup: "DefaultMoninObukhov"
t_end: "15hours"
non_orographic_gravity_wave: true
dz_bottom: 300.0
vert_diff: true
insolation: "timevarying"
z_max: 55000.0
precip_model: "0M"
cloud_model: "grid_scale"
surface_temperature: "ZonallyAsymmetric"
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
z_elem: 25
z_max: 55000.0
dz_bottom: 300.0
z_max: 75000.0
z_elem: 31
dz_bottom: 50.0
dt: "400secs"
t_end: "1days"
dt_save_state_to_disk: "24hours"
Expand All @@ -18,7 +18,7 @@ orographic_gravity_wave: "gfdl_restart"
surface_setup: "DefaultMoninObukhov"
prescribe_ozone: true
prescribed_aerosols: ["CB1", "CB2", "SO4"]
toml: [toml/sphere_aquaplanet_rhoe_equilmoist_allsky_gw_res.toml]
toml: [toml/sphere_held_suarez.toml]
diagnostics:
- short_name: [edt, evu, mmrso4, mmrbcpo, mmrbcpi, o3]
reduction_time: average
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
z_elem: 25
z_max: 55000.0
dz_bottom: 300.0
z_max: 75000.0
z_elem: 31
dz_bottom: 50.0
dt: "400secs"
t_end: "18hours"
dt_save_state_to_disk: "18hours"
Expand All @@ -14,4 +14,4 @@ rad: "allskywithclear"
insolation: "timevarying"
rayleigh_sponge: true
surface_setup: "DefaultMoninObukhov"
toml: [toml/sphere_aquaplanet_rhoe_equilmoist_allsky_gw_res.toml]
toml: [toml/sphere_held_suarez.toml]
Original file line number Diff line number Diff line change
@@ -1,14 +1,14 @@
z_max: 75000.0
z_elem: 31
dz_bottom: 50.0
dt_save_state_to_disk: "4days"
rayleigh_sponge: true
dt: "450secs"
z_elem: 25
dt: "400secs"
t_end: "4days"
dz_bottom: 300.0
vert_diff: true
forcing: "held_suarez"
z_max: 55000.0
precip_model: "0M"
regression_test: true
rayleigh_sponge: true
viscous_sponge: true
moist: "equil"
toml: [toml/sphere_held_suarez_rhoe_equilmoist_hightop_sponge.toml]
toml: [toml/sphere_held_suarez.toml]
8 changes: 5 additions & 3 deletions config/model_configs/sphere_held_suarez_rhoe_hightop.yml
Original file line number Diff line number Diff line change
@@ -1,8 +1,10 @@
dz_bottom: 300.0
z_max: 75000.0
z_elem: 31
dz_bottom: 50.0
dt_save_state_to_disk: "4days"
t_end: "8days"
forcing: "held_suarez"
dt: "400secs"
z_elem: 25
deep_atmosphere: true
z_max: 55000.0
rayleigh_sponge: true
toml: [toml/sphere_held_suarez.toml]
3 changes: 3 additions & 0 deletions src/cache/tracer_cache.jl
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@ using ClimaUtilities.ClimaArtifacts
import Dates: Year
import ClimaUtilities.TimeVaryingInputs:
TimeVaryingInput, LinearPeriodFillingInterpolation
import Interpolations as Intp

function tracer_cache(
Y,
Expand Down Expand Up @@ -47,6 +48,7 @@ function tracer_cache(
# time series of lon-lat-z data.
prescribed_aerosol_names_as_symbols = Symbol.(prescribed_aerosol_names)
target_space = axes(Y.c)
extrapolation_bc = (Intp.Periodic(), Intp.Flat(), Intp.Flat())
timevaryinginputs = [
TimeVaryingInput(
joinpath(
Expand All @@ -60,6 +62,7 @@ function tracer_cache(
target_space;
reference_date = start_date,
regridder_type = :InterpolationsRegridder,
regridder_kwargs = (; extrapolation_bc),
method = LinearPeriodFillingInterpolation(Year(1)),
) for name in prescribed_aerosol_names
]
Expand Down
3 changes: 3 additions & 0 deletions toml/diagnostic_edmfx.toml
Original file line number Diff line number Diff line change
@@ -1,3 +1,6 @@
[zd_rayleigh]
value = 50000.0

[entr_inv_tau]
value = 0.002

Expand Down
3 changes: 3 additions & 0 deletions toml/prognostic_edmfx.toml
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,9 @@ value = 0
[detr_coeff]
value = 0

[zd_rayleigh]
value = 50000.0

[detr_buoy_coeff]
value = 0

Expand Down
6 changes: 6 additions & 0 deletions toml/sphere_held_suarez.toml
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
[zd_viscous]
value = 50000.0

[zd_rayleigh]
value = 50000.0

6 changes: 0 additions & 6 deletions toml/sphere_held_suarez_rhoe_equilmoist_hightop_sponge.toml

This file was deleted.

0 comments on commit d8bf303

Please sign in to comment.