Changeset 8816

Timestamp:

Apr 5, 2013, 8:54:18 PM (12 years ago)

Author:

steve

Message:

Getting inundation_damage to work with scipy

Location:

trunk/anuga_core/source

Files:

• anuga/LICENSE.txt (deleted)
• anuga/README.txt (deleted)
• anuga/damage_modelling/inundation_damage.py (modified) (5 diffs)
• anuga/test_all.py (modified) (3 diffs)
• anuga_validation_tests/Analytical_exact/dam_break_wet (modified) (1 prop)

trunk/anuga_core/source/anuga/damage_modelling/inundation_damage.py

@@ -6 +6 @@
 import os
 from math import sqrt
-from Scientific.Functions.Interpolation import InterpolatingFunction
+#from Scientific.Functions.Interpolation import InterpolatingFunction
+from scipy.interpolate import interp1d
 from random import choice
 
@@ -208 +209 @@
     STRUCT_COLLAPSED_TITLE = "STRUCT_COLLAPSED"#"collapsed structure if 1"
     STRUCT_INUNDATED_TITLE = "STRUCT_INUNDATED"#"inundated structure if 1"
-    double_brick_damage_array = num.array([[-kinds.default_float_kind.MAX, 0.0],
+    double_brick_damage_array = num.array([#[-kinds.default_float_kind.MAX, 0.0],
+                                           [-1000.0, 0.0],
                                            [0.0-depth_epsilon, 0.0],
                                            [0.0,0.016],
@@ -218 +220 @@
                                            [2.0,0.587],
                                            [2.5,0.647],
-                                           [kinds.default_float_kind.MAX,64.7]])
-    double_brick_damage_curve = InterpolatingFunction( \
-        (num.ravel(double_brick_damage_array[:,0:1]),),
-        num.ravel(double_brick_damage_array[:,1:]))
-    
-    brick_veeer_damage_array = num.array([[-kinds.default_float_kind.MAX, 0.0],
+                                           [1000.0, 64.7]
+                                           #[kinds.default_float_kind.MAX,64.7]
+                                           ])
+    #double_brick_damage_curve = InterpolatingFunction( \
+    #    (num.ravel(double_brick_damage_array[:,0:1]),),
+    #    num.ravel(double_brick_damage_array[:,1:]))
+    double_brick_damage_curve = interp1d(double_brick_damage_array[:,0],double_brick_damage_array[:,1])
+    
+    brick_veeer_damage_array = num.array([#[-kinds.default_float_kind.MAX, 0.0],
+                                          [-1000.0,0.0],
                                           [0.0-depth_epsilon, 0.0],
                                           [0.0,0.016],
@@ -233 +239 @@
                                           [2.0,0.633],
                                           [2.5,0.694],
-                                          [kinds.default_float_kind.MAX,69.4]])
-    brick_veeer_damage_curve = InterpolatingFunction( \
-        (num.ravel(brick_veeer_damage_array[:,0:1]),),
-        num.ravel(brick_veeer_damage_array[:,1:]))
+                                          [1000.0,69.4]
+                                          #[kinds.default_float_kind.MAX,69.4]
+                                          ])
+    #brick_veeer_damage_curve = InterpolatingFunction( \
+    #    (num.ravel(brick_veeer_damage_array[:,0:1]),),
+    #    num.ravel(brick_veeer_damage_array[:,1:]))
+
+    brick_veeer_damage_curve = interp1d(brick_veeer_damage_array[:,0],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 = num.array([[-kinds.default_float_kind.MAX, 0.0],
+    contents_damage_array = num.array([#[-kinds.default_float_kind.MAX, 0.0],
+                                       [-1000.0,0.0],
                                        [0.0-depth_epsilon, 0.0],
                                        [0.0,0.013],
@@ -250 +262 @@
                                        [1.5,0.976],
                                        [2.0,0.986],
-                                       [kinds.default_float_kind.MAX,98.6]])
-    contents_damage_curve = InterpolatingFunction( \
-        (num.ravel(contents_damage_array[:,0:1]),),
-        num.ravel(contents_damage_array[:,1:]))
-
+                                       [1000.0,98.6]
+                                       #[kinds.default_float_kind.MAX,98.6]
+                                       ])
+    #contents_damage_curve = InterpolatingFunction( \
+    #    (num.ravel(contents_damage_array[:,0:1]),),
+    #    num.ravel(contents_damage_array[:,1:]))
+
+    contents_damage_curve = interp1d(contents_damage_array[:,0],contents_damage_array[:,1])
     #building collapse probability
     # inundation depth above ground floor, m

trunk/anuga_core/source/anuga/test_all.py

@@ -33 +33 @@
 
 # Directories that should not be searched for test files.
-exclude_dirs = ['shallow_water_balanced' , 'damage_modelling', # Special requirements
+exclude_dirs = ['shallow_water_balanced' , #'damage_modelling', # Special requirements
                 '.svn',          # subversion
                 'props', 'wcprops', 'prop-base', 'text-base', 'tmp']
@@ -197 +197 @@
     from optparse import OptionParser
 
+    import os
+    for file in os.listdir('.'):
+        if file.endswith('.sww') or\
+                file.endswith('.msh') or\
+                file.endswith('.csv') or\
+                file.endswith('.asc') or\
+                file.endswith('.prj') or\
+                file.endswith('.tsh') or\
+                file.endswith('.sts') or\
+                file.endswith('.tms') or\
+                file.endswith('.txt'):
+            os.remove(file)
+
     check_anuga_import()
 
@@ -238 +251 @@
         #os.remove(filename)
     
-    #if sys.platform == 'win32':
-    #    raw_input('Press the RETURN key')
+
+
+    import os
+    for file in os.listdir('.'):
+        if file.endswith('.sww') or\
+                file.endswith('.msh') or\
+                file.endswith('.csv') or\
+                file.endswith('.asc') or\
+                file.endswith('.prj') or\
+                file.endswith('.tsh') or\
+                file.endswith('.sts') or\
+                file.endswith('.tms') or\
+                file.endswith('.txt'):
+            try:
+                os.remove(file)
+            except:
+                pass
+            

trunk/anuga_core/source/anuga_validation_tests/Analytical_exact/dam_break_wet

@@ -1 +1 @@
 .deps
+.python_cache

@@ -1 +1 @@
 .deps
+.python_cache

@@ -1 +1 @@
 .deps
+.python_cache