change prognostic edmf entrainment and detrainment

CliMA · Oct 26, 2023 · 9715c3c · 9715c3c
1 parent 3712de8
commit 9715c3c
Show file tree

Hide file tree

Showing 2 changed files with 63 additions and 38 deletions.
diff --git a/config/model_configs/prognostic_edmfx_bomex_box.yml b/config/model_configs/prognostic_edmfx_bomex_box.yml
@@ -30,72 +30,72 @@ dt_save_to_disk: "10mins"
 toml: [toml/prognostic_edmfx_box.toml]
 diagnostics:
   - short_name: ts
-    period: 10mins
+    period: 1hours
   - short_name: ta
-    period: 10mins
+    period: 1hours
   - short_name: thetaa
-    period: 10mins
+    period: 1hours
   - short_name: ha
-    period: 10mins
+    period: 1hours
   - short_name: pfull
-    period: 10mins
+    period: 1hours
   - short_name: rhoa
-    period: 10mins
+    period: 1hours
   - short_name: ua
-    period: 10mins
+    period: 1hours
   - short_name: va
-    period: 10mins
+    period: 1hours
   - short_name: wa
-    period: 10mins
+    period: 1hours
   - short_name: hur
-    period: 10mins
+    period: 1hours
   - short_name: hus
-    period: 10mins
+    period: 1hours
   - short_name: clw
-    period: 10mins
+    period: 1hours
   - short_name: cli
-    period: 10mins
+    period: 1hours
   - short_name: hussfc
-    period: 10mins
+    period: 1hours
   - short_name: evspsbl
-    period: 10mins
+    period: 1hours
   - short_name: arup
-    period: 10mins
+    period: 1hours
   - short_name: waup
-    period: 10mins
+    period: 1hours
   - short_name: taup
-    period: 10mins
+    period: 1hours
   - short_name: thetaaup
-    period: 10mins
+    period: 1hours
   - short_name: haup
-    period: 10mins
+    period: 1hours
   - short_name: husup
-    period: 10mins
+    period: 1hours
   - short_name: hurup
-    period: 10mins
+    period: 1hours
   - short_name: clwup
-    period: 10mins
+    period: 1hours
   - short_name: cliup
-    period: 10mins
+    period: 1hours
   - short_name: rhoaen
-    period: 10mins
+    period: 1hours
   - short_name: waen
-    period: 10mins
+    period: 1hours
   - short_name: taen
-    period: 10mins
+    period: 1hours
   - short_name: thetaaen
-    period: 10mins
+    period: 1hours
   - short_name: haen
-    period: 10mins
+    period: 1hours
   - short_name: husen
-    period: 10mins
+    period: 1hours
   - short_name: huren
-    period: 10mins
+    period: 1hours
   - short_name: clwen
-    period: 10mins
+    period: 1hours
   - short_name: clien
-    period: 10mins
+    period: 1hours
   - short_name: tke
-    period: 10mins
+    period: 1hours
   - short_name: lmix
-    period: 10mins
+    period: 1hours
diff --git a/toml/prognostic_edmfx_box.toml b/toml/prognostic_edmfx_box.toml
@@ -5,20 +5,45 @@ type = "float"
 
 [EDMF_min_area]
 alias = "min_area"
-value = 1.0e-3
+value = 1.0e-5
+type = "float"
+
+[EDMF_max_area]
+alias = "max_area"
+value = 0.6
 type = "float"
 
 [entr_tau]
 alias = "entr_tau"
-value = 0
+value = 0.001
 type = "float"
 
 [entr_coeff]
 alias = "entr_coeff"
-value = 0.1
+value = 0
+type = "float"
+
+[min_area_limiter_scale]
+alias = "min_area_limiter_scale"
+value = 1e-4
 type = "float"
 
 [detr_tau]
 alias = "detr_tau"
+value = 0.001
+type = "float"
+
+[detr_coeff]
+alias = "detr_coeff"
 value = 0
 type = "float"
+
+[detr_buoy_coeff]
+alias = "detr_buoy_coeff"
+value = 0.12
+type = "float"
+
+[max_area_limiter_scale]
+alias = "max_area_limiter_scale"
+value = 0.01
+type = "float"