Changeset 6252

Timestamp:

Jan 31, 2009, 4:02:38 AM (16 years ago)

Author:

ole

Message:

Cleanup and comments in regard to ticket:314

Location:

anuga_core/source/anuga

Files:

• abstract_2d_finite_volumes/quantity.py (modified) (1 diff)
• fit_interpolate/fit.py (modified) (3 diffs)
• shallow_water/test_shallow_water_domain.py (modified) (2 diffs)

anuga_core/source/anuga/abstract_2d_finite_volumes/quantity.py

@@ -878 +878 @@
         # a crash in fittng, so disabled it until I can investigate further
         # Sorry. 23 Jan 2009. Logged as ticket:314
-        if False:
+        #if True: # Test will fail (31 Jan 2009) 
+        if False: # Test will pass (31 Jan 2009)
             # Use mesh as defined by domain
             # This used to cause problems for caching due to quantities

anuga_core/source/anuga/fit_interpolate/fit.py

@@ -267 +267 @@
                                         self.mesh_boundary_polygon,
                                         closed=True,
-                                        verbose=False) # Too much output if True
-
+                                        verbose=False) # Suppress output
         
         n = len(inside_indices)
@@ -301 +300 @@
                         AtA[j,k] += sigmas[j]*sigmas[k]
             else:
-                # FIXME(Ole): This is the message referred to in ticket:314
-                
                 flag = is_inside_polygon(x,
                                          self.mesh_boundary_polygon,
                                          closed=True,
-                                         verbose=False) # Too much output if True                
+                                         verbose=False) # Suppress output
                 msg = 'Point (%f, %f) is not inside mesh boundary' % tuple(x)
                 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])                
@@ -317 +315 @@
                 msg += 'Mesh boundary extent is (%.f, %.f), (%.f, %.f)'\
                     % (minx, maxx, miny, maxy)
+                raise RuntimeError, msg
                 
-
-                raise Exception(msg)
             self.AtA = AtA
 

anuga_core/source/anuga/shallow_water/test_shallow_water_domain.py

@@ -6544 +6544 @@
 
 
-        #------------------------------------------------------------------------------
+        #----------------------------------------------------------------------
         # Create domain
-        #------------------------------------------------------------------------------
+        #----------------------------------------------------------------------
 
         W=303400
@@ -6600 +6600 @@
 
 
-        #------------------------------------------------------------------------------
+        #----------------------------------------------------------------------
         # Fit data point to mesh
-        #------------------------------------------------------------------------------
+        #----------------------------------------------------------------------
 
         points_file = 'offending_point.pts'
 
-        G=Geospatial_data(data_points=[[306953.344, 6194461.5]], # Offending point
+        # Offending point
+        G=Geospatial_data(data_points=[[306953.344, 6194461.5]],
                           attributes=[1])
         G.export_points_file(points_file)
 
-        domain.set_quantity('elevation', 
-                            filename=points_file,
-                            use_cache=False,
-                            verbose=verbose,
-                            alpha=0.01)
-
-        
+        
+        try:
+            domain.set_quantity('elevation', 
+                                filename=points_file,
+                                use_cache=False,
+                                verbose=verbose,
+                                alpha=0.01)
+        except RuntimeError, e:
+            msg = 'Test failed: %s' % str(e)
+            raise Exception, msg
+        finally:
+            # Cleanup regardless
+            os.remove(meshname)
+            os.remove(points_file)
 
         
 if __name__ == "__main__":
 
-    suite = unittest.makeSuite(Test_Shallow_Water, 'test')
+    #suite = unittest.makeSuite(Test_Shallow_Water, 'test')
     #suite = unittest.makeSuite(Test_Shallow_Water, 'test_rainfall_forcing_with_evolve')
     #suite = unittest.makeSuite(Test_Shallow_Water,'test_get_energy_through_cross_section_with_g')    
-    #suite = unittest.makeSuite(Test_Shallow_Water,'test_fitting_using_shallow_water_domain')    
+    suite = unittest.makeSuite(Test_Shallow_Water,'test_fitting_example_that_crashed')    
     #suite = unittest.makeSuite(Test_Shallow_Water,'test_tight_slope_limiters')
     #suite = unittest.makeSuite(Test_Shallow_Water,'test_inflow_outflow_conservation')