Changeset 2091 for TI02-CSML

Timestamp:

01/02/07 10:43:07 (14 years ago)

Author:

domlowe

Message:

making coordinate reference systems and netcdf output CF compliant

Location:

TI02-CSML/trunk/csml

Files:

• API/genSubset.py (modified) (3 diffs)
• API/ops_GridSeriesFeature.py (modified) (3 diffs)
• csmllibs/csmlcrs.py (modified) (4 diffs)

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

@@ -6 +6 @@
 
 
-def _subsetDomain(time,times, domain,**kwargs):
+def _subsetDomain(timeaxis,times, domain,**kwargs):
     '''takes the domain and returns a subset according to the keyword selection criteria
     time = name of time dimension
@@ -17 +17 @@
         straxisValues=''
         if key in kwargs:
-            if key ==time:
+            if key ==timeaxis:
                 straxisValues=strTimes
                 arraySize=len(strTimes.split())
@@ -44 +44 @@
                                    
         subsetDomain[key]=straxisValues
-        if key != time:
+        if key != timeaxis:
             arraySize=len(subsetDomain[key].split(','))
         else:

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

@@ -136 +136 @@
         time=csml.API.ops_AbstractFeature.__getCDtime(time).torel(calunits)
         floatTimes.append(time.value)
-    nc.addAxis('t',floatTimes,isTime=1,units=calunits,calendar=caltype)
+    nc.addAxis('time',floatTimes,isTime=1,units=calunits,calendar=caltype)
+    
     for ord in ords:
-        print ord.coordAxisLabel.CONTENT
         vals=[]
         lon,lat=None,None
-        if ord.coordAxisLabel.CONTENT=='Time':
+        if ord.coordAxisLabel.CONTENT=='time':
             continue
         else:
@@ -147 +147 @@
                 if val != ' ':
                     vals.append(float(val))  
-                    print vals
-        if ord.coordAxisLabel.CONTENT=='Lon':
+        if ord.coordAxisLabel.CONTENT=='longitude':
             lon=1
             name='longitude'
-        elif ord.coordAxisLabel.CONTENT=='Lat':
+        elif ord.coordAxisLabel.CONTENT=='latitude':
             lat=1
             name='latitude'
@@ -159 +158 @@
         nc.addAxis(name,vals,isLon=lon,isLat=lat,units='')#to do, units attribute for CF compliance
     if len(ords)==3:
-        axes=['t',axisorder[1],axisorder[2]]
+        axes=['time',axisorder[1],axisorder[2]]
     elif len(ords)==2:
-        axes=['t',axisorder[1]]
-    #print fulldata
-    print axes
+        axes=['time',axisorder[1]]
     nc.addVariable(fulldata,self.id, axes,units='') #to do, units attribute for CF compliance
-    print 'added'
     nc.closeFinishedFile()
     return subsettedFeature, pathToSubsetNetCDF

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

@@ -21 +21 @@
         
         # define lon lat pressure time CRS:        
-        crs=CRSystem(srsName='ndg:crs:xypt', axes =['Lon', 'Lat','Pressure','Time'])
+        crs=CRSystem(srsName='ndg:crs:xypt', axes =['longitude', 'latitude','pressure','time'])
         crs.lonAxis=0
         crs.latAxis=1
@@ -28 +28 @@
         
         # define lon lat height time CRS:        
-        crs=CRSystem(srsName='ndg:crs:xyht', axes =['Lon', 'Lat','Height','Time'])
+        crs=CRSystem(srsName='ndg:crs:xyht', axes =['longitude', 'latitude','height','time'])
         crs.lonAxis=0
         crs.latAxis=1
@@ -35 +35 @@
         
         # define lon lat time CRS:
-        crs=CRSystem(srsName='ndg:crs:xyt', axes =['Lon', 'Lat','Time'])
+        crs=CRSystem(srsName='ndg:crs:xyt', axes =['longitude', 'latitude','time'])
         self.systems['ndg:crs:xyt']=crs
         crs.lonAxis=0
@@ -86 +86 @@
             unittype='unknown'
             if string.lower(unit) in ['second', 'seconds', 's', 'mins','minute','minutes','hour','hours','h','hr','hrs','day','days']:
-                unittype='Time'
+                unittype='time'
             elif string.lower(unit)[:10] in ['days since', 'seconds si', 'minutes si', 'hours sinc','months sin', 'years sinc']:
-                unittype='Time'
+                unittype='time'
             elif string.lower(unit) in ['mbar', 'pa','level']:
-                unittype='Pressure'
+                unittype='pressure'
             elif string.lower(unit) in ['m', 'km']:
-                unittype='Height'
+                unittype='height'
             elif string.lower(unit) in ['degrees_north', 'degrees_south']:
-                unittype='Lat'
+                unittype='latitude'
             elif string.lower(unit) in ['degrees_east','degrees_west']:
-                unittype='Lon'
+                unittype='longitude'
             crsMap.append(unittype)