Changeset 636 for inundation/ga

Timestamp:

Nov 30, 2004, 2:19:54 PM (20 years ago)

Author:

ole

Message:

Comments

Location:

inundation/ga/storm_surge/pyvolution

Files:

• mesh.py (modified) (3 diffs)
• pmesh2domain.py (modified) (1 diff)

inundation/ga/storm_surge/pyvolution/mesh.py

@@ -67 +67 @@
         from Numeric import array, zeros, Int, Float, maximum, sqrt, sum
 
-        General_mesh.__init__(self,coordinates, triangles)
+        General_mesh.__init__(self, coordinates, triangles)
 
         N = self.number_of_elements
@@ -306 +306 @@
             neighbour array has unique negative indices for boundary
             boundary_segments array imposes an ordering on segments
-            (not otherwise available from the dictionary)             
+            (not otherwise available from the dictionary)
+
+        Note: If a segment is listed in the boundary dictionary
+        it *will* become a boundary - even if there is a neighbouring triangle.
+        This would be the case for internal boundaries
         """
 
@@ -320 +324 @@
         index = -1        
         for id, edge in self.boundary_segments:
+
+            #FIXME: One would detect internal boundaries as follows
+            #if self.neighbours[id, edge] > -1:
+            #    print 'Internal boundary'
+            
             self.neighbours[id, edge] = index
             index -= 1

inundation/ga/storm_surge/pyvolution/pmesh2domain.py

@@ -19 +19 @@
         
     assert issubclass(DomainClass, Domain), "DomainClass is not a subclass of Domain."
+
+
+    
     domain = DomainClass(vertex_coordinates, volumes, marker_dict,
                          tagged_elements = tagged_elements_dict )
 
+
+    
+    #FIXME (Ole): Is this really the right place to apply the a default
+    #value specific to the shallow water wave equation?
+    #The 'assert' above indicates that any subclass of Domain is acceptable. 
+    #Suggestion - module shallow_water.py will eventually take care of this
+    #(when I get around to it) so it should be removed from here.  
+    
     # set the water level to be the elevation
     if vertex_quantity_dict.has_key('elevation') and not vertex_quantity_dict.has_key('level'):