Changeset 8200

Timestamp:

Aug 23, 2011, 11:07:29 PM (14 years ago)

Author:

steve

Message:

Pulled the number_of_full_nodes and triangle out of generic_mesh up into generic_domain. These "numbers" are now calculated from ghost_recv and full_send data

Location:

trunk/anuga_core/source

Files:

• anuga/abstract_2d_finite_volumes/general_mesh.py (modified) (9 diffs)
• anuga/abstract_2d_finite_volumes/generic_domain.py (modified) (6 diffs)
• anuga/abstract_2d_finite_volumes/neighbour_mesh.py (modified) (2 diffs)
• anuga/abstract_2d_finite_volumes/test_domain.py (modified) (2 diffs)
• anuga_parallel/parallel_shallow_water.py (modified) (2 diffs)

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

@@ -64 +64 @@
                  triangles,
                  geo_reference=None,
-                 number_of_full_nodes=None,
-                 number_of_full_triangles=None,
                  verbose=False):
         """Build triangular 2d mesh from nodes and triangle information
@@ -82 +80 @@
 
 
-        number_of_full_nodes and number_of_full_triangles relate to
-        parallelism when each mesh has an extra layer of ghost points and
-        ghost triangles attached to the end of the two arrays.
-        In this case it is usefull to specify the number of real (called full)
-        nodes and triangles. If omitted they will default to all.
-
         """
 
@@ -100 +92 @@
         self.number_of_nodes = self.nodes.shape[0]
 
-        if number_of_full_nodes is None:
-            self.number_of_full_nodes = self.number_of_nodes
-        else:
-            assert int(number_of_full_nodes)
-            self.number_of_full_nodes = number_of_full_nodes
-
-        if number_of_full_triangles is None:
-            self.number_of_full_triangles = self.number_of_triangles
-        else:
-            assert int(number_of_full_triangles)
-            self.number_of_full_triangles = number_of_full_triangles
 
         # FIXME: this stores a geo_reference, but when coords are returned
@@ -270 +251 @@
         """
 
-        N = self.number_of_full_nodes
+        N = self.number_of_nodes
         V = self.nodes[:N,:]
         if absolute is True:
@@ -461 +442 @@
         """
 
-        M = self.number_of_full_triangles
 
         if indices is None:
@@ -512 +492 @@
         Return list of triangle_ids, vertex_ids for specified node.
         If node in None or absent, this information will be returned
-        for all (full) nodes in a list L where L[v] is the triangle
+        for all nodes in a list L where L[v] is the triangle
         list for node v.
         """
@@ -537 +517 @@
             # If need be, we can speed this up by
             # working directly with the inverted triangle structure
-            for i in range(self.number_of_full_nodes):
+            for i in range(self.number_of_nodes):
                 L = self.get_triangles_and_vertices_per_node(node=i)
                 triangle_list.append(L)
@@ -600 +580 @@
 
         # Count number of triangles per node
-        number_of_triangles_per_node = num.zeros(self.number_of_full_nodes,
+        number_of_triangles_per_node = num.zeros(self.number_of_nodes,
                                                  num.int)       #array default#
         for volume_id, triangle in enumerate(self.get_triangles()):
@@ -611 +591 @@
 
         # Register (triangle, vertex) indices for each node
-        vertexlist = [None] * self.number_of_full_nodes
-        for volume_id in range(self.number_of_full_triangles):
+        vertexlist = [None] * self.number_of_nodes
+        for volume_id in range(self.number_of_triangles):
             a = self.triangles[volume_id, 0]
             b = self.triangles[volume_id, 1]

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

@@ -68 +68 @@
         """
 
-        number_of_full_nodes=None
-        number_of_full_triangles=None
+        #number_of_full_nodes=None
+        #number_of_full_triangles=None
         
         # Determine whether source is a mesh filename or coordinates
@@ -91 +91 @@
                          geo_reference=geo_reference,
                          use_inscribed_circle=use_inscribed_circle,
-                         number_of_full_nodes=number_of_full_nodes,
-                         number_of_full_triangles=number_of_full_triangles,
                          verbose=verbose)
 
@@ -112 +110 @@
 
         self.number_of_boundaries = self.mesh.number_of_boundaries
