Remove support for endYear = end

Results are unpredictable and this option causes more trouble
for development than it is worth.

Author: xylar

mpas_analysis/default.cfg

@@ -294,14 +294,10 @@ subprocessCount = 1
 # only the anomaly over a later span of years is of interest.
 # anomalyRefYear = 249
 
-# start and end years for timeseries analysis. Use endYear = end to indicate
-# that the full range of the data should be used.  If errorOnMissing = False,
-# the start and end year will be clipped to the valid range.  Otherwise, out
-# of bounds values will lead to an error.  In a "control" config file used in
-# a "main vs. control" analysis run, the range of years must be valid and
-# cannot include "end" because the original data may not be available.
+# start and end years for timeseries analysis.  Out-of-bounds values will lead
+# to an error.
 startYear = 1
-endYear = end
+endYear = 20
 
 
 # line colors for the main, control and obs curves
@@ -320,14 +316,10 @@ fitColor1 = tab:blue
 [index]
 ## options related to producing nino index.
 
-# start and end years for El Nino 3.4 analysis. Use endYear = end to indicate
-# that the full range of the data should be used.  If errorOnMissing = False,
-# the start and end year will be clipped to the valid range.  Otherwise, out
-# of bounds values will lead to an error.  In a "control" config file used in
-# a "main vs. control" analysis run, the range of years must be valid and
-# cannot include "end" because the original data may not be available.
+# start and end years for El Nino 3.4 analysis.  Out-of-bounds values will lead
+# to an error.
 startYear = 1
-endYear = end
+endYear = 20
 
 
 [regions]

mpas_analysis/ocean/hovmoller_ocean_regions.py

@@ -72,13 +72,7 @@ def __init__(self, config, regionMasksTask, oceanRegionalProfilesTask,
             tags=['profiles', 'timeSeries', 'hovmoller'])
 
         startYear = config.getint('timeSeries', 'startYear')
-        endYear = config.get('timeSeries', 'endYear')
-        if endYear == 'end':
-            # a valid end year wasn't found, so likely the run was not found,
-            # perhaps because we're just listing analysis tasks
-            endYear = startYear
-        else:
-            endYear = int(endYear)
+        endYear = config.getint('timeSeries', 'endYear')
 
         regionGroups = config.getexpression('hovmollerOceanRegions',
                                             'regionGroups')

mpas_analysis/ocean/streamfunction_moc.py

@@ -88,13 +88,7 @@ def __init__(self, config, mpasClimatologyTask, controlConfig=None):
         plotClimSubtask.run_after(computeClimSubtask)
 
         startYear = config.getint('timeSeries', 'startYear')
-        endYear = config.get('timeSeries', 'endYear')
-        if endYear == 'end':
-            # a valid end year wasn't found, so likely the run was not found,
-            # perhaps because we're just listing analysis tasks
-            endYear = startYear
-        else:
-            endYear = int(endYear)
+        endYear = config.getint('timeSeries', 'endYear')
 
         years = range(startYear, endYear + 1)
 

mpas_analysis/ocean/time_series_antarctic_melt.py

@@ -87,13 +87,7 @@ def __init__(self, config, mpasTimeSeriesTask, regionMasksTask,
         iceShelvesToPlot = masksSubtask.expand_region_names(iceShelvesToPlot)
 
         startYear = config.getint('timeSeries', 'startYear')
-        endYear = config.get('timeSeries', 'endYear')
-        if endYear == 'end':
-            # a valid end year wasn't found, so likely the run was not found,
-            # perhaps because we're just listing analysis tasks
-            endYear = startYear
-        else:
-            endYear = int(endYear)
+        endYear = config.getint('timeSeries', 'endYear')
 
         years = list(range(startYear, endYear + 1))
 

mpas_analysis/ocean/time_series_ocean_regions.py

@@ -70,13 +70,7 @@ def __init__(self, config, regionMasksTask, controlConfig=None):
             tags=['timeSeries', 'regions', 'antarctic'])
 
         startYear = config.getint('timeSeries', 'startYear')
-        endYear = config.get('timeSeries', 'endYear')
-        if endYear == 'end':
-            # a valid end year wasn't found, so likely the run was not found,
-            # perhaps because we're just listing analysis tasks
-            endYear = startYear
-        else:
-            endYear = int(endYear)
+        endYear = config.getint('timeSeries', 'endYear')
 
         regionGroups = config.getexpression(self.taskName, 'regionGroups')
 

mpas_analysis/ocean/time_series_transport.py

@@ -67,13 +67,7 @@ def __init__(self, config, controlConfig=None):
             tags=['timeSeries', 'transport'])
 
         startYear = config.getint('timeSeries', 'startYear')
-        endYear = config.get('timeSeries', 'endYear')
-        if endYear == 'end':
-            # a valid end year wasn't found, so likely the run was not found,
-            # perhaps because we're just listing analysis tasks
-            endYear = startYear
-        else:
-            endYear = int(endYear)
+        endYear = config.getint('timeSeries', 'endYear')
 
         years = [year for year in range(startYear, endYear + 1)]
 

mpas_analysis/shared/analysis_task.py

@@ -609,18 +609,10 @@ def update_time_bounds_from_file_names(config, section, componentName):
     calendar = namelist.get('config_calendar_type')
 
     requestedStartYear = config.getint(section, 'startYear')
-    requestedEndYear = config.get(section, 'endYear')
-    if requestedEndYear == 'end':
-        requestedEndYear = None
-    else:
-        # get it again as an integer
-        requestedEndYear = config.getint(section, 'endYear')
+    requestedEndYear = config.getint(section, 'endYear')
 
     startDate = '{:04d}-01-01_00:00:00'.format(requestedStartYear)
-    if requestedEndYear is None:
-        endDate = None
-    else:
-        endDate = '{:04d}-12-31_23:59:59'.format(requestedEndYear)
+    endDate = '{:04d}-12-31_23:59:59'.format(requestedEndYear)
 
     streamName = 'timeSeriesStatsMonthlyOutput'
     try:
@@ -653,10 +645,6 @@ def update_time_bounds_from_file_names(config, section, componentName):
         lastIndex -= 1
     endYear = years[lastIndex]
 
-    if requestedEndYear is None:
-        config.set(section, 'endYear', str(endYear))
-        requestedEndYear = endYear
-
     if startYear != requestedStartYear or endYear != requestedEndYear:
         raise ValueError(
             "{} start and/or end year different from requested\n"