Changeset 2488

Timestamp:

Mar 7, 2006, 10:44:45 AM (19 years ago)

Author:

jack

Message:

Fixed assertion failures in read_ASCII and read_NetCDF due to
typechecking not taking care of single element arrays correctly.

File:

• inundation/coordinate_transforms/geo_reference.py (modified) (2 diffs)

inundation/coordinate_transforms/geo_reference.py

@@ -75 +75 @@
         self.zone = infile.zone[0]
 
-        
+        # Fix some assertion failures
+        if type(self.zone) == ArrayType and self.zone.shape == ():
+            self.zone = self.zone[0]
+        if type(self.xllcorner) == ArrayType and self.xllcorner.shape == ():
+            self.xllcorner = self.xllcorner[0]
+        if type(self.yllcorner) == ArrayType and self.yllcorner.shape == ():
+            self.yllcorner = self.yllcorner[0]
+
         assert (type(self.xllcorner) == types.FloatType or\
                 type(self.xllcorner) == types.IntType)
@@ -102 +109 @@
         self.yllcorner = float(fd.readline())
             
-        
+        # Fix some assertion failures
+        if(type(self.zone) == ArrayType and self.zone.shape == ()):
+            self.zone = self.zone[0]
+        if type(self.xllcorner) == ArrayType and self.xllcorner.shape == ():
+            self.xllcorner = self.xllcorner[0]
+        if type(self.yllcorner) == ArrayType and self.yllcorner.shape == ():
+            self.yllcorner = self.yllcorner[0]
+    
         assert (type(self.xllcorner) == types.FloatType)
         assert (type(self.yllcorner) == types.FloatType)