Merge pull request #4009 from CliMA/sa/flux_form_updraft_advection

Use flux form terms for sedimentation

Author: sajjadazimi

.buildkite/pipeline.yml

@@ -862,6 +862,7 @@ steps:
         artifact_paths: "prognostic_edmfx_rico_implicit_column/output_active/*"
         agents:
           slurm_mem: 20GB
+        soft_fail: true
 
       - label: ":umbrella: Prognostic EDMFX Rico with 2-moment in a column"
         command: >

config/model_configs/prognostic_edmfx_rico_column_2M.yml

@@ -26,7 +26,7 @@ z_elem: 100
 z_stretch: false
 perturb_initstate: false
 dt: "5secs"
-t_end: "180mins"
+t_end: "12hours"
 dt_save_state_to_disk: "60mins"
 toml: [toml/prognostic_edmfx_1M.toml]
 netcdf_interpolation_num_points: [8, 8, 100]

config/model_configs/prognostic_edmfx_trmm_column.yml

@@ -25,7 +25,7 @@ y_elem: 2
 z_elem: 82
 z_stretch: false
 dt: 10secs
-t_end: 6hours
+t_end: 12hours
 dt_save_state_to_disk: 60mins
 toml: [toml/prognostic_edmfx_1M.toml]
 netcdf_interpolation_num_points: [8, 8, 82]

src/cache/precipitation_precomputed_quantities.jl

@@ -108,8 +108,8 @@ function set_precipitation_velocities!(
 )
     (; ᶜwₗ, ᶜwᵢ, ᶜwᵣ, ᶜwₛ, ᶜwₜqₜ, ᶜwₕhₜ) = p.precomputed
     (; ᶜΦ) = p.core
-    (; ᶜwₗʲs, ᶜwᵢʲs, ᶜwᵣʲs, ᶜwₛʲs, ᶜwₕʲs) = p.precomputed
-    (; ᶜts⁰) = p.precomputed
+    (; ᶜwₗʲs, ᶜwᵢʲs, ᶜwᵣʲs, ᶜwₛʲs) = p.precomputed
+    (; ᶜts⁰, ᶜtsʲs) = p.precomputed
     cmc = CAP.microphysics_cloud_params(p.params)
     cmp = CAP.microphysics_1m_params(p.params)
     thp = CAP.thermodynamics_params(p.params)
