Move up_top to update aux

diagnostics/compute_diagnostics.jl

@@ -119,12 +119,10 @@ function compute_diagnostics!(edmf, gm, grid, state, diagnostics, Case, TS)
     @inbounds for i in 1:(up.n_updrafts)
         up.cloud_base[i] = TC.zc_toa(grid)
         up.cloud_top[i] = 0.0
-        up.updraft_top[i] = 0.0
         up.cloud_cover[i] = 0.0
 
         @inbounds for k in TC.real_center_indices(grid)
             if aux_up[i].area[k] > 1e-3
-                up.updraft_top[i] = max(up.updraft_top[i], grid.zc[k])
                 up.lwp += ρ0_c[k] * aux_up[i].q_liq[k] * aux_up[i].area[k] * grid.Δz
                 up.iwp += ρ0_c[k] * aux_up[i].q_ice[k] * aux_up[i].area[k] * grid.Δz
 
@@ -218,5 +216,9 @@ function compute_diagnostics!(edmf, gm, grid, state, diagnostics, Case, TS)
         end
     end
 
+    TC.GMV_third_m(edmf, grid, state, Val(:Hvar), Val(:θ_liq_ice), Val(:H_third_m))
+    TC.GMV_third_m(edmf, grid, state, Val(:QTvar), Val(:q_tot), Val(:QT_third_m))
+    TC.GMV_third_m(edmf, grid, state, Val(:tke), Val(:w), Val(:W_third_m))
+
     return
 end

post_processing/mse_tables.jl

@@ -5,151 +5,151 @@
 all_best_mse = OrderedCollections.OrderedDict()
 #
 all_best_mse["ARM_SGP"] = OrderedCollections.OrderedDict()
-all_best_mse["ARM_SGP"]["qt_mean"] = 0.2210406967460874
-all_best_mse["ARM_SGP"]["updraft_area"] = 335.6889115694312
-all_best_mse["ARM_SGP"]["updraft_w"] = 141.75936982403
-all_best_mse["ARM_SGP"]["updraft_qt"] = 28.791450974607923
-all_best_mse["ARM_SGP"]["updraft_thetal"] = 172.01636711066666
+all_best_mse["ARM_SGP"]["qt_mean"] = 0.2099693151607237
+all_best_mse["ARM_SGP"]["updraft_area"] = 335.45875367066867
+all_best_mse["ARM_SGP"]["updraft_w"] = 140.92677349078969
+all_best_mse["ARM_SGP"]["updraft_qt"] = 28.70836894541848
+all_best_mse["ARM_SGP"]["updraft_thetal"] = 172.01631026298847
 all_best_mse["ARM_SGP"]["u_mean"] = 1.3235797273549681e-5
-all_best_mse["ARM_SGP"]["tke_mean"] = 1317.2275838383102
-all_best_mse["ARM_SGP"]["temperature_mean"] = 0.00010896485991162957
-all_best_mse["ARM_SGP"]["ql_mean"] = 175.64412390891934
+all_best_mse["ARM_SGP"]["tke_mean"] = 1313.6493467020196
+all_best_mse["ARM_SGP"]["temperature_mean"] = 0.00010624950402975059
+all_best_mse["ARM_SGP"]["ql_mean"] = 180.68590465680364
 all_best_mse["ARM_SGP"]["qi_mean"] = "NA"
-all_best_mse["ARM_SGP"]["thetal_mean"] = 0.0001004106864499418
-all_best_mse["ARM_SGP"]["Hvar_mean"] = 9941.712983278798
-all_best_mse["ARM_SGP"]["QTvar_mean"] = 6410.025571640897
+all_best_mse["ARM_SGP"]["thetal_mean"] = 9.770061871604239e-5
+all_best_mse["ARM_SGP"]["Hvar_mean"] = 9311.054396714339
+all_best_mse["ARM_SGP"]["QTvar_mean"] = 5802.412820315867
 #
 all_best_mse["Bomex"] = OrderedCollections.OrderedDict()
