Fix test errors

tests/integration/generated/test_min_case_add_dependencies_chrysalis.cfg

@@ -90,6 +90,8 @@ short_name = "v3.LR.historical_0051"
 walltime = "5:00:00"
 
   [[ atm_monthly_180x360_aave ]]
+  ref_final_yr = 1995
+  ref_start_yr = 1985
   sets = "enso_diags","qbo","streamflow","tropical_subseasonal",
   # streamflow_obs_ts is determined automatically
 

tests/integration/template_min_case_add_dependencies.cfg

@@ -90,6 +90,8 @@ short_name = "#expand case_name#"
 walltime = "#expand diags_walltime#"
 
   [[ atm_monthly_180x360_aave ]]
+  ref_final_yr = 1995
+  ref_start_yr = 1985
   sets = "enso_diags","qbo","streamflow","tropical_subseasonal",
   # streamflow_obs_ts is determined automatically
 

zppy/global_time_series.py

@@ -130,6 +130,7 @@ def global_time_series(config, scriptDir, existing_bundles, job_ids_file):  # no
             # List of dependencies
             dependencies: List[str] = []
             # Add Time Series dependencies
+            print(f"ts_num_years={c['ts_num_years']}")
             if c["use_atm"]:
                 # Iterate from year1 to year2 incrementing by the number of years per time series file.
                 for yr in range(c["year1"], c["year2"], c["ts_num_years"]):

zppy/templates/default.ini

@@ -54,6 +54,8 @@ plugins = force_list(default=list())
 qos = string(default="regular")
 # Reservation -- if you have access to a node reservation, specify it with this parameter.
 reservation = string(default="")
+# The years increment from `years` in `[ts]`
+ts_num_years = integer(default=5)
 # scriptDir -- NOTE: this parameter is created internally
 # templateDir -- NOTE: this parameter is created internally
 # The variables to process
@@ -222,8 +224,6 @@ swap_test_ref = boolean(default=False)
 tag = string(default="model_vs_obs")
 # Path to observation data for "tc_analysis" runs
 tc_obs = string(default="")
-# The years increment from `years` in `[ts]`
-ts_num_years = integer(default=5)
 # The years increment for reference data
 # Required for run_type="model_vs_model" "enso_diags"/"qbo"/"area_mean_time_series/streamflow" runs
 ts_num_years_ref = integer(default=5)
@@ -266,7 +266,6 @@ ts_daily_subsection = string(default="")
   swap_test_ref = boolean(default=None)
   tag = string(default=None)
   tc_obs = string(default=None)
-  ts_num_years = integer(default=None)
   ts_num_years_ref = integer(default=None)
   ts_subsection = string(default=None)
   ts_daily_subsection = string(default=None)
@@ -327,8 +326,6 @@ plots_lnd = string(default="")
 plots_ocn = string(default="")
 # regions to plot: glb, n, s (global, northern hemisphere, southern hemisphere)
 regions = string(default="glb,n,s")
-# The number of years in a time-series file
-ts_num_years = integer(default=10)
 ts_years = string_list(default=list(""))
 # `years = "1-100",` would plot years 1 to 100 on the graphs.