uncommitted updates

Author: andrewdnolan

compass/landice/tests/ismip6_GrIS_forcing/file_finders.py

@@ -74,7 +74,7 @@ def __init__(self, archive_fp, version="v1", workdir="./"):
         # should do some checking here that all the fps work...
         self.dir2GCMs = dir2GCMs
 
-    def get_filename(self, GCM, scenario, variable, start=2015, end=2100):
+    def get_filename(self, GCM, scenario, variable, start=1950, end=2100):
         """
         """
         if GCM == "NorESM1-M":

compass/landice/tests/ismip6_GrIS_forcing/forcing_gen/forcing_gen.cfg

@@ -9,6 +9,11 @@ racmo_smb_fn = smb_rec.1958-2019.BN_RACMO2.3p2_FGRN055_GrIS.MM.nc
 climatology_start = 1960
 climatology_end = 1989
 
+[TF_ref_climatology]
+GCM = MIROC5
+climatology_start = 1990
+climatology_end = 2014
+
 [ISMIP6_GrIS_Forcing]
 
 # full path to MALI mesh forcing data will be regridded onto

compass/landice/tests/ismip6_GrIS_forcing/process_forcing.py

@@ -107,8 +107,9 @@ def process_variable(self, GCM, scenario, var, forcing_fp, start, end):
                                       drop_variables=vars_2_drop,
                                       use_cftime=True)
 
-        # mask of desired time indices
-        mask = remapped_ds.time.dt.year.isin(range(start, end))
+        # create mask of desired time indices. Include forcing from year prior
+        # to requested start date since forcing in July but sims start in Jan
+        mask = remapped_ds.time.dt.year.isin(range(start - 1, end))
         # drop the non-desired time indices from remapped dataset
         remapped_ds = remapped_ds.where(mask, drop=True)
         # add xtime variable based on `time`