update the definition of the variable list to be flexible for ploting

and viewer

This comment contains update in the default.ini interms of the
definition of "vars" in pcmdi diagnostic sections. I now explicitly
defined "clim_vars", "mova_vars", "movc_vars" and "enso_vars" to
explicitly pass the needed variables for corresponding diagnostics in
pcmdi. This will be later on used to process the viewer page

The corresponding changes were also made in pcmdi_diags.bash to accept
the new variables defined in .cfg files and default.ini

Author: zhangshixuan1987

examples/post.v3.LR.amip.0101.cfg

@@ -1,7 +1,7 @@
 [default]
 input = /lcrc/group/e3sm2/ac.wlin/E3SMv3/AMIP/v3.LR.amip_0101
-output = /lcrc/group/e3sm/ac.forsyth2/zppy_pr719_output/unique_id_51/v3.LR.amip_0101
-www = /lcrc/group/e3sm/public_html/diagnostic_output/ac.forsyth2/zppy_pr719_output/unique_id_51
+output = /lcrc/group/e3sm/ac.szhang/acme_scratch/e3sm_project/zppy/zppy_pr719_output/unique_id_51/v3.LR.amip_0101
+www = /lcrc/group/e3sm/public_html/diagnostic_output/ac.szhang/zppy_pr719_output/unique_id_53
 campaign = "water_cycle"
 case = v3.LR.amip_0101
 debug = False
@@ -32,7 +32,7 @@ years = "2005:2015:5"
   [[ atm_monthly_180x360_aave ]]
   # list of variables to be interpolated to pressure level; see e3sm_to_cmip/vrt_remap_plev19.nc
   # This defaults to cmip_plevdata = string(default="inclusions/e3sm_to_cmip/vrt_remap_plev19.nc")
-  # cmip_plevdata = /lcrc/group/e3sm/ac.szhang/acme_scratch/e3sm_project/zppy/zppy/templates/inclusions/e3sm_to_cmip/vrt_remap_plev19.nc
+  #cmip_plevdata = /lcrc/group/e3sm/ac.szhang/acme_scratch/e3sm_project/zppy/zppy/templates/inclusions/e3sm_to_cmip/vrt_remap_plev19.nc
   input_files = "eam.h0"
   interp_vars = "U,V,T,Z3"
   ts_subsection = "atm_monthly_180x360_aave"
@@ -41,7 +41,7 @@ years = "2005:2015:5"
 [pcmdi_diags]
 active = True
 environment_commands = "source /lcrc/soft/climate/e3sm-unified/load_latest_e3sm_unified_chrysalis.sh"
-environment_commands_secondary = "source /gpfs/fs1/home/ac.forsyth2/miniforge3/etc/profile.d/conda.sh; conda activate zi-pcmdi-diags-20250925"
+environment_commands_secondary = "source /lcrc/soft/climate/e3sm-unified/load_latest_e3sm_unified_chrysalis.sh; conda activate zi-pcmdi-diags-20250730"
 nodes = 1
 walltime = "4:00:00"
 figure_format = "png"
@@ -66,7 +66,8 @@ ts_years = "2005-2014",
   ref_years = "2005-2014",
   # Variables in current pcmdi-cmip list
   # rltcre and rstcre are derived variables as they are not included in cmip_ts
-  vars = "pr,prw,psl,rlds,rldscs,rltcre,rstcre,rsus,rsuscs,rlus,rlut,rlutcs,rsds,rsdscs,rsdt,rsut,rsutcs,rtmt,sfcWind,tas,tauu,tauv,ts,ta-200,ta-850,ua-200,ua-850,va-200,va-850,zg-500"
+  # define a new variable name to be flexible  
+  clim_vars = "pr,prw,psl,rlds,rldscs,rltcre,rstcre,rsus,rsuscs,rlus,rlut,rlutcs,rsds,rsdscs,rsdt,rsut,rsutcs,rtmt,sfcWind,tas,tauu,tauv,ts,ta-200,ta-850,ua-200,ua-850,va-200,va-850,zg-500"
   # See zppy/templates/pcmdi_diags/regions_specs.json for options of all regions
   # Below is default setup for global/regional mean climate metrics
   regions = "global,ocean,land,NHEX,SHEX,TROPICS"
@@ -80,7 +81,7 @@ ts_years = "2005-2014",
   ref_final_yr = 2019
   ref_start_yr = 1870
   ref_years = "2005-2014",
-  vars = "ts"
+  movc_vars = "ts"
   # Name of modes varibility
   cpl_modes = "PDO,NPGO,AMO"
   frequency = 'mo'
@@ -97,7 +98,7 @@ ts_years = "2005-2014",
   ref_final_yr = 2015
   ref_start_yr = 1853
   ref_years = "2005-2014",
