Changeset 886

Timestamp:

Feb 15, 2005, 10:42:52 AM (20 years ago)

Author:

ole

Message:

Fixed similar problem with platform dependency on the shape of NetCDF arrays

Location:

inundation/ga/storm_surge/pyvolution

Files:

• test_util.py (modified) (2 diffs)
• util.py (modified) (2 diffs)

inundation/ga/storm_surge/pyvolution/test_util.py

@@ -390 +390 @@
         fid = NetCDFFile(filename)  
 
-        x = fid.variables['x']
-        y = fid.variables['y']        
-        stage = fid.variables['stage']
-        xmomentum = fid.variables['xmomentum']
-        ymomentum = fid.variables['ymomentum']
-        time = fid.variables['time']
+        x = fid.variables['x'][:]
+        y = fid.variables['y'][:]        
+        stage = fid.variables['stage'][:]
+        xmomentum = fid.variables['xmomentum'][:]
+        ymomentum = fid.variables['ymomentum'][:]
+        time = fid.variables['time'][:]
 
         #Take stage vertex values at last timestep on diagonal
@@ -413 +413 @@
 
         #And the midpoints are found now
-        Dx = take(x, [0,5,10,15])
-        Dy = take(y, [0,5,10,15])                
+        Dx = take(reshape(x, (16,1)), [0,5,10,15])
+        Dy = take(reshape(y, (16,1)), [0,5,10,15])                
 
         diag = concatenate( (Dx, Dy), axis=1)
         d_midpoints = (diag[1:] + diag[:-1])/2
-        
+
         #Let us see if the file function can find the correct
         #values at the midpoints at the last timestep:

inundation/ga/storm_surge/pyvolution/util.py

@@ -2 +2 @@
 
 It is also a clearing house for function tat may later earn a module
-of their own.
+of their own. 
 """
 
@@ -245 +245 @@
             y = reshape(y, (len(y),1))                
             vertex_coordinates = concatenate((x,y), axis=1) #m x 2 array
-                
+
             interpol = Interpolation(vertex_coordinates, 
                                      triangles,