Remove errorOnMissing config option

We always want an error on missing data

Author: xylar

mpas_analysis/default.cfg

@@ -151,11 +151,6 @@ file_cache_maxsize = 1200
 # with a single time slice.
 maxChunkSize = 10000
 
-# Whether missing input data should produce an error.  If not, the user gets
-# a warning and the time bounds are adjusted to the beginning and end of the
-# available data
-errorOnMissing = False
-
 
 [output]
 ## options related to writing out plots, intermediate cached data sets, logs,

mpas_analysis/polar_regions.cfg

@@ -1,11 +1,3 @@
-[input]
-## options related to reading in the results to be analyzed
-
-# Whether missing input data should produce an error.  If not, the user gets
-# a warning and the time bounds are adjusted to the beginning and end of the
-# available data
-errorOnMissing = True
-
 [output]
 ## options related to writing out plots, intermediate cached data sets, logs,
 ## etc.

mpas_analysis/shared/analysis_task.py

@@ -587,8 +587,6 @@ def update_time_bounds_from_file_names(config, section, componentName):
         '{}HistorySubdirectory'.format(componentName),
         defaultPath=runDirectory)
 
-    errorOnMissing = config.getboolean('input', 'errorOnMissing')
-
     namelistFileName = build_config_full_path(
         config, 'input',
         '{}NamelistFileName'.format(componentName))
@@ -660,24 +658,12 @@ def update_time_bounds_from_file_names(config, section, componentName):
         requestedEndYear = endYear
 
     if startYear != requestedStartYear or endYear != requestedEndYear:
-        if errorOnMissing:
-            raise ValueError(
-                "{} start and/or end year different from requested\n"
-                "requested: {:04d}-{:04d}\n"
-                "actual:   {:04d}-{:04d}\n".format(
-                    section, requestedStartYear, requestedEndYear, startYear,
-                    endYear))
-        else:
-            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))
-            config.set(section, 'startYear', str(startYear))
-            config.set(section, 'endYear', str(endYear))
+        raise ValueError(
+            "{} start and/or end year different from requested\n"
+            "requested: {:04d}-{:04d}\n"
+            "actual:   {:04d}-{:04d}\n".format(
+                section, requestedStartYear, requestedEndYear, startYear,
+                endYear))
 
     startDate = '{:04d}-01-01_00:00:00'.format(startYear)
     config.set(section, 'startDate', startDate)

mpas_analysis/test/test_mpas_climatology_task/QU240.cfg

@@ -20,7 +20,6 @@ oceanHistorySubdirectory = .
 oceanNamelistFileName = mpas-o_in
 oceanStreamsFileName = streams.ocean
 mpasMeshName = oQU240
-errorOnMissing = False
 
 [output]
 baseDirectory = /dir/for/analysis/output

mpas_analysis/test/test_remap_obs_clim_subtask/remap_obs.cfg

@@ -14,7 +14,6 @@ runSubdirectory = .
 oceanHistorySubdirectory = .
 oceanNamelistFileName = mpas-o_in
 oceanStreamsFileName = streams.ocean
-errorOnMissing = False
 
 [output]
 baseDirectory = /dir/for/analysis/output