Update parameters

Author: forsyth2

zppy/defaults/default.ini

@@ -375,10 +375,6 @@ pcmdi_version = string(default="v3.8.2")
 regions_specs = string(default="pcmdi_data/region/regions_specs.json")
 # File of observation data name for mean climate calculation
 reference_alias = string(default="pcmdi_data/reference/reference_alias.json")
-# Utility file with functions for zppy-pcmdi data processing
-pcmdi_zppy_util = string(default="pcmdi_data/utility/pcmdi_zppy_util.py")
-# Utility file with functions for zppy-pcmdi viewer page processing
-pcmdi_viewer_util = string(default="pcmdi_data/utility/pcmdi_viewer_util.py")
 # Template files for zppy-pcmdi viewer page processing
 pcmdi_viewer_template = string(default="pcmdi_data/viewer")
 # File of variable list to generate synthetic metrics plot
@@ -417,14 +413,10 @@ reference_data_path = string(default="")
 reference_data_path_ts = string(default="")
 # pcmdi_diags.py will set to match `years` if not specified
 ref_years = string_list(default=list(""))
-# The years increment for reference data
-ts_num_years_ref = integer(default=5)
 # Final year (i.e., the last available year) for the reference data
 ref_final_yr = string(default="")
 # Start year for the reference data
 ref_start_yr = string(default="")
-# reference model name
-ref_name = string(default="")
 # The years range for test model data
 ts_years = string_list(default=list(""))
 # The years increment for test model data
@@ -493,6 +485,7 @@ target_grid = string(default="1x1")
 target_grid_string = string(default="1px1p")
 # OPTIONS: 'regrid2','esmf'
 regrid_tool = string(default="esmf")
+regrid_tool_ocn = string(default="esmf")
 # OPTIONS: 'linear','conservative', only if tool is esmf
 regrid_method = string(default="regrid2")
 # OPTIONS: 'linear','conservative', only if tool is esmf
@@ -529,16 +522,13 @@ e3sm_to_cmip_atm_subsection = string(default="")
   regions_specs = string(default=None)
   pcmdi_webtitle = string(default=None)
   pcmdi_version = string(default=None)
-  pcmdi_zppy_util = string(default=None)
-  pcmdi_viewer_util = string(default=None)
   pcmdi_viewer_template = string(default=None)
   synthetic_metrics = string(default=None)
   multiprocessing = boolean(default=None)
   obs_ts = string(default=None)
   figure_sets = string(default=None)
   figure_sets_period = string(default=None)
   figure_format = string(default=None)
-  ref_name = string(default=None)
   ref_years = string_list(default=None)
   ref_start_yr = string(default=None)
   ref_final_yr = string(default=None)
@@ -548,10 +538,10 @@ e3sm_to_cmip_atm_subsection = string(default="")
   sets = string_list(default=None)
   ts_years = string_list(default=None)
   ts_num_years = integer(default=None)
-  ts_num_years_ref = integer(default=None)
   target_grid = string(default=None)
   target_grid_string = string(default=None)
   regrid_tool = string(default=None)
+  regrid_tool_ocn = string(default=None)
   regrid_method = string(default=None)
   regrid_method_ocn = string(default=None)
   obs_sets = string(default=None)

zppy/pcmdi_diags.py

@@ -215,7 +215,6 @@ def check_mvm_only_parameters_for_bash(c: Dict[str, Any]) -> None:
                 "enso",
             ]
         )
-        check_set_specific_parameter(c, ts_sets, "ts_num_years_ref")
         check_set_specific_parameter(c, ts_sets, "ts_subsection")
 
 

zppy/templates/pcmdi_diags.bash

@@ -30,7 +30,6 @@ case="{{ case }}"
 www="{{ www }}"
 run_type="{{ run_type }}"
 results_dir="{{ run_type }}"
-ref_name={{ ref_name }}
 {% if "synthetic_plots" not in subsection %}
 
 # Input variables
@@ -92,11 +91,7 @@ workdir=`mktemp -d tmp.${id}.XXXX`
 cd ${workdir}
 
 
-# TODO: Move anything in {{pcmdi_external_prefix}} == /lcrc/group/e3sm/diagnostics/ to the inclusions subdir
-# or to zppy-interfaces
-
-# utility file for pcmdi-zppy workflow
-cp -r '{{pcmdi_external_prefix}}/{{pcmdi_zppy_util}}'   .
+# TODO: Move anything in {{pcmdi_external_prefix}} == /lcrc/group/e3sm/diagnostics/ to the inclusions subdir or to zppy-interfaces. In theory, we would then not need to copy these files around.
 
 # files for definition of regions for regional mean
 cp -r '{{pcmdi_external_prefix}}/{{regions_specs}}'     .
@@ -107,9 +102,6 @@ cp -r '{{pcmdi_external_prefix}}/{{reference_alias}}'   .
 # file for list of variables for synthetic_metrics metric plots
 cp -r '{{pcmdi_external_prefix}}/{{synthetic_metrics}}' .
 
-# utility file for pcmdi-zppy viewer
-cp -r '{{pcmdi_external_prefix}}/{{pcmdi_viewer_util}}' .
-
 {% if "mean_climate" in subsection %}
 create_links_acyc_climo() {
   local ts_dir_source="$1"