Changeset 6488

Timestamp:

Mar 11, 2009, 1:52:20 PM (16 years ago)

Author:

ole

Message:

Added new test that revealed another fitting problem where
matrix AtA isn't being built. This test was derived from
the JJKelly example by Petar Milevsky.

The test has been disabled with a preciding X

See ticket:314 for more info

Location:

anuga_core/source/anuga

Files:

• fit_interpolate/fit.py (modified) (1 diff)
• geospatial_data/test_geospatial_data.py (modified) (2 diffs)
• shallow_water/test_points_large.csv (added)
• shallow_water/test_points_small.csv (added)
• shallow_water/test_shallow_water_domain.py (modified) (3 diffs)

anuga_core/source/anuga/fit_interpolate/fit.py

@@ -372 +372 @@
                 self.build_fit_subset(points, z, verbose=verbose)
 
-                msg = 'Matrix AtA was not built'
-                assert self.AtA is not None, msg
+                # 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'

anuga_core/source/anuga/geospatial_data/test_geospatial_data.py

@@ -1458 +1458 @@
         #print "data_points",data_points     
         new_points = ensure_absolute(data_points,
-                                             geo_reference=mesh_origin)
+                                     geo_reference=mesh_origin)
         #print "new_points",new_points
         #print "ab_points",ab_points
@@ -1468 +1468 @@
         data_points = geo.change_points_geo_ref(ab_points)   
         new_points = ensure_absolute(data_points,
-                                             geo_reference=geo)
+                                     geo_reference=geo)
         #print "new_points",new_points
         #print "ab_points",ab_points

anuga_core/source/anuga/shallow_water/test_shallow_water_domain.py

@@ -6527 +6527 @@
         os.remove(ptsfile)
 
-    def test_fitting_example_that_crashed(self):
-        """test_fitting_example_that_crashed
+    def test_fitting_example_that_crashed_1(self):
+        """test_fitting_example_that_crashed_1
         
         This unit test has been derived from a real world example (the Towradgi '98 rainstorm simulation).
@@ -6640 +6640 @@
         #    os.remove(meshname)
         #    os.remove(points_file)
+        
+        
+    def Xtest_fitting_example_that_crashed_2(self):
+        """test_fitting_example_that_crashed_2
+        
+        This unit test has been derived from a real world example 
+        (the JJKelly study, by Petar Milevski).
+        
+        It shows a condition where set_quantity crashes due to AtA
+        not being built properly
+        
+        See ticket:314
+        """
+
+        verbose = False        
+
+        from os.path import join
+        from anuga.shallow_water import Domain
+        from anuga.pmesh.mesh_interface import create_mesh_from_regions
+        from anuga.geospatial_data import Geospatial_data
+
+        meshname = 'test_mesh.msh'
+        W=304180
+        S=6185270
+        E=307650
+        N=6189040
+        maximum_triangle_area = 1000000
+
+
+        bounding_polygon = [[W, S], [E, S], [E, N], [W, N]]
+
+        create_mesh_from_regions(bounding_polygon,
+                                 boundary_tags={'south': [0], 
+                                                'east': [1], 
+                                                'north': [2], 
+                                                'west': [3]},
+                                 maximum_triangle_area=maximum_triangle_area,
+                                 filename=meshname,
+                                 use_cache=False,
+                                 verbose=True)
+
+        domain = Domain(meshname, use_cache=True, verbose=True)
+        
+        # Large test set revealed one problem
+        domain.set_quantity('elevation', 
+                            filename='test_points_large.csv',  
+                            use_cache=False,
+                            verbose=True)
+                            
+                            
+        # Small test set revealed another problem
+        domain.set_quantity('elevation', 
+                            filename='test_points_small.csv',
+                            use_cache=False,
+                            verbose=True)                            
+                    
+        
 
         
@@ -6647 +6704 @@
     #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_example_that_crashed')    
+    suite = unittest.makeSuite(Test_Shallow_Water,'test_fitting_example_that_crashed_2')    
     #suite = unittest.makeSuite(Test_Shallow_Water,'test_tight_slope_limiters')
     #suite = unittest.makeSuite(Test_Shallow_Water,'test_inflow_outflow_conservation')