Changeset 4704 for anuga_core/source/anuga/shallow_water/test_data_manager.py

Timestamp:

Sep 5, 2007, 4:42:58 PM (17 years ago)

Author:

ole

Message:

Implemented ticket:192

File:

• anuga_core/source/anuga/shallow_water/test_data_manager.py (modified) (11 diffs)

anuga_core/source/anuga/shallow_water/test_data_manager.py

@@ -256 +256 @@
         os.remove(sww.filename)
 
-    def NOtest_sww_extrema(self):
+    def test_sww_extrema(self):
         """Test that extrema of quantities can be retrieved at every vertex
         Extrema are updated at every *internal* timestep
@@ -263 +263 @@
         domain = self.domain
         
-        domain.set_name('datatest' + str(id(self)))
+        domain.set_name('extrema_test' + str(id(self)))
         domain.format = 'sww'
         domain.smooth = True
@@ -271 +271 @@
         assert domain.monitor_time_interval is None        
         
-        domain.set_quantities_to_be_monitored(['stage', 'ymomentum'])
-        
-        assert len(domain.quantities_to_be_monitored) == 2
-        assert domain.quantities_to_be_monitored[0] == 'stage'
-        assert domain.quantities_to_be_monitored[1] == 'ymomentum'        
+        domain.set_quantities_to_be_monitored(['xmomentum',
+                                               'ymomentum',
+                                               'stage-elevation'])
+        
+        assert len(domain.quantities_to_be_monitored) == 3
+        assert domain.quantities_to_be_monitored.has_key('stage-elevation')
+        assert domain.quantities_to_be_monitored.has_key('xmomentum')                
+        assert domain.quantities_to_be_monitored.has_key('ymomentum')        
         assert domain.monitor_polygon is None
         assert domain.monitor_time_interval is None        
@@ -282 +285 @@
 
         for t in domain.evolve(yieldstep = 1, finaltime = 1):
-            print domain.timestepping_statistics()
-            print domain.quantity_statistics()
+            pass
+            #print domain.timestepping_statistics()
+            #print domain.quantity_statistics(precision = '%.8f')
 
             
@@ -290 +294 @@
 
         # Get the variables
-        extrema = fid.variables['stage_extrema'][:]
-        assert allclose(range, [])
-
-        extrema = fid.variables['xmomentum_extrema'][:]
-        assert allclose(range,[])
-        
-        extrema = fid.variables['ymomentum_extrema'][:]
-        assert allclose(range,[])
+        extrema = fid.variables['stage-elevation:extrema'][:]
+        assert allclose(extrema, [0.00, 0.30])
+
+        loc = fid.variables['stage-elevation:min_location'][:]
+        assert allclose(loc, [0.16666667, 0.33333333])
+
+        loc = fid.variables['stage-elevation:max_location'][:]        
+        assert allclose(loc, [0.8333333, 0.16666667])        
+
+        time = fid.variables['stage-elevation:max_time'][:]
+        assert allclose(time, 0.0)                
+
+        extrema = fid.variables['xmomentum:extrema'][:]
+        assert allclose(extrema,[-0.06062178, 0.47886313])
+        
+        extrema = fid.variables['ymomentum:extrema'][:]
+        assert allclose(extrema,[0.00, 0.06241221])        
 
         
@@ -6723 +6736 @@
         number_of_points = len(points_utm)
         sww = Write_sww()
-        sww.header(outfile, times, number_of_volumes,
+        sww.store_header(outfile, times, number_of_volumes,
                          number_of_points, description='fully sick testing',
-                             verbose=self.verbose)
-        sww.triangulation(outfile, points_utm, volumes,
-                                    elevation,  new_origin=new_origin,
-                                    verbose=self.verbose)       
+                         verbose=self.verbose)
+        sww.store_triangulation(outfile, points_utm, volumes,
+                                elevation,  new_origin=new_origin,
+                                verbose=self.verbose)       
         outfile.close()
         fid = NetCDFFile(filename)
@@ -6755 +6768 @@
         number_of_points = len(points_utm)
         sww = Write_sww()
-        sww.header(outfile, times, number_of_volumes,
+        sww.store_header(outfile, times, number_of_volumes,
                          number_of_points, description='fully sick testing',
                          verbose=self.verbose)
-        sww.triangulation(outfile, points_utm, volumes,
-                                    elevation,  new_origin=new_origin,
-                                    verbose=self.verbose)       
+        sww.store_triangulation(outfile, points_utm, volumes,
+                                elevation,  new_origin=new_origin,
+                                verbose=self.verbose)       
         outfile.close()
         fid = NetCDFFile(filename)
@@ -6791 +6804 @@
         number_of_points = len(points_utm)
         sww = Write_sww()
-        sww.header(outfile, times, number_of_volumes,
+        sww.store_header(outfile, times, number_of_volumes,
                          number_of_points, description='fully sick testing',
                          verbose=self.verbose)
-        sww.triangulation(outfile, points_utm, volumes,
-                                    elevation,  new_origin=new_origin,
-                                    verbose=self.verbose)       
+        sww.store_triangulation(outfile, points_utm, volumes,
+                                elevation,  new_origin=new_origin,
+                                verbose=self.verbose)       
         outfile.close()
         fid = NetCDFFile(filename)
@@ -6830 +6843 @@
         number_of_points = len(points_utm)
         sww = Write_sww()
-        sww.header(outfile, times, number_of_volumes,
+        sww.store_header(outfile, times, number_of_volumes,
                          number_of_points, description='fully sick testing',
                          verbose=self.verbose)
-        sww.triangulation(outfile, points_utm, volumes,
-                                    elevation,  new_origin=new_origin,
-                                    points_georeference=points_georeference,
-                                    verbose=self.verbose)       
+        sww.store_triangulation(outfile, points_utm, volumes,
+                                elevation,  new_origin=new_origin,
+                                points_georeference=points_georeference,
+                                verbose=self.verbose)       
         outfile.close()
         fid = NetCDFFile(filename)
@@ -6866 +6879 @@
         number_of_points = len(points_utm)
         sww = Write_sww()
-        sww.header(outfile, times, number_of_volumes,
+        sww.store_header(outfile, times, number_of_volumes,
                          number_of_points, description='fully sick testing',
                          verbose=self.verbose)
-        sww.triangulation(outfile, points_utm, volumes,
-                                    elevation,  new_origin=new_origin,
-                                    points_georeference=points_georeference,
-                                    verbose=self.verbose)       
+        sww.store_triangulation(outfile, points_utm, volumes,
+                                elevation,  new_origin=new_origin,
+                                points_georeference=points_georeference,
+                                verbose=self.verbose)       
         outfile.close()
         fid = NetCDFFile(filename)
@@ -7281 +7294 @@
     #suite = unittest.makeSuite(Test_Data_Manager,'test_sww_header')
     #suite = unittest.makeSuite(Test_Data_Manager,'test_export_grid_parallel')
-    #suite = unittest.makeSuite(Test_Data_Manager,'t')
     suite = unittest.makeSuite(Test_Data_Manager,'test')
+    #suite = unittest.makeSuite(Test_Data_Manager,'test_sww_extrema')