Changeset 8529

Timestamp:

Aug 21, 2012, 11:07:14 PM (13 years ago)

Author:

steve

Message:

Looks like the produce_results.py scripts are running with
fabricate

Location:

trunk/anuga_core/validation_tests

Files:

• Tests/Benchmarks/Isolated_Building/produce_results.py (modified) (1 diff)
• Tests/Benchmarks/Okushiri (modified) (1 prop)
• Tests/Benchmarks/Okushiri/Benchmark_2.msh (deleted)
• Tests/Benchmarks/Okushiri/compare_timeseries_with_measures.py (modified) (1 diff)
• Tests/Benchmarks/Okushiri/compare_timeseries_with_measures.stdout (deleted)
• Tests/Benchmarks/Okushiri/create_okushiri.py (modified) (1 diff)
• Tests/Benchmarks/Okushiri/create_okushiri.stdout (deleted)
• Tests/Benchmarks/Okushiri/produce_results.py (modified) (1 diff)
• Tests/Benchmarks/Okushiri/run_okushiri.py (modified) (1 diff)
• Tests/Real_World/Patong/produce_results.py (modified) (1 diff)
• Tests/Simple/dam_break (modified) (1 prop)
• Tests/Simple/dam_break/produce_results.py (modified) (1 diff)
• Tests/Simple/deep_wave/produce_results.py (modified) (1 diff)
• Tests/Simple/parabolic_basin_1D (modified) (1 prop)
• Tests/Simple/parabolic_basin_1D/produce_results.py (modified) (1 diff)
• Tests/Simple/runup1 (modified) (1 prop)
• Tests/Simple/runup1/produce_results.py (modified) (1 diff)
• Tests/Simple/runup_sinusoid (modified) (1 prop)
• Tests/Simple/runup_sinusoid/produce_results.py (modified) (1 diff)
• Tests/Simple/steep_slope (modified) (1 prop)
• Tests/Simple/steep_slope/produce_results.py (modified) (1 diff)
• Tests/Simple/trapezoidal_channel (modified) (1 prop)
• Tests/Simple/trapezoidal_channel/produce_results.py (modified) (1 diff)
• produce_results.py (modified) (2 diffs)
• readme.txt (modified) (1 diff)
• utilities.py (added)

trunk/anuga_core/validation_tests/Tests/Benchmarks/Isolated_Building/produce_results.py

@@ -1 @@
-from anuga.utilities.argparsing import run_validation_script
+#--------------------------------
+# import modules
+#--------------------------------
+from fabricate import *
+from validation_tests.utilities import run_validation_script
 
+# Setup the python scripts which produce the output for this
+# validation test
+def build():
+    #run_validation_script('run_problem.py')
+    #run_validation_script('plot_problem.py')
+    pass
 
-#run_validation_script('run_problem.py')
-#run_validation_script('plot_problem.py')
+def clean():
+    autoclean()
 
-
-
+main()

trunk/anuga_core/validation_tests/Tests/Benchmarks/Okushiri/compare_timeseries_with_measures.py

@@ -13 +13 @@
 import project
 from anuga.abstract_2d_finite_volumes.util import file_function
-from anuga.utilities.numerical_tools import\
-     ensure_numeric, cov, get_machine_precision
+from anuga.utilities.numerical_tools import ensure_numeric
+from anuga.utilities.numerical_tools import cov
+#from anuga.utilities.numerical_tools import get_machine_precision
 from anuga.shallow_water.sww_interrogate import get_maximum_inundation_elevation
 from anuga.shallow_water.sww_interrogate import get_maximum_inundation_location
-from anuga.geometry.polygon import is_inside_polygon
-from create_okushiri import gulleys
 
 if sys.platform == 'win32':

trunk/anuga_core/validation_tests/Tests/Benchmarks/Okushiri/create_okushiri.py

@@ -13 +13 @@
 import project
 
-
+# configure my logging
+import anuga.utilities.log as log
+#log.console_logging_level = log.INFO
+#log.log_logging_level = log.DEBUG
+log.log_filename = './create_okushiri.log'
 
 