@@ -211,7 +211,14 @@ function set_precipitation_velocities!(
     # Add contributions to energy and total water advection
     # TODO do we need to add kinetic energy of subdomains?
     for j in 1:n
-        @. ᶜρwₕhₜ += Y.c.sgsʲs.:($$j).ρa * ᶜwₕʲs.:($$j) * Y.c.sgsʲs.:($$j).mse
+        @. ᶜρwₕhₜ +=
+            Y.c.sgsʲs.:($$j).ρa *
+            (
+                ᶜwₗʲs.:($$j) * Y.c.sgsʲs.:($$j).q_liq * (Iₗ(thp, ᶜtsʲs.:($$j)) + ᶜΦ) +
+                ᶜwᵢʲs.:($$j) * Y.c.sgsʲs.:($$j).q_ice * (Iᵢ(thp, ᶜtsʲs.:($$j)) + ᶜΦ) +
+                ᶜwᵣʲs.:($$j) * Y.c.sgsʲs.:($$j).q_rai * (Iₗ(thp, ᶜtsʲs.:($$j)) + ᶜΦ) +
+                ᶜwₛʲs.:($$j) * Y.c.sgsʲs.:($$j).q_sno * (Iᵢ(thp, ᶜtsʲs.:($$j)) + ᶜΦ)
+            )
     end
     @. ᶜwₕhₜ = Geometry.WVector(ᶜρwₕhₜ) / Y.c.ρ
 
@@ -323,8 +330,8 @@ function set_precipitation_velocities!(
 )
     (; ᶜwₗ, ᶜwᵢ, ᶜwᵣ, ᶜwₛ, ᶜwₙₗ, ᶜwₙᵣ, ᶜwₜqₜ, ᶜwₕhₜ) = p.precomputed
     (; ᶜΦ) = p.core
-    (; ᶜwₗʲs, ᶜwᵢʲs, ᶜwᵣʲs, ᶜwₛʲs, ᶜwₙₗʲs, ᶜwₙᵣʲs, ᶜwₕʲs) = p.precomputed
-    (; ᶜts⁰) = p.precomputed
+    (; ᶜwₗʲs, ᶜwᵢʲs, ᶜwᵣʲs, ᶜwₛʲs, ᶜwₙₗʲs, ᶜwₙᵣʲs) = p.precomputed
+    (; ᶜts⁰, ᶜtsʲs) = p.precomputed
     cmc = CAP.microphysics_cloud_params(p.params)
     cm1p = CAP.microphysics_1m_params(p.params)
     cm2p = CAP.microphysics_2m_params(p.params)
@@ -477,7 +484,14 @@ function set_precipitation_velocities!(
     # Add contributions to energy and total water advection
     # TODO do we need to add kinetic energy of subdomains?
     for j in 1:n
-        @. ᶜρwₕhₜ += Y.c.sgsʲs.:($$j).ρa * ᶜwₕʲs.:($$j) * Y.c.sgsʲs.:($$j).mse
+        @. ᶜρwₕhₜ +=
+            Y.c.sgsʲs.:($$j).ρa *
+            (
+                ᶜwₗʲs.:($$j) * Y.c.sgsʲs.:($$j).q_liq * (Iₗ(thp, ᶜtsʲs.:($$j)) + ᶜΦ) +
+                ᶜwᵢʲs.:($$j) * Y.c.sgsʲs.:($$j).q_ice * (Iᵢ(thp, ᶜtsʲs.:($$j)) + ᶜΦ) +
+                ᶜwᵣʲs.:($$j) * Y.c.sgsʲs.:($$j).q_rai * (Iₗ(thp, ᶜtsʲs.:($$j)) + ᶜΦ) +
+                ᶜwₛʲs.:($$j) * Y.c.sgsʲs.:($$j).q_sno * (Iᵢ(thp, ᶜtsʲs.:($$j)) + ᶜΦ)
+            )
     end
     @. ᶜwₕhₜ = Geometry.WVector(ᶜρwₕhₜ) / Y.c.ρ
 

src/cache/precomputed_quantities.jl

@@ -142,8 +142,6 @@ function precomputed_quantities(Y, atmos)
             ᶜwᵢʲs = similar(Y.c, NTuple{n, FT}),
             ᶜwᵣʲs = similar(Y.c, NTuple{n, FT}),
             ᶜwₛʲs = similar(Y.c, NTuple{n, FT}),
-            ᶜwₜʲs = similar(Y.c, NTuple{n, FT}),
-            ᶜwₕʲs = similar(Y.c, NTuple{n, FT}),
             ᶜSqₗᵖ⁰ = similar(Y.c, FT),
             ᶜSqᵢᵖ⁰ = similar(Y.c, FT),
             ᶜSqᵣᵖ⁰ = similar(Y.c, FT),
@@ -161,8 +159,6 @@ function precomputed_quantities(Y, atmos)
             ᶜwᵢʲs = similar(Y.c, NTuple{n, FT}),
             ᶜwᵣʲs = similar(Y.c, NTuple{n, FT}),
             ᶜwₛʲs = similar(Y.c, NTuple{n, FT}),
-            ᶜwₜʲs = similar(Y.c, NTuple{n, FT}),
-            ᶜwₕʲs = similar(Y.c, NTuple{n, FT}),
             ᶜwₙₗʲs = similar(Y.c, NTuple{n, FT}),
             ᶜwₙᵣʲs = similar(Y.c, NTuple{n, FT}),
             ᶜSqₗᵖ⁰ = similar(Y.c, FT),

src/cache/prognostic_edmf_precomputed_quantities.jl

@@ -519,23 +519,20 @@ NVTX.@annotate function set_prognostic_edmf_precomputed_quantities_precipitation
     @assert (p.atmos.moisture_model isa NonEquilMoistModel)
 
     (; params, dt) = p
-    (; ᶜΦ,) = p.core
     thp = CAP.thermodynamics_params(params)
     cmp = CAP.microphysics_1m_params(params)
     cmc = CAP.microphysics_cloud_params(params)
-    (; turbconv_model) = p.atmos
 
     (; ᶜSqₗᵖʲs, ᶜSqᵢᵖʲs, ᶜSqᵣᵖʲs, ᶜSqₛᵖʲs, ᶜρʲs, ᶜtsʲs) = p.precomputed
     (; ᶜSqₗᵖ⁰, ᶜSqᵢᵖ⁰, ᶜSqᵣᵖ⁰, ᶜSqₛᵖ⁰, ᶜts⁰) = p.precomputed
 
-    (; ᶜwₗʲs, ᶜwᵢʲs, ᶜwᵣʲs, ᶜwₛʲs, ᶜwₜʲs, ᶜwₕʲs) = p.precomputed
+    (; ᶜwₗʲs, ᶜwᵢʲs, ᶜwᵣʲs, ᶜwₛʲs) = p.precomputed
 
     # TODO - can I re-use them between js and env?
     ᶜSᵖ = p.scratch.ᶜtemp_scalar
     ᶜSᵖ_snow = p.scratch.ᶜtemp_scalar_2
 
     n = n_mass_flux_subdomains(p.atmos.turbconv_model)
-    FT = eltype(params)
 
     for j in 1:n
 
@@ -565,35 +562,6 @@ NVTX.@annotate function set_prognostic_edmf_precomputed_quantities_precipitation
             ᶜρʲs.:($$j),
             max(zero(Y.c.ρ), Y.c.sgsʲs.:($$j).q_ice),
         )
-        # compute their contirbutions to energy and total water advection
-        @. ᶜwₜʲs.:($$j) = ifelse(
-            Y.c.sgsʲs.:($$j).ρa * Y.c.sgsʲs.:($$j).q_tot > FT(0),
-            (
-                ᶜwₗʲs.:($$j) * Y.c.sgsʲs.:($$j).q_liq +
-                ᶜwᵢʲs.:($$j) * Y.c.sgsʲs.:($$j).q_ice +
-                ᶜwᵣʲs.:($$j) * Y.c.sgsʲs.:($$j).q_rai +
-                ᶜwₛʲs.:($$j) * Y.c.sgsʲs.:($$j).q_sno
-            ) / Y.c.sgsʲs.:($$j).q_tot,
-            FT(0),
-        )
-        @. ᶜwₕʲs.:($$j) = ifelse(
-            Y.c.sgsʲs.:($$j).ρa * abs(Y.c.sgsʲs.:($$j).mse) > FT(0),
-            (
-                ᶜwₗʲs.:($$j) *
-                Y.c.sgsʲs.:($$j).q_liq *
-                (Iₗ(thp, ᶜtsʲs.:($$j)) + ᶜΦ) +
-                ᶜwᵢʲs.:($$j) *
-                Y.c.sgsʲs.:($$j).q_ice *
-                (Iᵢ(thp, ᶜtsʲs.:($$j)) + ᶜΦ) +
-                ᶜwᵣʲs.:($$j) *
-                Y.c.sgsʲs.:($$j).q_rai *
-                (Iₗ(thp, ᶜtsʲs.:($$j)) + ᶜΦ) +
-                ᶜwₛʲs.:($$j) *
-                Y.c.sgsʲs.:($$j).q_sno *
-                (Iᵢ(thp, ᶜtsʲs.:($$j)) + ᶜΦ)
-            ) / (Y.c.sgsʲs.:($$j).mse),
-            FT(0),
-        )
 
         # Precipitation sources and sinks from the updrafts
         compute_precipitation_sources!(
@@ -730,7 +698,6 @@ NVTX.@annotate function set_prognostic_edmf_precomputed_quantities_precipitation
 )
 
     (; params, dt) = p
-    (; ᶜΦ,) = p.core
     thp = CAP.thermodynamics_params(params)
     cm1p = CAP.microphysics_1m_params(p.params)
     cm2p = CAP.microphysics_2m_params(p.params)
@@ -749,7 +716,7 @@ NVTX.@annotate function set_prognostic_edmf_precomputed_quantities_precipitation
     ) = p.precomputed
     (; ᶜSqₗᵖ⁰, ᶜSqᵢᵖ⁰, ᶜSqᵣᵖ⁰, ᶜSqₛᵖ⁰, ᶜSnₗᵖ⁰, ᶜSnᵣᵖ⁰, ᶜts⁰, ᶜu⁰) =
         p.precomputed
