Changeset 6304 for branches/numpy/anuga/damage_modelling

Timestamp:

Feb 10, 2009, 11:11:04 AM (16 years ago)

Author:

rwilson

Message:

Initial commit of numpy changes. Still a long way to go.

Location:

branches/numpy

Files:

• . (copied) (copied from anuga_core/source)
• anuga/damage_modelling/inundation_damage.py (modified) (3 diffs)
• anuga/damage_modelling/test_inundation_damage.py (modified) (5 diffs)

branches/numpy/anuga/damage_modelling/inundation_damage.py

@@ -10 +10 @@
 from types import StringType
 
-import Numeric as num
+import numpy as num
 
 
@@ -17 +17 @@
 except ImportError:  
     # Hand-built mockup of the things we need from the kinds package, since it
-    # was recently removed from the standard Numeric distro.  Some users may  
+    # was recently removed from the standard numeric distro.  Some users may  
     # not have it by default.  
     class _bunch:  
@@ -314 +314 @@
 
         # the data being created
-        struct_damage = num.zeros(self.structure_count, num.Float)
-        contents_damage = num.zeros(self.structure_count, num.Float)
+        struct_damage = num.zeros(self.structure_count, num.float)
+        contents_damage = num.zeros(self.structure_count, num.float)
         self.struct_inundated = ['']* self.structure_count
 

branches/numpy/anuga/damage_modelling/test_inundation_damage.py

@@ -17 +17 @@
 from anuga.shallow_water.data_manager import get_dataobject
 
-import Numeric as num
+import numpy as num
 
 
@@ -83 +83 @@
         #Initial condition - with jumps
         bed = domain.quantities['elevation'].vertex_values
-        stage = num.zeros(bed.shape, num.Float)
+        stage = num.zeros(bed.shape, num.float)
 
         h = 0.3
@@ -153 +153 @@
         #Initial condition - with jumps
         bed = domain.quantities['elevation'].vertex_values
-        stage = num.zeros(bed.shape, num.Float)
+        stage = num.zeros(bed.shape, num.float)
 
         h = 30.
@@ -476 +476 @@
         edm = EventDamageModel([0.0]*17, [0.0]*17, [0.0]*17,
                                [0.0]*17, [0.0]*17)
-        edm.struct_damage = num.zeros(17,num.Float) 
-        edm.contents_damage = num.zeros(17,num.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
@@ -597 +597 @@
         pass
     suite = unittest.makeSuite(Test_inundation_damage,'test')
-    #suite = unittest.makeSuite(Test_inundation_damage,'test_inundation_damage_list_as_input')
     runner = unittest.TextTestRunner()
     runner.run(suite)