Changeset 7675 for anuga_core/source/anuga/fit_interpolate/interpolate.py

Timestamp:

Apr 6, 2010, 8:23:54 PM (15 years ago)

Author:

James Hudson

Message:

Ticket 113 is complete, and all tests pass.
A centroid list is built by Interpolation_function as it calculates the interpolation matrix, and this is passed out as extra quantities which are output into the gauge.csv file.

File:

• anuga_core/source/anuga/fit_interpolate/interpolate.py (modified) (8 diffs)

anuga_core/source/anuga/fit_interpolate/interpolate.py

@@ -218 +218 @@
 
 
-
     ##
     # @brief Interpolate mesh data f to determine values, z, at points.
@@ -383 +382 @@
 
         # Unpack result
-        self._A, self.inside_poly_indices, self.outside_poly_indices = X
+        self._A, self.inside_poly_indices, self.outside_poly_indices, self.centroids = X
 
         # Check that input dimensions are compatible
@@ -436 +435 @@
         #                         point.
     # @param verbose True if this function is to be verbose.
-    # @return Interpolation matrix A, plus lists of the points inside and outside the mesh.
+    # @return Interpolation matrix A, plus lists of the points inside and outside the mesh
+        #         and the list of centroids, if requested.
     def _build_interpolation_matrix_A(self,
                                       point_coordinates,
@@ -487 +487 @@
         n = len(inside_poly_indices)
 
+        centroids = []
+                
         # Compute matrix elements for points inside the mesh
         if verbose: log.critical('Building interpolation matrix from %d points'
@@ -516 +518 @@
                                     # If centroids are needed, weight all 3 vertices equally
                     for j in js:
-                        A[i, j] = 1.0/3.0                    
+                        A[i, j] = 1.0/3.0
+                    centroids.append(self.mesh.centroid_coordinates[k])                                         
             else:
                 msg = 'Could not find triangle for point', x
                 raise Exception(msg)
-        return A, inside_poly_indices, outside_poly_indices
+        return A, inside_poly_indices, outside_poly_indices, centroids
 
 
@@ -841 +844 @@
         self.index = 0    # Initial time index
         self.precomputed_values = {}
+        self.centroids = []
 
         # Precomputed spatial interpolation if requested
@@ -994 +998 @@
                                                       self.interpolation_points,
                                                       verbose=False,
-                                                                                                          output_centroids=output_centroids)
+                                                      output_centroids=output_centroids)
+                        self.centroids = interpol.centroids                                                                                                               
                     elif triangles is None and vertex_coordinates is not None:
                         result = interpolate_polyline(Q,
@@ -1003 +1008 @@
 
                     #assert len(result), len(interpolation_points)
-                    self.precomputed_values[name][i, :] = result
-
+                    self.precomputed_values[name][i, :] = result                                                                        
+                                        
             # Report
             if verbose:
-                log.critical(self.statistics())
+                log.critical(self.statistics())                 
         else:
             # Store quantitites as is