Changeset 4589

Timestamp:

Jul 4, 2007, 6:33:05 PM (18 years ago)

Author:

ole

Message:

Fixed up dangerous double use of one variable

Location:

anuga_core/source/anuga/fit_interpolate

Files:

• fit.py (modified) (1 diff)
• general_fit_interpolate.py (modified) (1 diff)
• interpolate.py (modified) (3 diffs)

anuga_core/source/anuga/fit_interpolate/fit.py

@@ -272 +272 @@
         if verbose: print 'Building fitting matrix from %d points' %n        
         #Compute matrix elements for points inside the mesh
-        for k, i in enumerate(inside_poly_indices):
+        for d, i in enumerate(inside_poly_indices):
             #For each data_coordinate point
-            if verbose and k%((n+10)/10)==0: print 'Doing %d of %d' %(k, n)
+            if verbose and d%((n+10)/10)==0: print 'Doing %d of %d' %(d, n)
             x = point_coordinates[i]
             element_found, sigma0, sigma1, sigma2, k = \

anuga_core/source/anuga/fit_interpolate/general_fit_interpolate.py

@@ -26 +26 @@
 from anuga.caching.caching import cache
 from anuga.abstract_2d_finite_volumes.neighbour_mesh import Mesh
+
 from anuga.utilities.sparse import Sparse, Sparse_CSR
 from anuga.utilities.cg_solve import conjugate_gradient, VectorShapeError
-from anuga.coordinate_transforms.geo_reference import Geo_reference
-from anuga.utilities.quad import build_quadtree
 from anuga.utilities.numerical_tools import ensure_numeric
 from anuga.utilities.polygon import in_and_outside_polygon
+from anuga.utilities.quad import build_quadtree
+
+from anuga.coordinate_transforms.geo_reference import Geo_reference
 from anuga.geospatial_data.geospatial_data import Geospatial_data, \
      ensure_absolute
-from search_functions import search_tree_of_vertices
-
 
 

anuga_core/source/anuga/fit_interpolate/interpolate.py

@@ -32 +32 @@
 from anuga.utilities.cg_solve import conjugate_gradient, VectorShapeError
 from anuga.coordinate_transforms.geo_reference import Geo_reference
-from anuga.utilities.quad import build_quadtree
 from anuga.utilities.numerical_tools import ensure_numeric, mean, NAN
 from anuga.utilities.polygon import in_and_outside_polygon
@@ -255 +254 @@
         #print "self.outside_poly_indices",self.outside_poly_indices 
         #Build n x m interpolation matrix
-        if verbose and len(self.outside_poly_indices) >0:
+        if verbose and len(self.outside_poly_indices) > 0:
             print '\n WARNING: Points outside mesh boundary. \n'
         # Since you can block, throw a warning, not an error.
@@ -271 +270 @@
         n = len(self.inside_poly_indices)
         #Compute matrix elements for points inside the mesh
-        if verbose: print 'Building interpolation matrix fram %d points' %n
-        for k, i in enumerate(self.inside_poly_indices):
-            #For each data_coordinate point
-            if verbose and k%((n+10)/10)==0: print 'Doing %d of %d' %(k, n)
+        if verbose: print 'Building interpolation matrix from %d points' %n
+        for d, i in enumerate(self.inside_poly_indices):
+            # For each data_coordinate point
+            if verbose and d%((n+10)/10)==0: print 'Doing %d of %d' %(d, n)
             x = point_coordinates[i]
             element_found, sigma0, sigma1, sigma2, k = \
                            search_tree_of_vertices(self.root, self.mesh, x)
-            #Update interpolation matrix A if necessary
+            
+            # Update interpolation matrix A if necessary
             if element_found is True:
-                #Assign values to matrix A
-
-                j0 = self.mesh.triangles[k,0] #Global vertex id for sigma0
-                j1 = self.mesh.triangles[k,1] #Global vertex id for sigma1
-                j2 = self.mesh.triangles[k,2] #Global vertex id for sigma2
+                # Assign values to matrix A
+
+                j0 = self.mesh.triangles[k,0] # Global vertex id for sigma0
+                j1 = self.mesh.triangles[k,1] # Global vertex id for sigma1
+                j2 = self.mesh.triangles[k,2] # Global vertex id for sigma2
 
                 sigmas = {j0:sigma0, j1:sigma1, j2:sigma2}