Changeset 705 for inundation/ga/storm_surge/pyvolution/least_squares.py

Timestamp:

Dec 14, 2004, 12:59:59 PM (20 years ago)

Author:

duncan

Message:

fixed bug in least_squares algorithm.

File:

• inundation/ga/storm_surge/pyvolution/least_squares.py (modified) (3 diffs)

inundation/ga/storm_surge/pyvolution/least_squares.py

@@ -245 +245 @@
             #Find vertices near x
             candidate_vertices = root.search(x[0], x[1])
-
             is_more_elements = True
-            if candidate_vertices == []:
-                # The point isn't even within the root cell!
-                is_more_elements = False
-                element_found = False
-            else:
-                element_found, sigma0, sigma1, sigma2, k = \
-                    self.search_triangles_of_vertices(candidate_vertices, x)
-
+            
+            element_found, sigma0, sigma1, sigma2, k = \
+                self.search_triangles_of_vertices(candidate_vertices, x)
             while not element_found and is_more_elements: 
-                candidate_vertices = root.expand_search()
-                if candidate_vertices == []:
-                    # All the triangles have been searched.
+                candidate_vertices, branch = root.expand_search()
+                if branch == []:
+                    # Searching all the verts from the root cell that haven't
+                    # been searched.  This is the last try
+                    element_found, sigma0, sigma1, sigma2, k = \
+                      self.search_triangles_of_vertices(candidate_vertices, x)
                     is_more_elements = False
                 else:
                     element_found, sigma0, sigma1, sigma2, k = \
                       self.search_triangles_of_vertices(candidate_vertices, x)
-                    
-                
+                     
             
             #Update interpolation matrix A if necessary     
@@ -301 +297 @@
             sigma0 = -10.0
             sigma1 = -10.0
+            k = -10.0
 
             #For all vertices in same cell as point x
@@ -317 +314 @@
                     #print "PDSG - xi1", xi1
                     #print "PDSG - xi2", xi2
-                    #print "PDSG element %i verts((%f, %f),(%f, %f),(%f, %f))" \
-                    #      % (k, xi0[0], xi0[1], xi1[0], xi1[1], xi2[0], xi2[1])
+                   #print "PDSG element %i verts((%f, %f),(%f, %f),(%f, %f))" \
+                    #   % (k, xi0[0], xi0[1], xi1[0], xi1[1], xi2[0], xi2[1])
                     
                     #Get the three normals