Changeset 3019

Timestamp:

May 30, 2006, 3:19:30 PM (18 years ago)

Author:

duncan

Message:

interpolate: adding warnings

Location:

inundation/fit_interpolate

Files:

• interpolate.py (modified) (1 diff)
• test_interpolate.py (modified) (8 diffs)

inundation/fit_interpolate/interpolate.py

@@ -237 +237 @@
         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.
+        if verbose and 0 == len(self.inside_poly_indices):
+            print '\n WARNING: No points within the mesh! \n'
+            
         m = self.mesh.coordinates.shape[0] #Nbr of basis functions (1/vertex)
         n = point_coordinates.shape[0]     #Nbr of data points

inundation/fit_interpolate/test_interpolate.py

@@ -157 +157 @@
 
     def test_datapoints_at_vertices(self):
-        """Test that data points coinciding with vertices yield a diagonal matrix
-        """
+        #Test that data points coinciding with vertices yield a diagonal matrix
+        
 
         a = [0.0, 0.0]
@@ -177 +177 @@
 
     def test_datapoints_on_edge_midpoints(self):
-        """Try datapoints midway on edges -
-        each point should affect two matrix entries equally
-        """
+        #Try datapoints midway on edges -
+        #each point should affect two matrix entries equally
+        
 
         a = [0.0, 0.0]
@@ -197 +197 @@
 
     def test_datapoints_on_edges(self):
-        """Try datapoints on edges -
-        each point should affect two matrix entries in proportion
-        """
+        #Try datapoints on edges -
+        #each point should affect two matrix entries in proportion
+        
 
         a = [0.0, 0.0]
@@ -219 +219 @@
 
     def test_arbitrary_datapoints(self):
-        """Try arbitrary datapoints
-        """
+        #Try arbitrary datapoints
+        
 
         from Numeric import sum
@@ -238 +238 @@
 
     def test_arbitrary_datapoints_some_outside(self):
-        """Try arbitrary datapoints one outside the triangle.
-        That one should be ignored
-        """
+        #Try arbitrary datapoints one outside the triangle.
+        #That one should be ignored
+        
 
         from Numeric import sum
@@ -435 +435 @@
         
     def test_interpolate_attributes_to_pointsIII(self):
-        """Test linear interpolation of known values at vertices to
-        new points inside a triangle
-        """
+        #Test linear interpolation of known values at vertices to
+        #new points inside a triangle
+        
         a = [0.0, 0.0]
         b = [0.0, 5.0]
@@ -496 +496 @@
         
     def test_interpolate_point_outside_of_mesh(self):
-        """Test linear interpolation of known values at vertices to
-        new points inside a triangle
-        """
+        #Test linear interpolation of known values at vertices to
+        #new points inside a triangle
+        
         a = [0.0, 0.0]
         b = [0.0, 5.0]
@@ -1145 +1145 @@
 
     def test_interpolation_function_time(self):
-        """Test a long time series with an error in it (this did cause an
-        error once)
-        """
+        #Test a long time series with an error in it (this did cause an
+        #error once)
+        
 
         time = array(\