-        self.number_of_full_nodes = self.mesh.number_of_full_nodes
-        self.number_of_full_triangles = self.mesh.number_of_full_triangles
         self.number_of_triangles_per_node = \
                                     self.mesh.number_of_triangles_per_node
@@ -119 +115 @@
         self.vertex_value_indices = self.mesh.vertex_value_indices
         self.number_of_triangles = self.mesh.number_of_triangles
-
+        self.number_of_nodes = self.mesh.number_of_nodes
+        
         self.geo_reference = self.mesh.geo_reference
 
@@ -163 +160 @@
         self.fractional_step_operators = []
 
+        #---------------------------------------
+        # Ghost and Full Triangles and Nodes
+        #---------------------------------------
+        self.number_of_full_nodes = self.mesh.number_of_nodes
+        self.number_of_full_triangles = self.number_of_triangles
+
+
+
+
+
+
+        
         # Setup the ghost cell communication
         if full_send_dict is None:
@@ -203 +212 @@
                 self.tri_full_flag[id] = 0
 
+        self.number_of_full_triangles = num.sum(self.tri_full_flag)
+
+        self.node_full_flag = num.ones(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
+
+
+        self.number_of_full_nodes = num.sum(self.node_full_flag)
+
         # Test the assumption that all full triangles are store before
         # the ghost triangles.
-        if not num.allclose(self.tri_full_flag[:self.number_of_full_nodes], 1):
+        if not num.allclose(self.tri_full_flag[:self.number_of_full_triangles], 1):
             if self.numproc>1:
                 log.critical('WARNING: Not all full triangles are store before '
                              'ghost triangles')
+
+        if not num.allclose(self.node_full_flag[:self.number_of_full_nodes], 1):
+            if self.numproc>1:
+                log.critical('WARNING: Not all full nodes are store before '
+                             'ghost nodes')
+
+
 
         # Defaults

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

@@ -72 +72 @@
                  tagged_elements=None,
                  geo_reference=None,
-                 number_of_full_nodes=None,
-                 number_of_full_triangles=None,
                  use_inscribed_circle=False,
                  verbose=False):
@@ -86 +84 @@
 
         General_mesh.__init__(self, coordinates, triangles,
-                              number_of_full_nodes=\
-                              number_of_full_nodes,
-                              number_of_full_triangles=\
-                              number_of_full_triangles,
                               geo_reference=geo_reference,
                               verbose=verbose)

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

@@ -840 +840 @@
 
 
-        assert num.allclose(ghost_recv_dict[0][0], [24, 25, 26, 27,  0,  1,  2,  3])
-        assert num.allclose(full_send_dict[0][0] , [ 4,  5,  6,  7, 20, 21, 22, 23])
+        assert num.allclose(domain.ghost_recv_dict[0][0], [24, 25, 26, 27,  0,  1,  2,  3])
+        assert num.allclose(domain.full_send_dict[0][0] , [ 4,  5,  6,  7, 20, 21, 22, 23])
 
         def xylocation(x,y):
@@ -882 +882 @@
                                                    1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 0, 0, 0, 0])
 
+        assert num.allclose(domain.node_full_flag, [0, 0, 0, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
+                                                   1, 1, 1, 1, 1, 1, 1, 1, 0, 0, 0])
+
+
+        assert num.allclose(domain.number_of_full_nodes, 18)
+        
+        assert num.allclose(domain.number_of_full_triangles, 20)
+
         #Test that points are arranged in a counter clock wise order
         domain.check_integrity()

trunk/anuga_core/source/anuga_parallel/parallel_shallow_water.py

@@ -26 +26 @@
                  full_send_dict=None,
                  ghost_recv_dict=None,
-                 number_of_full_nodes=None,
-                 number_of_full_triangles=None,
+#                 number_of_full_nodes=None,
+#                 number_of_full_triangles=None,
                  geo_reference=None): #jj added this
 
@@ -38 +38 @@
                         processor=pypar.rank(),
                         numproc=pypar.size(),
-                        number_of_full_nodes=number_of_full_nodes,
-                        number_of_full_triangles=number_of_full_triangles,
+#                        number_of_full_nodes=number_of_full_nodes,
+#                        number_of_full_triangles=number_of_full_triangles,
                         geo_reference=geo_reference) #jj added this