Changeset 1740

Timestamp:

Aug 23, 2005, 2:42:43 PM (19 years ago)

Author:

ole

Message:

Recovered data_manager as it was on 18 Aug and test_data_manager as it was on 16 Aug

Location:

inundation/pyvolution

Files:

• data_manager.py (modified) (7 diffs)
• test_data_manager.py (modified) (1 diff)

inundation/pyvolution/data_manager.py

@@ -358 +358 @@
         from os import stat
 
+        minimum_allowed_depth = 0.001
+        #minimum_allowed_depth = 0.0  #FIXME pass in or read from domain
+        from Numeric import choose
 
         #Get NetCDF
@@ -449 +452 @@
                 # Get quantity
                 Q = domain.quantities[name]
-                A,V = Q.get_vertex_values(xy=False,
-                                      precision = self.precision)
+                A,V = Q.get_vertex_values(xy = False,
+                                          precision = self.precision)
 
                 #FIXME: Make this general (see below)
                 if name == 'stage':
+                    z = fid.variables['elevation']
+                    #print z[:]
+                    #print A-z[:]
+                    A = choose( A-z[:] >= minimum_allowed_depth, (z[:], A))
                     stage[i,:] = A.astype(self.precision)
                 elif name == 'xmomentum':
@@ -932 +939 @@
             #easting_min=None, easting_max=None,
             #northing_min=None, northing_max=None,
+            stride = 1,           
             attribute_name = 'elevation',
             z_func = None):
@@ -970 +978 @@
     attribute = []
     for i, line in enumerate(infile.readlines()):
+
+        if i % stride != 0: continue
+        
         fields = line.split()
 
@@ -1055 +1066 @@
     import os
     from Scientific.IO.NetCDF import NetCDFFile
-    from Numeric import Float, zeros
+    from Numeric import Float, zeros, reshape
 
     root = basename_in
@@ -1138 +1149 @@
     elevation = outfile.variables['elevation']
 
+    dem_elevation_r = reshape(dem_elevation, (nrows, ncols))
+
     #Store data
     #FIXME: Could perhaps be faster using array operations (Fixed 27/7/05)
@@ -1155 +1168 @@
                northing_min <= y <= northing_max:
                 tpoints[local_index, :] = [x-easting_min,y-northing_min]
-                telev[local_index] = dem_elevation[i, j]
+                telev[local_index] = dem_elevation_r[i, j]
                 global_index += 1
                 local_index += 1

inundation/pyvolution/test_data_manager.py

@@ -2000 +2000 @@
 #-------------------------------------------------------------
 if __name__ == "__main__":
-    #suite = unittest.makeSuite(Test_Data_Manager,'test')
+    suite = unittest.makeSuite(Test_Data_Manager,'test')
     #suite = unittest.makeSuite(Test_Data_Manager,'test_dem2pts_bounding_box')
     #suite = unittest.makeSuite(Test_Data_Manager,'test_decimate_dem')
-    suite = unittest.makeSuite(Test_Data_Manager,'test_decimate_dem_NODATA')
+    #suite = unittest.makeSuite(Test_Data_Manager,'test_decimate_dem_NODATA')
     runner = unittest.TextTestRunner()
     runner.run(suite)