-    (; ᶜwₗʲs, ᶜwᵢʲs, ᶜwᵣʲs, ᶜwₛʲs, ᶜwₙₗʲs, ᶜwₙᵣʲs, ᶜwₜʲs, ᶜwₕʲs, ᶜuʲs) =
+    (; ᶜwₗʲs, ᶜwᵢʲs, ᶜwᵣʲs, ᶜwₛʲs, ᶜwₙₗʲs, ᶜwₙᵣʲs, ᶜuʲs) =
         p.precomputed
 
     ᶜSᵖ = p.scratch.ᶜtemp_scalar
@@ -776,7 +743,6 @@ NVTX.@annotate function set_prognostic_edmf_precomputed_quantities_precipitation
 
     # Compute sources
     n = n_mass_flux_subdomains(p.atmos.turbconv_model)
-    FT = eltype(params)
     for j in 1:n
 
         # compute terminal velocity for precipitation
@@ -835,35 +801,6 @@ NVTX.@annotate function set_prognostic_edmf_precomputed_quantities_precipitation
             ᶜρʲs.:($$j),
             max(zero(Y.c.ρ), Y.c.sgsʲs.:($$j).q_ice),
         )
-        # compute their contirbutions to energy and total water advection
-        @. ᶜwₜʲs.:($$j) = ifelse(
-            Y.c.sgsʲs.:($$j).ρa * Y.c.sgsʲs.:($$j).q_tot > FT(0),
-            (
-                ᶜwₗʲs.:($$j) * Y.c.sgsʲs.:($$j).q_liq +
-                ᶜwᵢʲs.:($$j) * Y.c.sgsʲs.:($$j).q_ice +
-                ᶜwᵣʲs.:($$j) * Y.c.sgsʲs.:($$j).q_rai +
-                ᶜwₛʲs.:($$j) * Y.c.sgsʲs.:($$j).q_sno
-            ) / Y.c.sgsʲs.:($$j).q_tot,
-            FT(0),
-        )
-        @. ᶜwₕʲs.:($$j) = ifelse(
-            Y.c.sgsʲs.:($$j).ρa * abs(Y.c.sgsʲs.:($$j).mse) > FT(0),
-            (
-                ᶜwₗʲs.:($$j) *
-                Y.c.sgsʲs.:($$j).q_liq *
-                (Iₗ(thp, ᶜtsʲs.:($$j)) + ᶜΦ) +
-                ᶜwᵢʲs.:($$j) *
-                Y.c.sgsʲs.:($$j).q_ice *
-                (Iᵢ(thp, ᶜtsʲs.:($$j)) + ᶜΦ) +
-                ᶜwᵣʲs.:($$j) *
-                Y.c.sgsʲs.:($$j).q_rai *
-                (Iₗ(thp, ᶜtsʲs.:($$j)) + ᶜΦ) +
-                ᶜwₛʲs.:($$j) *
-                Y.c.sgsʲs.:($$j).q_sno *
-                (Iᵢ(thp, ᶜtsʲs.:($$j)) + ᶜΦ)
-            ) / (Y.c.sgsʲs.:($$j).mse),
-            FT(0),
-        )
 
         # Precipitation sources and sinks from the updrafts
         compute_warm_precipitation_sources_2M!(