Merge #464

464: Fix NA in print_new_mse r=charleskawczynski a=charleskawczynski

Closes #463. Thanks for catching this! This should have been incorporated in #459 / #460.

Co-authored-by: Charles Kawczynski <[email protected]>

integration_tests/utils/mse_tables.jl

@@ -36,14 +36,14 @@ all_best_mse["Bomex"]["Hvar_mean"] = 5052.5789606810795
 all_best_mse["Bomex"]["QTvar_mean"] = 1867.6591620137863
 #
 all_best_mse["DryBubble"] = OrderedCollections.OrderedDict()
-all_best_mse["DryBubble"]["updraft_area"] = 1.6058659376371123
-all_best_mse["DryBubble"]["updraft_w"] = 0.25807082785872376
-all_best_mse["DryBubble"]["updraft_thetal"] = 8.050980083463236e-9
+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"]["u_mean"] = 0.0
-all_best_mse["DryBubble"]["tke_mean"] = 0.9333433330750432
-all_best_mse["DryBubble"]["temperature_mean"] = 6.793208718709311e-7
-all_best_mse["DryBubble"]["thetal_mean"] = 4.3822689592288606e-7
-all_best_mse["DryBubble"]["Hvar_mean"] = 67.64692880461122
+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["DYCOMS_RF01"] = OrderedCollections.OrderedDict()
 all_best_mse["DYCOMS_RF01"]["qt_mean"] = 0.02268501733341757
@@ -72,19 +72,19 @@ 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.0006366589008711611
-all_best_mse["life_cycle_Tan2018"]["ql_mean"] = 0.1659420093191358
-all_best_mse["life_cycle_Tan2018"]["updraft_area"] = 0.3394005824866234
-all_best_mse["life_cycle_Tan2018"]["updraft_w"] = 0.48577311972001136
-all_best_mse["life_cycle_Tan2018"]["updraft_qt"] = 0.007861064239216719
-all_best_mse["life_cycle_Tan2018"]["updraft_thetal"] = 4.624784739237407e-6
-all_best_mse["life_cycle_Tan2018"]["v_mean"] = 0.04602322651968527
-all_best_mse["life_cycle_Tan2018"]["u_mean"] = 0.00018581731458674436
-all_best_mse["life_cycle_Tan2018"]["tke_mean"] = 0.030466017273497303
-all_best_mse["life_cycle_Tan2018"]["temperature_mean"] = 3.872863678181952e-7
-all_best_mse["life_cycle_Tan2018"]["thetal_mean"] = 3.8399618550356244e-7
-all_best_mse["life_cycle_Tan2018"]["Hvar_mean"] = 5665.176862919444
-all_best_mse["life_cycle_Tan2018"]["QTvar_mean"] = 5116.082902676909
+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["Nieuwstadt"] = OrderedCollections.OrderedDict()
 all_best_mse["Nieuwstadt"]["updraft_area"] = 99.30943787026952
@@ -97,21 +97,21 @@ all_best_mse["Nieuwstadt"]["thetal_mean"] = 1.0077237502209368e-5
 all_best_mse["Nieuwstadt"]["Hvar_mean"] = 1262.1498200489082
 #
 all_best_mse["Rico"] = OrderedCollections.OrderedDict()
-all_best_mse["Rico"]["qt_mean"] = 1.4088486775670792
-all_best_mse["Rico"]["updraft_area"] = 476.36751324553506
-all_best_mse["Rico"]["updraft_w"] = 103.95306470938849
-all_best_mse["Rico"]["updraft_qt"] = 11.08495796718709
-all_best_mse["Rico"]["updraft_thetal"] = 132.80045439762648
-all_best_mse["Rico"]["v_mean"] = 0.6345474416067549
-all_best_mse["Rico"]["u_mean"] = 0.5956933669264738
-all_best_mse["Rico"]["tke_mean"] = 88.67402779549431
-all_best_mse["Rico"]["temperature_mean"] = 0.0006387905532054656
-all_best_mse["Rico"]["ql_mean"] = 66.18885463568364
-all_best_mse["Rico"]["qr_mean"] = 756.9033792748122
+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"]["qi_mean"] = "NA"
-all_best_mse["Rico"]["thetal_mean"] = 0.0006291058322259514
-all_best_mse["Rico"]["Hvar_mean"] = 37307.16502895474
-all_best_mse["Rico"]["QTvar_mean"] = 8114.136243102087
+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["Soares"] = OrderedCollections.OrderedDict()
 all_best_mse["Soares"]["qt_mean"] = 0.12575900714669216

utils/print_new_mse.jl

@@ -38,7 +38,11 @@ println("all_best_mse = OrderedCollections.OrderedDict()\n#")
 for case in keys(computed_mse)
     println("all_best_mse[\"$case\"] = OrderedCollections.OrderedDict()")
     for var in keys(computed_mse[case])
-        println("all_best_mse[\"$case\"][\"$var\"] = $(computed_mse[case][var])")
+        if computed_mse[case][var] == "NA"
+            println("all_best_mse[\"$case\"][\"$var\"] = \"$(computed_mse[case][var])\"")
+        else
+            println("all_best_mse[\"$case\"][\"$var\"] = $(computed_mse[case][var])")
+        end
     end
     println("#")
 end