Changeset 6533 for branches/numpy/anuga/fit_interpolate

Timestamp:

Mar 17, 2009, 4:02:54 PM (16 years ago)

Author:

rwilson

Message:

Revert back to 6481, prior to auto-merge of trunk and numpy branch.

File:

• branches/numpy/anuga/fit_interpolate/fit.py (modified) (4 diffs)

branches/numpy/anuga/fit_interpolate/fit.py

@@ -310 +310 @@
                 assert flag is True, msg                
                 
-                # FIXME(Ole): This is the message referred to in ticket:314
                 minx = min(self.mesh_boundary_polygon[:,0])
                 maxx = max(self.mesh_boundary_polygon[:,0])                
@@ -318 +317 @@
                 msg += 'Mesh boundary extent is (%.f, %.f), (%.f, %.f)'\
                     % (minx, maxx, miny, maxy)
-                raise RuntimeError, msg
                 
 
@@ -377 +375 @@
                 self.build_fit_subset(points, z, verbose=verbose)
 
-                # FIXME(Ole): I thought this test would make sense here
-                # See test_fitting_example_that_crashed_2 in test_shallow_water_domain.py
-                # Committed 11 March 2009
-                msg = 'Matrix AtA was not built'
-                assert self.AtA is not None, msg
-                
-                #print 'Matrix was built OK'
-
                 
             point_coordinates = None
@@ -392 +382 @@
         if point_coordinates is None:
             if verbose: print 'Warning: no data points in fit'
-            msg = 'No interpolation matrix.'
-            assert self.AtA is not None, msg
-            assert self.Atz is not None
+            #assert self.AtA != None, 'no interpolation matrix'
+            #assert self.Atz != None
+            assert not self.AtA is None, 'no interpolation matrix'
+            assert not self.Atz is None
             
             # FIXME (DSG) - do  a message