Changeset 8219

Timestamp:

Sep 18, 2011, 9:28:18 PM (14 years ago)

Author:

steve

Message:

Rudy created a mesh which produced a degenerate surrogate triangle. Changed throwing an error to defaulting to a first order reconstruction

Location:

trunk/anuga_core/source/anuga

Files:

• abstract_2d_finite_volumes/neighbour_mesh.py (modified) (1 diff)
• shallow_water/shallow_water_ext.c (modified) (1 diff)
• structures (modified) (1 prop)
• structures/structure_operator.py (modified) (1 diff)

trunk/anuga_core/source/anuga/abstract_2d_finite_volumes/neighbour_mesh.py

@@ -675 +675 @@
             # Check that area hasn't been compromised
             area = self.areas[i]
-            ref = abs((x1*y0-x0*y1)+(x2*y1-x1*y2)+(x0*y2-x2*y0))/2
-            msg = 'Wrong area for vertex coordinates: %f %f %f %f %f %f'\
-                  %(x0,y0,x1,y1,x2,y2)
+            ref = -((x1*y0-x0*y1)+(x2*y1-x1*y2)+(x0*y2-x2*y0))/2
+            msg = 'Triangle %i (%f,%f), (%f,%f), (%f, %f)' % (i, x0,y0,x1,y1,x2,y2)
+            msg += 'Wrong area: %f  %f'\
+                  %(area, ref)
             assert abs((area - ref)/area) < epsilon, msg
 
-            msg = 'Triangle (%f,%f), (%f,%f), (%f, %f)' % (x0,y0,x1,y1,x2,y2)
+            msg = 'Triangle %i (%f,%f), (%f,%f), (%f, %f)' % (i, x0,y0,x1,y1,x2,y2)
             msg += ' is degenerate:  area == %f' % self.areas[i]
             assert area > 0.0, msg

trunk/anuga_core/source/anuga/shallow_water/shallow_water_ext.c

@@ -1438 +1438 @@
       
       // If the mesh is 'weird' near the boundary, 
-      // the triangle might be flat or clockwise:
+      // the triangle might be flat or clockwise
+      // Default to zero gradient
       if (area2 <= 0) 
       {
-          report_python_error(AT, "Negative triangle area");
-          return -1;
+          //printf("Error negative triangle area \n");
+          //report_python_error(AT, "Negative triangle area");
+          //return -1;
+
+          stage_vertex_values[k3]   = stage_centroid_values[k];
+          stage_vertex_values[k3+1] = stage_centroid_values[k];
+          stage_vertex_values[k3+2] = stage_centroid_values[k];
+          xmom_vertex_values[k3]    = xmom_centroid_values[k];
+          xmom_vertex_values[k3+1]  = xmom_centroid_values[k];
+          xmom_vertex_values[k3+2]  = xmom_centroid_values[k];
+          ymom_vertex_values[k3]    = ymom_centroid_values[k];
+          ymom_vertex_values[k3+1]  = ymom_centroid_values[k];
+          ymom_vertex_values[k3+2]  = ymom_centroid_values[k];
+
+          continue;
       }  
       

trunk/anuga_core/source/anuga/structures/structure_operator.py

@@ -239 +239 @@
             self.culvert_vector = centre_point1 - centre_point0
         else:
-            self.culvert_vector = self.end_points[1] - end_points[0]
+            self.culvert_vector = self.end_points[1] - self.end_points[0]
         
         self.culvert_length = math.sqrt(num.sum(self.culvert_vector**2))