Changeset 1330

Timestamp:

26/07/06 15:00:36 (15 years ago)

Author:

domlowe

Message:

changes to allow subsetting across greenwich meridian. Not fully working yet due to cdms problem

Location:

TI02-CSML/trunk/parser

Files:

• API/ops_GridSeriesFeature.py (modified) (2 diffs)
• apicalls.py (modified) (2 diffs)

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

@@ -119 +119 @@
         straxisValues=''
         if key in kwargs:
-            for val in dc[key]:
-                if val >= kwargs[key][0]:
-                    if val <= kwargs[key] [1]:
-                        arraySize=arraySize+1
-                        straxisValues=straxisValues+ str(val) + ', '
-        else: # this dimension has not been subsetted
+            if kwargs[key][0] < kwargs[key][1]:   
+                for val in dc[key]:
+                    if val >= kwargs[key][0]:
+                        if val <= kwargs[key] [1]:
+                            arraySize=arraySize+1
+                            straxisValues=straxisValues+ str(val) + ', '
+            else:#this if deals with selections such as longitude (330,30)
+                    for val in dc[key]:
+                        if val >= kwargs[key][0]:
+                            arraySize=arraySize+1
+                            straxisValues=straxisValues+ str(val) + ', '
+                    for val in dc[key]:
+                        if val <= kwargs[key] [1]:
+                            arraySize=arraySize+1
+                            straxisValues=straxisValues+ str(val) + ', '
+        else: # this dimension has not been subsetted at all
             for val in dc[key]:
                 arraySize=arraySize+1
@@ -180 +190 @@
     elif len(grid.ordinates)==2:
         feature_var =ncfile.createVariable (self.id, Float,('t',axisorder[1],axisorder[2]))
+    print feature_var.shape
+    print shape(fulldata)
     feature_var[:]=fulldata[:]
     ncfile.close()

TI02-CSML/trunk/parser/apicalls.py

@@ -29 +29 @@
 #get the domain complement of the feature
 print '\n The feature has domain complement :' 
-#print feature.getDomainComplement()
+print feature.getDomainComplement()
 
 #get combined domain
@@ -45 +45 @@
 
 spatialSubsetDictionary= {}
-spatialSubsetDictionary['latitude']=(-0,30.0)
-spatialSubsetDictionary['longitude']=(90, 120.0)
+spatialSubsetDictionary['latitude']=(-90,90)
+spatialSubsetDictionary['longitude']=(330,340)
 
 #request subsetted data from feature (can set paths here)