trunk/anuga_core/validation_tests/Tests/Benchmarks/Okushiri/produce_results.py

@@ -1 @@
-from anuga.utilities.argparsing import run_validation_script
+#--------------------------------
+# import modules
+#--------------------------------
+from fabricate import *
+from validation_tests.utilities import run_validation_script
 
+# Setup the python scripts which produce the output for this
+# validation test
 
-run_validation_script('create_okushiri.py')
-run_validation_script('run_okushiri.py')
-run_validation_script('compare_timeseries_with_measures.py')
+def build():
+    run_validation_script('create_okushiri.py')
+    run_validation_script('run_okushiri.py')
+    run_validation_script('compare_timeseries_with_measures.py')
 
+def clean():
+    autoclean()
 
+main()

trunk/anuga_core/validation_tests/Tests/Benchmarks/Okushiri/run_okushiri.py

@@ -25 +25 @@
 
 import project
+
+# configure my logging
+import anuga.utilities.log as log
+#log.console_logging_level = log.INFO
+#log.log_logging_level = log.DEBUG
+log.log_filename = './run_okushiri.log'
+
+
 
 def main(elevation_in_mesh=False):

trunk/anuga_core/validation_tests/Tests/Real_World/Patong/produce_results.py

@@ -1 +1 @@
 #--------------------------------
-# Setup Default values for basis
-# algorithm parameters.
+# import modules
 #--------------------------------
-import argparse
-parser = argparse.ArgumentParser(description='produce results')
-parser.add_argument('-cfl', type=float, default=1.0,
-                   help='cfl condition')
-parser.add_argument('-alg', type=str, default = "1_5",
-                   help='flow algorithm')
-args = parser.parse_args()
+from fabricate import *
+from validation_tests.utilities import run_validation_script
 
-cfl = args.cfl
-alg = args.alg
+# Setup the python scripts which produce the output for this
+# validation test
+def build():
+    #run_validation_script('run_problem.py')
+    #run_validation_script('plot_problem.py')
+    pass
+
+def clean():
+    autoclean()
+
+main()
 
 
 
-import dam_break
-import plot_results
 
-

trunk/anuga_core/validation_tests/Tests/Simple/dam_break/produce_results.py

@@ -1 @@
-from anuga.utilities.argparsing import run_validation_script
+#--------------------------------
+# import modules
+#--------------------------------
+from fabricate import *
+from validation_tests.utilities import run_validation_script
 
 
-run_validation_script('dam_break.py')
-run_validation_script('plot_results.py')
+# Setup the python scripts which produce the output for this
+# validation test
+def build():
+    run_validation_script('dam_break.py')
+    run_validation_script('plot_results.py')
 
+def clean():
+    autoclean()
 
+main()
 
-

trunk/anuga_core/validation_tests/Tests/Simple/deep_wave/produce_results.py

@@ -1 @@
-
-
 from fabricate import *
-
-# Get the values of alg and cfl and any other
-# paarameters set for these validation tests
-from validation_tests.parameters import *
-
+#--------------------------------
+# import modules
+#--------------------------------
+from fabricate import *
+from validation_tests.utilities import run_validation_script
 
 # Setup the python scripts which produce the output for this
 # validation test
 def build():
-    run('python', 'run_wave.py',  '-alg', alg, '-cfl', cfl)
-    run('python', 'plotme.py', '-alg', alg, '-cfl', cfl )
+    run_validation_script('run_wave.py')
+    run_validation_script('plotme.py')
 
 def clean():

trunk/anuga_core/validation_tests/Tests/Simple/parabolic_basin_1D/produce_results.py

@@ -1 @@
-from anuga.utilities.argparsing import run_validation_script
+#--------------------------------
+# import modules
+#--------------------------------
+from fabricate import *
+from validation_tests.utilities import run_validation_script
 
 
-run_validation_script('parabolic.py')
-run_validation_script('parabolaplot.py')
+# Setup the python scripts which produce the output for this
+# validation test
+def build():
+    run_validation_script('parabolic.py')
+    run_validation_script('parabolaplot.py')
 
