Changeset 531

Timestamp:

Nov 12, 2004, 3:56:50 PM (20 years ago)

Author:

duncan

Message:

basic quantity.get_values as a list of triangles

Location:

inundation/ga/storm_surge/pyvolution

Files:

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

inundation/ga/storm_surge/pyvolution/quantity.py

@@ -147 +147 @@
             self.interpolate()
             
+          
+    def get_values(self, location='vertices', indexes = None):
+        """get values for quantity
+
+        return X, Compatible list, Numeric array (see below)
+        location: Where values are to be stored.
+                  Permissible options are: vertices, edges, centroid
+                  Default is "vertices"
+
+        In case of location == 'centroid' the dimension values must
+        be a list of a Numerical array of length N, N being the number
+        of elements in the mesh. Otherwise it must be of dimension Nx3
+
+        The values will be stored in elements following their
+        internal ordering.
+
+        If values are described a function, it will be evaluated at specified points
+
+        If selected location is vertices, values for centroid and edges
+        will be assigned interpolated values.
+        In any other case, only values for the specified locations
+        will be assigned and the others will be left undefined.
+        """
+        from Numeric import take
+
+        if location not in ['vertices', 'centroids', 'edges']:
+            msg = 'Invalid location: %s' %location
+            raise msg         
+        
+        if (indexes ==  None):
+            indexes = range(len(self))
+            
+        if location == 'centroids':
+            return take(self.centroid_values,indexes)                       
+        elif location == 'edges':
+            return take(self.edge_values,indexes)
+        else:
+            return take(self.vertex_values,indexes)
 
 

inundation/ga/storm_surge/pyvolution/test_quantity.py

@@ -690 +690 @@
         quantity.interpolate()
         assert allclose(quantity.centroid_values, [10,100,3,400,5,999])
+
+        
+    def test_getting_some_vertex_values(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)
+        #print "domain.number_of_elements ",domain.number_of_elements 
+        quantity = Quantity(domain,[[1,1,1],[2,2,2],[3,3,3],
+                                    [4,4,4],[5,5,5],[6,6,6]])
+        value = [7]
+        indexes = [1]
+        quantity.set_values(value,
+                                  location = 'centroids',
+                                  indexes = indexes)
+        #print "quantity.centroid_values",quantity.centroid_values
+        #print "quantity.get_values(location = 'centroids') ",\
+        #      quantity.get_values(location = 'centroids')
+        assert allclose(quantity.centroid_values,
+                        quantity.get_values(location = 'centroids'))
+
+        
+        value = [[15,20,25]]
+        quantity.set_values(value, indexes = indexes)
+        #print "1 quantity.vertex_values",quantity.vertex_values
+        assert allclose(quantity.vertex_values, quantity.get_values())
+
+        assert allclose(quantity.edge_values,
+                        quantity.get_values(location = 'edges'))
+
+        # get a subset of elements 
+        subset = quantity.get_values(location='centroids', indexes=[0,5])
+        answer = [quantity.centroid_values[0],quantity.centroid_values[5]]
+        assert allclose(subset, answer)
+
+
+        subset = quantity.get_values(location='edges', indexes=[0,5])
+        answer = [quantity.edge_values[0],quantity.edge_values[5]]
+        #print "subset",subset
+        #print "answer",answer
+        assert allclose(subset, answer)
+
+        subset = quantity.get_values( indexes=[1,5])
+        answer = [quantity.vertex_values[1],quantity.vertex_values[5]]
+        #print "subset",subset
+        #print "answer",answer
+        assert allclose(subset, answer)
+        
+##############################################
+
+        values = [10,100,50]
+        quantity.set_values(values, indexes = [0,1,5])
+        #print "2 quantity.vertex_values",quantity.vertex_values
+        assert allclose(quantity.vertex_values[0], [10,10,10])
+        assert allclose(quantity.vertex_values[5], [50,50,50])
+        quantity.interpolate()
+        #print "quantity.centroid_values",quantity.centroid_values
+        assert allclose(quantity.centroid_values, [10,100,3,4,5,50])
+       
+        values = [[31,30,29],[400,400,400],[1000,999,998]]
+        quantity.set_values(values, indexes = [3,3,5])
+        quantity.interpolate()
+        assert allclose(quantity.centroid_values, [10,100,3,400,5,999])
+        
 #-------------------------------------------------------------
 if __name__ == "__main__":