Merge #2132

2132: remove precipitation timescale hack r=szy21 a=szy21 Co-authored-by: Zhaoyi Shen <11598433+szy21@users.noreply.github.com>
CliMA · Sep 21, 2023 · 0d2ce17 · 0d2ce17
2 parents e05216b + 11359d1
commit 0d2ce17
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 1 deletion.
diff --git a/config/model_configs/diagnostic_edmfx_trmm_box.yml b/config/model_configs/diagnostic_edmfx_trmm_box.yml
@@ -13,6 +13,7 @@ edmfx_sgs_flux: true
 moist: equil
 apply_limiter: false
 precip_model: "0M"
+override_τ_precip: false
 config: box
 hyperdiff: "true"
 kappa_4: 1e12
@@ -27,3 +28,4 @@ dt: 10secs
 t_end: 6hours
 dt_save_to_disk: 10mins
 FLOAT_TYPE: "Float64"
+toml: [toml/diagnostic_edmfx_trmm_box.toml]
diff --git a/src/parameterized_tendencies/microphysics/microphysics_wrappers.jl b/src/parameterized_tendencies/microphysics/microphysics_wrappers.jl
@@ -39,7 +39,7 @@ function q_tot_precipitation_sources(
             m_prs,
             TD.PhasePartition(t_prs, ts),
             TD.q_vap_saturation(t_prs, ts),
-        ) / 10,  # to be fixed after we get rid of parameter overwrites
+        ),
     )
 end
 

diff --git a/toml/diagnostic_edmfx_trmm_box.toml b/toml/diagnostic_edmfx_trmm_box.toml
@@ -0,0 +1,4 @@
+[precipitation_timescale]
+alias = "τ_precip"
+value = 100
+type = "float"
-Original file line number
+Diff line change
@@ Expand Up / @@ -39,7 +39,7 @@ function q_tot_precipitation_sources( @@
                 m_prs,
                 TD.PhasePartition(t_prs, ts),
                 TD.q_vap_saturation(t_prs, ts),
-            ) / 10,  # to be fixed after we get rid of parameter overwrites
+            ),
         )
     end
@@ Expand Down @@