Merge #150

150: Use ∇f2c operator r=charleskawczynski a=charleskawczynski



Co-authored-by: Charles Kawczynski <kawczynski.charles@gmail.com>

integration_tests/utils/mse_tables.jl

@@ -5,58 +5,58 @@
 all_best_mse = OrderedDict()
 #
 all_best_mse["ARM_SGP"] = OrderedDict()
-all_best_mse["ARM_SGP"]["qt_mean"] = 0.39076457831748124
-all_best_mse["ARM_SGP"]["updraft_area"] = 2064.422348745443
-all_best_mse["ARM_SGP"]["updraft_w"] = 349.99047432074934
-all_best_mse["ARM_SGP"]["updraft_qt"] = 13.619728203724032
-all_best_mse["ARM_SGP"]["updraft_thetal"] = 27.68278518698941
-all_best_mse["ARM_SGP"]["u_mean"] = 87.99854727781782
-all_best_mse["ARM_SGP"]["tke_mean"] = 658.1066280169667
-all_best_mse["ARM_SGP"]["temperature_mean"] = 0.00015306177344772738
-all_best_mse["ARM_SGP"]["ql_mean"] = 440.7429295064636
-all_best_mse["ARM_SGP"]["thetal_mean"] = 0.00015695269311694646
-all_best_mse["ARM_SGP"]["Hvar_mean"] = 790.3433409024976
-all_best_mse["ARM_SGP"]["QTvar_mean"] = 824.5276833646409
+all_best_mse["ARM_SGP"]["qt_mean"] = 0.498114127633553
+all_best_mse["ARM_SGP"]["updraft_area"] = 2093.6828668042076
+all_best_mse["ARM_SGP"]["updraft_w"] = 312.2858362762137
+all_best_mse["ARM_SGP"]["updraft_qt"] = 13.049211030061015
+all_best_mse["ARM_SGP"]["updraft_thetal"] = 27.688755593747118
+all_best_mse["ARM_SGP"]["u_mean"] = 87.99854727781786
+all_best_mse["ARM_SGP"]["tke_mean"] = 623.7218026468721
+all_best_mse["ARM_SGP"]["temperature_mean"] = 0.0001724383099792556
+all_best_mse["ARM_SGP"]["ql_mean"] = 443.34439649237044
+all_best_mse["ARM_SGP"]["thetal_mean"] = 0.00017431754699554798
+all_best_mse["ARM_SGP"]["Hvar_mean"] = 3336.6996099205016
+all_best_mse["ARM_SGP"]["QTvar_mean"] = 2382.7499444082923
 #
 all_best_mse["Bomex"] = OrderedDict()
-all_best_mse["Bomex"]["qt_mean"] = 0.11630202215943031
-all_best_mse["Bomex"]["updraft_area"] = 696.6084076602892
-all_best_mse["Bomex"]["updraft_w"] = 32.68716816280533
-all_best_mse["Bomex"]["updraft_qt"] = 4.295903040331427
-all_best_mse["Bomex"]["updraft_thetal"] = 21.54617155099515
-all_best_mse["Bomex"]["v_mean"] = 68.69118719015297
-all_best_mse["Bomex"]["u_mean"] = 53.30954148489654
-all_best_mse["Bomex"]["tke_mean"] = 42.28767401133633
-all_best_mse["Bomex"]["temperature_mean"] = 4.9916939441789214e-5
-all_best_mse["Bomex"]["ql_mean"] = 14.738089539411606
-all_best_mse["Bomex"]["thetal_mean"] = 5.095286922175702e-5
-all_best_mse["Bomex"]["Hvar_mean"] = 6391.425702973697
-all_best_mse["Bomex"]["QTvar_mean"] = 4557.07589319817
+all_best_mse["Bomex"]["qt_mean"] = 0.11756181706180903
+all_best_mse["Bomex"]["updraft_area"] = 687.5103787018642
+all_best_mse["Bomex"]["updraft_w"] = 33.36693766808095
+all_best_mse["Bomex"]["updraft_qt"] = 4.269253683755296
+all_best_mse["Bomex"]["updraft_thetal"] = 21.547553641705342
+all_best_mse["Bomex"]["v_mean"] = 67.8219486027001
+all_best_mse["Bomex"]["u_mean"] = 53.310392115625596
+all_best_mse["Bomex"]["tke_mean"] = 41.70597831858172
+all_best_mse["Bomex"]["temperature_mean"] = 5.041990634419992e-5
+all_best_mse["Bomex"]["ql_mean"] = 13.443742062005304
+all_best_mse["Bomex"]["thetal_mean"] = 5.147003408496979e-5
+all_best_mse["Bomex"]["Hvar_mean"] = 9299.014502806971
+all_best_mse["Bomex"]["QTvar_mean"] = 7330.969483973574
 #
 all_best_mse["DryBubble"] = OrderedDict()