+def clean():
+    autoclean()
 
+main()

trunk/anuga_core/validation_tests/Tests/Simple/runup1/produce_results.py

@@ -1 @@
-from anuga.utilities.argparsing import run_validation_script
+#--------------------------------
+# import modules
+#--------------------------------
+from fabricate import *
+from validation_tests.utilities import run_validation_script
 
 
-run_validation_script('runup.py')
-run_validation_script('runuplot.py')
+# Setup the python scripts which produce the output for this
+# validation test
+def build():
+    run_validation_script('runup.py')
+    run_validation_script('runuplot.py')
 
+def clean():
+    autoclean()
+
+main()

trunk/anuga_core/validation_tests/Tests/Simple/runup_sinusoid/produce_results.py

@@ -1 @@
-from anuga.utilities.argparsing import run_validation_script
+#--------------------------------
+# import modules
+#--------------------------------
+from fabricate import *
+from validation_tests.utilities import run_validation_script
+
+# Setup the python scripts which produce the output for this
+# validation test
+def build():
+    run_validation_script('runup_sinusoid.py')
+    run_validation_script('runup_sinusoidplot.py')
+
+def clean():
+    autoclean()
+
+main()
 
 
-run_validation_script('runup_sinusoid.py')
-run_validation_script('runup_sinusoidplot.py')
-
- 

trunk/anuga_core/validation_tests/Tests/Simple/steep_slope/produce_results.py

@@ -1 @@
-from anuga.utilities.argparsing import run_validation_script
+#--------------------------------
+# import modules
+#--------------------------------
+from fabricate import *
+from validation_tests.utilities import run_validation_script
 
+# Setup the python scripts which produce the output for this
+# validation test
+def build():
+    run_validation_script('channel_SU_sparse.py')
+    run_validation_script('channel_SU_2plot.py')
 
+def clean():
+    autoclean()
 
-run_validation_script('channel_SU_sparse.py')
-run_validation_script('channel_SU_2plot.py')
-
+main()

trunk/anuga_core/validation_tests/Tests/Simple/trapezoidal_channel/produce_results.py

@@ -1 @@
-from anuga.utilities.argparsing import run_validation_script
+#--------------------------------
+# import modules
+#--------------------------------
+from fabricate import *
+from validation_tests.utilities import run_validation_script
 
+# Setup the python scripts which produce the output for this
+# validation test
+def build():
+    run_validation_script('channel_floodplain1.py')
+    run_validation_script('plotme.py')
 
-run_validation_script('channel_floodplain1.py')
-run_validation_script('plotme.py')
+def clean():
+    autoclean()
 
- 
+main()

trunk/anuga_core/validation_tests/produce_results.py

@@ -4 +4 @@
 
 import os
-import anuga.utilities.system_tools as anugast
 import anuga
 import time
 
-from anuga.utilities.argparsing import parse_standard_args
-
 #--------------------------------
-# Setup Default values for basis
+# Get Default values for
 # algorithm parameters.
 #--------------------------------
-alg, cfl = parse_standard_args()
-
+from parameters import alg
+from parameters import cfl
 
 #---------------------------------
 # Get the current svn revision
 #---------------------------------
-
 timestamp = time.asctime()
 major_revision = anuga.config.major_revision
 minor_revision = anuga.utilities.system_tools.get_revision_number()
-
 
 #---------------------------------
@@ -54 +49 @@
         print 'Changing to', os.getcwd()
         try:
-            cmd = 'python produce_results.py -alg %s -cfl %s '% (alg,cfl)
+            cmd = 'python produce_results.py'
             print 'Running: '+cmd
             os.system( cmd )

trunk/anuga_core/validation_tests/readme.txt

@@ -6 +6 @@
 We have tried a few other latex2html converters (as of 18/05/2012), but they
 didn't seem to work neatly. 
+
+You can run the validation tests using different parameters by making changes 
+to the parameters.py file. THis would usually mean changing the flow_algorithm 
+parameter.