-all_best_mse["Bomex"]["qt_mean"] = 0.08636668156387615
-all_best_mse["Bomex"]["updraft_area"] = 129.83506522231684
-all_best_mse["Bomex"]["updraft_w"] = 16.66164887761313
-all_best_mse["Bomex"]["updraft_qt"] = 7.13756843801742
-all_best_mse["Bomex"]["updraft_thetal"] = 69.79389911450083
-all_best_mse["Bomex"]["v_mean"] = 67.12537293149072
-all_best_mse["Bomex"]["u_mean"] = 0.32019731498816095
-all_best_mse["Bomex"]["tke_mean"] = 74.38158346400462
-all_best_mse["Bomex"]["temperature_mean"] = 3.175038628071847e-5
-all_best_mse["Bomex"]["ql_mean"] = 7.919708087680498
+all_best_mse["Bomex"]["qt_mean"] = 0.08776796077692245
+all_best_mse["Bomex"]["updraft_area"] = 130.01639628691083
+all_best_mse["Bomex"]["updraft_w"] = 16.057586429511503
+all_best_mse["Bomex"]["updraft_qt"] = 6.890128846374632
+all_best_mse["Bomex"]["updraft_thetal"] = 69.78417329537506
+all_best_mse["Bomex"]["v_mean"] = 67.12281585199479
+all_best_mse["Bomex"]["u_mean"] = 0.3201493689027362
+all_best_mse["Bomex"]["tke_mean"] = 73.89824775455659
+all_best_mse["Bomex"]["temperature_mean"] = 3.252413195141947e-5
+all_best_mse["Bomex"]["ql_mean"] = 6.313648778401822
 all_best_mse["Bomex"]["qi_mean"] = "NA"
-all_best_mse["Bomex"]["thetal_mean"] = 3.212232758168316e-5
-all_best_mse["Bomex"]["Hvar_mean"] = 13645.040554744499
-all_best_mse["Bomex"]["QTvar_mean"] = 4681.254635957166
+all_best_mse["Bomex"]["thetal_mean"] = 3.2858173111125033e-5
+all_best_mse["Bomex"]["Hvar_mean"] = 6752.843931363311
+all_best_mse["Bomex"]["QTvar_mean"] = 2345.9671498346493
 #
 all_best_mse["DryBubble"] = OrderedCollections.OrderedDict()
-all_best_mse["DryBubble"]["updraft_area"] = 6.021102021431553e-23
-all_best_mse["DryBubble"]["updraft_w"] = 1.8608217807873358e-22
-all_best_mse["DryBubble"]["updraft_thetal"] = 3.616433131153784e-29
+all_best_mse["DryBubble"]["updraft_area"] = 1.1178997418227967e-5
+all_best_mse["DryBubble"]["updraft_w"] = 1.7309345555642683e-5
+all_best_mse["DryBubble"]["updraft_thetal"] = 4.865256388833988e-13
 all_best_mse["DryBubble"]["u_mean"] = 0.0
-all_best_mse["DryBubble"]["tke_mean"] = 3.20594097468317e-21
-all_best_mse["DryBubble"]["temperature_mean"] = 1.100592113507603e-29
-all_best_mse["DryBubble"]["thetal_mean"] = 8.687014221892445e-30
-all_best_mse["DryBubble"]["Hvar_mean"] = 9.153048468258677e-22
+all_best_mse["DryBubble"]["tke_mean"] = 0.0002489424086021527
+all_best_mse["DryBubble"]["temperature_mean"] = 4.3257377007550574e-13
+all_best_mse["DryBubble"]["thetal_mean"] = 3.6855714827595387e-13
+all_best_mse["DryBubble"]["Hvar_mean"] = 1.865321282865834e-5
 #
 all_best_mse["DYCOMS_RF01"] = OrderedCollections.OrderedDict()
