Index: wflow-py/wflow/pcrglobwb/virtualOS.py =================================================================== diff -u -ra86cb51cd1731ce83f57e4b0b932a2a115b39712 -rea74d7d019652362ccf1714f1c6448955e24b49d --- wflow-py/wflow/pcrglobwb/virtualOS.py (.../virtualOS.py) (revision a86cb51cd1731ce83f57e4b0b932a2a115b39712) +++ wflow-py/wflow/pcrglobwb/virtualOS.py (.../virtualOS.py) (revision ea74d7d019652362ccf1714f1c6448955e24b49d) @@ -39,7 +39,6 @@ import glob import netCDF4 as nc -import cftime import numpy as np import numpy.ma as ma import pcraster as pcr @@ -398,7 +397,7 @@ # msg += "\n" logger.warning(msg) try: - idx = cftime.date2index( + idx = nc.date2index( date, f.variables["time"], calendar=f.variables["time"].calendar, @@ -426,7 +425,7 @@ ) logger.debug(msg) try: - idx = cftime.date2index( + idx = nc.date2index( date, f.variables["time"], calendar=f.variables["time"].calendar, @@ -451,7 +450,7 @@ ) # msg += "\n" except: - idx = cftime.date2index( + idx = nc.date2index( date, f.variables["time"], calendar=f.variables["time"].calendar, @@ -707,7 +706,7 @@ # msg += "\n" logger.warning(msg) try: - idx = cftime.date2index( + idx = nc.date2index( date, f.variables["time"], calendar=f.variables["time"].calendar, @@ -735,7 +734,7 @@ ) logger.debug(msg) try: - idx = cftime.date2index( + idx = nc.date2index( date, f.variables["time"], calendar=f.variables["time"].calendar, @@ -760,7 +759,7 @@ ) # msg += "\n" except: - idx = cftime.date2index( + idx = nc.date2index( date, f.variables["time"], calendar=f.variables["time"].calendar, @@ -934,7 +933,7 @@ date = datetime.datetime(date.year, date.month, date.day) # time index (in the netCDF file) nctime = f.variables["time"] # A netCDF time variable object. - idx = cftime.date2index(date, nctime, calendar=nctime.calendar, select="exact") + idx = nc.date2index(date, nctime, calendar=nctime.calendar, select="exact") idx = int(idx) # sameClone = True @@ -1015,7 +1014,7 @@ date = datetime.datetime(date.year, date.month, date.day, 0, 0) # time index (in the netCDF file) nctime = f.variables["time"] # A netCDF time variable object. - idx = cftime.date2index(date, nctime, select="exact") + idx = nc.date2index(date, nctime, select="exact") idx = int(idx) # sameClone = True @@ -1089,7 +1088,7 @@ # time index (in the netCDF file) nctime = f.variables["time"] # A netCDF time variable object. - idx = cftime.date2index(date, nctime, calendar=nctime.calendar, select="exact") + idx = nc.date2index(date, nctime, calendar=nctime.calendar, select="exact") # convert to PCR object and close f outPCR = pcr.numpy2pcr( @@ -2118,7 +2117,7 @@ def findLastYearInNCTime(ncTimeVariable): # last datetime - last_datetime = cftime.num2date( + last_datetime = nc.num2date( ncTimeVariable[len(ncTimeVariable) - 1], ncTimeVariable.units, ncTimeVariable.calendar, @@ -2130,7 +2129,7 @@ def findFirstYearInNCTime(ncTimeVariable): # first datetime - first_datetime = cftime.num2date( + first_datetime = nc.num2date( ncTimeVariable[0], ncTimeVariable.units, ncTimeVariable.calendar )