Changeset 1884 for inundation/pyvolution/util.py

Timestamp:

Oct 10, 2005, 11:41:26 AM (18 years ago)

Author:

ole

Message:

Made interpolation_points in file_function absolute UTM coordinates and wrote test

File:

• inundation/pyvolution/util.py (modified) (5 diffs)

inundation/pyvolution/util.py

@@ -155 +155 @@
     All times are assumed to be in UTC
 
-    All spatial information is assumed to be in UTM coordinates.
+    All spatial information is assumed to be in absolute UTM coordinates.
 
     See Interpolation function for further documentation
@@ -170 +170 @@
     #- domain's georef
     #- sww file's georef
-    #- interpolation points georef
+    #- interpolation points as absolute UTM coordinates
 
 
@@ -228 +228 @@
     from config import time_format
     from Scientific.IO.NetCDF import NetCDFFile
-    from Numeric import array, zeros, Float, alltrue, concatenate, reshape        
+    from Numeric import array, zeros, Float, alltrue, concatenate, reshape
+    from util import ensure_numeric    
 
     #Open NetCDF file
@@ -251 +252 @@
 
 
+    if interpolation_points is not None:
+        interpolation_points = ensure_numeric(interpolation_points)
+
+
+
     #Now assert that requested quantitites (and the independent ones)
     #are present in file 
@@ -302 +308 @@
         y = reshape(y, (len(y),1))
         vertex_coordinates = concatenate((x,y), axis=1) #m x 2 array
+
+        if interpolation_points is not None:
+            #Adjust for georef
+            interpolation_points[:,0] -= xllcorner
+            interpolation_points[:,1] -= yllcorner        
+        
+