Changeset 648 for inundation/ga/storm_surge/pyvolution/domain.py

Timestamp:

Dec 1, 2004, 4:36:33 PM (20 years ago)

Author:

ole

Message:

Refactoring boundary structure to allow None Boundary object for internal boundaries.

File:

• inundation/ga/storm_surge/pyvolution/domain.py (modified) (3 diffs)

inundation/ga/storm_surge/pyvolution/domain.py

@@ -180 +180 @@
         More entries may point to the same boundary object
         
-        Schematically the mapping is:
-
-        self.boundary_segments: k: (vol_id, edge_id)
+        Schematically the mapping is from two dictionaries to one list
+        where the index is used as pointer to the boundary_values arrays
+        within each quantity.
+
         self.boundary:          (vol_id, edge_id): tag
         boundary_map (input):   tag: boundary_object
         ----------------------------------------------
-        self.boundary_objects:  k: boundary_object
+        self.boundary_objects:  ((vol_id, edge_id), boundary_object)
         
 
         Pre-condition:
-          self.boundary and self.boundary_segments have been built.
+          self.boundary has been built.
 
         Post-condition:
@@ -199 +200 @@
         However, if a tag is not used to the domain, no error is thrown.
         FIXME: This would lead to implementation of a
-        default boundary condition
+        default boundary condition        
+
+        Note: If a segment is listed in the boundary dictionary and if it is
+        not None, it *will* become a boundary -
+        even if there is a neighbouring triangle.
+        This would be the case for internal boundaries
+        
+        Boundary objects that are None will be skipped.
+
+        FIXME: If set_boundary is called multiple times and if Boundary
+        object is changed into None, the neighbour structure will not be
+        restored!!!
+        
+
         """
 
         self.boundary_objects = []
-        for k, (vol_id, edge_id) in enumerate(self.boundary_segments):
+
+        #FIXME: Try to remove the sorting and fix test_mesh.py
+        x = self.boundary.keys()
+        x.sort()
+        for k, (vol_id, edge_id) in enumerate(x):
             tag = self.boundary[ (vol_id, edge_id) ]
 
             if boundary_map.has_key(tag):
                 B = boundary_map[tag]
-                self.boundary_objects.append(B)                
+
+                if B is not None:
+                    self.boundary_objects.append( ((vol_id, edge_id), B) )
+                    self.neighbours[vol_id, edge_id] = -len(self.boundary_objects)
+                else:
+                    pass
+                    #FIXME: Check and perhaps fix neighbour structure
+                    
 
             else:
@@ -379 +404 @@
 
         #FIXME: Update only those that change (if that can be worked out)
-        for i, B in enumerate(self.boundary_objects):
-            vol_id, edge_id = self.boundary_segments[i]
+        for i, ((vol_id, edge_id), B) in enumerate(self.boundary_objects):
             q = B.evaluate(vol_id, edge_id)