Skip to content

Commit

Permalink
Merge #461
Browse files Browse the repository at this point in the history 
461: Prep some things for using OrdinaryDiffEq.jl r=charleskawczynski a=charleskawczynski

This PR preps some things for using OrdinaryDiffEq.jl.

Co-authored-by: Charles Kawczynski <kawczynski.charles@gmail.com>
  • Loading branch information
@bors @charleskawczynski
bors[bot] and charleskawczynski committed Oct 28, 2021
2 parents 3d353fb + 84deb7f commit 1f1c5ac
Show file tree
Hide file tree
Showing 7 changed files with 223 additions and 217 deletions.
15 changes: 10 additions & 5 deletions integration_tests/utils/initial_conditions.jl
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,11 +3,16 @@ const TC = TurbulenceConvection

function initialize_edmf(edmf::TC.EDMF_PrognosticTKE, grid, state, Case, gm::TC.GridMeanVariables, TS::TC.TimeStepping)
initialize_covariance(edmf, grid, state, gm, Case)
up = edmf.UpdVar
param_set = TC.parameter_set(gm)
TC.update_surface(Case, grid, state, gm, TS, param_set)
TC.compute_updraft_surface_bc(edmf, grid, state, Case)
if Case.casename == "DryBubble"
initialize_updrafts_DryBubble(edmf, grid, state, edmf.UpdVar, gm)
initialize_updrafts_DryBubble(edmf, grid, state, up, gm)
else
initialize_updrafts(edmf, grid, state, edmf.UpdVar, gm)
initialize_updrafts(edmf, grid, state, up, gm)
end
TC.set_updraft_surface_bc(edmf, grid, state, up, Case.Sur)
return
end