-all_best_mse["DryBubble"]["updraft_area"] = 557.2278112801557
-all_best_mse["DryBubble"]["updraft_w"] = 455.67441408984024
-all_best_mse["DryBubble"]["updraft_thetal"] = 7.06697244332881e-5
-all_best_mse["DryBubble"]["u_mean"] = 2.0570737365378528e-27
-all_best_mse["DryBubble"]["tke_mean"] = 1.3951776101632114e6
-all_best_mse["DryBubble"]["temperature_mean"] = 4.3637326456091146e-5
-all_best_mse["DryBubble"]["thetal_mean"] = 3.5552820910334556e-5
-all_best_mse["DryBubble"]["Hvar_mean"] = 8.313182534736389e10
+all_best_mse["DryBubble"]["updraft_area"] = 537.7311122986902
+all_best_mse["DryBubble"]["updraft_w"] = 439.7234044870159
+all_best_mse["DryBubble"]["updraft_thetal"] = 6.844189322499107e-5
+all_best_mse["DryBubble"]["u_mean"] = 1.969714757966663e-27
+all_best_mse["DryBubble"]["tke_mean"] = 1.3734866865847448e6
+all_best_mse["DryBubble"]["temperature_mean"] = 4.2569139799881244e-5
+all_best_mse["DryBubble"]["thetal_mean"] = 3.459812633008877e-5
+all_best_mse["DryBubble"]["Hvar_mean"] = 8.264801710472981e10
 #
 all_best_mse["DYCOMS_RF01"] = OrderedDict()
-all_best_mse["DYCOMS_RF01"]["qt_mean"] = 0.016003387551025275
-all_best_mse["DYCOMS_RF01"]["ql_mean"] = 3.0859596754024787
-all_best_mse["DYCOMS_RF01"]["updraft_area"] = 237.59082757701054
-all_best_mse["DYCOMS_RF01"]["updraft_w"] = 4.415932829728793
-all_best_mse["DYCOMS_RF01"]["updraft_qt"] = 1.1442707881908907
-all_best_mse["DYCOMS_RF01"]["updraft_thetal"] = 12.741433196078667
-all_best_mse["DYCOMS_RF01"]["v_mean"] = 39.84827885532264
-all_best_mse["DYCOMS_RF01"]["u_mean"] = 37.13647532777601
-all_best_mse["DYCOMS_RF01"]["tke_mean"] = 12.395751294412781
-all_best_mse["DYCOMS_RF01"]["temperature_mean"] = 2.520212665410528e-5
-all_best_mse["DYCOMS_RF01"]["thetal_mean"] = 2.548264421873188e-5
-all_best_mse["DYCOMS_RF01"]["Hvar_mean"] = 8169.595584887089
-all_best_mse["DYCOMS_RF01"]["QTvar_mean"] = 638.6085595959267
+all_best_mse["DYCOMS_RF01"]["qt_mean"] = 0.015790407015604215
+all_best_mse["DYCOMS_RF01"]["ql_mean"] = 3.2188572979301453
+all_best_mse["DYCOMS_RF01"]["updraft_area"] = 234.06928855870808
+all_best_mse["DYCOMS_RF01"]["updraft_w"] = 4.513818030068164
+all_best_mse["DYCOMS_RF01"]["updraft_qt"] = 1.1484351863007325
+all_best_mse["DYCOMS_RF01"]["updraft_thetal"] = 12.741437906306626
+all_best_mse["DYCOMS_RF01"]["v_mean"] = 39.84881395116392
+all_best_mse["DYCOMS_RF01"]["u_mean"] = 37.13710393082595
+all_best_mse["DYCOMS_RF01"]["tke_mean"] = 12.459021699371183
+all_best_mse["DYCOMS_RF01"]["temperature_mean"] = 2.430020252197371e-5
+all_best_mse["DYCOMS_RF01"]["thetal_mean"] = 2.4623392738702668e-5
+all_best_mse["DYCOMS_RF01"]["Hvar_mean"] = 8004.233346755046
+all_best_mse["DYCOMS_RF01"]["QTvar_mean"] = 627.9143173948462
 #
 all_best_mse["GABLS"] = OrderedDict()
 all_best_mse["GABLS"]["updraft_thetal"] = 1.860770054942234e-11
