Changeset 2206

Timestamp:

26/02/07 14:03:46 (14 years ago)

Author:

domlowe

Message:

nearest neighbour working for times, plus separation of subsetting into core functions and feature specific ones

Location:

TI02-CSML/trunk/csml

Files:

• API/__init__.py (modified) (1 diff)
• API/csmlutils.py (modified) (4 diffs)
• API/genSubset.py (modified) (4 diffs)
• API/ops_GridSeriesFeature.py (modified) (4 diffs)
• csmllibs/csmltime.py (modified) (1 diff)
• csmlprofilescan.py (copied) (copied from TI02-CSML/trunk/csml/csmlscan.py) (1 diff)
• csmlscan.py (modified) (1 diff)
• testfiles/apicalls.py (modified) (1 diff)
• testfiles/gridseries/testout.xml (deleted)

TI02-CSML/trunk/csml/API/__init__.py

@@ -51 +51 @@
 
 ##GridSeriesFeature methods:
-addMethods(csml.parser.GridSeriesFeature,[ops_GridFeature.testmethod,ops_GridSeriesFeature.getDomain,ops_GridSeriesFeature.subsetToGridSeries, ops_GridSeriesFeature.getUom])
+addMethods(csml.parser.GridSeriesFeature,[ops_GridFeature.testmethod,ops_GridSeriesFeature.getDomain,ops_GridSeriesFeature.subsetToGridSeries, ops_GridSeriesFeature.getUom, ops_GridSeriesFeature._subsetGrid])
 
 ##TrajectoryFeature methods:

TI02-CSML/trunk/csml/API/csmlutils.py

@@ -1 +1 @@
 '''csml utils contains useful  utility functions'''
-
+import csml
 
 def listify(item):
@@ -40 +40 @@
         rtMessage=""
         newValue=None
+                
+        def __fixTimes(value, axisValues):
+            newValue = csml.csmllibs.csmltime.getTimeAsValue(value)
+            newAxisValues=[]
+            for ax in axisValues:
+                newAxisValues.append(csml.csmllibs.csmltime.getTimeAsValue(ax))
+            return newValue, newAxisValues               
         
-        if value in axisValues:
+        if value in axisValues:
             newValue=value
-        else:
+        else:            
+            if str(value).find('T') != -1:
+                value, axisValues=__fixTimes(value,axisValues)
             sortedAxis=[]
             for i in axisValues:
                 sortedAxis.append(i)
-            sortedAxis.sort()
-            
+            sortedAxis.sort()   
             if value<sortedAxis[0]:
                 newValue=sortedAxis[0]
@@ -61 +69 @@
                             nextone=current
                             current=tempc
-                    
                         if value>current and value<nextone:
                             lowergap=value-current
@@ -74 +81 @@
             if newValue==None:
                 rtMessage="%s axis selected value '%s' nudged to nearest value in real axis '%s' ;" % (axisType, value, newValue)       
-                print rtMessage         
-                    
+        #        print rtMessage                
+        if type(newValue) is float:
+            if len(str(int(newValue))) ==14: # it's a time
+                print newValue
+                newValue=csml.csmllibs.csmltime.convertValueToCSML(newValue)   
         return (newValue)                            

TI02-CSML/trunk/csml/API/genSubset.py

@@ -8 +8 @@
 
 def checkNeighbours(domain, gridnames, **kwargs):
-    print domain
     #for any non-range requests, get nearest neighbour
     #e.g if 'latitude': (11) requested, latitude=12 may be the nearest value
@@ -106 +105 @@
         times=timeSelection
     
-   
-    #times=timeSelection
-    
-    print times
-    print len(times)
     if len(times)==0:
         #no time specified, select all.
@@ -176 +170 @@
             if filePos in filesFetched:
                 continue #already got data from this file, try next time
-            print selection             
             data, fillvalue, axisorder, units=comp.getData(fileposition=filePos, **selection)
             files.append(comp.fileList.fileNames.CONTENT[filePos]) #TODO, get the right file name
@@ -202 +195 @@
     crs=cat.getCRS(feature.value.gridSeriesDomain.srsName)
     timeName=crs.axes[crs.timeAxis]
-     #set the reference system for the time axis
+    #Find the original time name (timeAxis) for the file.
+    for gridOrd in feature.value.gridSeriesDomain.coordTransformTable.gridOrdinates:
+        if gridOrd.coordAxisLabel.CONTENT==timeName:
+            timeAxis = gridOrd.gridAxesSpanned.CONTENT  #only works for regular grids atm
+            break
+    #set the reference system for the time axis
     calunits, caltype=_setCalendar(feature, timeName)
     
     #selection by time - get explcit time values, not just a range mint, maxt
+    
     try:
-        timeSelection=kwargs[timeName]
+        timeSelection=kwargs[timeAxis]
     except KeyError:
         timeSelection=[]
+        
     times=_getTimes(timeSelection, timeName,domain)
     
     
-    return pathToSubsetNetCDF, kwargs, timeName, calunits, caltype, times
+    return pathToSubsetNetCDF, kwargs, timeAxis,timeName, calunits, caltype, times

TI02-CSML/trunk/csml/API/ops_GridSeriesFeature.py

@@ -44 +44 @@
         uom =None
     return uom
