Changeset 3447

Timestamp:

Aug 2, 2006, 5:14:16 PM (19 years ago)

Author:

duncan

Message:

Making set_region easier to use.

Files:

• development/dam_2006/run_dam.py (modified) (2 diffs)
• inundation/pyvolution/domain.py (modified) (3 diffs)
• inundation/pyvolution/test_domain.py (modified) (1 diff)

development/dam_2006/run_dam.py

@@ -56 +56 @@
     create_mesh.generate(project.mesh_filename,
                          gate_position,
-                         #is_course=True) # this creates the mesh
-                         is_course=False) # this creates the mesh
+                         is_course=True) # this creates the mesh
+                         #is_course=False) # this creates the mesh
 
     head,tail = path.split(project.mesh_filename)
@@ -91 +91 @@
 
     print 'Available boundary tags', domain.get_boundary_tags()
-
+    domain.set_region('dam','stage',0.2,
+                                 location = 'unique vertices') 
     domain.set_region(Set_region('dam','stage',0.2,
                                  location = 'unique vertices'))

inundation/pyvolution/domain.py

@@ -15 +15 @@
 from pyvolution.generic_boundary_conditions import Transmissive_boundary
 from pyvolution.pmesh2domain import pmesh_to_domain
+from pyvolution.region import Set_region as region_set_region
 
 import types
@@ -424 +425 @@
 
 
-    def set_region(self, functions):
+    def set_region(self, *args, **kwargs):
+        """
+        This method is used to set quantities based on a regional tag.
+        
+        It is most often called with the following parameters;
+        (self, tag, quantity, X, location='vertices')
+        tag: the name of the regional tag used to specify the region 
+        quantity: Name of quantity to change
+        X: const or function - how the quantity is changed
+        location: Where values are to be stored.
+            Permissible options are: vertices, centroid and unique vertices
+
+        A callable region class or a list of callable region classes
+        can also be passed into this function.
+        """
+        #print "*args", args
+        #print "**kwargs", kwargs 
+        if len(args) == 1:
+            self._set_region(*args, **kwargs)
+        else:
+            #Assume it is arguments for the region.set_region function
+            func = region_set_region(*args, **kwargs)
+            self._set_region(func)
+            
+        
+    def _set_region(self, functions):
         # The order of functions in the list is used.
         if type(functions) not in [types.ListType,types.TupleType]:
@@ -432 +458 @@
                 function(tag, self.tagged_elements[tag], self)
 
-                #Do we need to do this sort of thing?
-                #self = function(tag, self.tagged_elements[tag], self)
 
     #MISC

inundation/pyvolution/test_domain.py

@@ -536 +536 @@
 
 
+    def test_region_tags2(self):
+        """
+        get values based on triangle lists.
+        """
+        from mesh_factory import rectangular
+        from shallow_water import Domain
+        from Numeric import zeros, Float
+
+        #Create basic mesh
+        points, vertices, boundary = rectangular(1, 3)
+
+        #Create shallow water domain
+        domain = Domain(points, vertices, boundary)
+        domain.build_tagged_elements_dictionary({'bottom':[0,1],
+                                                 'top':[4,5],
+                                                 'all':[0,1,2,3,4,5]})
+
+
+        #Set friction
+        manning = 0.07
+        domain.set_quantity('friction', manning)
+
+        domain.set_region('top', 'friction', 1.0)
+        domain.set_region('bottom', 'friction', 0.09)
+        
+        #print domain.quantities['friction'].get_values()
+        assert allclose(domain.quantities['friction'].get_values(),\
+                        [[ 0.09,  0.09,  0.09],
+                         [ 0.09,  0.09,  0.09],
+                         [ 0.07,  0.07,  0.07],
+                         [ 0.07,  0.07,  0.07],
+                         [ 1.0,  1.0,  1.0],
+                         [ 1.0,  1.0,  1.0]])
+        
+        domain.set_region([set_bottom_friction, set_top_friction])
+        #print domain.quantities['friction'].get_values()
+        assert allclose(domain.quantities['friction'].get_values(),\
+                        [[ 0.09,  0.09,  0.09],
+                         [ 0.09,  0.09,  0.09],
+                         [ 0.07,  0.07,  0.07],
+                         [ 0.07,  0.07,  0.07],
+                         [ 1.0,  1.0,  1.0],
+                         [ 1.0,  1.0,  1.0]])
+
+        domain.set_region([set_all_friction])
+        #print domain.quantities['friction'].get_values()
+        assert allclose(domain.quantities['friction'].get_values(),
+                        [[ 10.09, 10.09, 10.09],
+                         [ 10.09, 10.09, 10.09],
+                         [ 10.07, 10.07, 10.07],
+                         [ 10.07, 10.07, 10.07],
+                         [ 11.0,  11.0,  11.0],
+                         [ 11.0,  11.0,  11.0]])
 
 #-------------------------------------------------------------