Changeset 8503 for trunk/anuga_core

Timestamp:

Aug 10, 2012, 5:47:11 PM (13 years ago)

Author:

steve

Message:

Added in hashtable calculation

Location:

trunk/anuga_core/source/anuga/abstract_2d_finite_volumes

Files:

• general_mesh.py (modified) (1 diff)
• generic_domain.py (modified) (1 diff)
• hashtable.c (added)
• neighbour_mesh.py (modified) (1 diff)
• quantity.py (modified) (1 diff)

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

@@ -683 +683 @@
         if node is not None:
             # Get index for this node
-            first = num.sum(self.number_of_triangles_per_node[:node])
-
+            #first = num.sum(self.number_of_triangles_per_node[:node])
+
+            first = self.node_index[node]
             # Get number of triangles for this node
             count = self.number_of_triangles_per_node[node]

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

@@ -213 +213 @@
 
 
+
+        N = len(self) #number_of_elements
+        self.number_of_elements = N
+
         # Setup cell full flag
         # =1 for full
         # =0 for ghost
-        N = len(self) #number_of_elements
-        self.number_of_elements = N
         self.tri_full_flag = num.ones(N, num.int)
+        
         for i in self.ghost_recv_dict.keys():
-            for id in self.ghost_recv_dict[i][0]:
-                self.tri_full_flag[id] = 0
+            id = self.ghost_recv_dict[i][0]
+            self.tri_full_flag[id] = 0
 
         self.number_of_full_triangles = int(num.sum(self.tri_full_flag))
 
-        self.node_full_flag = num.zeros(self.number_of_nodes, num.int)
-        L = self.mesh.get_triangles_and_vertices_per_node()
-        for i in range(len(L)):
-            tri_list = 0
-            for pair in L[i]:
-                tri_list = max( tri_list, self.tri_full_flag[pair[0]] )
-            self.node_full_flag[i] = tri_list
+
+        # Identify full nodes as thosethat intersect a full triangle.
+
+        Vol_ids  = self.vertex_value_indices/3
+        W = num.repeat(self.tri_full_flag, 3)
+
+        self.node_full_flag = num.minimum(num.bincount(self.triangles.flatten(), weights = W).astype(num.int), 1)
 
 
         #FIXME SR: The following line leads to a nasty segmentation fault!
         #self.number_of_full_nodes = int(num.sum(self.node_full_flag))
+
         self.number_of_full_nodes = self.number_of_nodes
 
 
-        # Test the assumption that all full triangles are store before
+        # Test the assumption that all full triangles are stored before
         # the ghost triangles.
         if not num.allclose(self.tri_full_flag[:self.number_of_full_nodes], 1):

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

@@ -256 +256 @@
             b = self.triangles[i, 1]
             c = self.triangles[i, 2]
-            if neighbourdict.has_key((a,b)):
-                    msg = "Edge 2 of triangle %d is duplicating edge %d of triangle %d.\n" %(i,neighbourdict[a,b][1],neighbourdict[a,b][0])
-                    raise Exception(msg)
-            if neighbourdict.has_key((b,c)):
-                    msg = "Edge 0 of triangle %d is duplicating edge %d of triangle %d.\n" %(i,neighbourdict[b,c][1],neighbourdict[b,c][0])
-                    raise Exception(msg)
-            if neighbourdict.has_key((c,a)):
-                    msg = "Edge 1 of triangle %d is duplicating edge %d of triangle %d.\n" %(i,neighbourdict[c,a][1],neighbourdict[c,a][0])
-                    raise Exception(msg)
+#            if neighbourdict.has_key((a,b)):
+#                    msg = "Edge 2 of triangle %d is duplicating edge %d of triangle %d.\n" %(i,neighbourdict[a,b][1],neighbourdict[a,b][0])
+#                    raise Exception(msg)
+#            if neighbourdict.has_key((b,c)):
+#                    msg = "Edge 0 of triangle %d is duplicating edge %d of triangle %d.\n" %(i,neighbourdict[b,c][1],neighbourdict[b,c][0])
+#                    raise Exception(msg)
+#            if neighbourdict.has_key((c,a)):
+#                    msg = "Edge 1 of triangle %d is duplicating edge %d of triangle %d.\n" %(i,neighbourdict[c,a][1],neighbourdict[c,a][0])
+#                    raise Exception(msg)
 
             neighbourdict[a,b] = (i, 2) #(id, edge)

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

@@ -321 +321 @@
         # may not be that important to optimise it?
 
-        N = self.vertex_values.shape[0]
-        for i in range(N):
-            v0 = self.vertex_values[i, 0]
-            v1 = self.vertex_values[i, 1]
-            v2 = self.vertex_values[i, 2]
-
-            self.centroid_values[i] = (v0 + v1 + v2)/3
+#        N = self.vertex_values.shape[0]
+#        for i in range(N):
+#            v0 = self.vertex_values[i, 0]
+#            v1 = self.vertex_values[i, 1]
+#            v2 = self.vertex_values[i, 2]
+#
+#            self.centroid_values[i] = (v0 + v1 + v2)/3
+
+        v0 = self.vertex_values[:, 0]
+        v1 = self.vertex_values[:, 1]
+        v2 = self.vertex_values[:, 2]
+
+        self.centroid_values[:] = (v0 + v1 + v2)/3
 
         self.interpolate_from_vertices_to_edges()