Changeset 3956

Timestamp:

Nov 9, 2006, 12:51:08 PM (18 years ago)

Author:

ole

Message:

More cleanup and refactoring. Also adhered to style guide for comparisons to
singletons such as None.

Location:

anuga_core/source/anuga/abstract_2d_finite_volumes

Files:

• general_mesh.py (modified) (1 diff)
• quantity.py (modified) (18 diffs)
• test_quantity.py (modified) (1 diff)

anuga_core/source/anuga/abstract_2d_finite_volumes/general_mesh.py

@@ -273 +273 @@
         Default is False as many parts of ANUGA expects relative coordinates.
         """
-
-
-        
-        V = self.vertex_coordinates #[:3*M,:]
+        
+        V = self.vertex_coordinates
         if absolute is True:
             if not self.geo_reference.is_absolute():

anuga_core/source/anuga/abstract_2d_finite_volumes/quantity.py

@@ -16 +16 @@
 
 from Numeric import array, zeros, Float, less, concatenate, NewAxis,\
-     argmax, allclose
+     argmax, allclose, take, reshape
 from anuga.utilities.numerical_tools import ensure_numeric, is_scalar
 
@@ -169 +169 @@
                    quantity = None,   # Another quantity
                    function = None,   # Callable object: f(x,y)
-                   geospatial_data = None, #Arbitrary dataset
+                   geospatial_data = None, # Arbitrary dataset
                    points = None, values = None, data_georef = None, #Input
                    # for fit (obsoleted by use of geo_spatial object)
@@ -207 +207 @@
           values corresponding to
           each data point must be present.
+          (Obsoleted by geospatial_data)          
 
         values:
           If points is specified, values is an array of length N containing
           attribute values for each point.
+          (Obsoleted by geospatial_data)          
 
         data_georef:
           If points is specified, geo_reference applies to each point.
+          (Obsoleted by geospatial_data)          
 
         filename:
@@ -355 +358 @@
                                       use_cache = use_cache)
         else:
-            raise 'This can\'t happen :-)'
-
-
-        #Update all locations in triangles
+            raise Exception, 'This can\'t happen :-)'
+
+
+
+        # Update all locations in triangles
         if location == 'vertices' or location == 'unique vertices':
-            #Intialise centroid and edge_values
+            # Intialise centroid and edge_values
             self.interpolate()
 
         if location == 'centroids':
-            #Extrapolate 1st order - to capture notion of area being specified
+            # Extrapolate 1st order - to capture notion of area being specified
             self.extrapolate_first_order()
 
@@ -377 +381 @@
 
         if location == 'centroids':
-            if (indices ==  None):
+            if indices is None:
                 self.centroid_values[:] = X
             else:
                 #Brute force
                 for i in indices:
-                    self.centroid_values[i,:] = X
+                    self.centroid_values[i] = X
 
         elif location == 'edges':
-            if (indices ==  None):
+            if indices is None:
                 self.edge_values[:] = X
             else:
                 #Brute force
                 for i in indices:
-                    self.edge_values[i,:] = X
+                    self.edge_values[i] = X
 
         elif location == 'unique vertices':
-            if (indices ==  None):
+            if indices is None:
                 self.edge_values[:] = X
             else:
@@ -412 +416 @@
                     self.interpolate()
         else:
-            if (indices ==  None):
+            if indices is None:
                 self.vertex_values[:] = X
             else:
                 #Brute force
                 for i_vertex in indices:
-                    self.vertex_values[i_vertex,:] = X
-
-
+                    self.vertex_values[i_vertex] = X
 
 
@@ -425 +427 @@
 
     def set_values_from_array(self, values,
-                              location, indices, verbose):
+                              location='vertices',
+                              indices=None,
+                              verbose=False):
         """Set values for quantity
 
@@ -480 +484 @@
 
         elif location == 'edges':
+            # FIXME (Ole): No mention of indices here. However, I don't
+            # think we ever need to set values at edges anyway
             assert len(values.shape) == 2, 'Values array must be 2d'
 
@@ -495 +501 @@
 
             self.set_vertex_values(values.flat, indices=indices)
