Changeset 8556

Timestamp:

Sep 5, 2012, 10:54:19 AM (13 years ago)

Author:

steve

Message:

Added in Yuyang's C code for build_boundary_dictionary

Location:

trunk/anuga_core/source/anuga/abstract_2d_finite_volumes

Files:

• neighbour_mesh.py (modified) (1 diff)
• neighbour_mesh_ext.c (added)
• test_neighbour_mesh.py (modified) (2 diffs)

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

@@ -347 +347 @@
 
 
-
-    def build_boundary_dictionary(self, boundary = None):
+    def build_boundary_dictionary(self, boundary=None):
+        """Build or check the dictionary of boundary tags.
+        self.boundary is a dictionary of tags,
+        keyed by volume id and edge:
+        { (id, edge): tag, ... }
+
+        Postconditions:
+        self.boundary is defined.
+        """
+
+        from anuga.config import default_boundary_tag
+
+        #arr_neighbours = num.array(self.neighbours)
+
+        
+        if boundary is None:
+            boundary = {}
+
+        from neighbour_mesh_ext import boundary_dictionary_construct
+        boundary = boundary_dictionary_construct(len(self), default_boundary_tag, self.neighbours, boundary)
+        
+
+        self.boundary = boundary
+        self.boundary_length = len(self.boundary)
+
+
+
+    def build_boundary_dictionary_old(self, boundary = None):
         """Build or check the dictionary of boundary tags.
          self.boundary is a dictionary of tags,

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

@@ -689 +689 @@
         #    raise Exception('Should have raised an exception')
 
-        #Specifying wrong non existing segment
+        #Specifying wrong non existing segment       
         try:
             mesh = Mesh(points, vertices, {(5,0): 'x'})
@@ -1843 +1843 @@
 
 if __name__ == "__main__":
-    suite = unittest.makeSuite(Test_Mesh, 'test')
+    suite = unittest.makeSuite(Test_Mesh, 'test_')
     runner = unittest.TextTestRunner()
     runner.run(suite)