Skip to content

Commit

Permalink
Merge #572
Browse files Browse the repository at this point in the history 
572: Replace more operators with ClimaCore operators r=charleskawczynski a=charleskawczynski

This PR removes some old unused operators and replaces some operators with ClimaCore operators for the `perturbation_pressure` function, which has been split up into 3 methods: `nh_pressure_buoy`,`nh_pressure_adv`,`nh_pressure_drag`.

Co-authored-by: Charles Kawczynski <[email protected]>
  • Loading branch information
@bors @charleskawczynski
bors[bot] and charleskawczynski authored Nov 17, 2021
2 parents 074fa5e + 84b5e11 commit 1d87c96
Show file tree
Hide file tree
Showing 6 changed files with 192 additions and 308 deletions.
7 changes: 7 additions & 0 deletions docs/bibliography.bib
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,13 @@
# Last author name (titlecase), followed by
# (no characters in-between) the year.
@article{He2020,
title = {An Improved Perturbation Pressure Closure for Eddy-Diffusivity Mass-Flux Schemes},
author = {He, Jia and Cohen, Yair and Lopez-Gomez, Ignacio and Jaruga, Anna and Schneider, Tapio},
year = {2020},
doi = {10.5281/zenodo.4291143},
}

@article{Nishizawa2018,
title = {A Surface Flux Scheme Based on the Monin-Obukhov Similarity for Finite Volume Models},
author = {Nishizawa, S and Kitamura, Y},
Expand Down
3 changes: 0 additions & 3 deletions docs/src/index.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,11 +6,8 @@ CurrentModule = TurbulenceConvection

```@docs
TurbulenceConvection.ClimaParams
TurbulenceConvection.ccut
TurbulenceConvection.fcut
TurbulenceConvection.ccut_downwind
TurbulenceConvection.ccut_upwind
TurbulenceConvection.fcut_upwind
TurbulenceConvection.daul_f2c_upwind
TurbulenceConvection.dual_centers
```
212 changes: 106 additions & 106 deletions integration_tests/utils/mse_tables.jl
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,60 +5,60 @@
all_best_mse = OrderedCollections.OrderedDict()
#
all_best_mse["ARM_SGP"] = OrderedCollections.OrderedDict()
all_best_mse["ARM_SGP"]["qt_mean"] = 0.22286959111173252
all_best_mse["ARM_SGP"]["updraft_area"] = 335.3378419225924
all_best_mse["ARM_SGP"]["updraft_w"] = 141.84841956414584
all_best_mse["ARM_SGP"]["updraft_qt"] = 27.421852759548216
all_best_mse["ARM_SGP"]["updraft_thetal"] = 170.98083895236377
all_best_mse["ARM_SGP"]["qt_mean"] = 0.22278121677461668
all_best_mse["ARM_SGP"]["updraft_area"] = 335.3383176130966
all_best_mse["ARM_SGP"]["updraft_w"] = 141.8823004933083
all_best_mse["ARM_SGP"]["updraft_qt"] = 27.413164420916416
all_best_mse["ARM_SGP"]["updraft_thetal"] = 170.9808313059217
all_best_mse["ARM_SGP"]["u_mean"] = 1.3375737467153984e-5
all_best_mse["ARM_SGP"]["tke_mean"] = 1318.3154189170075
all_best_mse["ARM_SGP"]["temperature_mean"] = 0.00010925945966980263
all_best_mse["ARM_SGP"]["ql_mean"] = 174.380491712554
all_best_mse["ARM_SGP"]["tke_mean"] = 1318.3046261161307
all_best_mse["ARM_SGP"]["temperature_mean"] = 0.00010922521417894034
all_best_mse["ARM_SGP"]["ql_mean"] = 174.47519591828427
all_best_mse["ARM_SGP"]["qi_mean"] = "NA"
all_best_mse["ARM_SGP"]["thetal_mean"] = 0.00010068350911718366
all_best_mse["ARM_SGP"]["Hvar_mean"] = 10272.960793535123
all_best_mse["ARM_SGP"]["QTvar_mean"] = 6518.918215318262
all_best_mse["ARM_SGP"]["thetal_mean"] = 0.00010065213829691764
all_best_mse["ARM_SGP"]["Hvar_mean"] = 10137.551325644243
all_best_mse["ARM_SGP"]["QTvar_mean"] = 6440.554634040854
#
all_best_mse["Bomex"] = OrderedCollections.OrderedDict()
all_best_mse["Bomex"]["qt_mean"] = 0.115170045283136
all_best_mse["Bomex"]["updraft_area"] = 129.45058117786624
all_best_mse["Bomex"]["updraft_w"] = 18.370154256735134
all_best_mse["Bomex"]["updraft_qt"] = 6.306330920610372
all_best_mse["Bomex"]["updraft_thetal"] = 69.45787769968938
all_best_mse["Bomex"]["v_mean"] = 66.9363180496193
all_best_mse["Bomex"]["u_mean"] = 0.3230987236309413
all_best_mse["Bomex"]["tke_mean"] = 74.29246691414228
all_best_mse["Bomex"]["temperature_mean"] = 4.591826060245829e-5
all_best_mse["Bomex"]["ql_mean"] = 8.909573333964328
all_best_mse["Bomex"]["qt_mean"] = 0.1142984832145794
all_best_mse["Bomex"]["updraft_area"] = 129.4666247111314
all_best_mse["Bomex"]["updraft_w"] = 18.589118153240914
all_best_mse["Bomex"]["updraft_qt"] = 6.547731688323363
all_best_mse["Bomex"]["updraft_thetal"] = 69.46255635584659
all_best_mse["Bomex"]["v_mean"] = 66.94211575405005
all_best_mse["Bomex"]["u_mean"] = 0.32311339179101467
all_best_mse["Bomex"]["tke_mean"] = 74.28852324222972
all_best_mse["Bomex"]["temperature_mean"] = 4.5531444155076916e-5
all_best_mse["Bomex"]["ql_mean"] = 8.977268260048694
all_best_mse["Bomex"]["qi_mean"] = "NA"
all_best_mse["Bomex"]["thetal_mean"] = 4.666238445127772e-5
all_best_mse["Bomex"]["Hvar_mean"] = 3822.8747397715383
all_best_mse["Bomex"]["QTvar_mean"] = 1433.09548125117
all_best_mse["Bomex"]["thetal_mean"] = 4.626406957782394e-5
all_best_mse["Bomex"]["Hvar_mean"] = 3659.788218303087
all_best_mse["Bomex"]["QTvar_mean"] = 1370.5023456643303
#
all_best_mse["DryBubble"] = OrderedCollections.OrderedDict()
all_best_mse["DryBubble"]["updraft_area"] = 0.0
all_best_mse["DryBubble"]["updraft_w"] = 0.0
all_best_mse["DryBubble"]["updraft_thetal"] = 0.0
all_best_mse["DryBubble"]["updraft_area"] = 2.7557258489751286e-21
all_best_mse["DryBubble"]["updraft_w"] = 1.4882211040018834e-21
all_best_mse["DryBubble"]["updraft_thetal"] = 1.6433291430641414e-28
all_best_mse["DryBubble"]["u_mean"] = 0.0
all_best_mse["DryBubble"]["tke_mean"] = 0.0
all_best_mse["DryBubble"]["temperature_mean"] = 0.0
all_best_mse["DryBubble"]["thetal_mean"] = 0.0
all_best_mse["DryBubble"]["Hvar_mean"] = 0.0
all_best_mse["DryBubble"]["tke_mean"] = 1.232445843616352e-20
all_best_mse["DryBubble"]["temperature_mean"] = 6.47738536904319e-29
all_best_mse["DryBubble"]["thetal_mean"] = 5.589101536282765e-29
all_best_mse["DryBubble"]["Hvar_mean"] = 2.498851618600324e-21
#
all_best_mse["DYCOMS_RF01"] = OrderedCollections.OrderedDict()
all_best_mse["DYCOMS_RF01"]["qt_mean"] = 0.022666124109793833
all_best_mse["DYCOMS_RF01"]["ql_mean"] = 10.29424581361349
all_best_mse["DYCOMS_RF01"]["updraft_area"] = 30.54686971359306
all_best_mse["DYCOMS_RF01"]["updraft_w"] = 4.138261488244225
all_best_mse["DYCOMS_RF01"]["updraft_qt"] = 2.1512919048289247
all_best_mse["DYCOMS_RF01"]["updraft_thetal"] = 46.18689371056938
all_best_mse["DYCOMS_RF01"]["v_mean"] = 0.0030072605138559954
all_best_mse["DYCOMS_RF01"]["u_mean"] = 0.07908969038701516
all_best_mse["DYCOMS_RF01"]["tke_mean"] = 21.342247465667818
all_best_mse["DYCOMS_RF01"]["temperature_mean"] = 8.099236822693791e-5
all_best_mse["DYCOMS_RF01"]["thetal_mean"] = 8.159657482364597e-5
all_best_mse["DYCOMS_RF01"]["Hvar_mean"] = 1243.0763870159726
all_best_mse["DYCOMS_RF01"]["QTvar_mean"] = 483.91315327820047
all_best_mse["DYCOMS_RF01"]["qt_mean"] = 0.02266612410948579
all_best_mse["DYCOMS_RF01"]["ql_mean"] = 10.294245805548519
all_best_mse["DYCOMS_RF01"]["updraft_area"] = 30.546869714022233
all_best_mse["DYCOMS_RF01"]["updraft_w"] = 4.138261487591031
all_best_mse["DYCOMS_RF01"]["updraft_qt"] = 2.1512919048837458
all_best_mse["DYCOMS_RF01"]["updraft_thetal"] = 46.18689371056959
all_best_mse["DYCOMS_RF01"]["v_mean"] = 0.0030072605142826316
all_best_mse["DYCOMS_RF01"]["u_mean"] = 0.07908969039042228
all_best_mse["DYCOMS_RF01"]["tke_mean"] = 21.342247469133646
all_best_mse["DYCOMS_RF01"]["temperature_mean"] = 8.099236820837013e-5
all_best_mse["DYCOMS_RF01"]["thetal_mean"] = 8.159657480540668e-5
all_best_mse["DYCOMS_RF01"]["Hvar_mean"] = 1243.0763870147414
all_best_mse["DYCOMS_RF01"]["QTvar_mean"] = 483.9131532801414
#
all_best_mse["GABLS"] = OrderedCollections.OrderedDict()
all_best_mse["GABLS"]["updraft_thetal"] = 0.0
Expand All @@ -72,82 +72,82 @@ 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"] = 0.0
all_best_mse["life_cycle_Tan2018"]["ql_mean"] = 0.0
all_best_mse["life_cycle_Tan2018"]["updraft_area"] = 0.0
all_best_mse["life_cycle_Tan2018"]["updraft_w"] = 0.0
all_best_mse["life_cycle_Tan2018"]["updraft_qt"] = 0.0
all_best_mse["life_cycle_Tan2018"]["updraft_thetal"] = 0.0
all_best_mse["life_cycle_Tan2018"]["v_mean"] = 0.0
all_best_mse["life_cycle_Tan2018"]["u_mean"] = 0.0
all_best_mse["life_cycle_Tan2018"]["tke_mean"] = 0.0
all_best_mse["life_cycle_Tan2018"]["temperature_mean"] = 0.0
all_best_mse["life_cycle_Tan2018"]["thetal_mean"] = 0.0
all_best_mse["life_cycle_Tan2018"]["Hvar_mean"] = 0.0
all_best_mse["life_cycle_Tan2018"]["QTvar_mean"] = 0.0
all_best_mse["life_cycle_Tan2018"]["qt_mean"] = 4.560496735623979e-12
all_best_mse["life_cycle_Tan2018"]["ql_mean"] = 2.753148799752455e-9
all_best_mse["life_cycle_Tan2018"]["updraft_area"] = 4.229250371299662e-11
all_best_mse["life_cycle_Tan2018"]["updraft_w"] = 1.7496250606897463e-10
all_best_mse["life_cycle_Tan2018"]["updraft_qt"] = 8.353350221446745e-13
all_best_mse["life_cycle_Tan2018"]["updraft_thetal"] = 4.933682386506118e-16
all_best_mse["life_cycle_Tan2018"]["v_mean"] = 1.4334837776655798e-11
all_best_mse["life_cycle_Tan2018"]["u_mean"] = 5.392661114895911e-14
all_best_mse["life_cycle_Tan2018"]["tke_mean"] = 1.614164841954162e-11
all_best_mse["life_cycle_Tan2018"]["temperature_mean"] = 2.2186848594108474e-15
all_best_mse["life_cycle_Tan2018"]["thetal_mean"] = 2.1813155704241545e-15
all_best_mse["life_cycle_Tan2018"]["Hvar_mean"] = 2.9145880501509424e-5
all_best_mse["life_cycle_Tan2018"]["QTvar_mean"] = 2.4665342833764468e-5
#
all_best_mse["Nieuwstadt"] = OrderedCollections.OrderedDict()
all_best_mse["Nieuwstadt"]["updraft_area"] = 98.77517013992535
all_best_mse["Nieuwstadt"]["updraft_w"] = 12.495642974380058
all_best_mse["Nieuwstadt"]["updraft_area"] = 98.77517014013256
all_best_mse["Nieuwstadt"]["updraft_w"] = 12.49564297439893
all_best_mse["Nieuwstadt"]["updraft_thetal"] = 117.36697373364835
all_best_mse["Nieuwstadt"]["u_mean"] = 14.602386345210023
all_best_mse["Nieuwstadt"]["tke_mean"] = 313.23199902597605
all_best_mse["Nieuwstadt"]["temperature_mean"] = 9.7231699614854e-6
all_best_mse["Nieuwstadt"]["thetal_mean"] = 1.0035366285832543e-5
all_best_mse["Nieuwstadt"]["Hvar_mean"] = 1277.7564627153547
all_best_mse["Nieuwstadt"]["u_mean"] = 14.602386345210018
all_best_mse["Nieuwstadt"]["tke_mean"] = 313.23199902585554
all_best_mse["Nieuwstadt"]["temperature_mean"] = 9.72316996150071e-6
all_best_mse["Nieuwstadt"]["thetal_mean"] = 1.0035366285845367e-5
all_best_mse["Nieuwstadt"]["Hvar_mean"] = 1277.75646271547
#
all_best_mse["Rico"] = OrderedCollections.OrderedDict()
all_best_mse["Rico"]["qt_mean"] = 1.2368324954575274
all_best_mse["Rico"]["updraft_area"] = 477.4540646477023
all_best_mse["Rico"]["updraft_w"] = 107.93534078910224
all_best_mse["Rico"]["updraft_qt"] = 12.106416673863404
all_best_mse["Rico"]["updraft_thetal"] = 133.36104664499535
all_best_mse["Rico"]["v_mean"] = 0.6116450245539317
all_best_mse["Rico"]["u_mean"] = 0.695169541619883
all_best_mse["Rico"]["tke_mean"] = 82.35898449028875
all_best_mse["Rico"]["temperature_mean"] = 0.0005727120565407745
all_best_mse["Rico"]["ql_mean"] = 63.507574798525205
all_best_mse["Rico"]["qt_mean"] = 1.232490792941298
all_best_mse["Rico"]["updraft_area"] = 477.45988305182055
all_best_mse["Rico"]["updraft_w"] = 108.26792606509692
all_best_mse["Rico"]["updraft_qt"] = 12.229178053754907
all_best_mse["Rico"]["updraft_thetal"] = 133.36315459294306
all_best_mse["Rico"]["v_mean"] = 0.6113308524177485
all_best_mse["Rico"]["u_mean"] = 0.6967351608990446
all_best_mse["Rico"]["tke_mean"] = 82.28835956328976
all_best_mse["Rico"]["temperature_mean"] = 0.000571483807060141
all_best_mse["Rico"]["ql_mean"] = 63.49114542479812
all_best_mse["Rico"]["qi_mean"] = "NA"
all_best_mse["Rico"]["qr_mean"] = 760.8475924163045
all_best_mse["Rico"]["thetal_mean"] = 0.0005650860400845547
all_best_mse["Rico"]["Hvar_mean"] = 173935.8383250262
all_best_mse["Rico"]["QTvar_mean"] = 39053.357708784606
all_best_mse["Rico"]["qr_mean"] = 760.8112853555336
all_best_mse["Rico"]["thetal_mean"] = 0.0005638487812436783
all_best_mse["Rico"]["Hvar_mean"] = 169678.75471329433
all_best_mse["Rico"]["QTvar_mean"] = 38176.792525191464
#
all_best_mse["Soares"] = OrderedCollections.OrderedDict()
all_best_mse["Soares"]["qt_mean"] = 0.12631256600224
all_best_mse["Soares"]["updraft_area"] = 96.19157396759499
all_best_mse["Soares"]["updraft_w"] = 11.391626503785842
all_best_mse["Soares"]["updraft_qt"] = 23.081037927314153
all_best_mse["Soares"]["updraft_thetal"] = 65.25330113168873
all_best_mse["Soares"]["u_mean"] = 96.34646256855906
all_best_mse["Soares"]["tke_mean"] = 241.36263695867387
all_best_mse["Soares"]["temperature_mean"] = 1.0985075298440972e-5
all_best_mse["Soares"]["thetal_mean"] = 1.0414382065295909e-5
all_best_mse["Soares"]["Hvar_mean"] = 1121.2519631022305
all_best_mse["Soares"]["qt_mean"] = 0.12603396706234768
all_best_mse["Soares"]["updraft_area"] = 98.26806423535538
all_best_mse["Soares"]["updraft_w"] = 11.392512040965762
all_best_mse["Soares"]["updraft_qt"] = 23.084438715322182
all_best_mse["Soares"]["updraft_thetal"] = 65.25330166099764
all_best_mse["Soares"]["u_mean"] = 96.34556775036845
all_best_mse["Soares"]["tke_mean"] = 241.28380828501062
all_best_mse["Soares"]["temperature_mean"] = 1.0974499064989044e-5
all_best_mse["Soares"]["thetal_mean"] = 1.0402937634003303e-5
all_best_mse["Soares"]["Hvar_mean"] = 1121.9358925312727
#
all_best_mse["TRMM_LBA"] = OrderedCollections.OrderedDict()
all_best_mse["TRMM_LBA"]["qt_mean"] = 3.9659428453653844
all_best_mse["TRMM_LBA"]["updraft_area"] = 7590.521944576031
all_best_mse["TRMM_LBA"]["updraft_w"] = 29147.7366679372
all_best_mse["TRMM_LBA"]["updraft_qt"] = 264.4032200629445
all_best_mse["TRMM_LBA"]["qt_mean"] = 3.965942845365399
all_best_mse["TRMM_LBA"]["updraft_area"] = 7590.5219445760895
all_best_mse["TRMM_LBA"]["updraft_w"] = 29147.736667935606
all_best_mse["TRMM_LBA"]["updraft_qt"] = 264.40322006295787
all_best_mse["TRMM_LBA"]["updraft_thetal"] = 1962.1800212491878
all_best_mse["TRMM_LBA"]["v_mean"] = 286.63130558520237
all_best_mse["TRMM_LBA"]["u_mean"] = 113.79505333419178
all_best_mse["TRMM_LBA"]["tke_mean"] = 25980.794418238478
all_best_mse["TRMM_LBA"]["temperature_mean"] = 0.0011280565198652176
all_best_mse["TRMM_LBA"]["ql_mean"] = 11329.919354934302
all_best_mse["TRMM_LBA"]["v_mean"] = 286.63130558519936
all_best_mse["TRMM_LBA"]["u_mean"] = 113.79505333419151
all_best_mse["TRMM_LBA"]["tke_mean"] = 25980.794418241887
all_best_mse["TRMM_LBA"]["temperature_mean"] = 0.001128056519865219
all_best_mse["TRMM_LBA"]["ql_mean"] = 11329.919354937361
all_best_mse["TRMM_LBA"]["qi_mean"] = "NA"
all_best_mse["TRMM_LBA"]["thetal_mean"] = 0.021118734698942185
all_best_mse["TRMM_LBA"]["Hvar_mean"] = 4347.874034178831
all_best_mse["TRMM_LBA"]["QTvar_mean"] = 2834.632990322874
all_best_mse["TRMM_LBA"]["thetal_mean"] = 0.02111873469894223
all_best_mse["TRMM_LBA"]["Hvar_mean"] = 4347.874034179779
all_best_mse["TRMM_LBA"]["QTvar_mean"] = 2834.632990323496
#
all_best_mse["LES_driven_SCM"] = OrderedCollections.OrderedDict()
all_best_mse["LES_driven_SCM"]["qt_mean"] = 8.334863909073507
all_best_mse["LES_driven_SCM"]["v_mean"] = 3.2669625943900944
all_best_mse["LES_driven_SCM"]["u_mean"] = 1.1394964360943123
all_best_mse["LES_driven_SCM"]["temperature_mean"] = 0.0033296196687915246
all_best_mse["LES_driven_SCM"]["ql_mean"] = 557.985924567264
all_best_mse["LES_driven_SCM"]["thetal_mean"] = 0.0036315363583872434
all_best_mse["LES_driven_SCM"]["qt_mean"] = 8.375126616070798
all_best_mse["LES_driven_SCM"]["v_mean"] = 3.234280171966482
all_best_mse["LES_driven_SCM"]["u_mean"] = 1.134423861786145
all_best_mse["LES_driven_SCM"]["temperature_mean"] = 0.0033437098531422594
all_best_mse["LES_driven_SCM"]["ql_mean"] = 412.3892161833214
all_best_mse["LES_driven_SCM"]["thetal_mean"] = 0.003642974955538725
#
#################################
#################################
Expand Down
Loading

0 comments on commit 1d87c96

Please sign in to comment.