Changeset 4536

Timestamp:

Jun 6, 2007, 5:46:34 PM (17 years ago)

Author:

ole

Message:

Fixed ticket:165 thanks to Duncan's excellent reduction of the problem which
had to do with ghost nodes.

Location:

anuga_core/source/anuga/abstract_2d_finite_volumes

Files:

• general_mesh.py (modified) (2 diffs)
• quantity.py (modified) (1 diff)
• quantity_ext.c (modified) (2 diffs)

anuga_core/source/anuga/abstract_2d_finite_volumes/general_mesh.py

@@ -476 +476 @@
 
         # Count number of triangles per node
-        number_of_triangles_per_node = zeros(self.number_of_nodes)
-        for volume_id, triangle in enumerate(self.triangles):
+        number_of_triangles_per_node = zeros(self.number_of_full_nodes)
+        for volume_id, triangle in enumerate(self.get_triangles()):
             for vertex_id in triangle:
                 number_of_triangles_per_node[vertex_id] += 1
@@ -486 +486 @@
 
         # Register (triangle, vertex) indices for each node
-        vertexlist = [None]*self.number_of_nodes
-        for volume_id in range(self.number_of_triangles):
+        vertexlist = [None]*self.number_of_full_nodes
+        for volume_id in range(self.number_of_full_triangles):
 
             a = self.triangles[volume_id, 0]

anuga_core/source/anuga/abstract_2d_finite_volumes/quantity.py

@@ -1104 +1104 @@
                 total = 0.0
                 for index in self.domain.vertex_value_indices:
+                    if current_node == N:
+                        msg = 'Current node exceeding number of nodes (%d) ' %(N)
+                        raise msg
+                    
+
+                    
                     k += 1
                     

anuga_core/source/anuga/abstract_2d_finite_volumes/quantity_ext.c

@@ -231 +231 @@
 
   for (i=0; i<N; i++) {
+  
+    //if (current_node == N) {
+    //  printf("Current node exceeding number of nodes (%d)", N);    
+    //  return 1;
+    // }
+    
     index = vertex_value_indices[i];
     k += 1;
@@ -366 +372 @@
                                      (double*) A -> data);
 
+        //printf("Error %d", err);
         if (err != 0) {
           PyErr_SetString(PyExc_RuntimeError,