Revert to Hector year reporting

Hector 1.x reports years in outputs as end of simulation year.
1745-12-31 = 1746.0
See JGCRI/hector#177

pyhector/__init__.py

@@ -138,6 +138,11 @@ def run(scenario, config_options=None):
         h.add_observable("temperature", "Tgav")
         h.run()
         global_temp = h.get_observable("temperature", "Tgav")
-        start = int(parameters["core"]["startDate"])
-        end = int(parameters["core"]["endDate"])
-    return pd.Series(global_temp, index=np.arange(start, end))
+        # In Hector 1.x RCP output value years are given as end of simulation
+        # year, e.g. 1745-12-31 = 1746.0.
+        # See https://github.com/JGCRI/hector/issues/177
+        start = int(parameters["core"]["startDate"]) + 1
+        # End of range is non-inclusive in Python ranges.
+        end = int(parameters["core"]["endDate"]) + 1
+        index = np.arange(start, end)
+    return pd.Series(global_temp, index=index)

tests/test_pyhector.py

@@ -23,14 +23,13 @@ def read_hector_output(csv_file):
     Hector output data.
     """
     # Filter out spin-up values. In Hector 1.x RCP output streams years are
-    # written as end of simulation year. This will change in Hector 2.x.
+    # given as end of simulation year. This will change in Hector 2.x.
     # See https://github.com/JGCRI/hector/issues/177
     start_year = 1746
     output_stream = pd.read_csv(csv_file, skiprows=1)
 
     wide = output_stream[output_stream.year >= start_year].pivot_table(
         index="year", columns="variable", values="value")
-    wide.index = wide.index - 1  # Adjust index to year only
 
     return wide