Changeset 8067

Timestamp:

Nov 4, 2010, 5:23:35 PM (14 years ago)

Author:

steve

Message:

Pulling together basic validate tests for anuga

Location:

trunk/anuga_validation

Files:

• Hinwood_2008/README.txt (modified) (2 diffs)
• automated_validation_tests/flow_tests/test_inflow_using_flowline.py (deleted)
• automated_validation_tests/flow_tests/validate_flow.py (modified) (1 diff)
• automated_validation_tests/validate_all.py (modified) (1 diff)
• convergence_study/tilted.py (modified) (3 diffs)
• convergence_study/wave.py (modified) (3 diffs)
• validation_tests (added)
• validation_tests/dam_break (added)
• validation_tests/dam_break/dam_break.py (added)
• validation_tests/periodic_carrier (added)
• validation_tests/periodic_carrier/carrier_wave_runup.py (added)
• validation_tests/periodic_forcing (added)
• validation_tests/periodic_forcing/wave.py (added)
• validation_tests/v_channel (added)
• validation_tests/yoon_parabolic (added)
• validation_tests/yoon_parabolic/yoon_import_mesh.py (added)
• validation_tests/yoon_parabolic/yoon_parabolic_basin_cross_mesh.py (added)

trunk/anuga_validation/Hinwood_2008/README.txt

@@ -4 +4 @@
 wave tank simulation.
 
-8 experiments were carried out in the flume tank.  Then were four
+8 experiments were carried out in the flume tank.  There were four
 scenarios, with a repeat for each scenario.
 
@@ -20 +20 @@
   and the given boundary condition and store the model outputs in ANUGA 
   sww files which can be viewed using one of the viewers,
-  e.g. Swollen.  The output is stored in a directory called output.
+  e.g. anuga-viewewr.  The output is stored in a directory called output.
      
 calc_rmds.py

trunk/anuga_validation/automated_validation_tests/flow_tests/validate_flow.py

@@ -25 +25 @@
         
         #print
-        s = 'test_inflow_using_flowline.py'
+        s = 'run_inflow_test_using_flowline.py'
         #print s
-        res = os.system('python %s > test_inflow_using_flowline.stdout' %s)
+        res = os.system('python %s > run_inflow_test_using_flowline.stdout' %s)
         assert res == 0
 

trunk/anuga_validation/automated_validation_tests/validate_all.py

@@ -34 +34 @@
 
     for filename in filenames:
-        if filename.startswith('validate') and filename.endswith('.py'):
+        if filename.startswith('validate_') and filename.endswith('.py'):
             #print 'Found %s in %s' %(filename, dirpath)
             validation_dirs_and_files.append((dirpath, filename))            

trunk/anuga_validation/convergence_study/tilted.py

@@ -11 +11 @@
 
 import sys
-from anuga.abstract_2d_finite_volumes.mesh_factory import rectangular_cross
-from anuga.shallow_water import Domain
-from anuga.shallow_water import Reflective_boundary
-from anuga.shallow_water import Dirichlet_boundary
-from anuga.shallow_water import Time_boundary
-from anuga.shallow_water import Transmissive_boundary
-from anuga.shallow_water import Transmissive_Momentum_Set_Stage_boundary
-from anuga.shallow_water.data_manager import start_screen_catcher, copy_code_files
+from anuga import rectangular_cross
+from anuga import Domain
+from anuga import Reflective_boundary
+from anuga import Dirichlet_boundary
+from anuga import Time_boundary
+from anuga import Transmissive_boundary
+from anuga import Transmissive_momentum_set_stage_boundary
+#from anuga.data_manager import start_screen_catcher, copy_code_files
 
 from math import cos
-from Numeric import zeros, Float
+import numpy as num
 from time import localtime, strftime, gmtime
 from os import sep
@@ -36 +36 @@
 output_dir = model_name + '_'+time
 output_file = model_name
-copy_code_files(output_dir,__file__)
+#copy_code_files(output_dir,__file__)
 #start_screen_catcher(output_dir+sep)
 
@@ -63 +63 @@
 print domain.get_timestepping_method()
 
-domain.use_edge_limiter = True
-domain.tight_slope_limiters = True
+#domain.use_edge_limiter = True
+#domain.tight_slope_limiters = True
 
 domain.CFL = 1.0

trunk/anuga_validation/convergence_study/wave.py

@@ -11 +11 @@
 
 import sys
-from anuga.abstract_2d_finite_volumes.mesh_factory import rectangular_cross
-from anuga.shallow_water import Domain
-from anuga.shallow_water import Reflective_boundary
-from anuga.shallow_water import Dirichlet_boundary
-from anuga.shallow_water import Time_boundary
-from anuga.shallow_water import Transmissive_boundary
-from anuga.shallow_water import Transmissive_Momentum_Set_Stage_boundary
-from anuga.shallow_water.data_manager import start_screen_catcher, copy_code_files
+from anuga import rectangular_cross
+from anuga import Domain
+from anuga import Reflective_boundary
+from anuga import Dirichlet_boundary
+from anuga import Time_boundary
+from anuga import Transmissive_boundary
+from anuga import Transmissive_momentum_set_stage_boundary
+#from anuga.data_manager import start_screen_catcher, copy_code_files
 
 from math import cos
-from Numeric import zeros, Float
+import numpy as num
 from time import localtime, strftime, gmtime
 from os import sep
@@ -36 +36 @@
 output_file = 'wave'
 
-copy_code_files(output_dir,__file__)
+#copy_code_files(output_dir,__file__)
 #start_screen_catcher(output_dir+sep)
 
-interactive_visualisation = False
+interactive_visualisation = True
 
 #------------------------------------------------------------------------------
@@ -60 +60 @@
 # Setup Algorithm
 #------------------------------------------------------------------------------
-domain.set_timestepping_method('rk2')
+
+domain.set_timestepping_method(2)
 domain.set_default_order(2)
 
 print domain.get_timestepping_method()
 
-domain.use_edge_limiter = True
-domain.tight_slope_limiters = False
-domain.use_centroid_velocities = False
+#domain.use_edge_limiter = True
+#domain.tight_slope_limiters = False
+#domain.use_centroid_velocities = False
+
+domain.set_beta(1.9)
 
 domain.CFL = 1.0
 
-domain.beta_w      = 1.0
-domain.beta_w_dry  = 0.0
-domain.beta_uh     = 1.0
-domain.beta_uh_dry = 0.0
-domain.beta_vh     = 1.0
-domain.beta_vh_dry = 0.0
+#domain.beta_w      = 1.0
+#domain.beta_w_dry  = 0.0
+#domain.beta_uh     = 1.0
+#domain.beta_uh_dry = 0.0
+#domain.beta_vh     = 1.0
+#domain.beta_vh_dry = 0.0