diff --git a/config/default_configs/default_config.yml b/config/default_configs/default_config.yml index 53b82d41ec..a3280023b0 100644 --- a/config/default_configs/default_config.yml +++ b/config/default_configs/default_config.yml @@ -265,7 +265,7 @@ implicit_diffusion: approximate_linear_solve_iters: help: "Number of iterations for the approximate linear solve (used when `implicit_diffusion` is true)" value: 1 -override_τ_precip: +override_precip_timescale: help: "If true, sets τ_precip to dt. Otherwise, τ_precip is set to the value in the toml dictionary" value: true output_default_diagnostics: diff --git a/config/longrun_configs/amip_target_diagedmf.yml b/config/longrun_configs/amip_target_diagedmf.yml index 78e9fe4913..3092e0c8f9 100644 --- a/config/longrun_configs/amip_target_diagedmf.yml +++ b/config/longrun_configs/amip_target_diagedmf.yml @@ -9,7 +9,7 @@ dt_save_state_to_disk: "20days" moist: "equil" cloud_model: "quadrature_sgs" precip_model: "0M" -override_τ_precip: false +override_precip_timescale: false rad: "allskywithclear" dt_rad: "1hours" dt_cloud_fraction: "1hours" diff --git a/config/longrun_configs/longrun_aquaplanet_allsky_diagedmf_0M.yml b/config/longrun_configs/longrun_aquaplanet_allsky_diagedmf_0M.yml index 4ead71b5ba..350811ece3 100644 --- a/config/longrun_configs/longrun_aquaplanet_allsky_diagedmf_0M.yml +++ b/config/longrun_configs/longrun_aquaplanet_allsky_diagedmf_0M.yml @@ -25,5 +25,5 @@ edmfx_nh_pressure: true edmfx_sgs_mass_flux: true edmfx_sgs_diffusive_flux: true precip_model: "0M" -override_τ_precip: false +override_precip_timescale: false toml: [toml/longrun_aquaplanet_diagedmf.toml] diff --git a/config/longrun_configs/longrun_aquaplanet_allsky_progedmf_diffonly_0M.yml b/config/longrun_configs/longrun_aquaplanet_allsky_progedmf_diffonly_0M.yml index b9ce8d3756..da94164f8a 100644 --- a/config/longrun_configs/longrun_aquaplanet_allsky_progedmf_diffonly_0M.yml +++ b/config/longrun_configs/longrun_aquaplanet_allsky_progedmf_diffonly_0M.yml @@ -27,5 +27,5 @@ edmfx_filter: true edmfx_sgs_mass_flux: false edmfx_sgs_diffusive_flux: true precip_model: "0M" -override_τ_precip: false +override_precip_timescale: false toml: [toml/longrun_aquaplanet_progedmf.toml] diff --git a/config/model_configs/diagnostic_edmfx_trmm_box_0M.yml b/config/model_configs/diagnostic_edmfx_trmm_box_0M.yml index 4b54a34c3f..e7d9150c09 100644 --- a/config/model_configs/diagnostic_edmfx_trmm_box_0M.yml +++ b/config/model_configs/diagnostic_edmfx_trmm_box_0M.yml @@ -15,7 +15,7 @@ moist: equil cloud_model: "quadrature_sgs" call_cloud_diagnostics_per_stage: true precip_model: "0M" -override_τ_precip: false +override_precip_timescale: false config: box x_max: 1e8 y_max: 1e8 diff --git a/config/model_configs/diagnostic_edmfx_trmm_stretched_box.yml b/config/model_configs/diagnostic_edmfx_trmm_stretched_box.yml index 89d172fe71..3bb3a3bbfd 100644 --- a/config/model_configs/diagnostic_edmfx_trmm_stretched_box.yml +++ b/config/model_configs/diagnostic_edmfx_trmm_stretched_box.yml @@ -16,7 +16,7 @@ moist: equil cloud_model: "quadrature_sgs" call_cloud_diagnostics_per_stage: true precip_model: "1M" -override_τ_precip: false +override_precip_timescale: false config: box x_max: 1e8 y_max: 1e8 diff --git a/config/model_configs/rcemipii_box_diagnostic_edmfx.yml b/config/model_configs/rcemipii_box_diagnostic_edmfx.yml index 157c4c67d4..c8e4fcdfec 100644 --- a/config/model_configs/rcemipii_box_diagnostic_edmfx.yml +++ b/config/model_configs/rcemipii_box_diagnostic_edmfx.yml @@ -16,7 +16,7 @@ edmfx_sgs_diffusive_flux: true rayleigh_sponge: true moist: equil precip_model: 0M -override_τ_precip: false +override_precip_timescale: false dt: 30secs t_end: 3600secs dt_save_state_to_disk: 12hours diff --git a/config/model_configs/rcemipii_sphere_diagnostic_edmfx.yml b/config/model_configs/rcemipii_sphere_diagnostic_edmfx.yml index 7f244913e0..d3d304dbf5 100644 --- a/config/model_configs/rcemipii_sphere_diagnostic_edmfx.yml +++ b/config/model_configs/rcemipii_sphere_diagnostic_edmfx.yml @@ -15,7 +15,7 @@ edmfx_sgs_diffusive_flux: true rayleigh_sponge: true moist: equil precip_model: 0M -override_τ_precip: false +override_precip_timescale: false dt: 100secs t_end: 12hours dt_save_state_to_disk: 12hours diff --git a/src/parameters/create_parameters.jl b/src/parameters/create_parameters.jl index 693228f4f5..0fcf74f8f7 100644 --- a/src/parameters/create_parameters.jl +++ b/src/parameters/create_parameters.jl @@ -104,7 +104,7 @@ function create_parameter_set(config::AtmosConfig) # Microphysics scheme parameters (from CloudMicrophysics.jl) # TODO - repeating the logic from solver/model_getters.jl... - if parsed_args["override_τ_precip"] + if parsed_args["override_precip_timescale"] toml_dict["precipitation_timescale"]["value"] = FT(CA.time_to_seconds(parsed_args["dt"])) end