Changeset 5919

Timestamp:

Nov 6, 2008, 5:22:13 PM (16 years ago)

Author:

rwilson

Message:

NumPy? conversion.

Location:

anuga_core/source_numpy_conversion/anuga/damage_modelling

Files:

• inundation_damage.py (modified) (6 diffs)
• test_inundation_damage.py (modified) (9 diffs)

anuga_core/source_numpy_conversion/anuga/damage_modelling/inundation_damage.py

@@ -7 +7 @@
 from math import sqrt
 from Scientific.Functions.Interpolation import InterpolatingFunction
-from Numeric import array, ravel, Float, zeros
+import numpy
 from random import choice
 from types import StringType
@@ -203 +203 @@
     STRUCT_COLLAPSED_TITLE = "collapsed structure if 1"
     STRUCT_INUNDATED_TITLE = "inundated structure if 1"
-    double_brick_damage_array = array([[-kinds.default_float_kind.MAX, 0.0],
+    double_brick_damage_array = numpy.array([[-kinds.default_float_kind.MAX, 0.0],
                                        [0.0-depth_epsilon, 0.0],
                                        [0.0,0.016],
@@ -215 +215 @@
                                        [kinds.default_float_kind.MAX,64.7]])
     double_brick_damage_curve = InterpolatingFunction( \
-        (ravel(double_brick_damage_array[:,0:1]),),
-        ravel(double_brick_damage_array[:,1:]))
-    
-    brick_veeer_damage_array = array([[-kinds.default_float_kind.MAX, 0.0],
+        (numpy.ravel(double_brick_damage_array[:,0:1]),),
+        numpy.ravel(double_brick_damage_array[:,1:]))
+    
+    brick_veeer_damage_array = numpy.array([[-kinds.default_float_kind.MAX, 0.0],
                                        [0.0-depth_epsilon, 0.0],
                                        [0.0,0.016],
@@ -230 +230 @@
                                        [kinds.default_float_kind.MAX,69.4]])
     brick_veeer_damage_curve = InterpolatingFunction( \
-        (ravel(brick_veeer_damage_array[:,0:1]),),
-        ravel(brick_veeer_damage_array[:,1:]))
+        (numpy.ravel(brick_veeer_damage_array[:,0:1]),),
+        numpy.ravel(brick_veeer_damage_array[:,1:]))
     struct_damage_curve = {'Double Brick':double_brick_damage_curve,
                            'Brick Veneer':brick_veeer_damage_curve}
     default_struct_damage_curve = brick_veeer_damage_curve
 
-    contents_damage_array = array([[-kinds.default_float_kind.MAX, 0.0],
+    contents_damage_array = numpy.array([[-kinds.default_float_kind.MAX, 0.0],
                                        [0.0-depth_epsilon, 0.0],
                                        [0.0,0.013],
@@ -247 +247 @@
                                        [kinds.default_float_kind.MAX,98.6]])
     contents_damage_curve = InterpolatingFunction( \
-        (ravel(contents_damage_array[:,0:1]),),
-        ravel(contents_damage_array[:,1:]))
+        (numpy.ravel(contents_damage_array[:,0:1]),),
+        numpy.ravel(contents_damage_array[:,1:]))
 
     #building collapse probability
@@ -312 +312 @@
 
         # the data being created
-        struct_damage = zeros(self.structure_count,Float)
-        contents_damage = zeros(self.structure_count,Float)
+        struct_damage = numpy.zeros(self.structure_count,numpy.float)
+        contents_damage = numpy.zeros(self.structure_count,numpy.float)
         self.struct_inundated = ['']* self.structure_count
 

anuga_core/source_numpy_conversion/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 numpy
 
 
@@ -83 +83 @@
         #Initial condition - with jumps
         bed = domain.quantities['elevation'].vertex_values
-        stage = zeros(bed.shape, Float)
+        stage = numpy.zeros(bed.shape, numpy.float)
 
         h = 0.3
@@ -153 +153 @@
         #Initial condition - with jumps
         bed = domain.quantities['elevation'].vertex_values
-        stage = zeros(bed.shape, Float)
+        stage = numpy.zeros(bed.shape, numpy.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 numpy.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 numpy.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 numpy.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 numpy.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 numpy.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 numpy.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,
+        assert numpy.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,
+        assert numpy.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,
+        assert numpy.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,
+        assert numpy.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 = numpy.zeros(17,numpy.float) 
+        edm.contents_damage = numpy.zeros(17,numpy.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 numpy.allclose(deps[0],0.113204555211)
+        assert numpy.allclose(deps[1],11.3215)
+        assert numpy.allclose(deps[2],0.0) # this value is outside both sww files
         
 #-------------------------------------------------------------