Changeset 628

Timestamp:

Nov 24, 2004, 6:03:56 PM (19 years ago)

Author:

duncan

Message:

name change

Location:

inundation/ga/storm_surge/pyvolution

Files:

• interpolate_sww.py (modified) (5 diffs)
• test_interpolate_sww.py (modified) (2 diffs)

inundation/ga/storm_surge/pyvolution/interpolate_sww.py

@@ -78 +78 @@
         point_stage =  self.interp.interpolate( self.stage)
         point_bed_elevation = self.interp.interpolate( self.bed_elevation)
-        self.point_heights = transpose(transpose(point_stage) - point_bed_elevation)
+        self.depth = transpose(transpose(point_stage) - point_bed_elevation)
         
-        #print "self.point_heights", self.point_heights
+        #print "self.depth", self.depth
         
     def read_sww(self,file_name):
@@ -138 +138 @@
 
 
-    def write_point_heights_xya(self,point_file, delimiter = ','):
+    def write_depth_xya(self,point_file, delimiter = ','):
         """
         pre condition:
@@ -162 +162 @@
         xya_dict = {}
         xya_dict['pointlist'] = self.point_coordinates
-        xya_dict['pointattributelist'] = self.point_heights
+        xya_dict['pointattributelist'] = self.depth
         
         export_xya_file(point_file, xya_dict, title, delimiter = delimiter)
@@ -172 +172 @@
     """
     import os, sys
-    usage = "usage: %s pyvolution_results.sww points.xya point_heights.xya" %         os.path.basename(sys.argv[0])
+    usage = "usage: %s pyvolution_results.sww points.xya depth.xya" %         os.path.basename(sys.argv[0])
 
     if len(sys.argv) < 4:
@@ -183 +183 @@
         interp = Interpolate_sww(sww_file)
         interp.interpolate_xya(point_file_in)
-        interp.write_point_heights_xya(point_file_out)
+        interp.write_depth_xya(point_file_out)
 
 

inundation/ga/storm_surge/pyvolution/test_interpolate_sww.py

@@ -180 +180 @@
         answer = [[0.08, 0.08], [0.02, 0.02], [0.14, 0.14], [.08,.08]]
         #print "answer",answer
-        assert allclose(interp.point_heights,answer)
+        assert allclose(interp.depth,answer)
 
         # create an output .xya file
         point_file_out = tempfile.mktemp(".xya")
-        interp.write_point_heights_xya(point_file_out)
+        interp.write_depth_xya(point_file_out)
         
         #check the output file
@@ -190 +190 @@
 
         assert allclose(interp.point_coordinates, xya_dict['pointlist'])
-        assert allclose(interp.point_heights,
+        assert allclose(interp.depth,
                         xya_dict['pointattributelist'] )