Changeset 1338 for TI02-CSML/trunk/Scanner/csmllibs/csmldataiface.py

Timestamp:

27/07/06 15:07:48 (15 years ago)

Author:

domlowe

Message:

Fix for greenwich meridian subsetting problem. Not extensively tested yet.

File:

• TI02-CSML/trunk/Scanner/csmllibs/csmldataiface.py (modified) (1 diff)

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

@@ -334 +334 @@
         #takes keyword args defining subset eg
         #subset=getSubsetOfDataForVar(latitude=(0.,10.0), longitude=(90, 100.0))
-        sel=cdms.selectors.Selector(**kwargs)
-        subset=self.file(self.varobj.name,sel)
-        #data = subset.getValue()
-        data = subset  #doesn't seem to matter which
+        for key in kwargs:
+            if key == 'longitude':
+                print key
+                if kwargs[key][0] > kwargs[key][1]:
+                    #subsetting greenwich meridian around 0
+                    lonMin = kwargs[key][0]
+                    lonMax =kwargs[key][1]
+                    kwargs[key]=(0.0, lonMax)
+                    sel=cdms.selectors.Selector(**kwargs)
+                    subset1=self.file(self.varobj.name,sel)
+                    kwargs[key]=(lonMin,359.9999)
+                    sel=cdms.selectors.Selector(**kwargs)
+                    subset2=self.file(self.varobj.name,sel)
+                    #concatenate arrays along longitude
+                    longitudeAxis=subset1.getAxisIndex('longitude') # this needs to be more robust test.
+                    subset = cdms.MV.concatenate([subset1,subset2],axis=longitudeAxis)
+                else:
+                    sel=cdms.selectors.Selector(**kwargs)
+                    subset=self.file(self.varobj.name,sel)
+        data = subset
         return data