@@ -69,85 +69,85 @@ all_best_mse["GABLS"]["Hvar_mean"] = 7.643558897729471e-6
 all_best_mse["GABLS"]["QTvar_mean"] = 9.984936776329999e-7
 #
 all_best_mse["life_cycle_Tan2018"] = OrderedDict()
-all_best_mse["life_cycle_Tan2018"]["qt_mean"] = 0.005294230942043059
-all_best_mse["life_cycle_Tan2018"]["ql_mean"] = 1.0056704094437499
-all_best_mse["life_cycle_Tan2018"]["updraft_area"] = 0.7648858557999505
-all_best_mse["life_cycle_Tan2018"]["updraft_w"] = 0.8401845851463927
-all_best_mse["life_cycle_Tan2018"]["updraft_qt"] = 0.0550742722403087
-all_best_mse["life_cycle_Tan2018"]["updraft_thetal"] = 2.4191518222555545e-5
-all_best_mse["life_cycle_Tan2018"]["v_mean"] = 0.2502026000688947
-all_best_mse["life_cycle_Tan2018"]["u_mean"] = 0.0006973346848118053
-all_best_mse["life_cycle_Tan2018"]["tke_mean"] = 0.1967458678709227
-all_best_mse["life_cycle_Tan2018"]["temperature_mean"] = 2.5994050429884272e-6
-all_best_mse["life_cycle_Tan2018"]["thetal_mean"] = 2.480435129001176e-6
-all_best_mse["life_cycle_Tan2018"]["Hvar_mean"] = 14410.195649134235
-all_best_mse["life_cycle_Tan2018"]["QTvar_mean"] = 13168.300311530424
+all_best_mse["life_cycle_Tan2018"]["qt_mean"] = 0.005053564995080643
+all_best_mse["life_cycle_Tan2018"]["ql_mean"] = 0.6395899525238553
+all_best_mse["life_cycle_Tan2018"]["updraft_area"] = 1.0339777593747757
+all_best_mse["life_cycle_Tan2018"]["updraft_w"] = 0.6209061993829758
+all_best_mse["life_cycle_Tan2018"]["updraft_qt"] = 0.07380586619863141
+all_best_mse["life_cycle_Tan2018"]["updraft_thetal"] = 3.901751387607662e-5
+all_best_mse["life_cycle_Tan2018"]["v_mean"] = 0.49499163791188205
+all_best_mse["life_cycle_Tan2018"]["u_mean"] = 0.0010615313001852583
+all_best_mse["life_cycle_Tan2018"]["tke_mean"] = 0.4598846573691013
+all_best_mse["life_cycle_Tan2018"]["temperature_mean"] = 2.5476255499782517e-6
+all_best_mse["life_cycle_Tan2018"]["thetal_mean"] = 2.4220566415130252e-6
+all_best_mse["life_cycle_Tan2018"]["Hvar_mean"] = 13100.103883684273
+all_best_mse["life_cycle_Tan2018"]["QTvar_mean"] = 12167.984828833269
 #
 all_best_mse["Nieuwstadt"] = OrderedDict()
