Changeset 4583

Timestamp:

Jul 4, 2007, 11:34:47 AM (17 years ago)

Author:

ole

Message:

Added code for restricting constant values to a polygon in set_quantity

Location:

anuga_core/source/anuga/abstract_2d_finite_volumes

Files:

• quantity.py (modified) (3 diffs)
• test_quantity.py (modified) (1 diff)

anuga_core/source/anuga/abstract_2d_finite_volumes/quantity.py

@@ -19 +19 @@
 
 from anuga.utilities.numerical_tools import ensure_numeric, is_scalar
+from anuga.utilities.polygon import inside_polygon
+
 from anuga.geospatial_data.geospatial_data import Geospatial_data
 from anuga.fit_interpolate.fit import fit_to_mesh
@@ -267 +269 @@
                  inside polygon. Polygon works by selecting indices
                  and calling set_values recursively.
+                 Polygon mode has only been implemented for
+                 constant values so far.
 
         indices: Restrict update of quantity to locations that are 
@@ -290 +294 @@
 
 
-        # Polygon situation
-        #if polygon is not None:
-        #    if indices is not None:
-        #        msg = 'Only one of polygon and indices can be specified'
-        #        raise Exception, msg
-        #
-        #    Need to get candidate points. I think we should
-        #    simplify this whole thing a bit. Do we really need location?
-        #    point_indices = inside_polygon(points, polygon)
+        # Treat special case: Polygon situation
+        # FIXME (Ole): This needs to be generalised and
+        # perhaps the notion of location and indices simplified
+        if polygon is not None:
+            if indices is not None:
+                msg = 'Only one of polygon and indices can be specified'
+                raise Exception, msg
+
+
+            msg = 'With polygon selected, set_quantity must provide '
+            msg += 'the keyword numeric and it must (currently) be '
+            msg += 'a constant.'
+            if numeric is None:
+                raise Exception, msg            
+            else:
+                # Check that numeric is as constant
+                assert type(numeric) in [FloatType, IntType, LongType], msg
+
+
+            location = 'centroids'
+
+
+            points = self.domain.get_centroid_coordinates()
+            indices = inside_polygon(points, polygon)
+            
+            self.set_values_from_constant(numeric,
+                                          location, indices, verbose)
+            
+            self.extrapolate_first_order()
+            return
+        
+        
+
 
 

anuga_core/source/anuga/abstract_2d_finite_volumes/test_quantity.py

@@ -401 +401 @@
 
 
-        # FIXME: Not done yet
         # Now try with polygon (pick points where y>2)
-        #polygon = [[0,2.1], [4,2.1], [4,7], [0,7]]
-        #quantity.set_values(0.0)
-        #quantity.set_values(3.14, polygon=polygon, location='vertices')
-        #
-        #print quantity.vertex_values
-        #
-        ## Indices refer to triangle numbers here - not vertices (why?)
-        #assert allclose(quantity.vertex_values,
-        #                [[0,0,0], [0,0,0], [0,0,0],
-        #                 [3.14,3.14,3.14]])                
+        polygon = [[0,2.1], [4,2.1], [4,7], [0,7]]
+        quantity.set_values(0.0)
+        quantity.set_values(3.14, polygon=polygon, location='vertices')
+        
+        # Indices refer to triangle numbers here - not vertices (why?)
+        assert allclose(quantity.vertex_values,
+                        [[0,0,0], [0,0,0], [0,0,0],
+                         [3.14,3.14,3.14]])