-       
-    
-def subsetToGridSeries(self, csmlpath=None, ncpath=None,**kwargs):
-       
+
+def _subsetGrid(self, csmlpath=None, ncpath=None,**kwargs):
+    '''this takes a selection from a gridseries object (be it a profile, a grid, whatever, it is still just a selection'''
+           
     #set self.domain:
     self.getDomain()      
@@ -53 +53 @@
     #if request doesn't match domain points find nearest neighbours
     kwargs=csml.API.genSubset.checkNeighbours(self.domain, self.gridnames, **kwargs)
-    
     #get the CRS from a  the  catalogue
     cat=csml.csmllibs.csmlcrs.CRSCatalogue()
@@ -59 +58 @@
     
     #non-feature specific setup code, mainly handles the time dimension/calendar
-    pathToSubsetNetCDF, kwargs, timeName, calunits, caltype, times=csml.API.genSubset.genericSubset(self, csmlpath, ncpath, self.domain, kwargs)
+    pathToSubsetNetCDF, kwargs, timeAxis, timeName,calunits, caltype, times=csml.API.genSubset.genericSubset(self, csmlpath, ncpath, self.domain, kwargs)
       
-    #Find the original time name (timeAxis) for the file.
-    for gridOrd in self.value.gridSeriesDomain.coordTransformTable.gridOrdinates:
-        if gridOrd.coordAxisLabel.CONTENT==timeName:
-            timeAxis = gridOrd.gridAxesSpanned.CONTENT  #only works for regular grids atm
-        else: 
-            print 'crs not supported'
- 
     ##Get names of variables in file and relate them to the subset selection 
     selection={}
@@ -76 +68 @@
             allValues=tuple(self.domain[gridOrd.coordAxisLabel.CONTENT])
     strTimes, axisorder, units, fulldata, fillvalue =csml.API.genSubset.getTheData(self, selection, times, timeName)
+    return pathToSubsetNetCDF, crs, timeName, times, strTimes, calunits, caltype, axisorder,units, fulldata, fillvalue, kwargs
     
+def subsetToGridSeries(self, csmlpath=None, ncpath=None,**kwargs):
+    #perform the subset (note this included nearest neighbour searching, so may return a different set of kwargs
+    pathToSubsetNetCDF, crs, timeName, times, strTimes, calunits, caltype, axisorder,units, fulldata, fillvalue, kwargs=self._subsetGrid(csmlpath, ncpath,**kwargs) 
     
     #Okay, got the data now. Need to write CSML feature and NetCDF files.

TI02-CSML/trunk/csml/csmllibs/csmltime.py

@@ -66 +66 @@
                 timeok = 1
     return timeok
+
+def getTimeAsValue(time):
+    year=int(time.split('-')[0])
+    month=int(time.split('-')[1])
+    day=int(time.split('-')[2].split('T')[0])
+    hour=int(time.split('-')[2].split('T')[1].split(':')[0])
+    minute=int(time.split('-')[2].split('T')[1].split(':')[1])
+    second=float(time.split('-')[2].split('T')[1].split(':')[2])
+    return (10000000000*year+100000000*month + (1000000 * day) + (10000*hour) + (100*minute) + second)
+
+def convertValueToCSML(t):
+    #this may need to be more robust
+    csmlt='%s-%s-%sT%s:%s:%s.%s'%(int(t/10000000000),str(int(t/100000000))[-2:],str(int(t/1000000))[-2:]
+,str(int(t/10000))[-2:],str(int(t/100))[-2:],str(int(t))[-2:],0)
+    return csmlt
+
 
 def getCDtime(time): 

TI02-CSML/trunk/csml/csmlprofilescan.py

@@ -195 +195 @@
 
 if __name__=='__main__':
-    #print 'profiling..'
+    print 'profiling..'
     #profile.run('main()')
-    main()
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+    profile.run('import csml')
+    subdir='/home/dom/Desktop/SVN/trunk/csml/chilbolton/'
+    f=[]
+    for item in os.listdir(subdir):
+        name=os.path.join(subdir,item)
+        if os.path.isfile(name):
+            if name[-3:]=='.nc':
+                f.append(name)
+    profile.run("csml.csmllibs.csmltime.getFileTimeList(f,'time')")
+    
+    
+    #main()
+
+
+
+
+
+
+
+
+
+
+
+
+
+

TI02-CSML/trunk/csml/csmlscan.py

@@ -194 +194 @@
 
 
-if __name__=='__main__':
-    #print 'profiling..'
-    #profile.run('main()')
+if __name__=='__main__':    
     main()
 

TI02-CSML/trunk/csml/testfiles/apicalls.py

@@ -38 +38 @@
 #define a selection (based on the domain)
 subsetDictionary={}
-subsetDictionary['t']=('2794-12-1T0:0:0.0', '2813-12-1T0:0:0.0')
-subsetDictionary['latitude']=(-90,90)
+subsetDictionary['t']=('2794-12-1T0:0:0.0','2795-12-1T0:0:0.0')
+#subsetDictionary['t']=()
+subsetDictionary['latitude']=(-90,60)
 subsetDictionary['longitude']=(-31.265,30.258)
 #request subsetted data from features (can set paths here) and add to container