-all_best_mse["DYCOMS_RF01"]["qt_mean"] = 0.023211752248954307
-all_best_mse["DYCOMS_RF01"]["ql_mean"] = 10.376027073142513
-all_best_mse["DYCOMS_RF01"]["updraft_area"] = 30.410904969004264
-all_best_mse["DYCOMS_RF01"]["updraft_w"] = 4.130302103222592
-all_best_mse["DYCOMS_RF01"]["updraft_qt"] = 2.1539861581159423
-all_best_mse["DYCOMS_RF01"]["updraft_thetal"] = 46.18817114932214
-all_best_mse["DYCOMS_RF01"]["v_mean"] = 0.0029841060124951553
-all_best_mse["DYCOMS_RF01"]["u_mean"] = 0.07894987226001016
-all_best_mse["DYCOMS_RF01"]["tke_mean"] = 21.328153184669077
-all_best_mse["DYCOMS_RF01"]["temperature_mean"] = 7.602915300910156e-5
-all_best_mse["DYCOMS_RF01"]["thetal_mean"] = 7.64144513433088e-5
-all_best_mse["DYCOMS_RF01"]["Hvar_mean"] = 1288.1644413250172
-all_best_mse["DYCOMS_RF01"]["QTvar_mean"] = 518.9269454149176
+all_best_mse["DYCOMS_RF01"]["qt_mean"] = 0.023198692272030544
+all_best_mse["DYCOMS_RF01"]["ql_mean"] = 10.347286087600702
+all_best_mse["DYCOMS_RF01"]["updraft_area"] = 30.41218602111556
+all_best_mse["DYCOMS_RF01"]["updraft_w"] = 4.1304092648269375
+all_best_mse["DYCOMS_RF01"]["updraft_qt"] = 2.1537875302070426
+all_best_mse["DYCOMS_RF01"]["updraft_thetal"] = 46.18817055108242
+all_best_mse["DYCOMS_RF01"]["v_mean"] = 0.002982833065277946
+all_best_mse["DYCOMS_RF01"]["u_mean"] = 0.07894988376751147
+all_best_mse["DYCOMS_RF01"]["tke_mean"] = 21.327285272822852
+all_best_mse["DYCOMS_RF01"]["temperature_mean"] = 7.606763938668142e-5
+all_best_mse["DYCOMS_RF01"]["thetal_mean"] = 7.644917953938347e-5
+all_best_mse["DYCOMS_RF01"]["Hvar_mean"] = 1288.1645081619606
+all_best_mse["DYCOMS_RF01"]["QTvar_mean"] = 518.9286165737209
 #
 all_best_mse["GABLS"] = OrderedCollections.OrderedDict()
 all_best_mse["GABLS"]["updraft_thetal"] = 0.0
-all_best_mse["GABLS"]["v_mean"] = 4.437982865575426e-52
+all_best_mse["GABLS"]["v_mean"] = 0.0
 all_best_mse["GABLS"]["u_mean"] = 0.0
-all_best_mse["GABLS"]["tke_mean"] = 3.7804810057060705e-34
+all_best_mse["GABLS"]["tke_mean"] = 0.0
 all_best_mse["GABLS"]["temperature_mean"] = 0.0
 all_best_mse["GABLS"]["thetal_mean"] = 0.0
 all_best_mse["GABLS"]["Hvar_mean"] = 0.0
-all_best_mse["GABLS"]["QTvar_mean"] = 2.7904840731253077e-31
-all_best_mse["GABLS"]["qt_mean"] = 2.305591753677729e-33
+all_best_mse["GABLS"]["QTvar_mean"] = 0.0
+all_best_mse["GABLS"]["qt_mean"] = 0.0
 #
 all_best_mse["life_cycle_Tan2018"] = OrderedCollections.OrderedDict()
