Fix update_time_bounds_from_file_names

Author: cbegeman

mpas_analysis/shared/analysis_task.py

@@ -602,7 +602,8 @@ def flush(self):
         pass
 
 
-def update_time_bounds_from_file_names(config, section, componentName):
+def update_time_bounds_from_file_names(config, section, componentName,
+                                       allow_cache=True):
     """
     Update the start and end years and dates for time series, climatologies or
     climate indices based on the years actually available in the list of files.
@@ -680,12 +681,16 @@ def update_time_bounds_from_file_names(config, section, componentName):
     endYear = years[lastIndex]
 
     if startYear != requestedStartYear or endYear != requestedEndYear:
-        print("Warning:"
-            "{} start and/or end year different from requested\n"
-            "requested: {:04d}-{:04d}\n"
-            "actual:   {:04d}-{:04d}\n".format(
-                section, requestedStartYear, requestedEndYear, startYear,
-                endYear))
+        message = ("{} start and/or end year different from requested\n"
+                   "requested: {:04d}-{:04d}\n"
+                   "actual:   {:04d}-{:04d}\n".format(
+                      section, requestedStartYear, requestedEndYear, startYear,
+                      endYear)
+                  )
+        if allow_cache:
+            print(f'Warning: {message}')
+        else:
+            raise ValueError(message)
 
     startDate = '{:04d}-01-01_00:00:00'.format(startYear)
     config.set(section, 'startDate', startDate)

mpas_analysis/test/test_mpas_climatology_task.py

@@ -168,7 +168,8 @@ def test_update_climatology_bounds_and_create_symlinks(self):
         with self.assertRaisesRegex(ValueError,
                                     'climatology start and/or end year '
                                     'different from requested'):
-            update_time_bounds_from_file_names(config, 'climatology', 'ocean')
+            update_time_bounds_from_file_names(config, 'climatology', 'ocean',
+                                               allow_cache=False)
 
     def test_subtask_run_analysis(self):
         mpasClimatologyTask = self.setup_task()