From 210ee79283ee80798cc5b6da2aab6f2510bf2a7f Mon Sep 17 00:00:00 2001 From: Ryan Forsyth Date: Wed, 11 Oct 2023 17:32:24 -0500 Subject: [PATCH] Reorder diags sets --- zppy/templates/cryosphere.cfg | 2 +- zppy/templates/default.ini | 4 +++- zppy/templates/water_cycle.cfg | 2 +- 3 files changed, 5 insertions(+), 3 deletions(-) diff --git a/zppy/templates/cryosphere.cfg b/zppy/templates/cryosphere.cfg index 2d1cb7b1..6cf4826b 100644 --- a/zppy/templates/cryosphere.cfg +++ b/zppy/templates/cryosphere.cfg @@ -1,5 +1,5 @@ [e3sm_diags] -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" +sets= "lat_lon","zonal_mean_xy","zonal_mean_2d","polar","cosp_histogram","meridional_mean_2d","enso_diags","qbo","diurnal_cycle","annual_cycle_zonal_mean","zonal_mean_2d_stratosphere","aerosol_aeronet","aerosol_budget" [mpas_analysis] generate = 'all', 'no_BGC', 'no_icebergs' diff --git a/zppy/templates/default.ini b/zppy/templates/default.ini index 3a4a9f40..2a83d0f5 100644 --- a/zppy/templates/default.ini +++ b/zppy/templates/default.ini @@ -188,7 +188,9 @@ run_type = string(default="model_vs_obs") # "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("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")) +# The order of the `sets` list is the order the sets will show up in E3SM Diags. +# `sets` below are ordered by 1) core or speciality and then 2) older to newer. +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")) # 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 diff --git a/zppy/templates/water_cycle.cfg b/zppy/templates/water_cycle.cfg index 5d0df7be..0cac81a4 100644 --- a/zppy/templates/water_cycle.cfg +++ b/zppy/templates/water_cycle.cfg @@ -1,5 +1,5 @@ [e3sm_diags] -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" +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","aerosol_aeronet","aerosol_budget" [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'