-all_best_mse["life_cycle_Tan2018"]["qt_mean"] = 2.2976942164148873e-8
-all_best_mse["life_cycle_Tan2018"]["ql_mean"] = 0.008028479364420428
-all_best_mse["life_cycle_Tan2018"]["updraft_area"] = 0.000444544745850674
-all_best_mse["life_cycle_Tan2018"]["updraft_w"] = 0.001227293723957471
-all_best_mse["life_cycle_Tan2018"]["updraft_qt"] = 0.0016037299012275881
-all_best_mse["life_cycle_Tan2018"]["updraft_thetal"] = 1.0010961545394686e-6
-all_best_mse["life_cycle_Tan2018"]["v_mean"] = 3.4433687300615583e-6
-all_best_mse["life_cycle_Tan2018"]["u_mean"] = 2.4027337835678723e-9
-all_best_mse["life_cycle_Tan2018"]["tke_mean"] = 7.561118778058277e-5
-all_best_mse["life_cycle_Tan2018"]["temperature_mean"] = 7.1891399017758624e-12
-all_best_mse["life_cycle_Tan2018"]["thetal_mean"] = 6.727774528733022e-12
-all_best_mse["life_cycle_Tan2018"]["Hvar_mean"] = 4.895684277143741
-all_best_mse["life_cycle_Tan2018"]["QTvar_mean"] = 0.25660460476361513
+all_best_mse["life_cycle_Tan2018"]["qt_mean"] = 0.0018729471020046955
+all_best_mse["life_cycle_Tan2018"]["ql_mean"] = 0.6620764135295186
+all_best_mse["life_cycle_Tan2018"]["updraft_area"] = 0.46871212413621166
+all_best_mse["life_cycle_Tan2018"]["updraft_w"] = 1.3005257013969729
+all_best_mse["life_cycle_Tan2018"]["updraft_qt"] = 0.0007885320917971831
+all_best_mse["life_cycle_Tan2018"]["updraft_thetal"] = 3.533362352209573e-7
+all_best_mse["life_cycle_Tan2018"]["v_mean"] = 0.04396509912559629
+all_best_mse["life_cycle_Tan2018"]["u_mean"] = 0.0001410877095054469
+all_best_mse["life_cycle_Tan2018"]["tke_mean"] = 0.09356522346201536
+all_best_mse["life_cycle_Tan2018"]["temperature_mean"] = 1.1022358498115837e-6
+all_best_mse["life_cycle_Tan2018"]["thetal_mean"] = 1.0929468110111997e-6
+all_best_mse["life_cycle_Tan2018"]["Hvar_mean"] = 239.49717778367759
+all_best_mse["life_cycle_Tan2018"]["QTvar_mean"] = 6.314970155385475
 #
 all_best_mse["Nieuwstadt"] = OrderedCollections.OrderedDict()
-all_best_mse["Nieuwstadt"]["updraft_area"] = 98.52997676709914
-all_best_mse["Nieuwstadt"]["updraft_w"] = 12.623407623696323
-all_best_mse["Nieuwstadt"]["updraft_thetal"] = 117.60675028076483
-all_best_mse["Nieuwstadt"]["u_mean"] = 13.62767273033254
-all_best_mse["Nieuwstadt"]["tke_mean"] = 313.0321002880792
-all_best_mse["Nieuwstadt"]["temperature_mean"] = 9.601721327177524e-6
-all_best_mse["Nieuwstadt"]["thetal_mean"] = 9.914720291767905e-6
-all_best_mse["Nieuwstadt"]["Hvar_mean"] = 1280.8750798583899
+all_best_mse["Nieuwstadt"]["updraft_area"] = 98.61903956765104
+all_best_mse["Nieuwstadt"]["updraft_w"] = 12.620181519729721
+all_best_mse["Nieuwstadt"]["updraft_thetal"] = 117.60674820900034
+all_best_mse["Nieuwstadt"]["u_mean"] = 13.627556919779142
+all_best_mse["Nieuwstadt"]["tke_mean"] = 312.92521835084375
+all_best_mse["Nieuwstadt"]["temperature_mean"] = 9.606319451874596e-6
+all_best_mse["Nieuwstadt"]["thetal_mean"] = 9.918979982485869e-6
+all_best_mse["Nieuwstadt"]["Hvar_mean"] = 1280.538121964536
 #
 all_best_mse["Rico"] = OrderedCollections.OrderedDict()
-all_best_mse["Rico"]["qt_mean"] = 1.4456944987609905
-all_best_mse["Rico"]["updraft_area"] = 476.26083803847405
-all_best_mse["Rico"]["updraft_w"] = 104.9096655192523
-all_best_mse["Rico"]["updraft_qt"] = 12.067764611581676
-all_best_mse["Rico"]["updraft_thetal"] = 133.77850013570426
-all_best_mse["Rico"]["v_mean"] = 0.6912218576637561
-all_best_mse["Rico"]["u_mean"] = 0.6118046618674639
-all_best_mse["Rico"]["tke_mean"] = 89.08748137258044
-all_best_mse["Rico"]["temperature_mean"] = 0.0006515941655033291
-all_best_mse["Rico"]["ql_mean"] = 70.30486913471371
+all_best_mse["Rico"]["qt_mean"] = 1.461216267731136
+all_best_mse["Rico"]["updraft_area"] = 476.1668575277046
+all_best_mse["Rico"]["updraft_w"] = 103.62523342741915
+all_best_mse["Rico"]["updraft_qt"] = 12.084264582170741
+all_best_mse["Rico"]["updraft_thetal"] = 133.77973866180497
+all_best_mse["Rico"]["v_mean"] = 0.661591213386313
+all_best_mse["Rico"]["u_mean"] = 0.5942324640298271
+all_best_mse["Rico"]["tke_mean"] = 90.06304177194619
+all_best_mse["Rico"]["temperature_mean"] = 0.0006561578714960826
+all_best_mse["Rico"]["ql_mean"] = 69.79123138670636
 all_best_mse["Rico"]["qi_mean"] = "NA"
