Skip to content

Commit

Permalink
split compute_covariance
Browse files Browse the repository at this point in the history 
merge update and comput prognostic upd

WIP

unify first decom_env

move init env cov to initialize_covariance

move all initializations from update to init

move all initialization componenets from update to initilize

move all initialization componenets from update to initilize
  • Loading branch information
yairchn committed Aug 17, 2021
1 parent 542ca4d commit 98b5ecb
Show file tree
Hide file tree
Showing 4 changed files with 181 additions and 177 deletions.
4 changes: 4 additions & 0 deletions integration_tests/utils/Cases.jl
View file
Original file line number Diff line number Diff line change
Expand Up @@ -194,6 +194,7 @@ function initialize_surface(self::CasesBase{SoaresCase}, Gr::Grid, Ref::Referenc
self.Sur.lhf = qt_flux * TC.surface_value(Ref.rho0, Gr) * latent_heat(self.Sur.Tsurface) # It would be 0.0 if we follow Nieuwstadt.
self.Sur.shf = theta_flux * cpm_c(self.Sur.qsurface) * TC.surface_value(Ref.rho0, Gr)
self.Sur.ustar_fixed = false
self.Sur.ustar = 0.28 # just to initilize grid mean covariances
self.Sur.Gr = Gr
self.Sur.Ref = Ref
self.Sur.bflux =
Expand Down Expand Up @@ -289,6 +290,7 @@ function initialize_surface(self::CasesBase{Nieuwstadt}, Gr::Grid, Ref::Referenc
self.Sur.lhf = 0.0 # It would be 0.0 if we follow Nieuwstadt.
self.Sur.shf = theta_flux * cpm_c(self.Sur.qsurface) * TC.surface_value(Ref.rho0, Gr)
self.Sur.ustar_fixed = false
self.Sur.ustar = 0.28 # just to initilize grid mean covariances
self.Sur.Gr = Gr
self.Sur.Ref = Ref
self.Sur.bflux =
Expand Down Expand Up @@ -1470,6 +1472,7 @@ function initialize_surface(self::CasesBase{DYCOMS_RF01}, Gr::Grid, Ref::Referen
g = CPP.grav(param_set)
self.Sur.zrough = 1.0e-4
self.Sur.ustar_fixed = false
self.Sur.ustar = 0.28 # just to initilize grid mean covariances
self.Sur.cm = 0.0011

# sensible heat flux
Expand Down Expand Up @@ -1709,6 +1712,7 @@ function initialize_surface(self::CasesBase{SP}, Gr::Grid, Ref::ReferenceState)
self.Sur.Tsurface = 300.0
theta_surface = self.Sur.Tsurface / exner_c(Ref.Pg)
theta_flux = 0.24
self.Sur.ustar = 0.28 # just to initilize grid mean covariances
self.Sur.bflux = g * theta_flux / theta_surface
initialize(self.Sur)
end
Expand Down
2 changes: 1 addition & 1 deletion integration_tests/utils/main.jl
View file
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ function TurbulenceConvection.initialize(self::Simulation1d, namelist)
Cases.initialize_surface(self.Case, self.Gr, self.Ref)
Cases.initialize_forcing(self.Case, self.Gr, self.Ref, self.GMV)
Cases.initialize_radiation(self.Case, self.Gr, self.Ref, self.GMV)
TC.initialize(self.Turb, self.Case, self.GMV, self.Ref)
TC.initialize(self.Turb, self.Case, self.GMV, self.Ref, self.TS)
TC.initialize_io(self)
TC.io(self)

Expand Down
234 changes: 117 additions & 117 deletions integration_tests/utils/mse_tables.jl
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,149 +5,149 @@
all_best_mse = OrderedDict()

all_best_mse["ARM_SGP"] = OrderedDict()
all_best_mse["ARM_SGP"]["qt_mean"] = 0.2562409304950924
all_best_mse["ARM_SGP"]["updraft_area"] = 1878.765016631723
all_best_mse["ARM_SGP"]["updraft_w"] = 354.0614012916157
all_best_mse["ARM_SGP"]["updraft_qt"] = 13.31390898545254
all_best_mse["ARM_SGP"]["updraft_thetal"] = 27.67752590003724
all_best_mse["ARM_SGP"]["u_mean"] = 87.99854727781783
all_best_mse["ARM_SGP"]["tke_mean"] = 618.226768895393
all_best_mse["ARM_SGP"]["temperature_mean"] = 0.00011507366487172529
all_best_mse["ARM_SGP"]["ql_mean"] = 193.9231392477703
all_best_mse["ARM_SGP"]["thetal_mean"] = 0.00011846833322983593
all_best_mse["ARM_SGP"]["Hvar_mean"] = 3594.0423766016543
all_best_mse["ARM_SGP"]["QTvar_mean"] = 1906.7902159685427
all_best_mse["ARM_SGP"]["qt_mean"] = 0.38761178010042174
all_best_mse["ARM_SGP"]["updraft_area"] = 1990.7197808062147
all_best_mse["ARM_SGP"]["updraft_w"] = 339.2192365349033
all_best_mse["ARM_SGP"]["updraft_qt"] = 12.806458694740062
all_best_mse["ARM_SGP"]["updraft_thetal"] = 27.6842068044621
all_best_mse["ARM_SGP"]["u_mean"] = 87.99854727781782
all_best_mse["ARM_SGP"]["tke_mean"] = 663.4394184477983
all_best_mse["ARM_SGP"]["temperature_mean"] = 0.00015889972747093204
all_best_mse["ARM_SGP"]["ql_mean"] = 337.4544820822815
all_best_mse["ARM_SGP"]["thetal_mean"] = 0.00015820918077276845
all_best_mse["ARM_SGP"]["Hvar_mean"] = 3317.516157649481
all_best_mse["ARM_SGP"]["QTvar_mean"] = 2008.0590300848555

all_best_mse["Bomex"] = OrderedDict()
all_best_mse["Bomex"]["qt_mean"] = 0.09488664032588795
all_best_mse["Bomex"]["updraft_area"] = 698.4845548183822
all_best_mse["Bomex"]["updraft_w"] = 32.87455987142051
all_best_mse["Bomex"]["updraft_qt"] = 4.295977609924503
all_best_mse["Bomex"]["updraft_thetal"] = 21.545270874484405
all_best_mse["Bomex"]["v_mean"] = 68.31091813242487
all_best_mse["Bomex"]["u_mean"] = 53.30796266698442
all_best_mse["Bomex"]["tke_mean"] = 42.41830631826519
all_best_mse["Bomex"]["temperature_mean"] = 4.145219261662451e-5
all_best_mse["Bomex"]["ql_mean"] = 6.880731397176597
all_best_mse["Bomex"]["thetal_mean"] = 4.1907202447421285e-5
all_best_mse["Bomex"]["Hvar_mean"] = 1302.648456680116
all_best_mse["Bomex"]["QTvar_mean"] = 701.2244670132267
all_best_mse["Bomex"]["qt_mean"] = 0.10355365519250541
all_best_mse["Bomex"]["updraft_area"] = 698.0878952183828
all_best_mse["Bomex"]["updraft_w"] = 32.66428504442064
all_best_mse["Bomex"]["updraft_qt"] = 4.280917239973568
all_best_mse["Bomex"]["updraft_thetal"] = 21.545736131296373
all_best_mse["Bomex"]["v_mean"] = 68.31955423876357
all_best_mse["Bomex"]["u_mean"] = 53.30815930416844
all_best_mse["Bomex"]["tke_mean"] = 41.59023149295848
all_best_mse["Bomex"]["temperature_mean"] = 4.526553313352871e-5
all_best_mse["Bomex"]["ql_mean"] = 23.26900159003541
all_best_mse["Bomex"]["thetal_mean"] = 4.533273882570006e-5
all_best_mse["Bomex"]["Hvar_mean"] = 1259.8741767596096
all_best_mse["Bomex"]["QTvar_mean"] = 609.2305855426724

all_best_mse["DryBubble"] = OrderedDict()
all_best_mse["DryBubble"]["updraft_area"] = 685.4284539592268
all_best_mse["DryBubble"]["updraft_w"] = 163.3278969296097
all_best_mse["DryBubble"]["updraft_thetal"] = 3.9771329264660604e-5
all_best_mse["DryBubble"]["u_mean"] = 2.156048480086128e-27
all_best_mse["DryBubble"]["tke_mean"] = 199514.1752751936
all_best_mse["DryBubble"]["temperature_mean"] = 3.253069186581781e-5
all_best_mse["DryBubble"]["thetal_mean"] = 2.5839984867230905e-5
all_best_mse["DryBubble"]["Hvar_mean"] = 736.6298770380382
all_best_mse["DryBubble"]["updraft_area"] = 685.6569382830485
all_best_mse["DryBubble"]["updraft_w"] = 163.3314944718753
all_best_mse["DryBubble"]["updraft_thetal"] = 3.97870319455191e-5
all_best_mse["DryBubble"]["u_mean"] = 1.934626721792358e-27
all_best_mse["DryBubble"]["tke_mean"] = 199502.376048235
all_best_mse["DryBubble"]["temperature_mean"] = 3.259107617074049e-5
all_best_mse["DryBubble"]["thetal_mean"] = 2.5895280916168157e-5
all_best_mse["DryBubble"]["Hvar_mean"] = 672.6851063406825

all_best_mse["DYCOMS_RF01"] = OrderedDict()
all_best_mse["DYCOMS_RF01"]["qt_mean"] = 0.01651005566599786
all_best_mse["DYCOMS_RF01"]["ql_mean"] = 5.239001419426639
all_best_mse["DYCOMS_RF01"]["updraft_area"] = 239.3599581819117
all_best_mse["DYCOMS_RF01"]["updraft_w"] = 4.293994613875446
all_best_mse["DYCOMS_RF01"]["updraft_qt"] = 1.1670031985036449
all_best_mse["DYCOMS_RF01"]["updraft_thetal"] = 12.740714975018966
all_best_mse["DYCOMS_RF01"]["v_mean"] = 39.7471229090217
all_best_mse["DYCOMS_RF01"]["u_mean"] = 37.04674485643113
all_best_mse["DYCOMS_RF01"]["tke_mean"] = 14.694034303959185
all_best_mse["DYCOMS_RF01"]["temperature_mean"] = 2.153119796810534e-5
all_best_mse["DYCOMS_RF01"]["thetal_mean"] = 2.2396665329425817e-5
all_best_mse["DYCOMS_RF01"]["Hvar_mean"] = 8268.163990807525
all_best_mse["DYCOMS_RF01"]["QTvar_mean"] = 602.791080657236
all_best_mse["DYCOMS_RF01"]["qt_mean"] = 0.016452430703503874
all_best_mse["DYCOMS_RF01"]["ql_mean"] = 5.181147252337545
all_best_mse["DYCOMS_RF01"]["updraft_area"] = 239.15780277937085
all_best_mse["DYCOMS_RF01"]["updraft_w"] = 4.297112138897
all_best_mse["DYCOMS_RF01"]["updraft_qt"] = 1.168353127139301
all_best_mse["DYCOMS_RF01"]["updraft_thetal"] = 12.740576608772622
all_best_mse["DYCOMS_RF01"]["v_mean"] = 39.74787992545479
all_best_mse["DYCOMS_RF01"]["u_mean"] = 37.04747002691809
all_best_mse["DYCOMS_RF01"]["tke_mean"] = 14.704764076402716
all_best_mse["DYCOMS_RF01"]["temperature_mean"] = 2.1172891846392625e-5
all_best_mse["DYCOMS_RF01"]["thetal_mean"] = 2.199842372794255e-5
all_best_mse["DYCOMS_RF01"]["Hvar_mean"] = 8299.089898766997
all_best_mse["DYCOMS_RF01"]["QTvar_mean"] = 604.8230196498848

all_best_mse["GABLS"] = OrderedDict()
all_best_mse["GABLS"]["updraft_thetal"] = 1.5535001058820114e-11
all_best_mse["GABLS"]["v_mean"] = 3.4677246602657887e-6
all_best_mse["GABLS"]["u_mean"] = 1.4210903443275854e-7
all_best_mse["GABLS"]["tke_mean"] = 5.103615660090955e-6
all_best_mse["GABLS"]["tke_mean"] = 5.090731426197982e-6
all_best_mse["GABLS"]["temperature_mean"] = 2.2342327570154436e-10
all_best_mse["GABLS"]["thetal_mean"] = 1.1491435234714619e-11
all_best_mse["GABLS"]["Hvar_mean"] = 9.024827569396929e-6
all_best_mse["GABLS"]["Hvar_mean"] = 8.480206176674251e-6
all_best_mse["GABLS"]["QTvar_mean"] = 7.678712372967577e-7

all_best_mse["life_cycle_Tan2018"] = OrderedDict()
all_best_mse["life_cycle_Tan2018"]["qt_mean"] = 0.005252401177877798
all_best_mse["life_cycle_Tan2018"]["ql_mean"] = 0.909055614748867
all_best_mse["life_cycle_Tan2018"]["updraft_area"] = 0.698310276477396
all_best_mse["life_cycle_Tan2018"]["updraft_w"] = 0.8672996063897188
all_best_mse["life_cycle_Tan2018"]["updraft_qt"] = 0.05345030896176364
all_best_mse["life_cycle_Tan2018"]["updraft_thetal"] = 2.3100825986569664e-5
all_best_mse["life_cycle_Tan2018"]["v_mean"] = 0.24113382216346507
all_best_mse["life_cycle_Tan2018"]["u_mean"] = 0.0007142970271014679
all_best_mse["life_cycle_Tan2018"]["tke_mean"] = 0.2148931012708324
all_best_mse["life_cycle_Tan2018"]["temperature_mean"] = 2.5739129244556346e-6
all_best_mse["life_cycle_Tan2018"]["thetal_mean"] = 2.455546253990734e-6
all_best_mse["life_cycle_Tan2018"]["Hvar_mean"] = 1010.1336131517666
all_best_mse["life_cycle_Tan2018"]["QTvar_mean"] = 428.3965924200794
all_best_mse["life_cycle_Tan2018"]["qt_mean"] = 0.005233402007690384
all_best_mse["life_cycle_Tan2018"]["ql_mean"] = 0.9054722692772448
all_best_mse["life_cycle_Tan2018"]["updraft_area"] = 0.7157614430858349
all_best_mse["life_cycle_Tan2018"]["updraft_w"] = 0.6420526937911337
all_best_mse["life_cycle_Tan2018"]["updraft_qt"] = 0.082571684196654
all_best_mse["life_cycle_Tan2018"]["updraft_thetal"] = 4.238530063578584e-5
all_best_mse["life_cycle_Tan2018"]["v_mean"] = 0.24534644796726243
all_best_mse["life_cycle_Tan2018"]["u_mean"] = 0.0007036019340486844
all_best_mse["life_cycle_Tan2018"]["tke_mean"] = 0.20249236519095723
all_best_mse["life_cycle_Tan2018"]["temperature_mean"] = 2.5563691055061092e-6
all_best_mse["life_cycle_Tan2018"]["thetal_mean"] = 2.4398637446903318e-6
all_best_mse["life_cycle_Tan2018"]["Hvar_mean"] = 1687.8085846297918
all_best_mse["life_cycle_Tan2018"]["QTvar_mean"] = 770.9001188444007

all_best_mse["Nieuwstadt"] = OrderedDict()
all_best_mse["Nieuwstadt"]["updraft_area"] = 595.5284086676158
all_best_mse["Nieuwstadt"]["updraft_w"] = 26.453656666442456
all_best_mse["Nieuwstadt"]["updraft_thetal"] = 30.475212629587944
all_best_mse["Nieuwstadt"]["u_mean"] = 152.44010675642693
all_best_mse["Nieuwstadt"]["tke_mean"] = 73.61147347343649
all_best_mse["Nieuwstadt"]["temperature_mean"] = 1.1879770627722882e-5
all_best_mse["Nieuwstadt"]["thetal_mean"] = 1.2042836405160453e-5
all_best_mse["Nieuwstadt"]["Hvar_mean"] = 186.3575024459958
all_best_mse["Nieuwstadt"]["updraft_area"] = 594.0762562586497
all_best_mse["Nieuwstadt"]["updraft_w"] = 26.417918720221774
all_best_mse["Nieuwstadt"]["updraft_thetal"] = 30.47521180731719
all_best_mse["Nieuwstadt"]["u_mean"] = 152.44823037392297
all_best_mse["Nieuwstadt"]["tke_mean"] = 73.56445220177362
all_best_mse["Nieuwstadt"]["temperature_mean"] = 1.1867492639962617e-5
all_best_mse["Nieuwstadt"]["thetal_mean"] = 1.2030554930593907e-5
all_best_mse["Nieuwstadt"]["Hvar_mean"] = 199.15337151426013

all_best_mse["Rico"] = OrderedDict()
all_best_mse["Rico"]["qt_mean"] = 0.40029856232472716
all_best_mse["Rico"]["updraft_area"] = 1916.7543807782797
all_best_mse["Rico"]["updraft_w"] = 169.94386509461293
all_best_mse["Rico"]["updraft_qt"] = 15.613578127431099
all_best_mse["Rico"]["updraft_thetal"] = 63.60341475531724
all_best_mse["Rico"]["v_mean"] = 106.33782409159436
all_best_mse["Rico"]["u_mean"] = 114.40532158324538
all_best_mse["Rico"]["tke_mean"] = 338.43814757103996
all_best_mse["Rico"]["temperature_mean"] = 0.0001969283182969964
all_best_mse["Rico"]["ql_mean"] = 571.2091503339077
all_best_mse["Rico"]["thetal_mean"] = 0.00016510650401174086
all_best_mse["Rico"]["Hvar_mean"] = 14589.478928192335
all_best_mse["Rico"]["QTvar_mean"] = 6656.940177395073
all_best_mse["Rico"]["qt_mean"] = 0.36386317992946376
all_best_mse["Rico"]["updraft_area"] = 2022.5605460177844
all_best_mse["Rico"]["updraft_w"] = 176.54153642298732
all_best_mse["Rico"]["updraft_qt"] = 15.741645025143768
all_best_mse["Rico"]["updraft_thetal"] = 63.597867221229926
all_best_mse["Rico"]["v_mean"] = 106.25996901860945
all_best_mse["Rico"]["u_mean"] = 114.49854104475314
all_best_mse["Rico"]["tke_mean"] = 320.504712232594
all_best_mse["Rico"]["temperature_mean"] = 0.00018761975405373125
all_best_mse["Rico"]["ql_mean"] = 321.309306505742
all_best_mse["Rico"]["thetal_mean"] = 0.00015881370156556888
all_best_mse["Rico"]["Hvar_mean"] = 8918.574701567559
all_best_mse["Rico"]["QTvar_mean"] = 4210.569870016442

all_best_mse["Soares"] = OrderedDict()
all_best_mse["Soares"]["qt_mean"] = 0.14895921323581782
all_best_mse["Soares"]["updraft_area"] = 452.48732417878887
all_best_mse["Soares"]["updraft_w"] = 21.320256004334087
all_best_mse["Soares"]["updraft_qt"] = 11.050101427337003
all_best_mse["Soares"]["updraft_thetal"] = 22.394551103035568
all_best_mse["Soares"]["u_mean"] = 730.7126252429525
all_best_mse["Soares"]["tke_mean"] = 59.245067652991125
all_best_mse["Soares"]["temperature_mean"] = 1.1559755283297136e-5
all_best_mse["Soares"]["thetal_mean"] = 1.2148013260597393e-5
all_best_mse["Soares"]["Hvar_mean"] = 226.0786222291041
all_best_mse["Soares"]["qt_mean"] = 0.14971945782878296
all_best_mse["Soares"]["updraft_area"] = 454.27978377427576
all_best_mse["Soares"]["updraft_w"] = 21.34994313880911
all_best_mse["Soares"]["updraft_qt"] = 11.04952338920855
all_best_mse["Soares"]["updraft_thetal"] = 22.394560601479213
all_best_mse["Soares"]["u_mean"] = 730.6963181927212
all_best_mse["Soares"]["tke_mean"] = 59.20789466791872
all_best_mse["Soares"]["temperature_mean"] = 1.1582494248680349e-5
all_best_mse["Soares"]["thetal_mean"] = 1.2171492686662377e-5
all_best_mse["Soares"]["Hvar_mean"] = 237.90200244509123

all_best_mse["SP"] = OrderedDict()
all_best_mse["SP"]["qt_mean"] = 3.510416297231523
all_best_mse["SP"]["updraft_area"] = 3.957261949593318
all_best_mse["SP"]["updraft_w"] = 0.9297496691723097
all_best_mse["SP"]["updraft_qt"] = 1.3823843455467135
all_best_mse["SP"]["updraft_thetal"] = 0.10515084910599827
all_best_mse["SP"]["v_mean"] = 0.4606093996187761
all_best_mse["SP"]["u_mean"] = 7.361079637201637e-5
all_best_mse["SP"]["tke_mean"] = 0.4716085614576058
all_best_mse["SP"]["temperature_mean"] = 6.899483632399964e-7
all_best_mse["SP"]["thetal_mean"] = 5.174695972454824e-7
all_best_mse["SP"]["Hvar_mean"] = 157.136961233449
all_best_mse["SP"]["QTvar_mean"] = 1.1883532135422397
all_best_mse["SP"]["qt_mean"] = 3.536471159623091
all_best_mse["SP"]["updraft_area"] = 3.9825228047656807
all_best_mse["SP"]["updraft_w"] = 0.935504623173964
all_best_mse["SP"]["updraft_qt"] = 1.3370715378676727
all_best_mse["SP"]["updraft_thetal"] = 0.10513164699173018
all_best_mse["SP"]["v_mean"] = 0.4685497410949717
all_best_mse["SP"]["u_mean"] = 7.47058157915074e-5
all_best_mse["SP"]["tke_mean"] = 0.14378635091439912
all_best_mse["SP"]["temperature_mean"] = 7.028571246826466e-7
all_best_mse["SP"]["thetal_mean"] = 5.306332907406958e-7
all_best_mse["SP"]["Hvar_mean"] = 1.5714311686379705e+02
all_best_mse["SP"]["QTvar_mean"] = 1.5714311686379705e+02

all_best_mse["TRMM_LBA"] = OrderedDict()
all_best_mse["TRMM_LBA"]["qt_mean"] = 2.1246915265901256
all_best_mse["TRMM_LBA"]["updraft_area"] = 22872.821162838074
all_best_mse["TRMM_LBA"]["updraft_w"] = 991.7309143514605
all_best_mse["TRMM_LBA"]["updraft_qt"] = 30.752267295615034
all_best_mse["TRMM_LBA"]["updraft_thetal"] = 110.01809619225895
all_best_mse["TRMM_LBA"]["v_mean"] = 292.5092039137652
all_best_mse["TRMM_LBA"]["u_mean"] = 1687.363971190998
all_best_mse["TRMM_LBA"]["tke_mean"] = 939.6772503430265
all_best_mse["TRMM_LBA"]["temperature_mean"] = 0.0008184033992479942
all_best_mse["TRMM_LBA"]["ql_mean"] = 722.5532468453052
all_best_mse["TRMM_LBA"]["thetal_mean"] = 0.008274363629958599
all_best_mse["TRMM_LBA"]["Hvar_mean"] = 3508.839129281229
all_best_mse["TRMM_LBA"]["QTvar_mean"] = 1756.3264143854908
all_best_mse["TRMM_LBA"]["qt_mean"] = 1.7801539352440001
all_best_mse["TRMM_LBA"]["updraft_area"] = 25490.576218824328
all_best_mse["TRMM_LBA"]["updraft_w"] = 952.1931284976196
all_best_mse["TRMM_LBA"]["updraft_qt"] = 29.298976822980265
all_best_mse["TRMM_LBA"]["updraft_thetal"] = 110.01487122270264
all_best_mse["TRMM_LBA"]["v_mean"] = 292.5260624226009
all_best_mse["TRMM_LBA"]["u_mean"] = 1687.307618406665
all_best_mse["TRMM_LBA"]["tke_mean"] = 1062.4959493307583
all_best_mse["TRMM_LBA"]["temperature_mean"] = 0.000714432852226086
all_best_mse["TRMM_LBA"]["ql_mean"] = 946.4306479521971
all_best_mse["TRMM_LBA"]["thetal_mean"] = 0.008200718951841728
all_best_mse["TRMM_LBA"]["Hvar_mean"] = 4134.281015592486
all_best_mse["TRMM_LBA"]["QTvar_mean"] = 1958.23271393029

#################################
#################################
Expand Down
Loading

0 comments on commit 98b5ecb

Please sign in to comment.