Changeset 2084

Timestamp:

31/01/07 15:34:45 (14 years ago)

Author:

domlowe

Message:

more restructuring of subsetting code

File:

• TI02-CSML/trunk/csml/API/ops_GridSeriesFeature.py (modified) (2 diffs)

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

@@ -39 +39 @@
     self.getDomain()
     
-    #non-feature specific setup code:
+    #get the CRS from a  the  catalogue
+    cat=csml.csmllibs.csmlcrs.CRSCatalogue()
+    crs=cat.getCRS(self.value.gridSeriesDomain.srsName)  
+    
+    #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)
       
@@ -49 +53 @@
             print 'crs not supported'
               
+
+   #get the ratio of times to files
+    timeToFileRatio = csml.API.genSubset._getTimeToFileRatio(self, self.domain, timeName)
+        
+            
+    #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...
+    filesFetched=[]
+        
+    ##Get names of variables in file and relate them to the subset selection 
+    selection={}
+    for gridOrd in self.value.gridSeriesDomain.coordTransformTable.gridOrdinates:
+        selection[gridOrd.gridAxesSpanned.CONTENT]=kwargs[gridOrd.coordAxisLabel.CONTENT]
     
-              
-              
+    
     self.files=[]
     strTimes=''
     fulldata=[]
-   
-    timeToFileRatio = csml.API.genSubset._getTimeToFileRatio(self, self.domain, timeName)
-        
     
-            
-    #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...
-    filesFetched=[]
-    #get data:
-    selection={}
     
-    #Get names of variables in file
-    cat=csml.csmllibs.csmlcrs.CRSCatalogue()
-    crs=cat.getCRS(self.value.gridSeriesDomain.srsName)  
-    
-    for gridOrd in self.value.gridSeriesDomain.coordTransformTable.gridOrdinates:
-        selection[gridOrd.gridAxesSpanned.CONTENT]=kwargs[gridOrd.coordAxisLabel.CONTENT]
-    
-                    
     for time in times:
         listPosition=self.domain[timeName].index(time)