Changeset 2304 for TI02-CSML/trunk

Timestamp:

21/03/07 11:44:38 (14 years ago)

Author:

domlowe

Message:

subsettign gridseries to pointseries code

Location:

TI02-CSML/trunk/csml

Files:

• API/__init__.py (modified) (1 diff)
• API/ops_GridSeriesFeature.py (modified) (1 diff)
• API/ops_ProfileSeriesFeature.py (modified) (4 diffs)
• csmllibs/csmldataiface.py (modified) (1 diff)
• csmllibs/netCDFWriter.py (modified) (3 diffs)

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, ops_GridSeriesFeature._subsetGrid,ops_GridSeriesFeature.subsetToProfileSeries, ops_GridSeriesFeature.subsetToProfile])
+addMethods(csml.parser.GridSeriesFeature,[ops_GridFeature.testmethod,ops_GridSeriesFeature.getDomain,ops_GridSeriesFeature.subsetToGridSeries, ops_GridSeriesFeature.getUom, ops_GridSeriesFeature._subsetGrid,ops_GridSeriesFeature.subsetToProfileSeries, ops_GridSeriesFeature.subsetToProfile,ops_GridSeriesFeature.subsetToPointSeries])
 
 ##TrajectoryFeature methods:

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

@@ -195 +195 @@
     subsettedFeature, pathToSubsetNetCDF=profileSeries.subsetToProfile(csmlpath=csmlpath, ncpath=ncpath, **kwargs)    
     return subsettedFeature, pathToSubsetNetCDF
+
+def subsetToPointSeries(self, csmlpath=None, ncpath=None,**kwargs):
+    #Two step process - subset GridSeries to ProfileSeries, then ProfileSeries to PointSeries
+    profileSeries, pSfile=self.subsetToProfileSeries(csmlpath=csmlpath, ncpath=ncpath, **kwargs)   
+    del kwargs['latitude']    #TODO - need to remove excess kwargs based on the domain of the temporary profileSeries feature
+    del kwargs['longitude']
+    subsettedFeature, pathToSubsetNetCDF=profileSeries.subsetToProfile(csmlpath=csmlpath, ncpath=ncpath, **kwargs)    
+    return subsettedFeature, pathToSubsetNetCDF

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

@@ -25 +25 @@
                     valList.append(val)
                 self.domain[name]=valList
+
         #handle other axes , eg pressure levels, but ignore location
         #TODO should use lonAxis at latAxis from CRS rather than latitude, longitude.
@@ -35 +36 @@
                     valList=[]
                     for val in vals.split():  
-                        valList.append(val)
+                        valList.append(float(val))
                     self.domain[name]=valList
     return self.domain
@@ -68 +69 @@
             
 def subsetToProfile(self, csmlpath=None, ncpath=None,**kwargs):
