wip

CliMA · Oct 20, 2023 · 67c79c7 · 67c79c7
1 parent 73a8f14
commit 67c79c7
Show file tree

Hide file tree

Showing 3 changed files with 39 additions and 41 deletions.
diff --git a/config/model_configs/prognostic_edmfx_bomex_box.yml b/config/model_configs/prognostic_edmfx_bomex_box.yml
@@ -24,78 +24,78 @@ y_elem: 2
 z_elem: 60
 z_stretch: false
 perturb_initstate: false
-dt: "5secs"
+dt: "2secs"
 t_end: "6hours"
-dt_save_to_disk: "10mins"
+dt_save_to_disk: "2mins"
 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/config/model_configs/prognostic_edmfx_dycoms_rf01_box.yml b/config/model_configs/prognostic_edmfx_dycoms_rf01_box.yml
@@ -25,5 +25,5 @@ z_elem: 30
 z_stretch: false
 dt: 2secs
 t_end: 4hours
-dt_save_to_disk: 10mins
+dt_save_to_disk: 2mins
 toml: [toml/prognostic_edmfx_box.toml]
diff --git a/src/cache/prognostic_edmf_precomputed_quantities.jl b/src/cache/prognostic_edmf_precomputed_quantities.jl
@@ -226,9 +226,7 @@ function set_prognostic_edmf_precomputed_quantities!(Y, p, ᶠuₕ³, t)
         @. ᶜtke_exch +=
             Y.c.sgsʲs.:($$j).ρa * ᶜdetrʲs.:($$j) / ᶜρa⁰ * (
                 1 / 2 *
-                (
-                    get_physical_w(ᶜuʲs.:($$j), ᶜlg) - get_physical_w(ᶜu⁰, ᶜlg)
-                )^2 - ᶜtke⁰
+                norm_sqr(ᶜinterp(ᶠu³⁰) - ᶜinterp(ᶠu³ʲs.:($$j))) - ᶜtke⁰
             )
     end