Changeset 570

Timestamp:

Nov 16, 2004, 5:31:53 PM (20 years ago)

Author:

ole

Message:

Fixed bug in leastsquares where sigmas may get negative within machine precision

Location:

inundation/ga/storm_surge/pyvolution

Files:

• least_squares.py (modified) (5 diffs)
• test_least_squares.py (modified) (1 diff)

inundation/ga/storm_surge/pyvolution/least_squares.py

@@ -235 +235 @@
             candidate_vertices = root.search(x[0], x[1])
 
+            
             #Find triangle containing x:
             element_found = False            
@@ -254 +255 @@
                     n2 = self.mesh.get_normal(k, 2)                
 
+                    
                     #Compute interpolation
                     sigma2 = dot((x-xi0), n2)/dot((xi2-xi0), n2)
@@ -262 +264 @@
                     epsilon = 1.0e-6
                     assert abs(sigma0 + sigma1 + sigma2 - 1.0) < epsilon
-
+                    
                     #Check that this triangle contains the data point
-                    if sigma0 >= 0 and sigma1 >= 0 and sigma2 >= 0:
+                    
+                    #Sigmas can get negative within
+                    #machine precision on some machines (e.g nautilus)
+                    #Hence the small eps
+                    
+                    eps = 1.0e-15
+                    if sigma0 >= -eps and sigma1 >= -eps and sigma2 >= -eps:
                         element_found = True
                         break
@@ -272 +280 @@
                     break
                     
-
-            print x, element_found, k
             
             #Update interpolation matrix A if necessary     
@@ -299 +305 @@
                 #Ok if there is no triangle for datapoint 
                 #(as in brute force version)
-                raise 'Could not find triangle for point', x
+                #raise 'Could not find triangle for point', x
 
 

inundation/ga/storm_surge/pyvolution/test_least_squares.py

@@ -682 +682 @@
 #-------------------------------------------------------------
 if __name__ == "__main__":
-    suite = unittest.makeSuite(TestCase,'test_more_tri')
+    suite = unittest.makeSuite(TestCase,'test')
     runner = unittest.TextTestRunner(verbosity=1)
     runner.run(suite)