+    #perform the subset 
+    pathToSubsetNetCDF, crs, timeName, times, strTimes, calunits, caltype, axisorder,units, fulldata, fillvalue, kwargs=self._subsetProfileSeries(csmlpath, ncpath,**kwargs) 
+    
+    (time, lat, lon)=(crs.axes[crs.timeAxis],crs.axes[crs.latAxis], crs.axes[crs.lonAxis])
+    
+    for axis in axisorder:
+        if axis not in [time, lat, lon]:
+            #this should be the 'profile' axis
+            if len(self.domain[axis]) ==1:
+                prof=self.domain[axis][0]
+            else:
+                prof=self.domain[axis]
+           
+            profName=axis
+    
+    
+    #Okay, got the data now. Need to write CSML feature and NetCDF files.
+    #Writing out the CSML feature
+    # define domain/coverage  to use in 'value' attribute   
+    
+    newdomain=csml.parser.csString(prof)
+    
+    rangeSet=csml.parser.RangeSet()
+    #rangeSet.arrayDescriptor=csml.parser.NetCDFExtract(id=self.id,fileName=csml.parser.csString(pathToSubsetNetCDF),variableName=csml.parser.csString(self.id),arraySize=csml.parser.csString(totalArraySize))
+    
+    #gridseries coverage
+    cvg=csml.parser.ProfileSeriesCoverage()
+    cvg.rangeSet=rangeSet
+    cvg.profileSeriesDomain=newdomain    
+    
+    #parameter, as before subsetting.
+    param = self.parameter
+        
+    #create 'location' attribute:
+    loc=self.location  #locataion attribute of profile is same as that of parent profileseries
+    
+    #create 'time' attribute
+    tName=crs.axes[crs.timeAxis]
+    try:
+        t=kwargs[tName]
+    except:
+        t=csml.parser.csString('unknown')
+               
+    #create a stand alone profile feature containing this coverage
+    csmlWrap=csml.csmllibs.csmlfeaturewrap.CSMLWrapper()
+    subsettedFeature=csmlWrap.createProfileFeature(value=cvg,parameter=param,location=loc, time=t, featureID=self.id,description=self.description)
+ 
+    ### write netcdf using NCWriter class (wraps cdms) ### 
+    nc=csml.csmllibs.netCDFWriter.NCwriter(pathToSubsetNetCDF)
+    axislist=[]
+    for a in axisorder:
+        if self.gridnames.has_key(a):
+            axislist.append(self.gridnames[a])
+        else:
+            axislist.append(a)
+    ords=None  
+    #need to pass in all dimensions except time as the kwargs..
+    otherdims={}
+    otherdims[profName]=prof
+    otherdims['latitude']=float(loc.CONTENT.split()[0])
+    otherdims['longitude']=float(loc.CONTENT.split()[1])
+    nc.genWriteVar(self.id,ords, times, calunits, caltype, axislist, units, fulldata, fillvalue, **otherdims)
+    nc.closeFinishedFile()
+    print 'NetCDF file written to %s'%pathToSubsetNetCDF
+    return subsettedFeature, pathToSubsetNetCDF
+
+
+def subsetToPointSeries(self, csmlpath=None, ncpath=None,**kwargs):
     #perform the subset 
     pathToSubsetNetCDF, crs, timeName, times, strTimes, calunits, caltype, axisorder,units, fulldata, fillvalue, kwargs=self._subsetProfileSeries(csmlpath, ncpath,**kwargs) 
@@ -123 +192 @@
     print 'NetCDF file written to %s'%pathToSubsetNetCDF
     return subsettedFeature, pathToSubsetNetCDF
+

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

@@ -432 +432 @@
         print kwargs
         
-        
         #takes keyword args defining subset eg
         #subset=getSubsetOfDataForVar(latitude=(0.,10.0), longitude=(90, 100.0))

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

@@ -53 +53 @@
 
     def genWriteVar(self,varid, ordinates, times, calunits, caltype, axisorder, unitlist, fulldata, fillvalue, **kwargs):
-        #**kwargs may contain additional axes not contained in a GridCoordinatesTable - e.g latitude, longitude may be stored in other attribute not in the rectified grid.
-        
+        #**kwargs may contain additional axes not contained in a GridCoordinatesTable - e.g latitude, longitude may be stored in other attribute not in the rectified grid.     
         axesdone=[]
         
@@ -88 +87 @@
         
         if kwargs is not None:
+            print 'handling extra'          
             for kw in kwargs:
                 lon,lat=None,None
                 if kw=='longitude':
                     lon=1
-                    name='longitude'
                 elif kw == 'latitude':
                     lat=1
-                    name = 'latitude'
+                name = kw
                 for ax in enumerate(axisorder):
                     if ax[1]==name:
@@ -101 +100 @@
                 vals=(kwargs[kw],)
                 self.addAxis(name,vals,isLon=lon,isLat=lat,units=unitlist[position])
+                axesdone.append(name)
+            
+        print 'Axesdone:'
+        print axesdone
+                
         self.addVariable(fulldata,varid, axisorder, fillvalue, units=unitlist[-1] ) #to do, units attribute for CF compliance