-all_best_mse["Nieuwstadt"]["updraft_area"] = 552.5788514617769
-all_best_mse["Nieuwstadt"]["updraft_w"] = 32.25062283579643
-all_best_mse["Nieuwstadt"]["updraft_thetal"] = 30.475538656673336
-all_best_mse["Nieuwstadt"]["u_mean"] = 153.8829083403498
-all_best_mse["Nieuwstadt"]["tke_mean"] = 64.18941651192912
-all_best_mse["Nieuwstadt"]["temperature_mean"] = 1.2441347455650014e-5
-all_best_mse["Nieuwstadt"]["thetal_mean"] = 1.2602999568822599e-5
-all_best_mse["Nieuwstadt"]["Hvar_mean"] = 199.43187580999842
+all_best_mse["Nieuwstadt"]["updraft_area"] = 604.1582860634906
+all_best_mse["Nieuwstadt"]["updraft_w"] = 28.443138551534215
+all_best_mse["Nieuwstadt"]["updraft_thetal"] = 30.475598474797245
+all_best_mse["Nieuwstadt"]["u_mean"] = 153.74316459223462
+all_best_mse["Nieuwstadt"]["tke_mean"] = 63.31048865005938
+all_best_mse["Nieuwstadt"]["temperature_mean"] = 1.2185697501058841e-5
+all_best_mse["Nieuwstadt"]["thetal_mean"] = 1.2347703190323162e-5
+all_best_mse["Nieuwstadt"]["Hvar_mean"] = 196.48869960733904
 #
 all_best_mse["Rico"] = OrderedDict()
-all_best_mse["Rico"]["qt_mean"] = 0.383463811848668
-all_best_mse["Rico"]["updraft_area"] = 2032.642031573551
-all_best_mse["Rico"]["updraft_w"] = 164.9093350224416
-all_best_mse["Rico"]["updraft_qt"] = 15.74986913364391
-all_best_mse["Rico"]["updraft_thetal"] = 63.60740672645253
-all_best_mse["Rico"]["v_mean"] = 106.20819791452406
-all_best_mse["Rico"]["u_mean"] = 114.28727850754993
-all_best_mse["Rico"]["tke_mean"] = 336.2314445616912
-all_best_mse["Rico"]["temperature_mean"] = 0.0001803816839338659
-all_best_mse["Rico"]["ql_mean"] = 45.19304937074048
-all_best_mse["Rico"]["thetal_mean"] = 0.00015731879419930554
-all_best_mse["Rico"]["Hvar_mean"] = 15476.713483584788
-all_best_mse["Rico"]["QTvar_mean"] = 8841.391505191177
+all_best_mse["Rico"]["qt_mean"] = 0.35841597279332155
+all_best_mse["Rico"]["updraft_area"] = 1960.8969374872222
+all_best_mse["Rico"]["updraft_w"] = 168.27938114573078
+all_best_mse["Rico"]["updraft_qt"] = 15.787973464310044
+all_best_mse["Rico"]["updraft_thetal"] = 63.603411577653105
+all_best_mse["Rico"]["v_mean"] = 106.18629926798079
+all_best_mse["Rico"]["u_mean"] = 114.16664515106795
+all_best_mse["Rico"]["tke_mean"] = 376.81031915199253
+all_best_mse["Rico"]["temperature_mean"] = 0.00016679762177657928
+all_best_mse["Rico"]["ql_mean"] = 34.00254853554125
+all_best_mse["Rico"]["thetal_mean"] = 0.00014532123689777748
+all_best_mse["Rico"]["Hvar_mean"] = 26193.65526397144
+all_best_mse["Rico"]["QTvar_mean"] = 15821.976836727468
 #
 all_best_mse["Soares"] = OrderedDict()
