Changeset 6151 for anuga_core/source/anuga/damage_modelling/test_inundation_damage.py

Timestamp:

Jan 13, 2009, 1:50:07 PM (14 years ago)

Author:

rwilson

Message:

Change Numeric imports to general form - ready to change to NumPy?.

File:

• anuga_core/source/anuga/damage_modelling/test_inundation_damage.py (modified) (9 diffs)

anuga_core/source/anuga/damage_modelling/test_inundation_damage.py

@@ -17 +17 @@
 from anuga.shallow_water.data_manager import get_dataobject
 
-from Numeric import zeros, Float, allclose
+import Numeric as num
 
 
@@ -83 +83 @@
         #Initial condition - with jumps
         bed = domain.quantities['elevation'].vertex_values
-        stage = zeros(bed.shape, Float)
+        stage = num.zeros(bed.shape, num.Float)
 
         h = 0.3
@@ -153 +153 @@
         #Initial condition - with jumps
         bed = domain.quantities['elevation'].vertex_values
-        stage = zeros(bed.shape, Float)
+        stage = num.zeros(bed.shape, num.Float)
 
         h = 30.
@@ -308 +308 @@
         #print "struct_loss",struct_loss
         struct_loss = [float(x) for x in struct_loss]
-        assert allclose(struct_loss,[10,150,16.9,0])
+        assert num.allclose(struct_loss,[10,150,16.9,0])
         depth = csv_handle.get_column(EventDamageModel.MAX_DEPTH_TITLE)
         #print "depth",depth
         depth = [float(x) for x in depth]
-        assert allclose(depth,[5.5,4.5,0.1,-0.3])
+        assert num.allclose(depth,[5.5,4.5,0.1,-0.3])
         os.remove(sww.filename)
         os.remove(csv_file)
@@ -395 +395 @@
         #print "struct_loss",struct_loss
         struct_loss = [float(x) for x in struct_loss]
-        assert allclose(struct_loss,[10,150,16.9,0])       
+        assert num.allclose(struct_loss,[10,150,16.9,0])       
         depth = csv_handle.get_column(EventDamageModel.MAX_DEPTH_TITLE)
         #print "depth",depth
         depth = [float(x) for x in depth]
-        assert allclose(depth,[5.5,4.5,0.1,-0.3])
+        assert num.allclose(depth,[5.5,4.5,0.1,-0.3])
        
         # Test another file
@@ -406 +406 @@
         #print "struct_loss",struct_loss
         struct_loss = [float(x) for x in struct_loss]
-        assert allclose(struct_loss,[10,150,16.9,0])       
+        assert num.allclose(struct_loss,[10,150,16.9,0])       
         depth = csv_handle.get_column(EventDamageModel.MAX_DEPTH_TITLE)
         #print "depth",depth
         depth = [float(x) for x in depth]
-        assert allclose(depth,[5.5,4.5,0.1,-0.3]) 
+        assert num.allclose(depth,[5.5,4.5,0.1,-0.3]) 
         os.remove(sww.filename)
         os.remove(csv_file)
@@ -458 +458 @@
                                struct_costs, content_costs)
         edm.calc_damage_percentages()
-        assert allclose(edm.struct_damage,[0.0,0.016,0.572,
-                                            0.0,0.016,0.618,
-                                            0.0,0.016,0.618])
-        assert allclose(edm.contents_damage,[0.0,0.013,0.970,
-                                             0.0,0.013,0.970,
-                                             0.0,0.013,0.970])
+        assert num.allclose(edm.struct_damage,[0.0,0.016,0.572,
+                                               0.0,0.016,0.618,
+                                               0.0,0.016,0.618])
+        assert num.allclose(edm.contents_damage,[0.0,0.013,0.970,
+                                                 0.0,0.013,0.970,
+                                                 0.0,0.013,0.970])
         edm.calc_cost()
-        assert allclose(edm.struct_loss,[0.0,.16,5.72,
-                                            0.0,.16,6.18,
-                                            0.0,0.016,0.618])
-        assert allclose(edm.contents_loss,[0.0,1.3,97,
-                                             0.0,1.3,97,
-                                             0.0,0.13,9.7])
+        assert num.allclose(edm.struct_loss,[0.0,.16,5.72,
+                                             0.0,.16,6.18,
+                                             0.0,0.016,0.618])
+        assert num.allclose(edm.contents_loss,[0.0,1.3,97,
+                                               0.0,1.3,97,
+                                               0.0,0.13,9.7])
         
         
@@ -476 +476 @@
         edm = EventDamageModel([0.0]*17, [0.0]*17, [0.0]*17,
                                [0.0]*17, [0.0]*17)
-        edm.struct_damage = zeros(17,Float) 
-        edm.contents_damage = zeros(17,Float) 
+        edm.struct_damage = num.zeros(17,num.Float) 
+        edm.contents_damage = num.zeros(17,num.Float) 
         collapse_probability = {0.4:[0], #0
                                 0.6:[1], #1
@@ -582 +582 @@
         # Test values based on returned results, so not an excellent test
         
-        assert allclose(deps[0],0.113204555211)
-        assert allclose(deps[1],11.3215)
-        assert allclose(deps[2],0.0) # this value is outside both sww files
+        assert num.allclose(deps[0],0.113204555211)
+        assert num.allclose(deps[1],11.3215)
+        assert num.allclose(deps[2],0.0) # this value is outside both sww files
         
 #-------------------------------------------------------------