Changeset 8786

Timestamp:

Mar 28, 2013, 6:14:52 PM (12 years ago)

Author:

steve

Message:

Adding in some automated validation tests

Location:

trunk/anuga_core

Files:

• source/anuga_validation_tests/Analytical_exact/dam_break_wet/validate_dam_break_wet.py (added)
• source/anuga_validation_tests/Case_studies/Okushiri/run_okushiri.py (modified) (2 diffs)
• source/anuga_validation_tests/Case_studies/Okushiri/validate_okushiri.py (modified) (1 diff)
• source/anuga_validation_tests/validate_all.py (added)
• validate_all.py (added)

trunk/anuga_core/source/anuga_validation_tests/Case_studies/Okushiri/run_okushiri.py

@@ -49 +49 @@
     print 'set stage'
     if elevation_in_mesh is False:
-        print 'start '
         domain.set_quantity('elevation',
                             filename=project.bathymetry_filename,
@@ -55 +54 @@
                             verbose=True,
                             use_cache=False)
-        print 'end'
 
 

trunk/anuga_core/source/anuga_validation_tests/Case_studies/Okushiri/validate_okushiri.py

@@ -1 @@
-"""Automatic verification that the ANUGA code validates against the okushiri
-dataset as expected. See anuga_validation/okushiri_2005 for more details
+"""Automatic verification of ANUGA flows.
+See functions exercised by this wrapper for more details
 """
 
 import unittest
 import os
+import numpy
+import anuga
 
+indent = anuga.indent
 
-class Test_Okushiri(unittest.TestCase):
+verbose = True
+
+class Test_results(unittest.TestCase):
     def setUp(self):
-        
-        # Remove garbage
-        for file in os.listdir('.'):
+        for file in os.listdir('.'):    
             if file.endswith('.stdout') or\
                     file.endswith('.sww') or\
-                    file.endswith('.msh'):
+                    file.endswith('.msh') or\
+                    file.endswith('.png'):
                 os.remove(file)
                 
-                
+        
     def tearDown(self):
         pass
 
-    def test_that_output_is_as_expected(self):
-        """Test that ANUGA replicates physics of the Okushiri Island
-        wave tank experiment
-        """
-        
-        #print
+    def test_simulation(self):
+    
+
+        if verbose:
+            print
+            print indent+'Running create mesh script'
+            
         s = 'create_okushiri.py'
-        #print s
-        res = os.system('python %s > create_okushiri.stdout' %s)
-        assert res == 0
-
-        s = 'run_okushiri.py'
-        #print s        
-        res = os.system('python %s > run_okushiri.stdout' %s)        
-        assert res == 0
-        
-        
-        s = 'compare_timeseries_with_measures.py'
-        #print s
-        res = os.system('python %s > compare_timeseries_with_measures.stdout'\
-                        %s)
+        res = os.system('python %s > validate_create.stdout' %s)
+        # Test that script runs ok
         assert res == 0
 
 
-    def test_caching_of_set_quantity(self):
-        """Test that caching of set_quantity works
-        """
-        
-        s = 'create_okushiri.py'
-        res = os.system('python %s > create_okushiri_for_caching.stdout' %s)
+        if verbose:
+            print indent+'Running simulation script'
+
+        s = 'run_okushiri.py'
+        res = os.system('python %s > validate_run.stdout' %s)
+        # Test that script runs ok
         assert res == 0
 
 
-        s = 'test_caching_of_set_quantity.py'
-        res = os.system('python %s > test_caching_of_set_quantity.stdout' %s)
+
+        if verbose:
+            print indent+'Running test script'
+
+        s = 'compare_timeseries_with_measures.py'
+        res = os.system('python %s > validate_test.stdout' %s)
+        # Test that script runs ok
         assert res == 0
 
         
 
-    def manual_test_that_output_is_as_expected(self):
-        from run_okushiri import main
-        from create_okushiri import create_mesh
-
-        # Note, this has not been tested when code is failing.
-        # Next step, use the parrameter elevation_in_mesh
-        # and only run create_okishiri once for speed.
-        
-        res = create_mesh()
-        assert res == None
-        
-        res = main()
-        assert res == None
-        
-        s = 'compare_timeseries_with_measures.py'
-        #print s
-        res = os.system('python %s > compare_timeseries_with_measures.stdout'\
-                        %s)
-        assert res == 0
-        
 
 #-------------------------------------------------------------
-if __name__ == "__main__":
-    suite = unittest.makeSuite(Test_Okushiri, 'test')
+if __name__ == '__main__':
+    suite = unittest.makeSuite(Test_results, 'test')
     runner = unittest.TextTestRunner(verbosity=2)
     runner.run(suite)