Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Remove error if config_dict value does not have default type #3206

Merged
merged 3 commits into from
Jul 18, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 2 additions & 5 deletions config/default_configs/default_config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -141,7 +141,7 @@ reference_job_id:
value: ~
vert_diff:
help: "Vertical diffusion [`false` (default), `VerticalDiffusion`, `true` (defaults to `VerticalDiffusion`), `FriersonDiffusion`]"
value: "false"
value: false
hyperdiff:
help: "Hyperdiffusion [`ClimaHyperdiffusion` (or `true`; default), `none` (or `false`)]"
value: "CAM_SE"
Expand Down Expand Up @@ -232,9 +232,6 @@ external_forcing:
external_forcing_file:
help: "External forcing file containing large-scale forcings, initial conditions, and boundary conditions [`nothing` (default), `path/to/file`]"
value: ~
fps:
help: "Frames per second for animations"
value: 5
subsidence:
help: "Subsidence [`nothing` (default), `Bomex`, `LifeCycleTan2018`, `Rico`, `DYCOMS`]"
value: ~
Expand All @@ -246,7 +243,7 @@ prognostic_tke:
value: false
prognostic_surface:
help: "Determines if surface temperature is prognostic [`false` (default), , `true`, `PrognosticSurfaceTemperature`, `PrescribedSurfaceTemperature`]"
value: "false"
value: false
albedo_model:
help: "Variable surface albedo [`ConstantAlbedo` (default), `RegressionFunctionAlbedo`, `CouplerAlbedo`]"
value: "ConstantAlbedo"
Expand Down
2 changes: 1 addition & 1 deletion config/gpu_configs/gpu_hs_rhoe_equil_55km_nz63_0M.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ z_elem: 63
dz_bottom: 30.0
dz_top: 3000.0
z_max: 55000.0
vert_diff: "true"
vert_diff: true
moist: "equil"
precip_model: "0M"
rayleigh_sponge: true
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ z_elem: 63
dz_bottom: 30.0
dz_top: 3000.0
z_max: 55000.0
vert_diff: "true"
vert_diff: true
moist: "equil"
precip_model: "0M"
rayleigh_sponge: true
Expand Down
2 changes: 1 addition & 1 deletion config/longrun_configs/longrun_moist_held_suarez.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ dt: "100secs"
t_end: "360days"
moist: "equil"
precip_model: "0M"
vert_diff: "true"
vert_diff: true
rayleigh_sponge: true
forcing: "held_suarez"
dt_save_state_to_disk: "10days"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ t_end: "360days"
deep_atmosphere: true
moist: "equil"
precip_model: "0M"
vert_diff: "true"
vert_diff: true
rayleigh_sponge: true
forcing: "held_suarez"
dt_save_state_to_disk: "10days"
Expand Down
2 changes: 1 addition & 1 deletion config/model_configs/box_hydrostatic_balance_rhoe.yml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
t_end: "1days"
config: "box"
hyperdiff: "false"
hyperdiff: false
dt: "20secs"
perturb_initstate: false
diagnostics:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ z_elem: 63
dz_bottom: 30.0
dz_top: 3000.0
z_max: 55000.0
vert_diff: "true"
vert_diff: true
moist: "equil"
precip_model: "0M"
rayleigh_sponge: true
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ z_elem: 63
dz_bottom: 30.0
dz_top: 3000.0
z_max: 55000.0
vert_diff: "true"
vert_diff: true
moist: "equil"
precip_model: "0M"
rayleigh_sponge: true
Expand Down
2 changes: 1 addition & 1 deletion config/model_configs/gpu_prognostic_edmfx_aquaplanet.yml
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ moist: equil
precip_model: 1M
dt: 10secs
t_end: 1hours
dt_save_to_disk: 600secs
dt_save_state_to_disk: 600secs
toml: [toml/prognostic_edmfx.toml]
output_default_diagnostics: false
diagnostics:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ dz_top: 1000.0
x_elem: 80
dz_bottom: 200.0
config: "plane"
hyperdiff: "false"
hyperdiff: false
z_max: 25000.0
topography: "Agnesi"
toml: [toml/plane_agnesi_mountain_test_stretched.toml]
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ t_end: "14400.0secs"
z_stretch: false
x_elem: 80
config: "plane"
hyperdiff: "false"
hyperdiff: false
z_max: 25000.0
topography: "Agnesi"
toml: [toml/plane_agnesi_mountain_test_uniform.toml]
Expand Down
2 changes: 1 addition & 1 deletion config/model_configs/prognostic_edmfx_bomex_column.yml
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ z_stretch: false
perturb_initstate: false
dt: "10secs"
t_end: "6hours"
dt_save_to_disk: "10mins"
dt_save_state_to_disk: "10mins"
toml: [toml/prognostic_edmfx_bomex.toml]
netcdf_interpolation_num_points: [2, 2, 60]
diagnostics:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ z_stretch: false
perturb_initstate: false
dt: "50secs"
t_end: "6hours"
dt_save_to_disk: "10mins"
dt_save_state_to_disk: "10mins"
toml: [toml/prognostic_edmfx_bomex.toml]
netcdf_interpolation_num_points: [2, 2, 60]
diagnostics:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ z_stretch: false
perturb_initstate: false
dt: "5secs"
t_end: "6hours"
dt_save_to_disk: "10mins"
dt_save_state_to_disk: "10mins"
toml: [toml/prognostic_edmfx_bomex_pigroup.toml]
netcdf_interpolation_num_points: [2, 2, 60]
diagnostics:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ prognostic_tke: true
moist: "equil"
call_cloud_diagnostics_per_stage: true
config: "column"
hyperdiff: "false"
hyperdiff: false
z_max: 3e3
x_elem: 2
y_elem: 2
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ prognostic_tke: true
moist: equil
call_cloud_diagnostics_per_stage: true
config: column
hyperdiff: "false"
hyperdiff: false
z_max: 1500
x_elem: 2
y_elem: 2
Expand Down
2 changes: 1 addition & 1 deletion config/model_configs/prognostic_edmfx_gabls_column.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ edmfx_filter: true
prognostic_tke: true
moist: "equil"
config: "column"
hyperdiff: "false"
hyperdiff: false
z_max: 400
x_elem: 2
y_elem: 2
Expand Down
2 changes: 1 addition & 1 deletion config/model_configs/prognostic_edmfx_gcmdriven_column.yml
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ z_stretch: false
perturb_initstate: false
dt: "10secs"
t_end: "6hours"
dt_save_to_disk: "10mins"
dt_save_state_to_disk: "10mins"
toml: [toml/prognostic_edmfx_bomex.toml]
netcdf_output_at_levels: true
netcdf_interpolation_num_points: [2, 2, 60]
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ z_stretch: false
perturb_initstate: false
dt: 20secs"
t_end: "12hours"
dt_save_to_disk: "10mins"
dt_save_state_to_disk: "10mins"
toml: [toml/prognostic_edmfx_simpleplume.toml]
netcdf_interpolation_num_points: [2, 2, 80]
diagnostics:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ dz_bottom: 30.0
dt_save_state_to_disk: "5days"
initial_condition: "IsothermalProfile"
config: "column"
hyperdiff: "false"
hyperdiff: false
z_elem: 45
dt: "3hours"
FLOAT_TYPE: "Float64"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,6 @@ dt_save_state_to_disk: "400secs"
initial_condition: "IsothermalProfile"
t_end: "1500secs"
config: "column"
hyperdiff: "false"
hyperdiff: false
dt: "400secs"
non_orographic_gravity_wave: true
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
dt_save_state_to_disk: "100days"
initial_condition: "IsothermalProfile"
hyperdiff: "false"
hyperdiff: false
z_elem: 70
dt: "3hours"
idealized_h2o: true
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
dt_save_state_to_disk: "100days"
initial_condition: "IsothermalProfile"
hyperdiff: "false"
hyperdiff: false
z_elem: 70
dt: "3hours"
idealized_h2o: true
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@

