Remove/fix unused YAML keys, add exception for diagnostics

CliMA · Jul 18, 2024 · 66f1e40 · 66f1e40
1 parent 41ee058
commit 66f1e40
Show file tree

Hide file tree

Showing 8 changed files with 11 additions and 8 deletions.
diff --git a/config/model_configs/gpu_prognostic_edmfx_aquaplanet.yml b/config/model_configs/gpu_prognostic_edmfx_aquaplanet.yml
@@ -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:

diff --git a/config/model_configs/prognostic_edmfx_bomex_column.yml b/config/model_configs/prognostic_edmfx_bomex_column.yml
@@ -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:

diff --git a/config/model_configs/prognostic_edmfx_bomex_implicit_column.yml b/config/model_configs/prognostic_edmfx_bomex_implicit_column.yml
@@ -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:

diff --git a/config/model_configs/prognostic_edmfx_bomex_pigroup_column.yml b/config/model_configs/prognostic_edmfx_bomex_pigroup_column.yml
@@ -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:

diff --git a/config/model_configs/prognostic_edmfx_gcmdriven_column.yml b/config/model_configs/prognostic_edmfx_gcmdriven_column.yml
@@ -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]

diff --git a/config/model_configs/prognostic_edmfx_simpleplume_column.yml b/config/model_configs/prognostic_edmfx_simpleplume_column.yml
@@ -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:

diff --git a/config/perf_configs/flame_perf_target_frierson.yml b/config/perf_configs/flame_perf_target_frierson.yml
@@ -8,7 +8,6 @@ dt_save_to_sol: "Inf"
 rad: "allskywithclear"
 log_progress: false
 vert_diff: "FriersonDiffusion"
-pproximate_linear_solve_iters: 2
 use_krylov_method: true
 use_dynamic_krylov_rtol: false
 krylov_rtol: 0.99

diff --git a/src/solver/yaml_helper.jl b/src/solver/yaml_helper.jl
@@ -83,7 +83,11 @@ function override_default_config(config_dict::AbstractDict;)
         end
     end
 
-    unused_keys = filter(k -> !haskey(default_config, k), keys(config_dict))
+    excluded_keys = Set(["diagnostics"])
+    unused_keys = filter(
+        k -> !haskey(default_config, k) && !(k in excluded_keys),
+        keys(config_dict),
+    )
     if !isempty(unused_keys)
         @warn "The configuration passed to ClimaAtmos contains unused keys: $(join(unused_keys, ", "))"
     end