Changeset 2220

Timestamp:

01/03/07 09:38:51 (14 years ago)

Author:

domlowe

Message:

workaround for masked array bug

Location:

TI02-CSML/trunk/csml/API

Files:

• genSubset.py (modified) (1 diff)
• ops_FileExtract.py (modified) (3 diffs)
• ops_GridSeriesFeature.py (modified) (2 diffs)

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

@@ -214 +214 @@
         timeSelection=[]
         
-    times=_getTimes(timeSelection, timeName,domain)
-    
+    times=_getTimes(timeSelection, timeName,domain)    
     
     return pathToSubsetNetCDF, kwargs, timeAxis,timeName, calunits, caltype, times

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

@@ -3 +3 @@
 import sys
 import Numeric
+import MA
 
 
@@ -14 +15 @@
     
     def setup(self):
-        self.dataArray=Numeric.array(self.data)
-        
-        #try: 
-            #self.dataArray=self.data.tolist()
-        #except:
-            #self.dataArray=self.data
+        #print self.data
+        #print type(self.data)
+        #self.dataArray=Numeric.array(self.data)
+        try: 
+            self.dataArray=Numeric.array(self.data)
+        except MA.MA.MAError:
+            self.dataArray=self.data.tolist()
+            self.dataArray=Numeric.array(self.dataArray)
       
-
+        print 
         
 def testmethod(self):
@@ -34 +37 @@
     #file position defines the position of the filename if a list of filenames exists
     #**kwargs can hold subsetting request.
-    #print fileposition
-    #print self.fileName
-    
     #get the right file  ##TO DO< check this is ok with FILE LIST
     if fileposition is not None:

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

@@ -97 +97 @@
     subsettedFeature=csmlWrap.createGridSeriesFeature(value=cvg,parameter=param,featureID=self.id,description=self.description)
  
-    
     ### write netcdf using NCWriter class (wraps cdms) ###
     nc=csml.csmllibs.netCDFWriter.NCwriter(pathToSubsetNetCDF)
@@ -106 +105 @@
     nc.genWriteVar(self.id,ords, times, calunits, caltype, axislist, units, fulldata, fillvalue)
     nc.closeFinishedFile()
-    
+    print 'NetCDF file written to %s'%pathToSubsetNetCDF
     return subsettedFeature, pathToSubsetNetCDF