Changeset 8249 for trunk/anuga_core/source/anuga/damage_modelling/inundation_damage.py

Timestamp:

Nov 15, 2011, 11:37:36 PM (13 years ago)

Author:

steve

Message:

Got rid of those annoying double_scalar warnings in the windows code (just divide by zero warnings)

File:

• trunk/anuga_core/source/anuga/damage_modelling/inundation_damage.py (modified) (4 diffs)

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

@@ -141 +141 @@
     in the specified directory.
     """
+
     quantities =  ['stage', 'elevation', 'xmomentum', 'ymomentum']
     points = ensure_absolute(points)
@@ -161 +162 @@
         raise IOError, msg
     from os import sep
+
     for this_sww_file in interate_over:
         callable_sww = file_function(dir+sep+this_sww_file,
@@ -167 +169 @@
                                      verbose=verbose,
                                      use_cache=use_cache)
-    
+
         for point_i, point in enumerate(points):
             for time in callable_sww.get_time():
                 quantity_values = callable_sww(time,point_i)
-            
                 w = quantity_values[0]
                 z = quantity_values[1]
                 uh = quantity_values[2] 
                 vh = quantity_values[3]
-                
+
+                #print w,z,uh,vh
+                if w == NAN or z == NAN or uh == NAN or vh == NAN:
+                    continue
+                    
                 #  -ground_floor_height is the minimum value.
                 depth = w - z - ground_floor_height
@@ -182 +187 @@
                 if depth > max_depths[point_i]:
                     max_depths[point_i] = depth
-                if w == NAN or z == NAN or uh == NAN or vh == NAN:
-                    continue
+                
                 momentum = sqrt(uh*uh + vh*vh)
                 if momentum > max_momentums[point_i]:
                     max_momentums[point_i] = momentum
+
+
     return max_depths, max_momentums