Changeset 2808

Timestamp:

May 5, 2006, 5:01:16 PM (19 years ago)

Author:

ole

Message:

Domain from meshfile, set storage of unique vertex values etc

Location:

inundation

Files:

• parallel/documentation/report.tex (modified) (1 diff)
• pyvolution/domain.py (modified) (2 diffs)
• pyvolution/general_mesh.py (modified) (1 diff)
• pyvolution/pmesh2domain.py (modified) (1 diff)
• pyvolution/shallow_water.py (modified) (1 diff)
• pyvolution/util.py (modified) (3 diffs)

inundation/parallel/documentation/report.tex

@@ -20 +20 @@
 \documentclass{manual}
 
-\usepackage{url}
+%\usepackage{url} %Already defined in manual
 \usepackage{graphicx}
 

inundation/pyvolution/domain.py

@@ -27 +27 @@
                  tagged_elements=None, geo_reference=None,
                  use_inscribed_circle=False,
-                 mesh_filename=None):
+                 mesh_filename=None,
+                 use_cache=False,
+                 verbose=False):
+        
         """Instantiate generic computational Domain.
+        
         Input:
-          source:    Either a mesh filename or coordinates of mesh vertices. If it is a
-                     filename values specified for triangles will be overridden.
+          source:    Either a mesh filename or coordinates of mesh vertices.
+                     If it is a filename values specified for triangles will
+                     be overridden.
           triangles: Mesh connectivity (see mesh.py for more information)
           boundary:  See mesh.py for more information
 
-          conserved_quantities: List of quantity names entering the conservation equations
+          conserved_quantities: List of quantity names entering the
+                                conservation equations
           other_quantities:     List of other quantity names
 
@@ -55 +61 @@
             coordinates, triangles, boundary, vertex_quantity_dict, \
                          tagged_elements, geo_reference = \
-                         pmesh_to_domain(file_name=mesh_filename)
+                         pmesh_to_domain(file_name=mesh_filename,
+                                         use_cache=use_cache,
+                                         verbose=verbose)
 
             

inundation/pyvolution/general_mesh.py

@@ -302 +302 @@
             #Register the vertices v as lists of
             #(triangle_id, vertex_id) tuples associated with them
-            #This is used for smoothing
+            #This is used for averaging multiple vertex values.
             for vertex_id, v in enumerate([a,b,c]):
                 if vertexlist[v] is None:

inundation/pyvolution/pmesh2domain.py

@@ -114 +114 @@
 
 
-
 def pmesh_to_domain(file_name=None,
-                    mesh_instance=None):
+                    mesh_instance=None,
+                    use_cache=False,
+                    verbose=False):
+    """
+    Convert a pmesh file or a pmesh mesh instance to a bunch of lists
+    that can be used to instanciate a domain object.
+
+    use_cache: True means that caching is attempted for the computed domain.    
+    """
+ 
+    if use_cache is True:
+        from caching import cache
+        result = cache(_pmesh_to_domain, (file_name, mesh_instance),
+                       dependencies = [file_name],                     
+                       verbose = verbose)
+
+    else:
+        result = apply(_pmesh_to_domain, (file_name, mesh_instance))        
+        
+    return result
+
+
+def _pmesh_to_domain(file_name=None,
+                    mesh_instance=None,
+                    use_cache=False,
+                    verbose=False):
     """
     Convert a pmesh file or a pmesh mesh instance to a bunch of lists

inundation/pyvolution/shallow_water.py

@@ -101 +101 @@
         self.store = True
         self.format = 'sww'
-        self.smooth = True
+        self.set_store_vertices_uniquely(False)
+
+        self.quantities_to_be_stored = ['stage','xmomentum','ymomentum']
+        
+
+    def set_store_vertices_uniquely(self, flag, reduction=None):
+        """Decide whether vertex values should be stored uniquely as
+        computed in the model or whether they should be reduced to one
+        value per vertex using self.reduction. 
+        """
+        self.smooth = not flag
 
         #Reduction operation for get_vertex_values
-        self.reduction = mean
-        #self.reduction = min  #Looks better near steep slopes
-
-        self.quantities_to_be_stored = ['stage','xmomentum','ymomentum']
-
+        if reduction is None:
+            self.reduction = mean
+            #self.reduction = min  #Looks better near steep slopes
+        
+        
+        
 
     def set_quantities_to_be_stored(self, q):

inundation/pyvolution/util.py

@@ -504 +504 @@
 
 
-from pylab import *
     
 def sww2timeseries(swwfile,
@@ -585 +584 @@
                       
     """
+
+    
     k = _sww2timeseries(swwfile,
                         gauge_filename,
@@ -606 +607 @@
                     title_on = None,
                     verbose = False):
+
+    from pylab import * #FIXME (Ole): List actual functions used rather than *
+    
 
     assert type(swwfile) == type(''),\