update bc for precip, fix diagnostics

integration_tests/utils/mse_tables.jl

@@ -97,21 +97,21 @@ all_best_mse["Nieuwstadt"]["thetal_mean"] = 9.917616755053735e-6
 all_best_mse["Nieuwstadt"]["Hvar_mean"] = 1280.8007043658781
 #
 all_best_mse["Rico"] = OrderedCollections.OrderedDict()
-all_best_mse["Rico"]["qt_mean"] = 1.235373777575182
-all_best_mse["Rico"]["updraft_area"] = 476.43449013983553
-all_best_mse["Rico"]["updraft_w"] = 107.40405310018487
-all_best_mse["Rico"]["updraft_qt"] = 13.607308934479319
-all_best_mse["Rico"]["updraft_thetal"] = 133.82710210870454
-all_best_mse["Rico"]["v_mean"] = 0.6148403192213757
-all_best_mse["Rico"]["u_mean"] = 0.687919871785871
-all_best_mse["Rico"]["tke_mean"] = 81.87009094376897
-all_best_mse["Rico"]["temperature_mean"] = 0.0005724685760372894
-all_best_mse["Rico"]["ql_mean"] = 63.221626171949666
+all_best_mse["Rico"]["qt_mean"] = 1.2374332817585152
+all_best_mse["Rico"]["updraft_area"] = 476.42828102112094
+all_best_mse["Rico"]["updraft_w"] = 107.63994685627974
+all_best_mse["Rico"]["updraft_qt"] = 13.561257420867225
+all_best_mse["Rico"]["updraft_thetal"] = 133.82585090829056
+all_best_mse["Rico"]["v_mean"] = 0.6139821705021405
+all_best_mse["Rico"]["u_mean"] = 0.6873796298887406
+all_best_mse["Rico"]["tke_mean"] = 81.73582834680109
+all_best_mse["Rico"]["temperature_mean"] = 0.000572523750928536
+all_best_mse["Rico"]["ql_mean"] = 62.68774587854839
 all_best_mse["Rico"]["qi_mean"] = "NA"
-all_best_mse["Rico"]["qr_mean"] = 761.0155860169355
-all_best_mse["Rico"]["thetal_mean"] = 0.0005648945947258508
-all_best_mse["Rico"]["Hvar_mean"] = 171098.9387189221
-all_best_mse["Rico"]["QTvar_mean"] = 38413.36964386556
+all_best_mse["Rico"]["qr_mean"] = 761.0071192508036
+all_best_mse["Rico"]["thetal_mean"] = 0.000564880580847811
+all_best_mse["Rico"]["Hvar_mean"] = 172497.32482685937
+all_best_mse["Rico"]["QTvar_mean"] = 38768.421549556835
 #
 all_best_mse["Soares"] = OrderedCollections.OrderedDict()
 all_best_mse["Soares"]["qt_mean"] = 0.1254170125375242
@@ -137,6 +137,8 @@ all_best_mse["TRMM_LBA"]["tke_mean"] = 25978.742967693444
 all_best_mse["TRMM_LBA"]["temperature_mean"] = 0.001128034559871981
 all_best_mse["TRMM_LBA"]["ql_mean"] = 11329.388277438018
 all_best_mse["TRMM_LBA"]["qi_mean"] = "NA"
+all_best_mse["TRMM_LBA"]["qr_mean"] = "NA"
+all_best_mse["TRMM_LBA"]["qs_mean"] = "NA"
 all_best_mse["TRMM_LBA"]["thetal_mean"] = 0.021118728717622385
 all_best_mse["TRMM_LBA"]["Hvar_mean"] = 4347.857247874721
 all_best_mse["TRMM_LBA"]["QTvar_mean"] = 2834.5221950389873

src/EDMF_Precipitation.jl

@@ -1,5 +1,5 @@
 """
-Computes the qr advection (down) tendency
+Computes the rain and snow advection (down) tendency
 """
 function compute_precipitation_advection_tendencies(grid, state, gm, TS::TimeStepping)
     param_set = parameter_set(gm)
@@ -45,7 +45,7 @@ function compute_precipitation_advection_tendencies(grid, state, gm, TS::TimeSte
 
     If = CCO.DivergenceF2C()
     RB = CCO.RightBiasedC2F(; top = CCO.SetValue(FT(0)))
-    ∇ = CCO.DivergenceF2C()
+    ∇ = CCO.DivergenceF2C(; bottom = CCO.Extrapolate())
     wvec = CC.Geometry.WVector
 
     # TODO - some positivity limiters are needed

src/diagnostics.jl

@@ -34,6 +34,7 @@ function io_dictionary_aux()
     io_dict = Dict{String, DT}(
         "updraft_area" => (; dims = ("zc", "t"), group = "profiles", field = state -> center_aux_bulk(state).area),
         "updraft_ql" => (; dims = ("zc", "t"), group = "profiles", field = state -> center_aux_bulk(state).q_liq),
+        "updraft_qi" => (; dims = ("zc", "t"), group = "profiles", field = state -> center_aux_bulk(state).q_ice),
         "updraft_RH" => (; dims = ("zc", "t"), group = "profiles", field = state -> center_aux_bulk(state).RH),
         "updraft_qt" => (; dims = ("zc", "t"), group = "profiles", field = state -> center_aux_bulk(state).q_tot),
         "updraft_w" => (; dims = ("zf", "t"), group = "profiles", field = state -> face_aux_bulk(state).w),
@@ -98,6 +99,7 @@ function io_dictionary_aux()
         "env_w" => (; dims = ("zf", "t"), group = "profiles", field = state -> face_aux_environment(state).w),
         "env_qt" => (; dims = ("zc", "t"), group = "profiles", field = state -> center_aux_environment(state).q_tot),
         "env_ql" => (; dims = ("zc", "t"), group = "profiles", field = state -> center_aux_environment(state).q_liq),
+        "env_qi" => (; dims = ("zc", "t"), group = "profiles", field = state -> center_aux_environment(state).q_ice),
         "env_area" => (; dims = ("zc", "t"), group = "profiles", field = state -> center_aux_environment(state).area),
         "env_temperature" => (; dims = ("zc", "t"), group = "profiles", field = state -> center_aux_environment(state).T),
         "env_RH" => (; dims = ("zc", "t"), group = "profiles", field = state -> center_aux_environment(state).RH),