-all_best_mse["Soares"]["qt_mean"] = 0.16742194350656076
-all_best_mse["Soares"]["updraft_area"] = 489.1269503069583
-all_best_mse["Soares"]["updraft_w"] = 23.616238982054952
-all_best_mse["Soares"]["updraft_qt"] = 11.081819566897922
-all_best_mse["Soares"]["updraft_thetal"] = 22.394631245647613
-all_best_mse["Soares"]["u_mean"] = 728.2831605943467
-all_best_mse["Soares"]["tke_mean"] = 61.540898678684236
-all_best_mse["Soares"]["temperature_mean"] = 1.2777630018834098e-5
-all_best_mse["Soares"]["thetal_mean"] = 1.3390033388858172e-5
-all_best_mse["Soares"]["Hvar_mean"] = 238.62566333706377
+all_best_mse["Soares"]["qt_mean"] = 0.15530035057365052
+all_best_mse["Soares"]["updraft_area"] = 478.4531388030559
+all_best_mse["Soares"]["updraft_w"] = 22.43929559177187
+all_best_mse["Soares"]["updraft_qt"] = 11.047771373058655
+all_best_mse["Soares"]["updraft_thetal"] = 22.394882548810855
+all_best_mse["Soares"]["u_mean"] = 726.0285439274984
+all_best_mse["Soares"]["tke_mean"] = 55.20155667027502
+all_best_mse["Soares"]["temperature_mean"] = 1.2552677525942928e-5
+all_best_mse["Soares"]["thetal_mean"] = 1.3159290112440356e-5
+all_best_mse["Soares"]["Hvar_mean"] = 226.78811490213786
 #
 all_best_mse["SP"] = OrderedDict()
-all_best_mse["SP"]["qt_mean"] = 3.746325959636048
-all_best_mse["SP"]["updraft_area"] = 5.911477573957478
-all_best_mse["SP"]["updraft_w"] = 0.9494543540310392
-all_best_mse["SP"]["updraft_qt"] = 1.374484868343361
-all_best_mse["SP"]["updraft_thetal"] = 0.10512934438556375
-all_best_mse["SP"]["v_mean"] = 0.5109730647299865
-all_best_mse["SP"]["u_mean"] = 8.929222520620567e-5
-all_best_mse["SP"]["tke_mean"] = 0.16958834720245686
-all_best_mse["SP"]["temperature_mean"] = 7.689273658427972e-7
-all_best_mse["SP"]["thetal_mean"] = 5.916606947734092e-7
-all_best_mse["SP"]["Hvar_mean"] = 48.907618959600704
-all_best_mse["SP"]["QTvar_mean"] = 24.8054269866188
+all_best_mse["SP"]["qt_mean"] = 1.5331163826085181
+all_best_mse["SP"]["updraft_area"] = 5.703208781927522
+all_best_mse["SP"]["updraft_w"] = 1.2733816609463413
+all_best_mse["SP"]["updraft_qt"] = 1.758265575294442
+all_best_mse["SP"]["updraft_thetal"] = 0.10509397234888228
+all_best_mse["SP"]["v_mean"] = 0.11322179445801007
+all_best_mse["SP"]["u_mean"] = 5.126268674374482e-5
+all_best_mse["SP"]["tke_mean"] = 0.14308341972036548
+all_best_mse["SP"]["temperature_mean"] = 6.507014852511049e-7
+all_best_mse["SP"]["thetal_mean"] = 4.635150258073339e-7
+all_best_mse["SP"]["Hvar_mean"] = 18567.99931971328
+all_best_mse["SP"]["QTvar_mean"] = 517.6947068342721
 #
 all_best_mse["TRMM_LBA"] = OrderedDict()