Expand Down Expand Up @@ -61,7 +66,7 @@ function initialize_updrafts(edmf, grid, state, up::TC.UpdraftVariables, gm::TC.
prog_up[i].ρaθ_liq_ice[k] = 0
end

aux_up[i].area[kc_surf] = up.updraft_fraction / up.n_updrafts
aux_up[i].area[kc_surf] = edmf.area_surface_bc[i]
end
return
end
Expand Down Expand Up @@ -155,7 +160,7 @@ function initialize_updrafts_DryBubble(edmf, grid, state, up::TC.UpdraftVariable

@inbounds for k in TC.real_center_indices(grid)
if minimum(z_in) <= grid.zc[k] <= maximum(z_in)
aux_up[i].area[k] = Area_in[k] #up.updraft_fraction/up.n_updrafts
aux_up[i].area[k] = Area_in[k]
aux_up[i].θ_liq_ice[k] = θ_liq_in[k]
aux_up[i].q_tot[k] = 0.0
aux_up[i].q_liq[k] = 0.0
Expand All @@ -167,7 +172,7 @@ function initialize_updrafts_DryBubble(edmf, grid, state, up::TC.UpdraftVariable
prog_up[i].ρaθ_liq_ice[k] = prog_up[i].ρarea[k] * aux_up[i].θ_liq_ice[k]
prog_up[i].ρaq_tot[k] = prog_up[i].ρarea[k] * aux_up[i].q_tot[k]
else
aux_up[i].area[k] = 0.0 #up.updraft_fraction/up.n_updrafts
aux_up[i].area[k] = 0.0
aux_up[i].θ_liq_ice[k] = prog_gm.θ_liq_ice[k]
aux_up[i].T[k] = aux_gm.T[k]
prog_up[i].ρarea[k] = 0.0
Expand Down
5 changes: 5 additions & 0 deletions integration_tests/utils/main.jl
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,12 +2,17 @@ import Logging
import TerminalLoggers
Logging.global_logger(TerminalLoggers.TerminalLogger())

import UnPack
import JSON
import ArgParse
import TurbulenceConvection

import ClimaCore
const CC = ClimaCore

import OrdinaryDiffEq
const ODE = OrdinaryDiffEq

include("initial_conditions.jl")
include("parameter_set.jl")
include("Cases.jl")
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 = OrderedCollections.OrderedDict()
#
all_best_mse["ARM_SGP"] = OrderedCollections.OrderedDict()
all_best_mse["ARM_SGP"]["qt_mean"] = 0.1937868833377895
all_best_mse["ARM_SGP"]["updraft_area"] = 332.5130433697999
all_best_mse["ARM_SGP"]["updraft_w"] = 139.68836100180596
all_best_mse["ARM_SGP"]["updraft_qt"] = 27.67624225275512
all_best_mse["ARM_SGP"]["updraft_thetal"] = 170.98107515832285
all_best_mse["ARM_SGP"]["qt_mean"] = 0.19390367930350438
all_best_mse["ARM_SGP"]["updraft_area"] = 332.4402027548815
all_best_mse["ARM_SGP"]["updraft_w"] = 139.58192065054712
all_best_mse["ARM_SGP"]["updraft_qt"] = 27.44198525874918
all_best_mse["ARM_SGP"]["updraft_thetal"] = 170.98080431855797
all_best_mse["ARM_SGP"]["u_mean"] = 1.3375737467153984e-5
all_best_mse["ARM_SGP"]["tke_mean"] = 1112.558800485841
all_best_mse["ARM_SGP"]["temperature_mean"] = 9.969032110644417e-5
all_best_mse["ARM_SGP"]["ql_mean"] = 181.94162918971983
all_best_mse["ARM_SGP"]["tke_mean"] = 1111.5588787005
all_best_mse["ARM_SGP"]["temperature_mean"] = 9.995455908960415e-5
all_best_mse["ARM_SGP"]["ql_mean"] = 180.82073242686013
all_best_mse["ARM_SGP"]["qi_mean"] = "NA"
all_best_mse["ARM_SGP"]["thetal_mean"] = 9.071730005791216e-5
all_best_mse["ARM_SGP"]["Hvar_mean"] = 3519.230160056996
all_best_mse["ARM_SGP"]["QTvar_mean"] = 2106.838743581866
all_best_mse["ARM_SGP"]["thetal_mean"] = 9.09304374163764e-5
all_best_mse["ARM_SGP"]["Hvar_mean"] = 3509.857560166501
all_best_mse["ARM_SGP"]["QTvar_mean"] = 2092.8715199107323
#
all_best_mse["Bomex"] = OrderedCollections.OrderedDict()
all_best_mse["Bomex"]["qt_mean"] = 0.10696209201553009
all_best_mse["Bomex"]["updraft_area"] = 129.60734915601356
all_best_mse["Bomex"]["updraft_w"] = 18.11948828129131
all_best_mse["Bomex"]["updraft_qt"] = 6.547810027971549
all_best_mse["Bomex"]["updraft_thetal"] = 69.46259471940465
all_best_mse["Bomex"]["v_mean"] = 67.07237783700688
all_best_mse["Bomex"]["u_mean"] = 0.32350988098242145
all_best_mse["Bomex"]["tke_mean"] = 74.32017597884396
all_best_mse["Bomex"]["temperature_mean"] = 4.2231253951419114e-5
all_best_mse["Bomex"]["ql_mean"] = 7.9718034518658
all_best_mse["Bomex"]["qt_mean"] = 0.11483242578948855
all_best_mse["Bomex"]["updraft_area"] = 129.47539487351594
all_best_mse["Bomex"]["updraft_w"] = 18.456353562473677
all_best_mse["Bomex"]["updraft_qt"] = 6.293139703853067
all_best_mse["Bomex"]["updraft_thetal"] = 69.45789505720731
all_best_mse["Bomex"]["v_mean"] = 67.20327183395196
all_best_mse["Bomex"]["u_mean"] = 0.3239495912530888
all_best_mse["Bomex"]["tke_mean"] = 74.20959898036108
all_best_mse["Bomex"]["temperature_mean"] = 4.579692123533297e-5
all_best_mse["Bomex"]["ql_mean"] = 8.845365805526594
all_best_mse["Bomex"]["qi_mean"] = "NA"
all_best_mse["Bomex"]["thetal_mean"] = 4.283000092251991e-5
all_best_mse["Bomex"]["Hvar_mean"] = 5052.5789606810795
all_best_mse["Bomex"]["QTvar_mean"] = 1867.6591620137863
all_best_mse["Bomex"]["thetal_mean"] = 4.653466535219922e-5
all_best_mse["Bomex"]["Hvar_mean"] = 3660.042308512486
all_best_mse["Bomex"]["QTvar_mean"] = 1370.1578026813831
#
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"] = 0.008809732970125968
all_best_mse["DryBubble"]["updraft_w"] = 0.009196708755788522
all_best_mse["DryBubble"]["updraft_thetal"] = 6.109350513252823e-11
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"] = 0.06695998474152366
all_best_mse["DryBubble"]["temperature_mean"] = 1.7442763395288954e-7
all_best_mse["DryBubble"]["thetal_mean"] = 1.7627117194572037e-7
all_best_mse["DryBubble"]["Hvar_mean"] = 13.983572050341268
#
all_best_mse["DYCOMS_RF01"] = OrderedCollections.OrderedDict()
all_best_mse["DYCOMS_RF01"]["qt_mean"] = 0.02268501733341757
all_best_mse["DYCOMS_RF01"]["ql_mean"] = 10.246690732383373
all_best_mse["DYCOMS_RF01"]["updraft_area"] = 30.552887825763474
all_best_mse["DYCOMS_RF01"]["updraft_w"] = 4.139939321413488
all_best_mse["DYCOMS_RF01"]["updraft_qt"] = 2.1514551303278813
all_best_mse["DYCOMS_RF01"]["updraft_thetal"] = 46.18691223287438
all_best_mse["DYCOMS_RF01"]["v_mean"] = 0.003022964856130046
all_best_mse["DYCOMS_RF01"]["u_mean"] = 0.07897382411615939
all_best_mse["DYCOMS_RF01"]["tke_mean"] = 21.34053820370525
all_best_mse["DYCOMS_RF01"]["temperature_mean"] = 8.089190207020192e-5
all_best_mse["DYCOMS_RF01"]["thetal_mean"] = 8.161671501734431e-5
all_best_mse["DYCOMS_RF01"]["Hvar_mean"] = 1243.0760923272474
all_best_mse["DYCOMS_RF01"]["QTvar_mean"] = 483.9269981437983
all_best_mse["DYCOMS_RF01"]["qt_mean"] = 0.022666713104234296
all_best_mse["DYCOMS_RF01"]["ql_mean"] = 10.256139166342813
all_best_mse["DYCOMS_RF01"]["updraft_area"] = 30.54669809874986
all_best_mse["DYCOMS_RF01"]["updraft_w"] = 4.138415405707247
all_best_mse["DYCOMS_RF01"]["updraft_qt"] = 2.151277943091616
all_best_mse["DYCOMS_RF01"]["updraft_thetal"] = 46.18691202772125
all_best_mse["DYCOMS_RF01"]["v_mean"] = 0.003017573985754719
all_best_mse["DYCOMS_RF01"]["u_mean"] = 0.07897757036807564
all_best_mse["DYCOMS_RF01"]["tke_mean"] = 21.339576090856358
all_best_mse["DYCOMS_RF01"]["temperature_mean"] = 8.090792610798844e-5
all_best_mse["DYCOMS_RF01"]["thetal_mean"] = 8.163443100286099e-5
all_best_mse["DYCOMS_RF01"]["Hvar_mean"] = 1243.0759306183045
all_best_mse["DYCOMS_RF01"]["QTvar_mean"] = 483.9211443079225
#
all_best_mse["GABLS"] = OrderedCollections.OrderedDict()
all_best_mse["GABLS"]["updraft_thetal"] = 0.0
all_best_mse["GABLS"]["v_mean"] = 0.0
all_best_mse["GABLS"]["u_mean"] = 0.0
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"] = 0.0
all_best_mse["GABLS"]["qt_mean"] = 0.0
all_best_mse["GABLS"]["updraft_thetal"] = 1.0347573167600641e-13
all_best_mse["GABLS"]["v_mean"] = 8.474414920833814e-9
all_best_mse["GABLS"]["u_mean"] = 4.287157494955059e-10
all_best_mse["GABLS"]["tke_mean"] = 1.2057264985586782e-8
all_best_mse["GABLS"]["temperature_mean"] = 1.0310663877232706e-13
all_best_mse["GABLS"]["thetal_mean"] = 1.0309378452566319e-13
all_best_mse["GABLS"]["Hvar_mean"] = 2.7619617172167112e-8
all_best_mse["GABLS"]["QTvar_mean"] = 6.729746679456171e-9
all_best_mse["GABLS"]["qt_mean"] = 8.796506450344822e-9
#
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"] = 2.7148310462950577e-5
all_best_mse["life_cycle_Tan2018"]["ql_mean"] = 0.011254012032056294
all_best_mse["life_cycle_Tan2018"]["updraft_area"] = 0.10347078513588603
all_best_mse["life_cycle_Tan2018"]["updraft_w"] = 0.009492942717518256
all_best_mse["life_cycle_Tan2018"]["updraft_qt"] = 0.006554317087522834
all_best_mse["life_cycle_Tan2018"]["updraft_thetal"] = 3.892925485566945e-6
all_best_mse["life_cycle_Tan2018"]["v_mean"] = 0.0006612746186875956
all_best_mse["life_cycle_Tan2018"]["u_mean"] = 7.785180319487577e-7
all_best_mse["life_cycle_Tan2018"]["tke_mean"] = 0.00041409108819202373
all_best_mse["life_cycle_Tan2018"]["temperature_mean"] = 1.3095740966422832e-8
all_best_mse["life_cycle_Tan2018"]["thetal_mean"] = 1.3006328599924384e-8
all_best_mse["life_cycle_Tan2018"]["Hvar_mean"] = 61.843265856117526
all_best_mse["life_cycle_Tan2018"]["QTvar_mean"] = 55.14222261251299
#
all_best_mse["Nieuwstadt"] = OrderedCollections.OrderedDict()
all_best_mse["Nieuwstadt"]["updraft_area"] = 99.30943787026952
all_best_mse["Nieuwstadt"]["updraft_w"] = 12.530323471115624
all_best_mse["Nieuwstadt"]["updraft_thetal"] = 117.36698693265451
all_best_mse["Nieuwstadt"]["u_mean"] = 14.606450471967452
all_best_mse["Nieuwstadt"]["tke_mean"] = 297.37728008127647
all_best_mse["Nieuwstadt"]["temperature_mean"] = 9.76613471652064e-6
all_best_mse["Nieuwstadt"]["thetal_mean"] = 1.0077237502209368e-5
all_best_mse["Nieuwstadt"]["Hvar_mean"] = 1262.1498200489082
all_best_mse["Nieuwstadt"]["updraft_area"] = 99.30680730241976
all_best_mse["Nieuwstadt"]["updraft_w"] = 12.532603831055757
all_best_mse["Nieuwstadt"]["updraft_thetal"] = 117.36698420064039
all_best_mse["Nieuwstadt"]["u_mean"] = 14.605846002991228
all_best_mse["Nieuwstadt"]["tke_mean"] = 297.6200902436141
all_best_mse["Nieuwstadt"]["temperature_mean"] = 9.76975747628881e-6
all_best_mse["Nieuwstadt"]["thetal_mean"] = 1.0079671223620376e-5
all_best_mse["Nieuwstadt"]["Hvar_mean"] = 1262.4021288867405
#
all_best_mse["Rico"] = OrderedCollections.OrderedDict()
all_best_mse["Rico"]["qt_mean"] = 1.4115026886201938
all_best_mse["Rico"]["updraft_area"] = 477.1340467058102
all_best_mse["Rico"]["updraft_w"] = 104.36571080548602
all_best_mse["Rico"]["updraft_qt"] = 11.193850923248508
all_best_mse["Rico"]["updraft_thetal"] = 133.337764176309
all_best_mse["Rico"]["v_mean"] = 0.6349514873773198
all_best_mse["Rico"]["u_mean"] = 0.5950044066899047
all_best_mse["Rico"]["tke_mean"] = 88.02803414425841
all_best_mse["Rico"]["temperature_mean"] = 0.0006404340878628531
all_best_mse["Rico"]["ql_mean"] = 67.34084618658736
all_best_mse["Rico"]["qr_mean"] = 764.2447543860758
all_best_mse["Rico"]["qt_mean"] = 1.4091519722032944
all_best_mse["Rico"]["updraft_area"] = 477.1573419655477
all_best_mse["Rico"]["updraft_w"] = 104.33661141777853
all_best_mse["Rico"]["updraft_qt"] = 11.129158977839953
all_best_mse["Rico"]["updraft_thetal"] = 133.33586643054403
all_best_mse["Rico"]["v_mean"] = 0.6345416474916987
all_best_mse["Rico"]["u_mean"] = 0.5931838976831404
all_best_mse["Rico"]["tke_mean"] = 87.9373416741573
all_best_mse["Rico"]["temperature_mean"] = 0.0006398511287561713
all_best_mse["Rico"]["ql_mean"] = 67.25059874346336
all_best_mse["Rico"]["qr_mean"] = 764.2426257410092
all_best_mse["Rico"]["qi_mean"] = "NA"
all_best_mse["Rico"]["thetal_mean"] = 0.0006306985428011532
all_best_mse["Rico"]["Hvar_mean"] = 36945.86936057957
all_best_mse["Rico"]["QTvar_mean"] = 8039.952632272018
all_best_mse["Rico"]["thetal_mean"] = 0.0006301103134104575
all_best_mse["Rico"]["Hvar_mean"] = 35877.508288558216
all_best_mse["Rico"]["QTvar_mean"] = 7780.226919628343
#
all_best_mse["Soares"] = OrderedCollections.OrderedDict()
all_best_mse["Soares"]["qt_mean"] = 0.12575900714669216
all_best_mse["Soares"]["updraft_area"] = 100.88933399567385
all_best_mse["Soares"]["updraft_w"] = 11.371296940528719
all_best_mse["Soares"]["updraft_qt"] = 23.085797027930987
all_best_mse["Soares"]["updraft_thetal"] = 65.2533003293989
all_best_mse["Soares"]["u_mean"] = 96.34716247347927
all_best_mse["Soares"]["tke_mean"] = 241.70621112065135
all_best_mse["Soares"]["temperature_mean"] = 1.0944229964057937e-5
all_best_mse["Soares"]["thetal_mean"] = 1.0373777791831969e-5
all_best_mse["Soares"]["Hvar_mean"] = 1122.9974486974659
all_best_mse["Soares"]["qt_mean"] = 0.12520821109639335
all_best_mse["Soares"]["updraft_area"] = 98.22912055780739
all_best_mse["Soares"]["updraft_w"] = 11.347807786528925
all_best_mse["Soares"]["updraft_qt"] = 23.082327239155074
all_best_mse["Soares"]["updraft_thetal"] = 65.25330382463778
all_best_mse["Soares"]["u_mean"] = 96.34764012532587
all_best_mse["Soares"]["tke_mean"] = 241.8004426711386
all_best_mse["Soares"]["temperature_mean"] = 1.0933312621550153e-5
all_best_mse["Soares"]["thetal_mean"] = 1.0358997967028737e-5
all_best_mse["Soares"]["Hvar_mean"] = 1125.2655700207752
#
all_best_mse["TRMM_LBA"] = OrderedCollections.OrderedDict()
all_best_mse["TRMM_LBA"]["qt_mean"] = 4.145614105604253
all_best_mse["TRMM_LBA"]["updraft_area"] = 7593.775620639387
all_best_mse["TRMM_LBA"]["updraft_w"] = 30179.119838992876
all_best_mse["TRMM_LBA"]["updraft_qt"] = 264.736771485311
all_best_mse["TRMM_LBA"]["updraft_thetal"] = 1962.538731733454
all_best_mse["TRMM_LBA"]["v_mean"] = 286.1837016217381
all_best_mse["TRMM_LBA"]["u_mean"] = 113.6792526983015
all_best_mse["TRMM_LBA"]["tke_mean"] = 26157.41824381172
all_best_mse["TRMM_LBA"]["temperature_mean"] = 0.00120332861383581
all_best_mse["TRMM_LBA"]["ql_mean"] = 11010.415707299408
all_best_mse["TRMM_LBA"]["qt_mean"] = 4.146956999545959
all_best_mse["TRMM_LBA"]["updraft_area"] = 7593.167519865197
all_best_mse["TRMM_LBA"]["updraft_w"] = 30164.962706317317
all_best_mse["TRMM_LBA"]["updraft_qt"] = 264.6429860959435
all_best_mse["TRMM_LBA"]["updraft_thetal"] = 1962.507965899428
all_best_mse["TRMM_LBA"]["v_mean"] = 286.18819257818774
all_best_mse["TRMM_LBA"]["u_mean"] = 113.68034995977092
all_best_mse["TRMM_LBA"]["tke_mean"] = 26124.28884332928
all_best_mse["TRMM_LBA"]["temperature_mean"] = 0.0012035732376905165
all_best_mse["TRMM_LBA"]["ql_mean"] = 11006.291727503945
all_best_mse["TRMM_LBA"]["qi_mean"] = "NA"
all_best_mse["TRMM_LBA"]["thetal_mean"] = 0.021125367882270093
all_best_mse["TRMM_LBA"]["Hvar_mean"] = 4358.578919761997
all_best_mse["TRMM_LBA"]["QTvar_mean"] = 2809.315913846882
all_best_mse["TRMM_LBA"]["thetal_mean"] = 0.02112567312586219
all_best_mse["TRMM_LBA"]["Hvar_mean"] = 4353.553914713869
all_best_mse["TRMM_LBA"]["QTvar_mean"] = 2808.6300851874603
#
all_best_mse["LES_driven_SCM"] = OrderedCollections.OrderedDict()
all_best_mse["LES_driven_SCM"]["qt_mean"] = 6.716231063608435
all_best_mse["LES_driven_SCM"]["v_mean"] = 3.7460774871699654
all_best_mse["LES_driven_SCM"]["u_mean"] = 1.2502623246740394
all_best_mse["LES_driven_SCM"]["temperature_mean"] = 0.002918997007162039
all_best_mse["LES_driven_SCM"]["ql_mean"] = 1983.1633525201985
all_best_mse["LES_driven_SCM"]["thetal_mean"] = 0.003229048681423764
all_best_mse["LES_driven_SCM"]["qt_mean"] = 6.720941274456452
all_best_mse["LES_driven_SCM"]["v_mean"] = 3.7497621211432155
all_best_mse["LES_driven_SCM"]["u_mean"] = 1.2516967001878967
all_best_mse["LES_driven_SCM"]["temperature_mean"] = 0.0029205165425626226
all_best_mse["LES_driven_SCM"]["ql_mean"] = 2028.7452506033694
all_best_mse["LES_driven_SCM"]["thetal_mean"] = 0.003230479151299842
#
#################################
#################################
Expand Down
7 changes: 4 additions & 3 deletions src/TurbulenceConvection.jl
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@ import CLIMAParameters
import OrdinaryDiffEq
import CloudMicrophysics
import SurfaceFluxes
import UnPack

const ODE = OrdinaryDiffEq
const CC = ClimaCore
Expand Down Expand Up @@ -105,9 +106,9 @@ function debug_state(state, code_location::String)
vars_positive = [
vec(prog_gm.θ_liq_ice),
vec(prog_gm_f.w),
vec(prog_up[1].area),
vec(prog_up[1].θ_liq_ice),
vec(prog_up_f[1].w),
vec(prog_up[1].ρarea),
vec(prog_up[1].ρaθ_liq_ice),
vec(prog_up_f[1].ρaw),
vec(aux_en.area),
vec(aux_en.θ_liq_ice),
]
Expand Down
Loading

0 comments on commit 1f1c5ac

Please sign in to comment.