-all_best_mse["Rico"]["qr_mean"] = 765.8891298985278
-all_best_mse["Rico"]["thetal_mean"] = 0.0006414533050563745
-all_best_mse["Rico"]["Hvar_mean"] = 22791.8778176754
-all_best_mse["Rico"]["QTvar_mean"] = 4513.061076325462
+all_best_mse["Rico"]["qr_mean"] = 765.9753444576647
+all_best_mse["Rico"]["thetal_mean"] = 0.0006459491204637934
+all_best_mse["Rico"]["Hvar_mean"] = 20043.952395704495
+all_best_mse["Rico"]["QTvar_mean"] = 3977.214921455993
 #
 all_best_mse["Soares"] = OrderedCollections.OrderedDict()
-all_best_mse["Soares"]["qt_mean"] = 0.12567373382470898
-all_best_mse["Soares"]["updraft_area"] = 96.65678362229501
-all_best_mse["Soares"]["updraft_w"] = 11.427983398582578
-all_best_mse["Soares"]["updraft_qt"] = 23.61924529700588
-all_best_mse["Soares"]["updraft_thetal"] = 65.72194182060416
-all_best_mse["Soares"]["u_mean"] = 94.29398613455446
-all_best_mse["Soares"]["tke_mean"] = 241.2823661229273
-all_best_mse["Soares"]["temperature_mean"] = 1.0916499383528016e-5
-all_best_mse["Soares"]["thetal_mean"] = 1.0345865761424823e-5
-all_best_mse["Soares"]["Hvar_mean"] = 1119.5303378698738
+all_best_mse["Soares"]["qt_mean"] = 0.1257904686397003
+all_best_mse["Soares"]["updraft_area"] = 98.21922321246183
+all_best_mse["Soares"]["updraft_w"] = 11.423147273156957
+all_best_mse["Soares"]["updraft_qt"] = 23.615121270329094
+all_best_mse["Soares"]["updraft_thetal"] = 65.7219396386948
+all_best_mse["Soares"]["u_mean"] = 94.2923650437216
+all_best_mse["Soares"]["tke_mean"] = 241.22739244519957
+all_best_mse["Soares"]["temperature_mean"] = 1.0913731129957992e-5
+all_best_mse["Soares"]["thetal_mean"] = 1.0343924750695743e-5
+all_best_mse["Soares"]["Hvar_mean"] = 1118.8459567581533
 #
 all_best_mse["TRMM_LBA"] = OrderedCollections.OrderedDict()
-all_best_mse["TRMM_LBA"]["qt_mean"] = 4.194442187440091
-all_best_mse["TRMM_LBA"]["updraft_area"] = 7586.856238021082
-all_best_mse["TRMM_LBA"]["updraft_w"] = 29915.750125418013
-all_best_mse["TRMM_LBA"]["updraft_qt"] = 263.0500923695103
-all_best_mse["TRMM_LBA"]["updraft_thetal"] = 1961.5540014141934
-all_best_mse["TRMM_LBA"]["v_mean"] = 286.312182682163
-all_best_mse["TRMM_LBA"]["u_mean"] = 113.71340703033253
-all_best_mse["TRMM_LBA"]["tke_mean"] = 25246.293654008747
-all_best_mse["TRMM_LBA"]["temperature_mean"] = 0.001209989943233731
-all_best_mse["TRMM_LBA"]["ql_mean"] = 10878.454190862496
+all_best_mse["TRMM_LBA"]["qt_mean"] = 4.370141509071347
+all_best_mse["TRMM_LBA"]["updraft_area"] = 7588.792583634186
+all_best_mse["TRMM_LBA"]["updraft_w"] = 30830.63975659635
+all_best_mse["TRMM_LBA"]["updraft_qt"] = 263.1587569415405
+all_best_mse["TRMM_LBA"]["updraft_thetal"] = 1961.8451637527064
+all_best_mse["TRMM_LBA"]["v_mean"] = 285.9190262131904
+all_best_mse["TRMM_LBA"]["u_mean"] = 113.61185296026021
+all_best_mse["TRMM_LBA"]["tke_mean"] = 25299.781769411315
+all_best_mse["TRMM_LBA"]["temperature_mean"] = 0.001282306577221344
+all_best_mse["TRMM_LBA"]["ql_mean"] = 10591.308689650668
 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.021135597811925984
