From 53550c29a7eaadb715e45d51c9b2509c61cd2601 Mon Sep 17 00:00:00 2001 From: nefrathenrici Date: Wed, 13 Mar 2024 14:11:30 -0700 Subject: [PATCH] Format files to please YAML linter --- .github/workflows/yaml_format.yml | 2 +- .../default_configs/default_edmf_config.yml | 2 +- config/default_configs/default_perf.yml | 2 +- config/gpu_configs/gpu_aquaplanet_chap.yml | 18 ++++----- .../gpu_aquaplanet_chap_2process.yml | 18 ++++----- .../gpu_aquaplanet_chap_4process.yml | 18 ++++----- .../gpu_aquaplanet_chap_ws_1process.yml | 18 ++++----- .../gpu_aquaplanet_chap_ws_2process.yml | 18 ++++----- .../gpu_aquaplanet_chap_ws_4process.yml | 18 ++++----- config/gpu_configs/gpu_aquaplanet_dyamond.yml | 14 +++---- .../gpu_aquaplanet_dyamond_2process.yml | 14 +++---- .../gpu_aquaplanet_dyamond_4process.yml | 14 +++---- .../gpu_diagnostic_edmfx_aquaplanet.yml | 18 ++++----- .../longrun_aquaplanet_dyamond.yml | 14 +++---- .../diagnostic_edmfx_aquaplanet.yml | 16 ++++---- .../diagnostic_edmfx_bomex_box.yml | 38 +++++++++---------- .../diagnostic_edmfx_bomex_stretched_box.yml | 38 +++++++++---------- .../diagnostic_edmfx_dycoms_rf01_box.yml | 36 +++++++++--------- ...gnostic_edmfx_dycoms_rf01_explicit_box.yml | 38 +++++++++---------- .../diagnostic_edmfx_gabls_box.yml | 6 +-- .../diagnostic_edmfx_rico_box.yml | 4 +- .../diagnostic_edmfx_trmm_box.yml | 4 +- .../diagnostic_edmfx_trmm_stretched_box.yml | 1 - .../prognostic_edmfx_aquaplanet.yml | 18 ++++----- ...brium_clearsky_prognostic_surface_temp.yml | 1 - .../restart_mpi_baroclinic_wave_rhoe.yml | 2 +- ...erf_target_prognostic_edmfx_aquaplanet.yml | 18 ++++----- .../perf_configs/gpu_baroclinic_wave_rhoe.yml | 8 ++-- .../gpu_implicit_barowave_wrt_h_elem.yml | 14 +++---- config/perf_configs/invalidations.yml | 2 +- 30 files changed, 215 insertions(+), 217 deletions(-) diff --git a/.github/workflows/yaml_format.yml b/.github/workflows/yaml_format.yml index 3b8eb59906d..b772148205d 100644 --- a/.github/workflows/yaml_format.yml +++ b/.github/workflows/yaml_format.yml @@ -10,7 +10,7 @@ jobs: with: file_or_dir: config strict: true - # Ignore warning + # Ignore warning config_data: | extends: default rules: diff --git a/config/default_configs/default_edmf_config.yml b/config/default_configs/default_edmf_config.yml index 374d7cf2e23..9eda32c990c 100644 --- a/config/default_configs/default_edmf_config.yml +++ b/config/default_configs/default_edmf_config.yml @@ -37,4 +37,4 @@ edmfx_sgs_diffusive_flux: value: false updraft_number: help: "Sets the number of updrafts for the EDMF scheme" - value: 1 \ No newline at end of file + value: 1 diff --git a/config/default_configs/default_perf.yml b/config/default_configs/default_perf.yml index 96e46004265..41ec2651959 100644 --- a/config/default_configs/default_perf.yml +++ b/config/default_configs/default_perf.yml @@ -13,4 +13,4 @@ precip_model: "0M" dt_save_to_sol: "Inf" rad: "allskywithclear" warn_allocations_diagnostics: true -log_progress: false \ No newline at end of file +log_progress: false diff --git a/config/gpu_configs/gpu_aquaplanet_chap.yml b/config/gpu_configs/gpu_aquaplanet_chap.yml index 6cb4218066c..c067d968fef 100644 --- a/config/gpu_configs/gpu_aquaplanet_chap.yml +++ b/config/gpu_configs/gpu_aquaplanet_chap.yml @@ -7,23 +7,23 @@ z_max: 55000.0 z_elem: 63 dz_bottom: 30.0 dz_top: 3000.0 -moist: equil -surface_setup: DefaultMoninObukhov +moist: equil +surface_setup: DefaultMoninObukhov rad: allskywithclear idealized_insolation: false dt_rad: 1hours dt_cloud_fraction: 1hours -turbconv: diagnostic_edmfx +turbconv: diagnostic_edmfx implicit_diffusion: true approximate_linear_solve_iters: 2 prognostic_tke: true -edmfx_upwinding: first_order -edmfx_entr_model: "Generalized" -edmfx_detr_model: "Generalized" -edmfx_nh_pressure: true +edmfx_upwinding: first_order +edmfx_entr_model: "Generalized" +edmfx_detr_model: "Generalized" +edmfx_nh_pressure: true edmfx_sgs_mass_flux: true edmfx_sgs_diffusive_flux: true precip_model: 0M -dt: 100secs -t_end: 1days +dt: 100secs +t_end: 1days toml: [toml/diagnostic_edmfx_box.toml] diff --git a/config/gpu_configs/gpu_aquaplanet_chap_2process.yml b/config/gpu_configs/gpu_aquaplanet_chap_2process.yml index f9b649d7f06..e70270c8697 100644 --- a/config/gpu_configs/gpu_aquaplanet_chap_2process.yml +++ b/config/gpu_configs/gpu_aquaplanet_chap_2process.yml @@ -7,23 +7,23 @@ z_max: 55000.0 z_elem: 63 dz_bottom: 30.0 dz_top: 3000.0 -moist: equil -surface_setup: DefaultMoninObukhov +moist: equil +surface_setup: DefaultMoninObukhov rad: allskywithclear idealized_insolation: false dt_rad: 1hours dt_cloud_fraction: 1hours -turbconv: diagnostic_edmfx +turbconv: diagnostic_edmfx implicit_diffusion: true approximate_linear_solve_iters: 2 prognostic_tke: true -edmfx_upwinding: first_order -edmfx_entr_model: "Generalized" -edmfx_detr_model: "Generalized" -edmfx_nh_pressure: true +edmfx_upwinding: first_order +edmfx_entr_model: "Generalized" +edmfx_detr_model: "Generalized" +edmfx_nh_pressure: true edmfx_sgs_mass_flux: true edmfx_sgs_diffusive_flux: true precip_model: 0M -dt: 100secs -t_end: 1days +dt: 100secs +t_end: 1days toml: [toml/diagnostic_edmfx_box.toml] diff --git a/config/gpu_configs/gpu_aquaplanet_chap_4process.yml b/config/gpu_configs/gpu_aquaplanet_chap_4process.yml index 0faddbf60fa..4c47fdcd078 100644 --- a/config/gpu_configs/gpu_aquaplanet_chap_4process.yml +++ b/config/gpu_configs/gpu_aquaplanet_chap_4process.yml @@ -7,23 +7,23 @@ z_max: 55000.0 z_elem: 63 dz_bottom: 30.0 dz_top: 3000.0 -moist: equil -surface_setup: DefaultMoninObukhov +moist: equil +surface_setup: DefaultMoninObukhov rad: allskywithclear idealized_insolation: false dt_rad: 1hours dt_cloud_fraction: 1hours -turbconv: diagnostic_edmfx +turbconv: diagnostic_edmfx implicit_diffusion: true approximate_linear_solve_iters: 2 prognostic_tke: true -edmfx_upwinding: first_order -edmfx_entr_model: "Generalized" -edmfx_detr_model: "Generalized" -edmfx_nh_pressure: true +edmfx_upwinding: first_order +edmfx_entr_model: "Generalized" +edmfx_detr_model: "Generalized" +edmfx_nh_pressure: true edmfx_sgs_mass_flux: true edmfx_sgs_diffusive_flux: true precip_model: 0M -dt: 100secs -t_end: 1days +dt: 100secs +t_end: 1days toml: [toml/diagnostic_edmfx_box.toml] diff --git a/config/gpu_configs/gpu_aquaplanet_chap_ws_1process.yml b/config/gpu_configs/gpu_aquaplanet_chap_ws_1process.yml index 06f70b22777..543e72a92a0 100644 --- a/config/gpu_configs/gpu_aquaplanet_chap_ws_1process.yml +++ b/config/gpu_configs/gpu_aquaplanet_chap_ws_1process.yml @@ -7,23 +7,23 @@ z_max: 55000.0 z_elem: 63 dz_bottom: 30.0 dz_top: 3000.0 -moist: equil -surface_setup: DefaultMoninObukhov +moist: equil +surface_setup: DefaultMoninObukhov rad: allskywithclear idealized_insolation: false dt_rad: 1hours dt_cloud_fraction: 1hours -turbconv: diagnostic_edmfx +turbconv: diagnostic_edmfx implicit_diffusion: true approximate_linear_solve_iters: 2 prognostic_tke: true -edmfx_upwinding: first_order -edmfx_entr_model: "Generalized" -edmfx_detr_model: "Generalized" -edmfx_nh_pressure: true +edmfx_upwinding: first_order +edmfx_entr_model: "Generalized" +edmfx_detr_model: "Generalized" +edmfx_nh_pressure: true edmfx_sgs_mass_flux: true edmfx_sgs_diffusive_flux: true precip_model: 0M -dt: 50secs -t_end: 1days +dt: 50secs +t_end: 1days toml: [toml/diagnostic_edmfx_box.toml] diff --git a/config/gpu_configs/gpu_aquaplanet_chap_ws_2process.yml b/config/gpu_configs/gpu_aquaplanet_chap_ws_2process.yml index 49f50ce3166..668384c6d51 100644 --- a/config/gpu_configs/gpu_aquaplanet_chap_ws_2process.yml +++ b/config/gpu_configs/gpu_aquaplanet_chap_ws_2process.yml @@ -7,23 +7,23 @@ z_max: 55000.0 z_elem: 63 dz_bottom: 30.0 dz_top: 3000.0 -moist: equil -surface_setup: DefaultMoninObukhov +moist: equil +surface_setup: DefaultMoninObukhov rad: allskywithclear idealized_insolation: false dt_rad: 1hours dt_cloud_fraction: 1hours -turbconv: diagnostic_edmfx +turbconv: diagnostic_edmfx implicit_diffusion: true approximate_linear_solve_iters: 2 prognostic_tke: true -edmfx_upwinding: first_order -edmfx_entr_model: "Generalized" -edmfx_detr_model: "Generalized" -edmfx_nh_pressure: true +edmfx_upwinding: first_order +edmfx_entr_model: "Generalized" +edmfx_detr_model: "Generalized" +edmfx_nh_pressure: true edmfx_sgs_mass_flux: true edmfx_sgs_diffusive_flux: true precip_model: 0M -dt: 50secs -t_end: 1days +dt: 50secs +t_end: 1days toml: [toml/diagnostic_edmfx_box.toml] diff --git a/config/gpu_configs/gpu_aquaplanet_chap_ws_4process.yml b/config/gpu_configs/gpu_aquaplanet_chap_ws_4process.yml index fd666d4c089..4074e3972e0 100644 --- a/config/gpu_configs/gpu_aquaplanet_chap_ws_4process.yml +++ b/config/gpu_configs/gpu_aquaplanet_chap_ws_4process.yml @@ -7,23 +7,23 @@ z_max: 55000.0 z_elem: 63 dz_bottom: 30.0 dz_top: 3000.0 -moist: equil -surface_setup: DefaultMoninObukhov +moist: equil +surface_setup: DefaultMoninObukhov rad: allskywithclear idealized_insolation: false dt_rad: 1hours dt_cloud_fraction: 1hours -turbconv: diagnostic_edmfx +turbconv: diagnostic_edmfx implicit_diffusion: true approximate_linear_solve_iters: 2 prognostic_tke: true -edmfx_upwinding: first_order -edmfx_entr_model: "Generalized" -edmfx_detr_model: "Generalized" -edmfx_nh_pressure: true +edmfx_upwinding: first_order +edmfx_entr_model: "Generalized" +edmfx_detr_model: "Generalized" +edmfx_nh_pressure: true edmfx_sgs_mass_flux: true edmfx_sgs_diffusive_flux: true precip_model: 0M -dt: 50secs -t_end: 1days +dt: 50secs +t_end: 1days toml: [toml/diagnostic_edmfx_box.toml] diff --git a/config/gpu_configs/gpu_aquaplanet_dyamond.yml b/config/gpu_configs/gpu_aquaplanet_dyamond.yml index 468481d899c..8210c713e23 100644 --- a/config/gpu_configs/gpu_aquaplanet_dyamond.yml +++ b/config/gpu_configs/gpu_aquaplanet_dyamond.yml @@ -6,15 +6,15 @@ z_max: 55000.0 z_elem: 63 dz_bottom: 30.0 dz_top: 3000.0 -moist: "equil" -precip_model: "0M" -rad: "allskywithclear" +moist: "equil" +precip_model: "0M" +rad: "allskywithclear" idealized_insolation: false dt_rad: "1hours" -vert_diff: "true" -surface_setup: "DefaultMoninObukhov" +vert_diff: "true" +surface_setup: "DefaultMoninObukhov" rayleigh_sponge: true -dt: "100secs" +dt: "100secs" t_end: "12hours" -job_id: "gpu_aquaplanet_dyamond" +job_id: "gpu_aquaplanet_dyamond" toml: [toml/longrun_aquaplanet_dyamond.toml] diff --git a/config/gpu_configs/gpu_aquaplanet_dyamond_2process.yml b/config/gpu_configs/gpu_aquaplanet_dyamond_2process.yml index e754ff1a7e1..c82efe7219d 100644 --- a/config/gpu_configs/gpu_aquaplanet_dyamond_2process.yml +++ b/config/gpu_configs/gpu_aquaplanet_dyamond_2process.yml @@ -6,15 +6,15 @@ z_max: 55000.0 z_elem: 63 dz_bottom: 30.0 dz_top: 3000.0 -moist: "equil" -precip_model: "0M" -rad: "allskywithclear" +moist: "equil" +precip_model: "0M" +rad: "allskywithclear" idealized_insolation: false dt_rad: "1hours" -vert_diff: "true" -surface_setup: "DefaultMoninObukhov" +vert_diff: "true" +surface_setup: "DefaultMoninObukhov" rayleigh_sponge: true -dt: "100secs" +dt: "100secs" t_end: "12hours" -job_id: "gpu_aquaplanet_dyamond_2process" +job_id: "gpu_aquaplanet_dyamond_2process" toml: [toml/longrun_aquaplanet_dyamond.toml] diff --git a/config/gpu_configs/gpu_aquaplanet_dyamond_4process.yml b/config/gpu_configs/gpu_aquaplanet_dyamond_4process.yml index bc554a83b24..372d80c96da 100644 --- a/config/gpu_configs/gpu_aquaplanet_dyamond_4process.yml +++ b/config/gpu_configs/gpu_aquaplanet_dyamond_4process.yml @@ -6,15 +6,15 @@ z_max: 55000.0 z_elem: 63 dz_bottom: 30.0 dz_top: 3000.0 -moist: "equil" -precip_model: "0M" -rad: "allskywithclear" +moist: "equil" +precip_model: "0M" +rad: "allskywithclear" idealized_insolation: false dt_rad: "1hours" -vert_diff: "true" -surface_setup: "DefaultMoninObukhov" +vert_diff: "true" +surface_setup: "DefaultMoninObukhov" rayleigh_sponge: true -dt: "100secs" +dt: "100secs" t_end: "12hours" -job_id: "gpu_aquaplanet_dyamond_4process" +job_id: "gpu_aquaplanet_dyamond_4process" toml: [toml/longrun_aquaplanet_dyamond.toml] diff --git a/config/gpu_configs/gpu_diagnostic_edmfx_aquaplanet.yml b/config/gpu_configs/gpu_diagnostic_edmfx_aquaplanet.yml index dd6d3491cd5..ccb043e712a 100644 --- a/config/gpu_configs/gpu_diagnostic_edmfx_aquaplanet.yml +++ b/config/gpu_configs/gpu_diagnostic_edmfx_aquaplanet.yml @@ -1,20 +1,20 @@ dt_save_state_to_disk: "3hours" dt_save_to_sol: "Inf" job_id: gpu_diagnostic_edmfx_aquaplanet -surface_setup: DefaultMoninObukhov +surface_setup: DefaultMoninObukhov rad: clearsky -turbconv: diagnostic_edmfx +turbconv: diagnostic_edmfx implicit_diffusion: true approximate_linear_solve_iters: 2 prognostic_tke: true -edmfx_upwinding: first_order -edmfx_entr_model: "Generalized" -edmfx_detr_model: "Generalized" -edmfx_nh_pressure: true +edmfx_upwinding: first_order +edmfx_entr_model: "Generalized" +edmfx_detr_model: "Generalized" +edmfx_nh_pressure: true edmfx_sgs_mass_flux: true edmfx_sgs_diffusive_flux: true -moist: equil +moist: equil precip_model: 0M -dt: 100secs -t_end: 6hours +dt: 100secs +t_end: 6hours toml: [toml/diagnostic_edmfx_box.toml] diff --git a/config/longrun_configs/longrun_aquaplanet_dyamond.yml b/config/longrun_configs/longrun_aquaplanet_dyamond.yml index b3585f1abe1..59d70cf0002 100644 --- a/config/longrun_configs/longrun_aquaplanet_dyamond.yml +++ b/config/longrun_configs/longrun_aquaplanet_dyamond.yml @@ -3,17 +3,17 @@ z_max: 55000.0 z_elem: 63 dz_bottom: 30.0 dz_top: 3000.0 -moist: "equil" -precip_model: "0M" +moist: "equil" +precip_model: "0M" cloud_model: "grid_scale" -rad: "allskywithclear" +rad: "allskywithclear" idealized_insolation: false dt_rad: "1hours" -vert_diff: "true" -surface_setup: "DefaultMoninObukhov" +vert_diff: "true" +surface_setup: "DefaultMoninObukhov" rayleigh_sponge: true dt_save_state_to_disk: "3hours" -dt: "50secs" +dt: "50secs" t_end: "1days" -job_id: "longrun_aquaplanet_dyamond" +job_id: "longrun_aquaplanet_dyamond" toml: [toml/longrun_aquaplanet_dyamond.toml] diff --git a/config/model_configs/diagnostic_edmfx_aquaplanet.yml b/config/model_configs/diagnostic_edmfx_aquaplanet.yml index af7ae8644d2..6172b0c9be2 100644 --- a/config/model_configs/diagnostic_edmfx_aquaplanet.yml +++ b/config/model_configs/diagnostic_edmfx_aquaplanet.yml @@ -1,21 +1,21 @@ job_id: diagnostic_edmfx_aquaplanet surface_setup: DefaultMoninObukhov rad: clearsky -turbconv: diagnostic_edmfx +turbconv: diagnostic_edmfx implicit_diffusion: true approximate_linear_solve_iters: 2 prognostic_tke: true -edmfx_upwinding: first_order -edmfx_entr_model: "Generalized" -edmfx_detr_model: "Generalized" -edmfx_nh_pressure: true +edmfx_upwinding: first_order +edmfx_entr_model: "Generalized" +edmfx_detr_model: "Generalized" +edmfx_nh_pressure: true edmfx_sgs_mass_flux: true edmfx_sgs_diffusive_flux: true -moist: equil +moist: equil precip_model: 0M override_τ_precip: false -dt: 100secs -t_end: 12hours +dt: 100secs +t_end: 12hours dt_save_state_to_disk: 12hours regression_test: true toml: [toml/diagnostic_edmfx_trmm_box.toml] diff --git a/config/model_configs/diagnostic_edmfx_bomex_box.yml b/config/model_configs/diagnostic_edmfx_bomex_box.yml index d49677c0b85..aed032f916d 100644 --- a/config/model_configs/diagnostic_edmfx_bomex_box.yml +++ b/config/model_configs/diagnostic_edmfx_bomex_box.yml @@ -1,31 +1,31 @@ job_id: "diagnostic_edmfx_bomex_box" -initial_condition: "Bomex" -subsidence: "Bomex" -edmf_coriolis: "Bomex" -ls_adv: "Bomex" +initial_condition: "Bomex" +subsidence: "Bomex" +edmf_coriolis: "Bomex" +ls_adv: "Bomex" surface_setup: "Bomex" -turbconv: "diagnostic_edmfx" +turbconv: "diagnostic_edmfx" implicit_diffusion: true approximate_linear_solve_iters: 2 prognostic_tke: true -edmfx_upwinding: "first_order" -edmfx_entr_model: "Generalized" -edmfx_detr_model: "Generalized" -edmfx_nh_pressure: true +edmfx_upwinding: "first_order" +edmfx_entr_model: "Generalized" +edmfx_detr_model: "Generalized" +edmfx_nh_pressure: true edmfx_sgs_mass_flux: true edmfx_sgs_diffusive_flux: true moist: "equil" -config: "box" -hyperdiff: "true" -x_max: 1e8 -y_max: 1e8 -x_elem: 2 -y_elem: 2 -z_elem: 60 -z_max: 3e3 +config: "box" +hyperdiff: "true" +x_max: 1e8 +y_max: 1e8 +x_elem: 2 +y_elem: 2 +z_elem: 60 +z_max: 3e3 z_stretch: false -dt: "100secs" -t_end: "6hours" +dt: "100secs" +t_end: "6hours" dt_save_state_to_disk: "10mins" toml: [toml/diagnostic_edmfx_box.toml] netcdf_output_at_levels: true diff --git a/config/model_configs/diagnostic_edmfx_bomex_stretched_box.yml b/config/model_configs/diagnostic_edmfx_bomex_stretched_box.yml index 3a414caaeda..deae04fc6a7 100644 --- a/config/model_configs/diagnostic_edmfx_bomex_stretched_box.yml +++ b/config/model_configs/diagnostic_edmfx_bomex_stretched_box.yml @@ -1,32 +1,32 @@ job_id: "diagnostic_edmfx_bomex_stretched_box" -initial_condition: "Bomex" -subsidence: "Bomex" -edmf_coriolis: "Bomex" -ls_adv: "Bomex" +initial_condition: "Bomex" +subsidence: "Bomex" +edmf_coriolis: "Bomex" +ls_adv: "Bomex" surface_setup: "Bomex" -turbconv: "diagnostic_edmfx" +turbconv: "diagnostic_edmfx" implicit_diffusion: true approximate_linear_solve_iters: 2 prognostic_tke: true -edmfx_upwinding: "first_order" -edmfx_entr_model: "Generalized" -edmfx_detr_model: "Generalized" -edmfx_nh_pressure: true +edmfx_upwinding: "first_order" +edmfx_entr_model: "Generalized" +edmfx_detr_model: "Generalized" +edmfx_nh_pressure: true edmfx_sgs_mass_flux: true edmfx_sgs_diffusive_flux: true moist: "equil" -config: "box" -hyperdiff: "true" -x_max: 1e8 -y_max: 1e8 -x_elem: 2 -y_elem: 2 -z_elem: 30 -z_max: 3e3 +config: "box" +hyperdiff: "true" +x_max: 1e8 +y_max: 1e8 +x_elem: 2 +y_elem: 2 +z_elem: 30 +z_max: 3e3 dz_bottom: 50.0 dz_top: 200.0 -dt: "200secs" -t_end: "6hours" +dt: "200secs" +t_end: "6hours" dt_save_state_to_disk: "10mins" toml: [toml/diagnostic_edmfx_box.toml] netcdf_output_at_levels: true diff --git a/config/model_configs/diagnostic_edmfx_dycoms_rf01_box.yml b/config/model_configs/diagnostic_edmfx_dycoms_rf01_box.yml index a22c943c486..d3249949e76 100644 --- a/config/model_configs/diagnostic_edmfx_dycoms_rf01_box.yml +++ b/config/model_configs/diagnostic_edmfx_dycoms_rf01_box.yml @@ -1,31 +1,31 @@ job_id: diagnostic_edmfx_dycoms_rf01_box -initial_condition: DYCOMS_RF01 -subsidence: DYCOMS -edmf_coriolis: DYCOMS_RF01 -rad: DYCOMS_RF01 +initial_condition: DYCOMS_RF01 +subsidence: DYCOMS +edmf_coriolis: DYCOMS_RF01 +rad: DYCOMS_RF01 surface_setup: DYCOMS_RF01 -turbconv: diagnostic_edmfx +turbconv: diagnostic_edmfx implicit_diffusion: true approximate_linear_solve_iters: 2 prognostic_tke: true -edmfx_upwinding: first_order -edmfx_entr_model: "Generalized" -edmfx_detr_model: "Generalized" -edmfx_nh_pressure: true +edmfx_upwinding: first_order +edmfx_entr_model: "Generalized" +edmfx_detr_model: "Generalized" +edmfx_nh_pressure: true edmfx_sgs_mass_flux: true edmfx_sgs_diffusive_flux: true moist: equil -config: box -hyperdiff: "true" -x_max: 1e8 -y_max: 1e8 -x_elem: 2 -y_elem: 2 -z_elem: 30 -z_max: 1500 +config: box +hyperdiff: "true" +x_max: 1e8 +y_max: 1e8 +x_elem: 2 +y_elem: 2 +z_elem: 30 +z_max: 1500 z_stretch: false dt: 100secs -t_end: 4hours +t_end: 4hours dt_save_state_to_disk: 10mins toml: [toml/diagnostic_edmfx_box.toml] netcdf_output_at_levels: true diff --git a/config/model_configs/diagnostic_edmfx_dycoms_rf01_explicit_box.yml b/config/model_configs/diagnostic_edmfx_dycoms_rf01_explicit_box.yml index 4eb6e111ff4..e48df7b2ef1 100644 --- a/config/model_configs/diagnostic_edmfx_dycoms_rf01_explicit_box.yml +++ b/config/model_configs/diagnostic_edmfx_dycoms_rf01_explicit_box.yml @@ -1,29 +1,29 @@ job_id: diagnostic_edmfx_dycoms_rf01_explicit_box -initial_condition: DYCOMS_RF01 -subsidence: DYCOMS -edmf_coriolis: DYCOMS_RF01 -rad: DYCOMS_RF01 +initial_condition: DYCOMS_RF01 +subsidence: DYCOMS +edmf_coriolis: DYCOMS_RF01 +rad: DYCOMS_RF01 surface_setup: DYCOMS_RF01 -turbconv: diagnostic_edmfx +turbconv: diagnostic_edmfx prognostic_tke: true -edmfx_upwinding: first_order -edmfx_entr_model: "Generalized" -edmfx_detr_model: "Generalized" -edmfx_nh_pressure: true +edmfx_upwinding: first_order +edmfx_entr_model: "Generalized" +edmfx_detr_model: "Generalized" +edmfx_nh_pressure: true edmfx_sgs_mass_flux: true edmfx_sgs_diffusive_flux: true moist: equil -config: box -hyperdiff: "true" -x_max: 1e8 -y_max: 1e8 -x_elem: 2 -y_elem: 2 -z_elem: 30 -z_max: 1500 +config: box +hyperdiff: "true" +x_max: 1e8 +y_max: 1e8 +x_elem: 2 +y_elem: 2 +z_elem: 30 +z_max: 1500 z_stretch: false -dt: 20secs -t_end: 4hours +dt: 20secs +t_end: 4hours dt_save_state_to_disk: 10mins toml: [toml/diagnostic_edmfx_box.toml] netcdf_output_at_levels: true diff --git a/config/model_configs/diagnostic_edmfx_gabls_box.yml b/config/model_configs/diagnostic_edmfx_gabls_box.yml index f17a16c24c6..d7631b83b7e 100644 --- a/config/model_configs/diagnostic_edmfx_gabls_box.yml +++ b/config/model_configs/diagnostic_edmfx_gabls_box.yml @@ -7,9 +7,9 @@ implicit_diffusion: true approximate_linear_solve_iters: 2 prognostic_tke: true edmfx_upwinding: first_order -edmfx_entr_model: "Generalized" -edmfx_detr_model: "Generalized" -edmfx_nh_pressure: true +edmfx_entr_model: "Generalized" +edmfx_detr_model: "Generalized" +edmfx_nh_pressure: true edmfx_sgs_mass_flux: true edmfx_sgs_diffusive_flux: true moist: equil diff --git a/config/model_configs/diagnostic_edmfx_rico_box.yml b/config/model_configs/diagnostic_edmfx_rico_box.yml index 18116a921be..5773f40dde2 100644 --- a/config/model_configs/diagnostic_edmfx_rico_box.yml +++ b/config/model_configs/diagnostic_edmfx_rico_box.yml @@ -8,8 +8,8 @@ implicit_diffusion: true approximate_linear_solve_iters: 2 prognostic_tke: true edmfx_upwinding: first_order -edmfx_entr_model: "Generalized" -edmfx_detr_model: "Generalized" +edmfx_entr_model: "Generalized" +edmfx_detr_model: "Generalized" edmfx_nh_pressure: true edmfx_sgs_mass_flux: true edmfx_sgs_diffusive_flux: true diff --git a/config/model_configs/diagnostic_edmfx_trmm_box.yml b/config/model_configs/diagnostic_edmfx_trmm_box.yml index ddd7b3c3cf9..6f5459a03af 100644 --- a/config/model_configs/diagnostic_edmfx_trmm_box.yml +++ b/config/model_configs/diagnostic_edmfx_trmm_box.yml @@ -7,8 +7,8 @@ implicit_diffusion: true approximate_linear_solve_iters: 2 prognostic_tke: true edmfx_upwinding: first_order -edmfx_entr_model: "Generalized" -edmfx_detr_model: "Generalized" +edmfx_entr_model: "Generalized" +edmfx_detr_model: "Generalized" edmfx_nh_pressure: true edmfx_sgs_mass_flux: true edmfx_sgs_diffusive_flux: true diff --git a/config/model_configs/diagnostic_edmfx_trmm_stretched_box.yml b/config/model_configs/diagnostic_edmfx_trmm_stretched_box.yml index d748638db84..341b660191b 100644 --- a/config/model_configs/diagnostic_edmfx_trmm_stretched_box.yml +++ b/config/model_configs/diagnostic_edmfx_trmm_stretched_box.yml @@ -1,4 +1,3 @@ - job_id: diagnostic_edmfx_trmm_stretched_box initial_condition: TRMM_LBA rad: TRMM_LBA diff --git a/config/model_configs/prognostic_edmfx_aquaplanet.yml b/config/model_configs/prognostic_edmfx_aquaplanet.yml index c6635700577..358561564d7 100644 --- a/config/model_configs/prognostic_edmfx_aquaplanet.yml +++ b/config/model_configs/prognostic_edmfx_aquaplanet.yml @@ -1,18 +1,18 @@ job_id: prognostic_edmfx_aquaplanet -surface_setup: DefaultMoninObukhov +surface_setup: DefaultMoninObukhov rad: clearsky -turbconv: prognostic_edmfx +turbconv: prognostic_edmfx prognostic_tke: true -edmfx_upwinding: first_order -edmfx_entr_model: "Generalized" -edmfx_detr_model: "ConstantArea" -edmfx_nh_pressure: true +edmfx_upwinding: first_order +edmfx_entr_model: "Generalized" +edmfx_detr_model: "ConstantArea" +edmfx_nh_pressure: true edmfx_sgs_mass_flux: true edmfx_sgs_diffusive_flux: true -moist: equil +moist: equil precip_model: 0M -dt: 10secs -t_end: 1hours +dt: 10secs +t_end: 1hours dt_save_state_to_disk: 600secs toml: [toml/prognostic_edmfx_box.toml] output_default_diagnostics: false diff --git a/config/model_configs/single_column_radiative_equilibrium_clearsky_prognostic_surface_temp.yml b/config/model_configs/single_column_radiative_equilibrium_clearsky_prognostic_surface_temp.yml index e0723672eb9..41a65e49a35 100644 --- a/config/model_configs/single_column_radiative_equilibrium_clearsky_prognostic_surface_temp.yml +++ b/config/model_configs/single_column_radiative_equilibrium_clearsky_prognostic_surface_temp.yml @@ -1,4 +1,3 @@ - rad: "clearsky" idealized_h2o: true hyperdiff: "false" diff --git a/config/mpi_configs/restart_mpi_baroclinic_wave_rhoe.yml b/config/mpi_configs/restart_mpi_baroclinic_wave_rhoe.yml index 1230e1398b4..b59404cef18 100644 --- a/config/mpi_configs/restart_mpi_baroclinic_wave_rhoe.yml +++ b/config/mpi_configs/restart_mpi_baroclinic_wave_rhoe.yml @@ -1,3 +1,3 @@ job_id: "restart_mpi_baroclinic_wave_rhoe" t_end: "20days" -initial_condition: "DryBaroclinicWave" \ No newline at end of file +initial_condition: "DryBaroclinicWave" diff --git a/config/perf_configs/flame_perf_target_prognostic_edmfx_aquaplanet.yml b/config/perf_configs/flame_perf_target_prognostic_edmfx_aquaplanet.yml index 06cfebdc5a8..127202e098d 100644 --- a/config/perf_configs/flame_perf_target_prognostic_edmfx_aquaplanet.yml +++ b/config/perf_configs/flame_perf_target_prognostic_edmfx_aquaplanet.yml @@ -1,18 +1,18 @@ job_id: flame_perf_target_prognostic_edmfx_aquaplanet -surface_setup: DefaultExchangeCoefficients +surface_setup: DefaultExchangeCoefficients rad: gray vert_diff: "false" -turbconv: prognostic_edmfx +turbconv: prognostic_edmfx prognostic_tke: true -edmfx_upwinding: first_order -edmfx_entr_model: "Generalized" -edmfx_detr_model: "ConstantArea" -edmfx_nh_pressure: true +edmfx_upwinding: first_order +edmfx_entr_model: "Generalized" +edmfx_detr_model: "ConstantArea" +edmfx_nh_pressure: true edmfx_sgs_mass_flux: true edmfx_sgs_diffusive_flux: true -moist: equil +moist: equil precip_model: 0M -dt: 10secs -t_end: 1hours +dt: 10secs +t_end: 1hours dt_save_state_to_disk: 600secs toml: [toml/prognostic_edmfx_box.toml] diff --git a/config/perf_configs/gpu_baroclinic_wave_rhoe.yml b/config/perf_configs/gpu_baroclinic_wave_rhoe.yml index 9f4e4107c9d..3e0bf4f0225 100644 --- a/config/perf_configs/gpu_baroclinic_wave_rhoe.yml +++ b/config/perf_configs/gpu_baroclinic_wave_rhoe.yml @@ -1,6 +1,6 @@ -job_id: "gpu_baroclinic_wave_rhoe" +job_id: "gpu_baroclinic_wave_rhoe" dt: "400secs" -t_end: "10days" -dt_save_state_to_disk: "2days" -initial_condition: "DryBaroclinicWave" +t_end: "10days" +dt_save_state_to_disk: "2days" +initial_condition: "DryBaroclinicWave" dt_save_to_sol: "Inf" diff --git a/config/perf_configs/gpu_implicit_barowave_wrt_h_elem.yml b/config/perf_configs/gpu_implicit_barowave_wrt_h_elem.yml index 481fc62890c..56a8fe82030 100644 --- a/config/perf_configs/gpu_implicit_barowave_wrt_h_elem.yml +++ b/config/perf_configs/gpu_implicit_barowave_wrt_h_elem.yml @@ -1,8 +1,8 @@ -job_id: gpu_implicit_barowave_wrt_h_elem -z_elem: 25 -h_elem: 12 -initial_condition: DryBaroclinicWave -t_end: 1mins -dt: 1secs -dt_save_to_sol: Inf +job_id: gpu_implicit_barowave_wrt_h_elem +z_elem: 25 +h_elem: 12 +initial_condition: DryBaroclinicWave +t_end: 1mins +dt: 1secs +dt_save_to_sol: Inf dt_save_state_to_disk: Inf diff --git a/config/perf_configs/invalidations.yml b/config/perf_configs/invalidations.yml index ad13593b005..ecfb3f0cfc1 100644 --- a/config/perf_configs/invalidations.yml +++ b/config/perf_configs/invalidations.yml @@ -1 +1 @@ -job_id: "invalidations" \ No newline at end of file +job_id: "invalidations"