-all_best_mse["TRMM_LBA"]["qt_mean"] = 1.564848667277376
-all_best_mse["TRMM_LBA"]["updraft_area"] = 23278.77793198278
-all_best_mse["TRMM_LBA"]["updraft_w"] = 897.542352740181
-all_best_mse["TRMM_LBA"]["updraft_qt"] = 27.81652635986677
-all_best_mse["TRMM_LBA"]["updraft_thetal"] = 110.01429960913735
-all_best_mse["TRMM_LBA"]["v_mean"] = 292.4389255452546
-all_best_mse["TRMM_LBA"]["u_mean"] = 1687.3530689065476
-all_best_mse["TRMM_LBA"]["tke_mean"] = 1312.573139677765
-all_best_mse["TRMM_LBA"]["temperature_mean"] = 0.0006445516942442612
-all_best_mse["TRMM_LBA"]["ql_mean"] = 959.5304484383556
-all_best_mse["TRMM_LBA"]["thetal_mean"] = 0.008156443335018422
-all_best_mse["TRMM_LBA"]["Hvar_mean"] = 4438.849539879371
-all_best_mse["TRMM_LBA"]["QTvar_mean"] = 2010.6521493912053
+all_best_mse["TRMM_LBA"]["qt_mean"] = 1.7173759897692624
+all_best_mse["TRMM_LBA"]["updraft_area"] = 23186.65786464699
+all_best_mse["TRMM_LBA"]["updraft_w"] = 907.838270898333
+all_best_mse["TRMM_LBA"]["updraft_qt"] = 27.29262014533943
+all_best_mse["TRMM_LBA"]["updraft_thetal"] = 110.00554694277362
+all_best_mse["TRMM_LBA"]["v_mean"] = 292.51185223035424
+all_best_mse["TRMM_LBA"]["u_mean"] = 1687.3134487742964
+all_best_mse["TRMM_LBA"]["tke_mean"] = 1454.7530719704341
+all_best_mse["TRMM_LBA"]["temperature_mean"] = 0.0007357837027575268
+all_best_mse["TRMM_LBA"]["ql_mean"] = 1015.0743167223092
+all_best_mse["TRMM_LBA"]["thetal_mean"] = 0.008212061220950818
+all_best_mse["TRMM_LBA"]["Hvar_mean"] = 4577.033431272572
+all_best_mse["TRMM_LBA"]["QTvar_mean"] = 2088.020119919547
 #
 #################################
 #################################

src/Operators.jl

@@ -13,12 +13,6 @@ struct SetGradient{FT}
 end
 struct Extrapolate end
 
-function ∇f2c(f, grid::Grid, k::Int)
-    return (f[k] - f[k - 1]) * grid.dzi
-end
-function ∇f2c(f, grid::Grid, k::Int, i::Int)
-    return (f[i, k] - f[i, k - 1]) * grid.dzi
-end
 function ∇f2c(f_dual::SVector, grid::Grid, k::Int; bottom = NoBCGivenError(), top = NoBCGivenError())
     if is_surface_face(grid, k - 1)
         return ∇f2c(f_dual, grid, BottomBCTag(), bottom)
@@ -31,7 +25,7 @@ end
 ∇f2c(f::SVector, grid::Grid, ::InteriorTag) = (f[2] - f[1]) * grid.dzi
 ∇f2c(f::SVector, grid::Grid, ::TopBCTag, bc::SetValue) = (bc.value - f[1]) * grid.dzi
 ∇f2c(f::SVector, grid::Grid, ::TopBCTag, bc::SetGradient) = bc.value
-∇f2c(f::SVector, grid::Grid, ::BottomBCTag, bc::SetValue) = (f[2] - bc.value) * grid.dzi
+∇f2c(f::SVector, grid::Grid, ::BottomBCTag, bc::SetValue) = (f[1] - bc.value) * grid.dzi
 ∇f2c(f::SVector, grid::Grid, ::BottomBCTag, bc::SetGradient) = bc.value
 
 function ∇c2f(f, grid::Grid, k::Int)

src/Turbulence_PrognosticTKE.jl

@@ -903,7 +903,8 @@ function compute_updraft_closures(self::EDMF_PrognosticTKE, GMV::GridMeanVariabl
             a_kfull = interpc2f(self.UpdVar.Area.values, grid, k, i)
             if a_kfull > 0.0
                 b_kfull = interpc2f(self.UpdVar.B.values, grid, k, i)
-                ∇w_up = ∇f2c(self.UpdVar.W.values, grid, k, i)
+                w_dual = dual_faces(self.UpdVar.W.values, grid, k, i)
+                ∇w_up = ∇f2c(w_dual, grid, k; bottom = SetValue(0), top = SetGradient(0))
                 asp_ratio = 1.0
                 self.nh_pressure_b[i, k], self.nh_pressure_adv[i, k], self.nh_pressure_drag[i, k] =
                     perturbation_pressure(