-  vars = "psl"
+  mova_vars = "psl"
   # Varibility modes
   atm_modes = "NAM,NAO,PNA,NPO,SAM,PSA1,PSA2"
   frequency = 'mo'
@@ -114,7 +115,7 @@ ts_years = "2005-2014",
   ref_final_yr = 2018
   ref_start_yr = 1979
   ref_years = "2005-2014",
-  vars = "psl,pr,prsn,ts,tas,tauu,tauv,hfls,hfss,rlds,rsds,rlus,rlut,rsdt"
+  enso_vars = "psl,pr,prsn,ts,tas,tauu,tauv,hfls,hfss,rlds,rsds,rlus,rlut,rsdt"
   # See zppy/templates/pcmdi_diags/reference_alias.json for options
   enso_groups = "ENSO_perf,ENSO_proc,ENSO_tel"
 

zppy/defaults/default.ini

@@ -431,16 +431,12 @@ ref_start_yr = string(default="")
 # zppy will then set it to match `figure_sets_period`
 # For other plots, zppy will set it to match `years`, if not specified
 ref_years = string_list(default=list(""))
-# Variables to be used by the pcmdi diagnostics
-# mean_climate AND synthetic_plots: vars = "pr,prw,psl,rlds,rldscs,rltcre,rstcre,rlut,rlutcs,rsds,rsdscs,rsdt,rsus,rsuscs,rlus,rsut,rtmt,sfcWind,tas,tauu,tauv,ts,ta-200,ta-850,ua-200,ua-850,va-200,va-850,zg-500"
-# variability_modes_atm: vars = "psl"
-# variability_modes_cpl: vars = "ts"
-# enso: vars = "psl,pr,prsn,ts,tas,tauu,tauv,hflx,hfss,rlds,rsds,rlus,rlut,rsdt"
-# Default setup is for mean_climate:
-vars = string(default="pr,prw,psl,rlds,rldscs,rltcre,rstcre,rlut,rlutcs,rsds,rsdscs,rsdt,rsus,rsuscs,rlus,rsut,rtmt,sfcWind,tas,tauu,tauv,ts,ta-200,ta-850,ua-200,ua-850,va-200,va-850,zg-500")
 ###########################################################################################
 # Specify these for the mean_climate subtask
 ###########################################################################################
+# Variables to be used by the pcmdi diagnostics
+# mean_climate AND synthetic_plots: clim_vars = "pr,prw,psl,rlds,rldscs,rltcre,rstcre,rlut,rlutcs,rsds,rsdscs,rsdt,rsus,rsuscs,rlus,rsut,rtmt,sfcWind,tas,tauu,tauv,ts,ta-200,ta-850,ua-200,ua-850,va-200,va-850,zg-500"
+clim_vars = string(default="pr,prw,psl,rlds,rldscs,rltcre,rstcre,rlut,rlutcs,rsds,rsdscs,rsdt,rsus,rsuscs,rlus,rsut,rtmt,sfcWind,tas,tauu,tauv,ts,ta-200,ta-850,ua-200,ua-850,va-200,va-850,zg-500")
 # variables in the cmip6 table that can be potentially used by pcmdi
 # this list depends on the definition of cmip variable
 # required for "mean climate" diagnostics
@@ -465,7 +461,11 @@ regrid_method_ocn = string(default="conservative")
 # Specify these for the variability_modes_cpl and variability_modes_atm subtasks
 ###########################################################################################
 ### 2 options for names of atm, cpl modes varibility:
+# variability_modes_atm: vars = "psl"
+atm_vars = string(default="psl")
 atm_modes = string(default="NAM,NAO,PNA,NPO,SAM,PSA1,PSA2")
+# variability_modes_cpl: vars = "ts"
+cpl_vars = string(default="ts")
 cpl_modes = string(default="PDO,NPGO,AMO")
 CBF = string(default=True)
 ConvEOF = string(default=True)
@@ -483,6 +483,8 @@ seasons = string(default="monthly")
 ###########################################################################################
 # Specify these for the enso subtasks (not currently enabled)
 ###########################################################################################
+# enso: vars = "psl,pr,prsn,ts,tas,tauu,tauv,hflx,hfss,rlds,rsds,rlus,rlut,rsdt"
+enso_vars = string(default="psl,pr,prsn,ts,tas,tauu,tauv,hflx,hfss,rlds,rsds,rlus,rlut,rsdt")
 enso_groups = string(default="ENSO_perf,ENSO_proc,ENSO_tel")
 ###########################################################################################
 # Specify these for the synthetic_plots subtask
