Changeset 302

Timestamp:

Sep 15, 2004, 1:49:49 PM (21 years ago)

Author:

ole

Message:

Added check for point inside triangle

File:

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

inundation/ga/storm_surge/pyvolution/least_squares.py

@@ -58 +58 @@
 
                 #Compute interpolation
-                
                 sigma2 = dot((x-xi0), n2)/dot((xi2-xi0), n2)
                 sigma0 = dot((x-xi1), n0)/dot((xi0-xi1), n0)
@@ -66 +65 @@
                 assert abs(sigma0 + sigma1 + sigma2 - 1.0) < epsilon
 
-                #Assign values to matrix
-                v0 = self.vertices[k,0]
-                self.matrix[i, v0] = sigma0
+                
+                #Check that this trinagle contains data point
+                if sigma0 >= 0 and sigma1 >= 0 and sigma2 >= 0:
 
-                v1 = self.vertices[k,1]
-                self.matrix[i, v1] = sigma1
+                    #Assign values to matrix
+                    v_id = self.vertices[k,0]
+                    self.matrix[i, v_id] = sigma0
 
-                v2 = self.vertices[k,2]
-                self.matrix[i, v2] = sigma2
+                    v_id = self.vertices[k,1]
+                    self.matrix[i, v_id] = sigma1
+
+                    v_id = self.vertices[k,2]
+                    self.matrix[i, v_id] = sigma2