prescribe hourly cloud and water vapor

CliMA · Jan 3, 2025 · a186648 · a186648
1 parent 5206985
commit a186648
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 2 deletions.
diff --git a/src/callbacks/callbacks.jl b/src/callbacks/callbacks.jl
@@ -130,7 +130,10 @@ NVTX.@annotate function rrtmgp_model_callback!(integrator)
             end
 
             # assume that ᶜq_vap = ᶜq_tot when computing ᶜvmr_h2o
-            @. ᶜvmr_h2o = TD.shum_to_mixing_ratio(ᶜq_tot, ᶜq_tot)
+            @. ᶜvmr_h2o = TD.vol_vapor_mixing_ratio(
+                thermo_params,
+                TD.PhasePartition(ᶜq_tot),
+            )
         else
             @. ᶜvmr_h2o = TD.vol_vapor_mixing_ratio(
                 thermo_params,
@@ -148,6 +151,16 @@ NVTX.@annotate function rrtmgp_model_callback!(integrator)
     if radiation_mode isa RRTMGPI.AllSkyRadiation ||
        radiation_mode isa RRTMGPI.AllSkyRadiationWithClearSkyDiagnostics
         if !radiation_mode.idealized_clouds
+            if radiation_mode.cloud isa PrescribedCloudInRadiation
+                @. ᶜvmr_h2o = TD.vol_vapor_mixing_ratio(
+                    thermo_params,
+                    TD.PhasePartition(
+                        p.radiation.prescribed_clouds_field.q,
+                        p.radiation.prescribed_clouds_field.clwc,
+                        p.radiation.prescribed_clouds_field.ciwc,
+                    ),
+                )
+            end
             ᶜΔz = Fields.Δz_field(Y.c)
             ᶜlwp = Fields.array2field(
                 rrtmgp_model.center_cloud_liquid_water_path,

diff --git a/src/parameterized_tendencies/radiation/radiation.jl b/src/parameterized_tendencies/radiation/radiation.jl
@@ -290,7 +290,7 @@ end
 get_cloud_cache(_, _, _) = (;)
 function get_cloud_cache(::PrescribedCloudInRadiation, Y, start_date)
     target_space = axes(Y.c)
-    prescribed_cloud_names = ("cc", "clwc", "ciwc")
+    prescribed_cloud_names = ("cc", "clwc", "ciwc", "q")
     prescribed_cloud_names_as_symbols = Symbol.(prescribed_cloud_names)
     extrapolation_bc = (Intp.Periodic(), Intp.Flat(), Intp.Flat())
     timevaryinginputs = [