-all_best_mse["TRMM_LBA"]["Hvar_mean"] = 4218.851781887298
-all_best_mse["TRMM_LBA"]["QTvar_mean"] = 2795.6762095973504
+all_best_mse["TRMM_LBA"]["thetal_mean"] = 0.021142841574681895
+all_best_mse["TRMM_LBA"]["Hvar_mean"] = 4196.816226656944
+all_best_mse["TRMM_LBA"]["QTvar_mean"] = 2772.6720734920077
 #
 all_best_mse["LES_driven_SCM"] = OrderedCollections.OrderedDict()
-all_best_mse["LES_driven_SCM"]["qt_mean"] = 3.5420265210561492
-all_best_mse["LES_driven_SCM"]["v_mean"] = 1.3019018960003872
-all_best_mse["LES_driven_SCM"]["u_mean"] = 0.44975297501846073
-all_best_mse["LES_driven_SCM"]["temperature_mean"] = 0.0012765816195862473
-all_best_mse["LES_driven_SCM"]["ql_mean"] = 51763.60544244611
-all_best_mse["LES_driven_SCM"]["thetal_mean"] = 0.0015098886836858313
+all_best_mse["LES_driven_SCM"]["qt_mean"] = 3.5617162347368296
+all_best_mse["LES_driven_SCM"]["v_mean"] = 1.3028760898968443
+all_best_mse["LES_driven_SCM"]["u_mean"] = 0.44955547910863786
+all_best_mse["LES_driven_SCM"]["temperature_mean"] = 0.001277413538359007
+all_best_mse["LES_driven_SCM"]["ql_mean"] = 55700.59768552013
+all_best_mse["LES_driven_SCM"]["thetal_mean"] = 0.0015156834284607626
 #
 #################################
 #################################

src/update_aux.jl

@@ -213,14 +213,9 @@ function update_aux!(edmf::EDMF_PrognosticTKE{N_up}, gm, grid, state, Case, para
     #####
     #####  diagnose_GMV_moments
     #####
-    #! format: off
     get_GMV_CoVar(edmf, grid, state, :Hvar, :θ_liq_ice)
     get_GMV_CoVar(edmf, grid, state, :QTvar, :q_tot)
     get_GMV_CoVar(edmf, grid, state, :HQTcov, :θ_liq_ice, :q_tot)
-    GMV_third_m(edmf, grid, state, Val(:Hvar), Val(:θ_liq_ice), Val(:H_third_m))
-    GMV_third_m(edmf, grid, state, Val(:QTvar), Val(:q_tot), Val(:QT_third_m))
-    GMV_third_m(edmf, grid, state, Val(:tke), Val(:w), Val(:W_third_m))
-    #! format: on
 
     # TODO - use this inversion in free_convection_windspeed and not compute zi twice
     edmf.zi = get_inversion(grid, state, param_set, surface.Ri_bulk_crit)
@@ -524,4 +519,14 @@ function update_aux!(edmf::EDMF_PrognosticTKE{N_up}, gm, grid, state, Case, para
         end
     end
 
+    @inbounds for i in 1:N_up
+        up.updraft_top[i] = 0.0
+
+        @inbounds for k in real_center_indices(grid)
+            if aux_up[i].area[k] > 1e-3
+                up.updraft_top[i] = max(up.updraft_top[i], grid.zc[k])
+            end
+        end
+    end
+
 end