Changeset 7820

Timestamp:

Jun 11, 2010, 11:42:42 AM (15 years ago)

Author:

James Hudson

Message:

Added unit test for sww_merge.

Location:

trunk/anuga_core/source/anuga/utilities

Files:

• sww_merge.py (modified) (4 diffs)
• test_file_utils.py (modified) (2 diffs)

trunk/anuga_core/source/anuga/utilities/sww_merge.py

@@ +1 @@
+"""
+    Merge a list of .sww files together into a single file.
+"""
+
 import numpy as num
 from anuga.utilities.numerical_tools import ensure_numeric
@@ -11 +15 @@
     """
         Merge a list of sww files into a single file.
+        
+        May be useful for parallel runs. Note that some advanced information
+        and custom quantities may not be exported.
     """
     
@@ -81 +88 @@
 
     for q in dynamic_quantities:
-        q_values = ensure_numeric(out_d_quantities[quantity])
-        x = q_values.astype(netcdf_float)
-        fido.variables[q] = x
-
+        q_values = out_d_quantities[q]
+        for i, time_slice in enumerate(q_values):
+            fido.variables[q][i] = num.array(time_slice, netcdf_float)
+        
         # This updates the _range values
         q_range = fido.variables[q + Write_sww.RANGE][:]
@@ -98 +105 @@
     
 
-from anuga.abstract_2d_finite_volumes.mesh_factory import rectangular, \
-                                                            rectangular_cross
-from anuga.shallow_water.shallow_water_domain import Domain
-from anuga.file.sww import SWW_file
-from anuga.abstract_2d_finite_volumes.generic_boundary_conditions import \
-    Dirichlet_boundary
-
-Bd = Dirichlet_boundary([0.5, 0., 0.])
-
-# Create shallow water domain
-domain = Domain(*rectangular_cross(2, 2))
-domain.set_name('test1')
-domain.set_quantity('elevation', 2)
-domain.set_quantity('stage', 5)
-domain.set_boundary({'left': Bd, 'right': Bd, 'top': Bd, 'bottom': Bd})
-for t in domain.evolve(yieldstep=0.5, finaltime=1):
-    pass
-    
-domain = Domain(*rectangular(3, 3))
-domain.set_name('test2')
-domain.set_quantity('elevation', 3)
-domain.set_quantity('stage', 50)
-domain.set_boundary({'left': Bd, 'right': Bd, 'top': Bd, 'bottom': Bd})
-for t in domain.evolve(yieldstep=0.5, finaltime=1):
-    pass
-        
-sww_merge(['test1.sww', 'test2.sww'], 'test_out.sww', verbose = True)

trunk/anuga_core/source/anuga/utilities/test_file_utils.py

@@ -6 +6 @@
 from anuga.utilities.file_utils import copy_code_files, get_all_swwfiles
 from anuga.utilities.file_utils import del_dir
+from sww_merge import sww_merge
 
 
@@ -109 +110 @@
         assert len(iterate)==4            
 
+    def test_merge_swwfiles(self):
+        from anuga.abstract_2d_finite_volumes.mesh_factory import rectangular, \
+                                                                    rectangular_cross
+        from anuga.shallow_water.shallow_water_domain import Domain
+        from anuga.file.sww import SWW_file
+        from anuga.abstract_2d_finite_volumes.generic_boundary_conditions import \
+            Dirichlet_boundary
+
+        Bd = Dirichlet_boundary([0.5, 0., 0.])
+
+        # Create shallow water domain
+        domain = Domain(*rectangular_cross(2, 2))
+        domain.set_name('test1')
+        domain.set_quantity('elevation', 2)
+        domain.set_quantity('stage', 5)
+        domain.set_boundary({'left': Bd, 'right': Bd, 'top': Bd, 'bottom': Bd})
+        for t in domain.evolve(yieldstep=0.5, finaltime=1):
+            pass
+            
+        domain = Domain(*rectangular(3, 3))
+        domain.set_name('test2')
+        domain.set_quantity('elevation', 3)
+        domain.set_quantity('stage', 50)
+        domain.set_boundary({'left': Bd, 'right': Bd, 'top': Bd, 'bottom': Bd})
+        for t in domain.evolve(yieldstep=0.5, finaltime=1):
+            pass
+                
+        outfile = 'test_out.sww'
+        sww_merge(['test1.sww', 'test2.sww'], outfile)
+        self.failUnless(os.access(outfile, os.F_OK))  
+        
+        # remove temp files
+        os.remove('test1.sww')
+        os.remove('test2.sww')
+      #  os.remove(outfile)      
+        
+        
+
 #-------------------------------------------------------------
 
 if __name__ == "__main__":
-    #suite = unittest.makeSuite(Test_Data_Manager, 'test_sww2domain2')
-    suite = unittest.makeSuite(Test_FileUtils, 'test_sww')
+    suite = unittest.makeSuite(Test_FileUtils, 'test')
     runner = unittest.TextTestRunner() #verbosity=2)
     runner.run(suite)