+            
         else:
+            # Location vertices
             if len(values.shape) == 1:
                 self.set_vertex_values(values, indices=indices)
@@ -505 +513 @@
                 assert values.shape[1] == 3, msg
 
-                if indices == None:
+                if indices is None:
                     self.vertex_values = values
                 else:
@@ -513 +521 @@
                 msg = 'Values array must be 1d or 2d'
                 raise msg
+            
 
     def set_values_from_quantity(self, q,
@@ -518 +527 @@
         """Set quantity values from specified quantity instance q
 
-        Location is ignored
+        Location is ignored - vertices will always be used here.
         """
 
@@ -536 +545 @@
 
     def set_values_from_function(self, f,
-                                 location, indices, verbose):
+                                 location='vertices',
+                                 indices=None,
+                                 verbose=False):
         """Set values for quantity using specified function
 
+        Input
+        
         f: x, y -> z Function where x, y and z are arrays
         location: Where values are to be stored.
@@ -544 +557 @@
                   unique vertices
                   Default is "vertices"
+        indices:  
+
+                  
         """
 
@@ -551 +567 @@
         #FIXME: Should supply absolute coordinates
 
-        from Numeric import take
-
-        if (indices is None):
-            indices = range(len(self))
-            is_subset = False
-        else:
-            is_subset = True
-
-
-        # FIXME (Ole): Now we can compute the arrays once and for all
-        # for both centroids and vertices and the use set_values_from_array
-
+
+        # Compute the function values and call set_values again
         if location == 'centroids':
-            V = take(self.domain.centroid_coordinates, indices)
-            if is_subset:
-                self.set_values(f(V[:,0], V[:,1]),
-                                location = location,
-                                indices = indices)
-            else:
-                self.set_values(f(V[:,0], V[:,1]), location = location)
+            if indices is None:
+                indices = range(len(self))
+                
+            V = take(self.domain.get_centroid_coordinates(), indices)
+            self.set_values(f(V[:,0], V[:,1]),
+                            location=location,
+                            indices=indices)
+            
         elif location == 'vertices':
+
+            M = self.domain.number_of_triangles
             V = self.domain.get_vertex_coordinates()
 
@@ -577 +586 @@
             values = f(x, y)
 
+
+            # FIXME (Ole): This code should replace all the
+            # rest of this function and it would work, except
+            # one unit test in test_region fails.
+            # If that could be resolved this one will be
+            # more robust and simple.
+            
+            #values = reshape(values, (M,3))
+            #self.set_values(values,
+            #                location='vertices',
+            #                indices=indices)
+
+
+            # This should be removed
             if is_scalar(values):
                 # Function returned a constant value
@@ -582 +605 @@
                                               location, indices, verbose)
                 return
-                
-            
-            if is_subset:
+
+            # This should be removed            
+            if indices is None:
+                for j in range(3):
+                    self.vertex_values[:,j] = values[j::3]                 
+            else:    
                 #Brute force
                 for i in indices:
                     for j in range(3):
                         self.vertex_values[i,j] = values[3*i+j]
-            else:
-                for j in range(3):
-                    self.vertex_values[:,j] = values[j::3] 
+
+
         else:
             raise 'Not implemented: %s' %location
@@ -973 +998 @@
         assert len(A.shape) == 1
 
-        if indices == None:
+        if indices is None:
             assert A.shape[0] == self.domain.get_nodes().shape[0]
             vertex_list = range(A.shape[0])

anuga_core/source/anuga/abstract_2d_finite_volumes/test_quantity.py

@@ -1348 +1348 @@
         quantity = Quantity(domain,[[1,1,1],[2,2,2],[3,3,3],
                                     [4,4,4],[5,5,5],[6,6,6]])
+
+
+        # Check that constants work
+        value = 7
+        indices = [1]
+        quantity.set_values(value,
+                            location = 'centroids',
+                            indices = indices)
+        #print "quantity.centroid_values",quantity.centroid_values
+        assert allclose(quantity.centroid_values, [1,7,3,4,5,6])
+        
         value = [7]
         indices = [1]