Update diags defaults (#458)

zppy/templates/cryosphere.cfg

@@ -1,5 +1,5 @@
 [e3sm_diags]
-sets = "lat_lon","zonal_mean_xy","zonal_mean_2d","polar","cosp_histogram","meridional_mean_2d","enso_diags","qbo","diurnal_cycle","annual_cycle_zonal_mean","streamflow","zonal_mean_2d_stratosphere"
+sets = "aerosol_aeronet","aerosol_budget","annual_cycle_zonal_mean","cosp_histogram","diurnal_cycle","enso_diags","lat_lon","meridional_mean_2d","polar","qbo","streamflow","zonal_mean_2d","zonal_mean_2d_stratosphere","zonal_mean_xy"
 
 [mpas_analysis]
 generate = 'all', 'no_BGC', 'no_icebergs'

zppy/templates/default.ini

@@ -172,16 +172,17 @@ reference_data_path_ts_rof = string(default="")
 # Required for "model_vs_model" "enso_diags"/"streamflow"/"tc_analysis" runs: `ref_final_yr`, `ref_start_yr`
 run_type = string(default="model_vs_obs")
 # The sets to run
-# All available sets = "lat_lon","zonal_mean_xy","zonal_mean_2d","polar","cosp_histogram","meridional_mean_2d","enso_diags","qbo","diurnal_cycle","annual_cycle_zonal_mean","streamflow","zonal_mean_2d_stratosphere","tc_analysis","area_mean_time_series","aerosol_aeronet","aerosol_budget",
-# A subset of these are provided as a default. These sets can be run as long as standard climo files are generated.
-# The additional sets can be included if the appropriate input is available: "enso_diags","qbo","diurnal_cycle","streamflow","tc_analysis","area_mean_time_series"
-# Note that "enso_diags","qbo","area_mean_time_series" require time-series data.
-# They also require `obs_ts` and `ref_start_yr` to be set.
-# "qbo" requires `ref_final_yr` to be set as well.
+# All available sets (16) = "aerosol_aeronet","aerosol_budget","annual_cycle_zonal_mean","area_mean_time_series","cosp_histogram","diurnal_cycle","enso_diags","lat_lon","meridional_mean_2d","polar","qbo","streamflow","tc_analysis","zonal_mean_2d","zonal_mean_2d_stratosphere","zonal_mean_xy"
+#
+# A subset of these are provided as a default below. These 10 sets can be run as long as standard climo files are generated.
+#
+# The 6 additional sets can be included if the appropriate input is available: "area_mean_time_series","diurnal_cycle","enso_diags","qbo","streamflow","tc_analysis"
+# 3 of these require time-series data and for `obs_ts` and `ref_start_yr` to be set: "area_mean_time_series","enso_diags","qbo"
 # "diurnal_cycle" requires `climo_diurnal_subsection`, `climo_diurnal_frequency`, and `dc_obs_climo` to be set.
+# "qbo" requires `ref_final_yr` to be set.
 # "streamflow" requires `streamflow_obs_ts` to be set.
 # "tc_analysis" requires `tc_obs` to be set.
-sets = string_list(default=list("lat_lon","zonal_mean_xy","zonal_mean_2d","polar","cosp_histogram","meridional_mean_2d","annual_cycle_zonal_mean","zonal_mean_2d_stratosphere","aerosol_aeronet","aerosol_budget"))
+sets = string_list(default=list("aerosol_aeronet","aerosol_budget","annual_cycle_zonal_mean","cosp_histogram","lat_lon","meridional_mean_2d","polar","zonal_mean_2d","zonal_mean_2d_stratosphere","zonal_mean_xy"))
 # Used for `test_name` and `short_test_name` in https://e3sm-project.github.io/e3sm_diags/_build/html/master/available-parameters.html
 short_name = string(default="")
 # See https://e3sm-project.github.io/e3sm_diags/_build/html/master/available-parameters.html

zppy/templates/water_cycle.cfg

@@ -1,5 +1,5 @@
 [e3sm_diags]
-sets = "lat_lon","zonal_mean_xy","zonal_mean_2d","polar","cosp_histogram","meridional_mean_2d","enso_diags","qbo","diurnal_cycle","annual_cycle_zonal_mean","streamflow","zonal_mean_2d_stratosphere"
+sets = "aerosol_aeronet","aerosol_budget","annual_cycle_zonal_mean","cosp_histogram","diurnal_cycle","enso_diags","lat_lon","meridional_mean_2d","polar","qbo","streamflow","zonal_mean_2d","zonal_mean_2d_stratosphere","zonal_mean_xy"
 
 [mpas_analysis]
 generate = 'all', 'no_landIceCavities', 'no_BGC', 'no_icebergs', 'no_min', 'no_max', 'no_sose', 'no_climatologyMapAntarcticMelt', 'no_regionalTSDiagrams', 'no_timeSeriesAntarcticMelt', 'no_timeSeriesOceanRegions', 'no_climatologyMapSose', 'no_woceTransects', 'no_soseTransects', 'no_geojsonTransects', 'no_oceanRegionalProfiles', 'no_hovmollerOceanRegions'