@@ -545,8 +547,11 @@ cmip_movs_set = string(default="cmip6.historical.v20220825")
   ref_final_yr = string(default=None)
   ref_start_yr = string(default=None)
   ref_years = string_list(default=None)
-  vars = string(default=None)
+  clim_vars = string(default=None)
   cmip_vars = string(default=None)
+  mova_vars = string(default=None)
+  movc_vars = string(default=None)
+  enso_vars = string(default=None)
   regions = string(default=None)
   target_grid = string(default=None)
   target_grid_string = string(default=None)

zppy/templates/pcmdi_diags.bash

@@ -30,9 +30,10 @@ case="{{ case }}"
 www="{{ www }}"
 run_type="{{ run_type }}"
 results_dir="{{ run_type }}"
+
 {% if current_set != "synthetic_plots" %}
 
-# Input variables
+# Input time range 
 y1={{ year1 }}
 y2={{ year2 }}
 ref_y1={{ ref_year1 }}
@@ -86,6 +87,16 @@ else
    fi
 fi
 
+{% if current_set == "mean_climate"%}
+source_vars="{{ clim_vars }}"
+{% elif current_set == "variability_modes_cpl"%}
+source_vars="{{ movc_vars }}"
+{% elif current_set == "variability_modes_atm"%}
+source_vars="{{ mova_vars }}"
+{% elif current_set == "enso"%}
+source_vars="{{ enso_vars }}"
+{% endif %}
+
 {% endif %}
 
 # Top-level directory
@@ -294,8 +305,8 @@ create_links_ts() {
 
   local script_dir="{{ scriptDir }}"
   local prefix="{{ prefix }}"
-  local vars="{{ vars }}"
   local ts_step="{{ ts_num_years }}"
+  local vars="${source_vars}"
 
   echo "create_links_ts: linking from ${ts_dir_source} to ${ts_dir_destination}"
 
@@ -499,7 +510,7 @@ echo "Linking observational data into ${obstmp_dir}..."
 ###################
 echo "Linking observational data using SLURM..."
 
-command="zi-pcmdi-link-observation --model_name_ref ${model_name_ref} --tableID_ref ${tableID_ref} --vars={{ vars }} --obs_sets {{ obs_sets }} --obs_ts {{ obs_ts }} --obstmp_dir ${obstmp_dir}"
+command="zi-pcmdi-link-observation --model_name_ref ${model_name_ref} --tableID_ref ${tableID_ref} --vars=${source_vars} --obs_sets {{ obs_sets }} --obs_ts {{ obs_ts }} --obstmp_dir ${obstmp_dir}"
 echo "Running: ${command}"
 
 {{ environment_commands_secondary }}
@@ -704,7 +715,11 @@ seasons = '{{ seasons }}'.split(",")
 frequency = '{{ frequency }}'
 
 # Variables to analyze (comma-separated string or space-separated)
-varModel = '{{ vars }}'
+{% if current_set == "variability_modes_cpl"%}
+varModel = '{{ movc_vars }}'
+{% elif current_set == "variability_modes_atm"%}
+varModel = '{{ mova_vars }}'
+{% endif %}
 
 # Unit conversion flags for model and observations
 ModUnitsAdjust = {{ ModUnitsAdjust }}
@@ -825,7 +840,7 @@ source_dirs="--climo_ts_dir_primary ${ts_dir_primary} --climo_ts_dir_ref ${ts_di
 # So, it's a good idea to make sure they can't be (or at least are unlikely to be) empty.
 # run_type == "model_vs_obs" only: obs_sets (default value is NOT "")
 # run_type == "model_vs_model" only: model_name_ref, tableID_ref (default values are NOT "")
-core_parameters="--num_workers {{ num_workers }} --multiprocessing {{ multiprocessing }} --subsection {{ subsection }} ${source_dirs} --model_name ${model_name} --model_tableID {{model_tableID }} --figure_format {{ figure_format }}  --run_type {{ run_type }} --obs_sets {{ obs_sets }} --model_name_ref ${model_name_ref} --vars {{ vars }} --tableID_ref ${tableID_ref} --generate_sftlf {{ generate_sftlf }} --case_id ${case_id} --results_dir ${results_dir}"
+core_parameters="--num_workers {{ num_workers }} --multiprocessing {{ multiprocessing }} --subsection {{ subsection }} ${source_dirs} --model_name ${model_name} --model_tableID {{model_tableID }} --figure_format {{ figure_format }}  --run_type {{ run_type }} --obs_sets {{ obs_sets }} --model_name_ref ${model_name_ref} --vars ${source_vars} --tableID_ref ${tableID_ref} --generate_sftlf {{ generate_sftlf }} --case_id ${case_id} --results_dir ${results_dir}"
 {% endif %}
 
 {% if current_set == "mean_climate" %}