Merge pull request #1752 from UV-CDAT/climofast

several tweaks, mainly saving method results for re-use, to improve

Author: doutriaux1

Packages/cdms2/Lib/axis.py

@@ -735,10 +735,22 @@ def designateTime(self, persistent=0, calendar=None):
             if calendar is not None:
                 self.setCalendar(calendar, persistent)
 
+    # For isTime(), keep track of whether each id is for a time axis or not, for better performance.
+    # This dictionary is a class variable (not a member of any particular instance).
+    idtaxis = {}  # id:type where type is 'T' for time, 'O' for other
+
     # Return true iff the axis is a time axis
     def isTime(self):
         id = self.id.strip().lower()
-        if (hasattr(self,'axis') and self.axis=='T'): return 1
+        if hasattr(self,'axis'):
+            if self.axis=='T': return 1
+            elif self.axis is not None: return 0
+        # Have we saved the id-to-axis type information already?
+        if id in self.idtaxis:
+            if self.idtaxis[id]=='T':
+                return 1
+            else:
+                return 0
         ## Try to figure it out from units
         try:
           import genutil
@@ -747,15 +759,23 @@ def isTime(self):
           if len(sp)>1:
             t=genutil.udunits(1,"day")
             s = sp[0].strip()
-            if s in t.available_units() and t.know_units()[s]=="TIME":
+            if s in t.available_units() and t.known_units()[s]=="TIME":
+              self.idtaxis[id] = 'T'
               return 1
             #try the plural version since udunits only as singular (day noy days)
             s=s+"s"
-            if s in t.available_units() and t.know_units()[s]=="TIME":
+            if s in t.available_units() and t.known_units()[s]=="TIME":
+              self.idtaxis[id] = 'T'
               return 1
         except:
           pass
-        return (id[0:4] == 'time') or (id in time_aliases)
+        #return (id[0:4] == 'time') or (id in time_aliases)
+        if (id[0:4] == 'time') or (id in time_aliases):
+            self.idtaxis[id]='T'
+            return 1
+        else:
+            self.idtaxis[id] = 'O'
+            return 0
 
     # Return true iff the axis is a forecast axis
     def isForecast(self):
@@ -896,6 +916,9 @@ def isCircularAxis(self):
     # (2) self.topology is undefined, and the axis is a longitude
     def isCircular(self):
 
+        if hasattr(self,'realtopology'):
+            if self.realtopology=='circular': return 1
+            elif self.realtopology=='linear': return 0
         if(len(self) < 2):
             return 0
 
@@ -918,6 +941,9 @@ def isCircular(self):
         else:
             iscircle = 0
 
+        # save realtopology attribute in __dict__, don't write it to the file
+        if iscircle==1:  self.__dict__['realtopology'] = 'circular'
+        elif iscircle==0: self.__dict__['realtopology'] = 'linear'
         return iscircle
 
     def designateCircular(self, modulo, persistent=0):
@@ -1947,6 +1973,7 @@ def getExplicitBounds(self):
                 try:
                     boundsVar = self.parent[boundsName]
                     boundsArray = numpy.ma.filled(boundsVar)
+                    self._boundsArray_ = boundsArray  # for climatology performance
                 except KeyError,err:
                     print err
                     boundsArray = None

Packages/cdms2/Lib/dataset.py

@@ -307,6 +307,9 @@ def openDataset(uri,mode='r',template=None,dods=1,dpath=None, hostObj=None):
                 if hasattr(file1, libcf.CF_FILETYPE):
                     if getattr(file1, libcf.CF_FILETYPE) == libcf.CF_GLATT_FILETYPE_HOST:
                         file = gsHost.open(path, mode)
+                    elif mode=='r' and hostObj is None:
+                        # helps performance on machines where file open (in CdmsFile) is costly
+                        file = file1
                     else:
                         file = CdmsFile(path, mode, hostObj = hostObj)
                     file1.close()

Packages/unidata/Lib/__init__.py

@@ -16,6 +16,6 @@
 modification, or enhancement.
 
 """
-from udunits import udunits,addBaseUnit,addDimensionlessUnit,addScaledUnit,\
-        addOffsettedUnit,addMultipliedUnits,addInvertedUnit,addDividedUnits
-udunits_init=0
+from udunits import udunits, addBaseUnit, addDimensionlessUnit, addScaledUnit  # noqa
+from udunits import addOffsettedUnit, addMultipliedUnits, addInvertedUnit, addDividedUnits  # noqa
+udunits_init = 0  # noqa