netcdftime -> cftime

pynemo/nemo_bdy_extr_tm3.py

@@ -38,7 +38,7 @@ import numpy as np
 import scipy.spatial as sp
 from calendar import monthrange, isleap
 from scipy.interpolate import interp1d
-from netcdftime import datetime, utime
+from cftime import datetime, utime
 from pynemo import nemo_bdy_ncgen as ncgen
 from pynemo import nemo_bdy_ncpop as ncpop
 

pynemo/reader/directory.py

@@ -5,7 +5,7 @@ This is an abstraction for the data repository
 from os import listdir
 import numpy as np
 from netCDF4 import Dataset
-from netCDF4 import netcdftime
+from cftime import utime 
 import copy
 import logging
 class Reader(object):
@@ -74,7 +74,7 @@ class Reader(object):
                 x = [filename, index]
                 group.data_list.append(x)
                 group.time_counter.append(varid[index]+t_adjust)
-                group.date_counter.append(netcdftime.utime(varid.units,
+                group.date_counter.append(utime(varid.units,
                                                            varid.calendar).num2date(varid[index]+t_adjust))
             group.units = varid.units
             group.calendar = varid.calendar

pynemo/reader/ncml.py

@@ -10,7 +10,7 @@ import string
 import logging
 import numpy as np
 import jnius_config
-from netCDF4 import netcdftime
+from cftime import utime 
 ncmlpath, file_name = os.path.split(__file__)
 ncmlpath = os.path.join(ncmlpath, "jars", "netcdfAll-4.6.jar") 
 jnius_config.set_classpath('.',ncmlpath)
@@ -78,7 +78,7 @@ class Reader(object):
         grid.time_counter = timevar[:]+t_adjust
         grid.date_counter = []
         for index in range(0,len(grid.time_counter)):            
-            grid.date_counter.append(netcdftime.utime(grid.units,
+            grid.date_counter.append(utime(grid.units,
                                                       grid.calendar).num2date(grid.time_counter[index])) 
 
     def close(self):