Changeset 8249

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)

Location:

trunk/anuga_core/source/anuga

Files:

• damage_modelling/inundation_damage.py (modified) (4 diffs)
• damage_modelling/test_inundation_damage.py (modified) (1 diff)
• file (modified) (1 prop)
• file/test_mux.py (modified) (1 diff)
• file/test_urs.py (modified) (4 diffs)
• file/urs.py (modified) (6 diffs)
• file_conversion (modified) (1 prop)
• file_conversion/dem2pts.py (modified) (1 diff)

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
 

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

@@ -578 +578 @@
                                points_are_lats_longs=True)
         points_ab = spat.get_data_points( absolute = True)
+
         deps, _ = calc_max_depth_and_momentum(sww_file,
                                               points_ab,

trunk/anuga_core/source/anuga/file/test_mux.py

@@ -117 +117 @@
     def delete_mux(self, files):
         for file in files:
-            os.remove(file)
+            try:
+                os.remove(file)
+            except:
+                pass
         
     def write_mux2(self, lat_long_points, time_step_count, time_step,

trunk/anuga_core/source/anuga/file/test_urs.py

@@ -101 +101 @@
         
     def test_URS_points_northern_hemisphere(self):
-               
+
         LL_LAT = 8.0
         LL_LONG = 97.0
@@ -130 +130 @@
 #                                   export_csv=True,
 #                                   verbose=self.verbose)
-        
+
         geo=calculate_boundary_points(poly_lat_long,
                                   ZONE,
@@ -138 +138 @@
                                   isSouthHemisphere=False,
                                   verbose=self.verbose)
-        
+
         results = frozenset(geo.get_data_points(as_lat_long=True,
                                                 isSouthHemisphere=False))
+
         #print 'results',results
 
@@ -160 +161 @@
             if not found:
                 assert False
-        
 
     def covered_in_other_tests_test_URS_points_needed_poly1(self):

trunk/anuga_core/source/anuga/file/urs.py

@@ -199 +199 @@
 
     """
-
+    
     msg = "grid_spacing can not be zero"
     assert not grid_spacing == 0, msg
@@ -207 +207 @@
     # List of segments.  Each segment is two points.
     segs = [i and [a[i-1], a[i]] or [a[len(a)-1], a[0]] for i in range(len(a))]
+
 
     # convert the segs to Lat's and longs.
@@ -213 +214 @@
     lat_long_set = frozenset()
     for seg in segs:
+
         points_lat_long = points_needed(seg, ll_lat, ll_long, grid_spacing,
                                         lat_amount, long_amount, zone,
                                         isSouthHemisphere)
+
         lat_long_set |= frozenset(points_lat_long)
+
 
     if lat_long_set == frozenset([]):
@@ -276 +280 @@
     for index_lat in range(first_row_lat, last_row_lat + 1):
         for index_long in range(first_row_long, last_row_long + 1):
+
             lat = ll_lat + index_lat*grid_spacing
             long = ll_long + index_long*grid_spacing
+
 
             #filter here to keep good points
@@ -283 +289 @@
                 points_lat_long.append((lat, long)) #must be hashable
 
+
     # Now that we have these points, lets throw ones out that are too far away
+
     return points_lat_long
        
@@ -302 +310 @@
     x2_1 = x2-x1
     y2_1 = y2-y1
-    try:
-        d = abs((x2_1)*(y1-y0)-(x1-x0)*(y2_1))/sqrt( \
-            (x2_1)*(x2_1)+(y2_1)*(y2_1))
-    except ZeroDivisionError:
-        if sqrt((x2_1)*(x2_1)+(y2_1)*(y2_1)) == 0 \
-           and abs((x2_1)*(y1-y0)-(x1-x0)*(y2_1)) == 0:
-            return True
-        else:
-            return False
-
-    return d <= max_distance
-
-
-
+
+
+    num = (x2_1)*(x2_1)+(y2_1)*(y2_1)
+    if sqrt(num) == 0 and abs(num) == 0:
+        return True
+    else:
+        d = abs((x2_1)*(y1-y0)-(x1-x0)*(y2_1))/num
+        return d <= max_distance
+
+
+
+

trunk/anuga_core/source/anuga/file_conversion/dem2pts.py

@@ -240 +240 @@
 
         if upper_index == lower_index + newcols:
-            points[lower_index:upper_index, :] = tpoints
-            elevation[lower_index:upper_index] = telev
+            # Seems to be an error with the windows version of
+            # Netcdf. The following gave errors
+            #points[lower_index:upper_index, :] = tpoints
+            #elevation[lower_index:upper_index] = telev
+            # so used the following
+            for index in range(newcols):
+                points[index+lower_index, :] = tpoints[index,:]
+                elevation[index+lower_index] = telev[index]
 
     assert global_index == nopoints, 'index not equal to number of points'