rad: "clearsky"
idealized_h2o: true
hyperdiff: "false"
hyperdiff: false
config: "column"
initial_condition: "IsothermalProfile"
z_max: 70000
Expand All @@ -12,6 +12,6 @@ t_end: "654days"
dt: "3hours"
dt_save_to_sol: "30hours"
dt_save_state_to_disk: "100days"
prognostic_surface: "true"
prognostic_surface: true
surface_setup: DefaultExchangeCoefficients
toml: [toml/single_column_radiative_equilibrium_clearsky_prognostic_surface_temp.toml]
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
dt_save_state_to_disk: "100days"
initial_condition: "IsothermalProfile"
hyperdiff: "false"
hyperdiff: false
z_elem: 70
dt: "3hours"
t_end: "654days"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ surface_setup: "DefaultMoninObukhov"
t_end: "15hours"
non_orographic_gravity_wave: true
dz_bottom: 300.0
vert_diff: "true"
vert_diff: true
insolation: "timevarying"
z_max: 55000.0
precip_model: "0M"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,6 @@ surface_setup: DefaultMoninObukhov
prognostic_surface: "PrognosticSurfaceTemperature"
rad: "clearsky"
precip_model: "0M"
vert_diff: "true"
vert_diff: true
dt_save_state_to_disk: "5days"
check_conservation: true
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ dt: "450secs"
z_elem: 25
t_end: "4days"
dz_bottom: 300.0
vert_diff: "true"
vert_diff: true
forcing: "held_suarez"
z_max: 55000.0
precip_model: "0M"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ rayleigh_sponge: true
topo_smoothing: true
dt: "200secs"
t_end: "2days"
vert_diff: "true"
vert_diff: true
forcing: "held_suarez"
precip_model: "0M"
topography: "DCMIP200"
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
dt_save_state_to_disk: "8days"
t_end: "8days"
discrete_hydrostatic_balance: true
hyperdiff: "false"
hyperdiff: false
perturb_initstate: false
FLOAT_TYPE: "Float64"
dt_save_to_sol: "600secs"
2 changes: 1 addition & 1 deletion config/model_configs/test_env.yml
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
vert_diff: "true"
vert_diff: true
surface_setup: "DefaultExchangeCoefficients"
moist: "equil"
rad: "allskywithclear"
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
vert_diff: "true"
vert_diff: true
surface_setup: "DefaultExchangeCoefficients"
moist: "equil"
rad: "clearsky"
Expand Down
2 changes: 1 addition & 1 deletion config/perf_configs/bm_perf_target.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ z_elem: 25
dt: "1secs"
surface_setup: "DefaultExchangeCoefficients"
t_end: "10secs"
vert_diff: "true"
vert_diff: true
implicit_diffusion: true
approximate_linear_solve_iters: 2
h_elem: 12
Expand Down
2 changes: 1 addition & 1 deletion config/perf_configs/bm_perf_target_threaded.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ z_elem: 25
dt: "1secs"
surface_setup: "DefaultExchangeCoefficients"
t_end: "10secs"
vert_diff: "true"
vert_diff: true
implicit_diffusion: true
approximate_linear_solve_iters: 2
h_elem: 12
Expand Down
2 changes: 1 addition & 1 deletion config/perf_configs/checkbounds.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ z_elem: 25
dt: "1secs"
surface_setup: "DefaultExchangeCoefficients"
t_end: "10secs"
vert_diff: "true"
vert_diff: true
implicit_diffusion: true
approximate_linear_solve_iters: 2
h_elem: 12
Expand Down
2 changes: 1 addition & 1 deletion config/perf_configs/cpu_implicit_barowave.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ apply_limiter: true
z_elem: 25
dt: "1secs"
surface_setup: "DefaultExchangeCoefficients"
vert_diff: "true"
vert_diff: true
implicit_diffusion: true
approximate_linear_solve_iters: 2
h_elem: 12
Expand Down
2 changes: 1 addition & 1 deletion config/perf_configs/flame_gpu_implicit_barowave_moist.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ z_elem: 25
dt: "1secs"
surface_setup: "DefaultExchangeCoefficients"
t_end: "10secs"
vert_diff: "true"
vert_diff: true
implicit_diffusion: true
approximate_linear_solve_iters: 2
h_elem: 12
Expand Down
2 changes: 1 addition & 1 deletion config/perf_configs/flame_perf_diagnostics.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ z_elem: 25
dt: "1secs"
surface_setup: "DefaultExchangeCoefficients"
t_end: "10secs"
vert_diff: "true"
vert_diff: true
implicit_diffusion: true
approximate_linear_solve_iters: 2
h_elem: 12
Expand Down
2 changes: 1 addition & 1 deletion config/perf_configs/flame_perf_gw.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ z_elem: 25
dt: "1secs"
surface_setup: "DefaultExchangeCoefficients"
t_end: "10secs"
vert_diff: "true"
vert_diff: true
implicit_diffusion: true
approximate_linear_solve_iters: 2
h_elem: 12
Expand Down
2 changes: 1 addition & 1 deletion config/perf_configs/flame_perf_target.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ z_elem: 25
dt: "1secs"
surface_setup: "DefaultExchangeCoefficients"
t_end: "10secs"
vert_diff: "true"
vert_diff: true
implicit_diffusion: true
approximate_linear_solve_iters: 2
h_elem: 12
Expand Down
2 changes: 1 addition & 1 deletion config/perf_configs/flame_perf_target_callbacks.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ z_elem: 25
dt: "1secs"
surface_setup: "DefaultExchangeCoefficients"
t_end: "10secs"
vert_diff: "true"
vert_diff: true
implicit_diffusion: true
approximate_linear_solve_iters: 2
h_elem: 12
Expand Down
Loading
Loading