Changeset 2275 for TI02-CSML/trunk/csml/API

Timestamp:

14/03/07 15:43:59 (13 years ago)

Author:

domlowe

Message:

unravelled grid/axis name confusion

Location:

TI02-CSML/trunk/csml/API

Files:

• genSubset.py (modified) (7 diffs)
• ops_FileExtract.py (modified) (1 diff)

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

@@ -10 +10 @@
     #for any non-range requests, get nearest neighbour
     #e.g if 'latitude': (11) requested, latitude=12 may be the nearest value
+    print 'DOMAIN'
+    print domain
+    print 'GRIDNAMES'
+    print gridnames
+    print 'KWARGS'
+    print kwargs
+    #think this has got muddled.. 
+    
     for key in kwargs:
+    #need to skip time axis
         #handle single values
         if type(kwargs[key]) is not tuple:
-            if type(domain[gridnames[key]]) is not list:
-                axeslist=domain[gridnames[key]].tolist()
+            if type(domain[Key]) is not list:
+                axeslist=domain[Key].tolist()
             else:
-                axeslist = domain[gridnames[key]]
+                axeslist = domain[key]
             nearestNeighbour=csml.API.csmlutils.nudgeSingleValuesToAxisValues(kwargs[key],axeslist)
             if nearestNeighbour is not None:
@@ -24 +33 @@
             tmpkey=[]
             for val in kwargs[key]:
-                nearestNeighbour=csml.API.csmlutils.nudgeSingleValuesToAxisValues(val, domain[gridnames[key]])
+                nearestNeighbour=csml.API.csmlutils.nudgeSingleValuesToAxisValues(val, domain[key])
                 if nearestNeighbour is not None:
                     tmpkey.append(nearestNeighbour)   
@@ -39 +48 @@
     totalArraySize=1
     for key in domain.keys():
-        print key
         straxisValues=''
         if key in kwargs:
@@ -155 +163 @@
 
 def getTheData(feature, selection, times,timeName):
+    print selection
+    print times
+    print timeName
+    
     #SOME OF THIS SHOULD PROBABLY BE IN THE DATA IO LAYER
     domain = feature.domain
@@ -163 +175 @@
     #get the ratio of times to files
     timeToFileRatio = _getTimeToFileRatio(feature, domain, timeName)
-    print selection
             
     #list to keep track of files that have already been fetched. eg. if multiple times are in a single file only need to get data from that file once...
@@ -173 +184 @@
             filePos=int(float(listPosition)/timeToFileRatio)
             if filePos in filesFetched:
-                continue #already got data from this file, try next time
+                continue #already got data from this file, try next time          
             data, fillvalue, axisorder, units=comp.getData(fileposition=filePos, **selection)
             files.append(comp.fileList.fileNames.CONTENT[filePos]) #TODO, get the right file name
@@ -212 +223 @@
     calunits, caltype=_setCalendar(feature, timeName, gridordinates)
     
-    #selection by time - get explcit time values, not just a range mint, maxt
-    
     try:
-        timeSelection=kwargs[timeAxis]
+        timeSelection=kwargs[timeName]
     except KeyError:
         timeSelection=[]
-        
+    
     times=_getTimes(timeSelection, timeName,domain)    
-    
     return pathToSubsetNetCDF, kwargs, timeAxis,timeName, calunits, caltype, times

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

@@ -33 +33 @@
     #**kwargs can hold subsetting request.
     #get the right file  ##TO DO< check this is ok with FILE LIST
+       
+    # TODO - cannot subset times within an individual file - no way to determine the original time crs..
+    
     if fileposition is not None:
         file =self.fileList.fileNames.CONTENT.split()[fileposition]