Changeset 2866 for inundation/pyvolution

Timestamp:

May 15, 2006, 2:26:21 PM (19 years ago)

Author:

ole

Message:

Implemented Domain(meshfile) variant widely, updated documentation and added more statistics

Location:

inundation/pyvolution

Files:

• domain.py (modified) (3 diffs)
• general_mesh.py (modified) (4 diffs)
• mesh.py (modified) (5 diffs)

inundation/pyvolution/domain.py

@@ -76 +76 @@
         # Initialise underlying mesh structure
         Mesh.__init__(self, coordinates, triangles, boundary,
-                      tagged_elements, geo_reference, use_inscribed_circle)
-
+                      tagged_elements, geo_reference, use_inscribed_circle,
+                      verbose=verbose)
+
+        if verbose: print 'Initialising Domain'        
         from Numeric import zeros, Float, Int
         from quantity import Quantity, Conserved_quantity
@@ -123 +125 @@
 
         # Setup Communication Buffers
+           
+        if verbose: print 'Domain: Set up communication buffers (parallel)'
         self.nsys = len(self.conserved_quantities)
         for key in self.full_send_dict:
@@ -179 +183 @@
             # If the mesh file passed any quantity values
             # , initialise with these values.
+            if verbose: print 'Domain: Initialising quantity values'
             self.set_quantity_vertices_dict(vertex_quantity_dict)
 
+           
+        if verbose: print 'Domain: Done'
+
+            
 
 

inundation/pyvolution/general_mesh.py

@@ -53 +53 @@
     #input
     def __init__(self, coordinates, triangles,
-                 geo_reference=None):
+                 geo_reference=None,
+                 verbose=False):
         """
         Build triangles from x,y coordinates (sequence of 2-tuples or
@@ -62 +63 @@
         If specified coordinates are assumed to be relative to this origin.
         """
+
+        if verbose: print 'General_mesh: Building basic mesh structure' 
 
         from Numeric import array, zeros, Int, Float, sqrt, sum
@@ -108 +111 @@
 
         #Initialise each triangle
+        if verbose:
+            print 'General_mesh: Computing areas, normals and edgelenghts'
+            
         for i in range(N):
-            #if i % (N/10) == 0: print '(%d/%d)' %(i, N)
+            if verbose and i % ((N+10)/10) == 0: print '(%d/%d)' %(i, N)
+           
 
             x0 = V[i, 0]; y0 = V[i, 1]
@@ -157 +164 @@
         
         #Build vertex list
+        if verbose: print 'Building vertex list'         
         self.build_vertexlist()
 

inundation/pyvolution/mesh.py

@@ -60 +60 @@
 
 
-    def __init__(self, coordinates, triangles, boundary = None,
-                 tagged_elements = None, geo_reference = None,
-                 use_inscribed_circle = False):
+    def __init__(self, coordinates, triangles,
+                 boundary=None,
+                 tagged_elements=None,
+                 geo_reference=None,
+                 use_inscribed_circle=False,
+                 verbose=False):
         """
         Build triangles from x,y coordinates (sequence of 2-tuples or
@@ -73 +76 @@
         from Numeric import array, zeros, Int, Float, maximum, sqrt, sum
 
-        
-        General_mesh.__init__(self, coordinates, triangles, geo_reference)
+        General_mesh.__init__(self, coordinates, triangles,
+                              geo_reference, verbose=verbose)
+
+        if verbose: print 'Initialising mesh'         
 
         N = self.number_of_elements
@@ -94 +99 @@
 
         #Initialise each triangle
+        if verbose: print 'Mesh: Computing centroids and radii'        
         for i in range(N):
-            #if i % (N/10) == 0: print '(%d/%d)' %(i, N)
+            if verbose and i % ((N+10)/10) == 0: print '(%d/%d)' %(i, N)
 
             x0 = V[i, 0]; y0 = V[i, 1]
@@ -144 +150 @@
 
         #Build neighbour structure
+        if verbose: print 'Mesh: Building neigbour structure'                
         self.build_neighbour_structure()
 
         #Build surrogate neighbour structure
+        if verbose: print 'Mesh: Building surrogate neigbour structure'
         self.build_surrogate_neighbour_structure()
 
         #Build boundary dictionary mapping (id, edge) to symbolic tags
+        if verbose: print 'Mesh: Building boundary dictionary'
         self.build_boundary_dictionary(boundary)
 
         #Build tagged element  dictionary mapping (tag) to array of elements
+        if verbose: print 'Mesh: Building tagged elements dictionary'        
         self.build_tagged_elements_dictionary(tagged_elements)
 
@@ -159 +169 @@
 
         #FIXME check integrity?
+        if verbose: print 'Mesh: Done'                
 
     def __repr__(self):