Changeset 3382

Timestamp:

Jul 19, 2006, 2:59:00 PM (19 years ago)

Author:

duncan

Message:

checking in ...working on the tests

Location:

inundation/damage

Files:

• inundation_damage.py (modified) (2 diffs)
• test_inundation_damage.py (modified) (5 diffs)

inundation/damage/inundation_damage.py

@@ -51 +51 @@
     csv = Exposure_csv(exposure_file_in)
     geospatial = csv.get_location()
+    geospatial = ensure_absolute(geospatial)
     max_depths, max_momentums = calc_max_depth_and_momentum(sww_file,
                                     geospatial,
@@ -99 +100 @@
     """
     quantities =  ['stage', 'elevation', 'xmomentum', 'ymomentum']
+    #print "points",points 
     points = ensure_absolute(points)
     point_count = len(points)

inundation/damage/test_inundation_damage.py

@@ -134 +134 @@
         writer = csv.writer(fd)
         writer.writerow(['LONGITUDE','LATITUDE','STR_VALUE','C_VALUE','ROOF_TYPE','WALLS', 'SHORE_DIST'])
-        writer.writerow(['151.5','-34','199770','130000','Metal','Timber',20])
-        writer.writerow(['151','-34.5','150000','76000','Metal','Double Brick',200])
-        writer.writerow(['151','-34.25','150000','76000','Metal','Brick Veneer',200])
+        writer.writerow(['151.5','-34','199770','130000','Metal','Timber',20.])
+        writer.writerow(['151','-34.5','150000','76000','Metal','Double Brick',200.])
+        writer.writerow(['151','-34.25','150000','76000','Metal','Brick Veneer',200.])
+        fd.close()
 
         
@@ -154 +155 @@
 
     
-    def ztest_inundation_damage2(self):
+    def test_inundation_damage2(self):
 
         # create mesh
@@ -162 +163 @@
         m.add_vertices(points)
         m.autoSegment()
-        m.generate_mesh(verbose=True) #False)
+        m.generate_mesh(verbose=False)
         m.export_mesh_file(mesh_file)
         
@@ -204 +205 @@
         fd = open(csv_file,'wb')
         writer = csv.writer(fd)
-        writer.writerow(['LONGITUDE','LATITUDE','STR_VALUE','C_VALUE','ROOF_TYPE','WALLS', 'SHORE_DIST'])
-        writer.writerow(['151.5','-34','199770','130000','Metal','Timber',20])
-        writer.writerow(['151','-34.5','150000','76000','Metal','Double Brick',200])
-        writer.writerow(['151','-34.25','150000','76000','Metal','Brick Veneer',200])
+        writer.writerow(['x','y','STR_VALUE','C_VALUE','ROOF_TYPE','WALLS', 'SHORE_DIST'])
+        writer.writerow([5.5,0.5,'199770','130000','Metal','Timber',20])
+        writer.writerow([4.5,1.0,'150000','76000','Metal','Double Brick',20])
+        writer.writerow([4.5,1.5,'150000','76000','Metal','Brick Veneer',20])
+        fd.close()
+
+        sww_file = domain.filename + "." + domain.format
+        #print "sww_file",sww_file 
+        inundation_damage(sww_file, csv_file, verbose=False)
+
 
     def ztest_add_depth_and_momentum2csv(self):
@@ -351 +358 @@
 #-------------------------------------------------------------
 if __name__ == "__main__":
-    #suite = unittest.makeSuite(Test_inundation_damage,'test_inundation_damage')
+    #suite = unittest.makeSuite(Test_inundation_damage,'test_inundation_damage2')
     suite = unittest.makeSuite(Test_inundation_damage,'test')
     runner = unittest.TextTestRunner()