...

CliMA · Nov 20, 2024 · 91ac353 · 91ac353
1 parent 40b2255
commit 91ac353
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 3 deletions.
diff --git a/config/model_configs/sphere_aquaplanet_rhoe_nonequilmoist_allsky.yml b/config/model_configs/sphere_aquaplanet_rhoe_nonequilmoist_allsky.yml
@@ -2,16 +2,19 @@ z_max: 60000.0
 z_elem: 31
 dz_bottom: 50.0
 dt: "400secs"
-t_end: "18hours"
+t_end: "1hours"
 dt_save_state_to_disk: "18hours"
 vert_diff: "FriersonDiffusion"
 implicit_diffusion: true
 approximate_linear_solve_iters: 2
 cloud_model: "grid_scale"
 moist: "nonequil"
-precip_model: "nothing"
+precip_model: "1M"
 rad: "allskywithclear"
 insolation: "timevarying"
 rayleigh_sponge: true
 surface_setup: "DefaultMoninObukhov"
 toml: [toml/sphere_aquaplanet.toml]
+diagnostics:
+  - short_name: [ts, ta, thetaa, ha, pfull, rhoa, ua, va, wa, hur, hus, husra, cl, clw, cli, hussfc, evspsbl, hfes, pr]
+    period: 400secs
diff --git a/src/ClimaAtmos.jl b/src/ClimaAtmos.jl
@@ -29,6 +29,7 @@ include(joinpath("parameterized_tendencies", "radiation", "radiation.jl"))
 
 include(joinpath("cache", "prognostic_edmf_precomputed_quantities.jl"))
 include(joinpath("cache", "diagnostic_edmf_precomputed_quantities.jl"))
+include(joinpath("cache", "sedimentation_precomputed_quantities.jl"))
 include(joinpath("cache", "precipitation_precomputed_quantities.jl"))
 include(joinpath("cache", "precomputed_quantities.jl"))
 include(joinpath("cache", "cloud_fraction.jl"))

diff --git a/src/cache/precomputed_quantities.jl b/src/cache/precomputed_quantities.jl
@@ -509,6 +509,10 @@ NVTX.@annotate function set_precomputed_quantities!(Y, p, t)
     #     compute_gm_mixing_length!(ᶜmixing_length, Y, p)
     # end
 
+    if moisture_model isa NonEquilMoistModel
+        set_sedimentation_precomputed_quantities!(Y, p, t)
+    end
+
     if precip_model isa Microphysics1Moment
         set_precipitation_precomputed_quantities!(Y, p, t)
     end

diff --git a/src/cache/sedimentation_precomputed_quantities.jl b/src/cache/sedimentation_precomputed_quantities.jl
@@ -16,7 +16,7 @@ Updates the sedimentation terminal velocity stored in `p`
 for the non-equilibrium microphysics scheme
 """
 function set_sedimentation_precomputed_quantities!(Y, p, t)
-    @assert (p.atmos.moisture_model isa MicrophysicsNonEq)
+    @assert (p.atmos.moisture_model isa NonEquilMoistModel)
 
     (; ᶜwₗ, ᶜwᵢ) = p.precomputed
     cmc = CAP.microphysics_cloud_params(p.params)