Merge pull request #2627 from CliMA/zs/hotfix

fix some longrun configs and plots

config/longrun_configs/amip_target_diagedmf.yml

@@ -29,11 +29,3 @@ t_end: "40days"
 job_id: "amip_target_diagedmf"
 toml: [toml/longrun_aquaplanet_rhoe_equil_55km_nz63_clearsky_diagedmf_0M.toml]
 netcdf_output_at_levels: true
-output_default_diagnostics: false
-diagnostics:
-  - short_name: [ts, ta, thetaa, ha, pfull, rhoa, ua, va, wa, hfes, hur, hus, cl, clw, cli, evspsbl, pr, rsd, rsu, rld, rlu]
-    reduction_time: average
-    period: 1days
-  - short_name: [arup, waup, taup, thetaaup, haup, husup, hurup, clwup, cliup, waen, tke, lmix]
-    reduction_time: average
-    period: 1days

config/longrun_configs/longrun_aquaplanet_amip.yml

@@ -26,11 +26,3 @@ dt: "100secs"
 t_end: "30days"
 job_id: "longrun_aquaplanet_amip"
 toml: [toml/longrun_aquaplanet_amip.toml]
-output_default_diagnostics: false
-diagnostics:
-  - short_name: [ts, ta, thetaa, ha, pfull, rhoa, ua, va, wa, hfes, hur, hus, cl, clw, cli, evspsbl, pr, rsd, rsu, rld, rlu, rsdcs, rsucs, rldcs, rlucs]
-    reduction_time: average
-    period: 1days
-  - short_name: [arup, waup, taup, thetaaup, haup, husup, hurup, clwup, cliup, waen, tke, lmix]
-    reduction_time: average
-    period: 1days

config/longrun_configs/longrun_aquaplanet_rhoe_equil_55km_nz63_allsky_diagedmf_0M.yml

@@ -26,10 +26,3 @@ t_end: "60days"
 job_id: "longrun_aquaplanet_rhoe_equil_55km_nz63_allsky_diagedmf_0M"
 toml: [toml/longrun_aquaplanet_rhoe_equil_55km_nz63_clearsky_diagedmf_0M.toml]
 output_default_diagnostics: false
-diagnostics:
-  - short_name: [ts, ta, thetaa, ha, pfull, rhoa, ua, va, wa, hfes, hur, hus, cl, clw, cli, evspsbl, pr, rsd, rsu, rld, rlu]
-    reduction_time: average
-    period: 1days
-  - short_name: [arup, waup, taup, thetaaup, haup, husup, hurup, clwup, cliup, waen, tke, lmix]
-    reduction_time: average
-    period: 1days

config/longrun_configs/longrun_aquaplanet_rhoe_equil_55km_nz63_clearsky_0M.yml

@@ -17,4 +17,3 @@ rad: "clearsky"
 dt_rad: "6hours"
 job_id: "longrun_aquaplanet_rhoe_equil_55km_nz63_clearsky_0M"
 toml: [toml/longrun_aquaplanet_rhoe_equil_55km_nz63_gray_0M.toml]
-

config/longrun_configs/longrun_aquaplanet_rhoe_equil_55km_nz63_clearsky_diagedmf_0M.yml

@@ -25,11 +25,3 @@ dt: "100secs"
 t_end: "60days"
 job_id: "longrun_aquaplanet_rhoe_equil_55km_nz63_clearsky_diagedmf_0M"
 toml: [toml/longrun_aquaplanet_rhoe_equil_55km_nz63_clearsky_diagedmf_0M.toml]
-output_default_diagnostics: false
-diagnostics:
-  - short_name: [ts, ta, thetaa, ha, pfull, rhoa, ua, va, wa, hfes, hur, hus, cl, clw, cli, evspsbl, pr, rsd, rsu, rld, rlu]
-    reduction_time: average
-    period: 1days
-  - short_name: [arup, waup, taup, thetaaup, haup, husup, hurup, clwup, cliup, waen, tke, lmix]
-    reduction_time: average
-    period: 1days

config/longrun_configs/longrun_aquaplanet_rhoe_equil_55km_nz63_clearsky_diagedmf_diffonly_0M.yml

@@ -23,11 +23,3 @@ dt: "100secs"
 t_end: "100days"
 job_id: "longrun_aquaplanet_rhoe_equil_55km_nz63_clearsky_diagedmf_diffonly_0M"
 toml: [toml/longrun_aquaplanet_rhoe_equil_55km_nz63_clearsky_diagedmf_0M.toml]
-output_default_diagnostics: false
-diagnostics:
-  - short_name: [ts, ta, thetaa, ha, pfull, rhoa, ua, va, wa, hfes, hur, hus, cl, clw, cli, evspsbl, pr, rsd, rsu, rld, rlu]
-    reduction_time: average
-    period: 1days
-  - short_name: [arup, waup, taup, thetaaup, haup, husup, hurup, clwup, cliup, waen, tke, lmix]
-    reduction_time: average
-    period: 1days

post_processing/ci_plots.jl

@@ -365,9 +365,7 @@ function make_plots(
     )
 end
 
-DryBaroWavePlots = Union{Val{:sphere_baroclinic_wave_rhoe}}
-
-function make_plots(::DryBaroWavePlots, simulation_path)
+function make_plots(::Val{:sphere_baroclinic_wave_rhoe}, simulation_path)
     simdir = SimDir(simulation_path)
     short_names, reduction = ["pfull", "va", "wa", "rv"], "inst"
     vars = [get(simdir; short_name, reduction) for short_name in short_names]
@@ -391,8 +389,8 @@ end
 
 function make_plots(::Val{:longrun_bw_rhoe_highres}, simulation_path)
     simdir = SimDir(simulation_path)
-    short_names = ["pfull", "va", "wa", "rv"]
-    vars = [get(simdir; short_name) for short_name in short_names]
+    short_names, reduction = ["pfull", "va", "wa", "rv"], "inst"
+    vars = [get(simdir; short_name, reduction) for short_name in short_names]
     make_plots_generic(simulation_path, vars, z = 1500, time = 10days)
 end
 
@@ -433,8 +431,8 @@ LongMoistBaroWavePlots = Union{
 
 function make_plots(::LongMoistBaroWavePlots, simulation_path)
     simdir = SimDir(simulation_path)
-    short_names = ["pfull", "va", "wa", "rv", "hus"]
-    vars = [get(simdir; short_name) for short_name in short_names]
+    short_names, reduction = ["pfull", "va", "wa", "rv", "hus"], "inst"
+    vars = [get(simdir; short_name, reduction) for short_name in short_names]
     make_plots_generic(simulation_path, vars, z = 1500, time = 10days)
 end