Changeset 460

Timestamp:

Oct 28, 2004, 4:22:55 PM (20 years ago)

Author:

duncan

Message:

removed temp methods in quantity

File:

• inundation/ga/storm_surge/pyvolution/quantity.py (modified) (2 diffs)

inundation/ga/storm_surge/pyvolution/quantity.py

@@ -240 +240 @@
                 raise msg
             
- #FIXME - roll this back into set_array_values, if possible             
-    def set_array_values_by_index(self, values, location='vertices', indexes = None):
-        from Numeric import array, Float, Int
-
-        values = array(values).astype(Float)
-        
-        if not (indexes == None):
-            indexes = array(indexes).astype(Int)
-
-        N = self.centroid_values.shape[0]
-        
-        if location == 'centroids':
-            assert len(values.shape) == 1, 'Values array must be 1d'
-
-            if indexes == None:
-                msg = 'Number of values must match number of elements'
-                assert values.shape[0] == N, msg
-            
-                self.centroid_values = values
-            else:
-                msg = 'Number of values must match number of indexes'
-                assert values.shape[0] == indexes.shape[0], msg
-                
-                #Brute force
-                for i in range(len(indexes)):
-                    self.centroid_values[indexes[i]] = values[i]
-                
 
     # FIXME have a get_vertex_values as well, so the 'level' quantity can be
@@ -299 +272 @@
         #Intialise centroid and edge_values
         self.interpolate()
+
  
-    def set_some_vertex_values(self, A, indexes):
-        """Set vertex values for some triangles based on input array A
-        which is assumed to have one entry per (unique) vertex, i.e.
-        one value for each row in array self.domain.coordinates.
-        """
-
-        from Numeric import array, Float
-        
-        #Assert that A can be converted to a Numeric array of appropriate dim
-        A = array(A, Float)
-        msg = 'Number of values must match number of indexes'
-        assert A.shape[0] == len(indexes), msg 
-        if (len(A.shape) == 2):
-            assert A.shape[0] == len(indexes), msg  
-            msg = 'Each vertex must have a list of three values, or one value'
-            assert A.shape[1] == 3, msg  
-        elif (len(A.shape) <> 1):  
-            msg = 'vertex values must be 1D or 2D.'
-            raise msg 
-        
-        #Go through list of triangles
-        #FIXME This is brute force.  Can it be optimised?
-        for element_index, value in map(None, indexes, A):            
-            if len(A.shape) == 2:
-                self.vertex_values[element_index] = value
-            else:
-                self.vertex_values[element_index, 0] = value
-                self.vertex_values[element_index, 1] = value
-                self.vertex_values[element_index, 2] = value
-                
-        #Intialise centroid and edge_values
-        self.interpolate()
-
-    
     def smooth_vertex_values(self, value_array='field_values',
                              precision = None):