Changeset 8440

Timestamp:

May 23, 2012, 5:38:56 PM (12 years ago)

Author:

steve

Message:

Commiting validation files

Location:

trunk/anuga_core

Files:

• source/anuga/test_all.py (modified) (2 diffs)
• source/anuga_parallel/parallel_operator_factory.py (modified) (2 diffs)
• validation_tests/Tests/Analytical/Dam_Break/dam_break.py (modified) (2 diffs)
• validation_tests/Tests/Analytical/Dam_Break/produce_results.py (modified) (1 diff)
• validation_tests/Tests/Analytical/Dam_Break/stage_plot.png (modified) (previous)
• validation_tests/Tests/Analytical/Dam_Break/xvel_plot.png (modified) (previous)
• validation_tests/Tests/Analytical/deep_wave/produce_results.py (modified) (1 diff)
• validation_tests/Tests/Analytical/parabolic_basin_1D/produce_results.py (modified) (1 diff)
• validation_tests/Tests/Analytical/runup1/produce_results.py (modified) (1 diff)
• validation_tests/Tests/Analytical/runup1/runuplot.py (modified) (4 diffs)
• validation_tests/produce_results.py (modified) (2 diffs)
• validation_tests/report.tex (modified) (3 diffs)

trunk/anuga_core/source/anuga/test_all.py

@@ -25 +25 @@
 import anuga.config as config
 from anuga.utilities.terminal_width import terminal_width
+import anuga.utilities.system_tools as aust
 
 
@@ -227 +228 @@
     # timestamp at the end
     timestamp = time.asctime()
-    version = config.major_revision
-    print '\nFinished at %s, version %s' % (timestamp, version)
+    major_revision = config.major_revision
+    minor_revision = aust.get_revision_number()
+    print '\nFinished at %s, version %s %s' % (timestamp, major_revision, minor_revision)
 
     # Cleaning up

trunk/anuga_core/source/anuga_parallel/parallel_operator_factory.py

@@ -60 +60 @@
     myid = pypar.rank()
 
+    line = num.array(line, dtype='d')
 
     alloc, inlet_master_proc, inlet_procs, enquiry_proc = allocate_inlet_procs(domain,
@@ -320 +321 @@
     inlet_enq_proc = -1
 
+
+
     # Calculate the number of points of the line inside full polygon
 

trunk/anuga_core/validation_tests/Tests/Analytical/Dam_Break/dam_break.py

@@ -15 +15 @@
 from time import localtime, strftime, gmtime
 #from balanced_dev import *
+
+
+#--------------------------------
+# Setup Default values for basic
+# algorithm parameters.
+#--------------------------------
+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()
+
+cfl = args.cfl
+alg = args.alg
+
+
 
 
@@ -46 +64 @@
 
 domain.set_name(output_file)                
-domain.set_datadir(output_dir)  
+domain.set_datadir(output_dir) 
 
 #------------------------------------------------------------------------------
-# Setup Algorithm
+# Setup Algorithm, either using command line arguments read
+# in earlier or manually yourself
 #------------------------------------------------------------------------------
-#domain.set_timestepping_method('rk2')
-#domain.set_default_order(2)
-#
-#print domain.get_timestepping_method()
-#
-#domain.use_edge_limiter = True
-##domain.use_edge_limiter = False
-#domain.tight_slope_limiters = True
-#domain.use_centroid_velocities = False
-#
-#domain.CFL = 1.0
-
-#domain.beta_w      = 0.6
-#domain.beta_uh     = 0.6
-#domain.beta_vh     = 0.6
-
+domain.set_flow_algorithm(alg)
+domain.set_CFL(cfl)
 
 #------------------------------------------------------------------------------

trunk/anuga_core/validation_tests/Tests/Analytical/Dam_Break/produce_results.py

@@ +1 @@
+#--------------------------------
+# Setup Default values for basis
+# algorithm parameters.
+#--------------------------------
+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()
+
+cfl = args.cfl
+alg = args.alg
+
+
+
 import dam_break
 import plot_results

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

@@ +1 @@
+#--------------------------------
+# Setup Default values for basis
+# algorithm parameters.
+#--------------------------------
+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()
+
+cfl = args.cfl
+alg = args.alg
+
+
 import run_wave
 import plotme

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

@@ +1 @@
+#--------------------------------
+# Setup Default values for basis
+# algorithm parameters.
+#--------------------------------
+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()
+
+cfl = args.cfl
+alg = args.alg
+
+
+
+
 import parabolic
 import parabolaplot

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

@@ +1 @@
+#--------------------------------
+# Setup Default values for basis
+# algorithm parameters.
+#--------------------------------
+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()
+
+cfl = args.cfl
+alg = args.alg
+
+
+
 import runup
 import runuplot

trunk/anuga_core/validation_tests/Tests/Analytical/runup1/runuplot.py

@@ -62 +62 @@
 pyplot.xlabel('x (m)')
 pyplot.ylabel('z (m)')
-pyplot.title('Free surface and bed at y==0.5, time = 1.0 second')
+pyplot.title('Free surface and bed at y = 0.5, time = 1.0 second')
 pyplot.savefig('elev_1s_v2.png')
 
@@ -68 +68 @@
 pyplot.plot(p.x[v],p.xvel[5,v])
 pyplot.plot(p.x[v],p.xvel[5,v],'o')
-pyplot.title('Velocity at y==0.500, time = 1.0 second')
+pyplot.title('Velocity at y = 0.5, time = 1.0 second')
 pyplot.xlabel('x (m)')
 pyplot.ylabel('Velocity (m/s)')
@@ -116 +116 @@
 pyplot.xlabel('x (m)')
 pyplot.ylabel('z (m)')
-pyplot.title('Free surface and bed at y==0.5, time = 30.0 second')
+pyplot.title('Free surface and bed at y = 0.5, time = 30.0 second')
 pyplot.legend()
 pyplot.savefig('elev_30s_v2.png')
@@ -124 +124 @@
 pyplot.plot([0.,1.], [-0.0, -0.0], label='Analytical')
 pyplot.legend()
-pyplot.title('Velocity at y==0.500, time = 30.0 second')
+pyplot.title('Velocity at y = 0.5, time = 30.0 second')
 pyplot.xlabel('x (m)')
 pyplot.ylabel('Velocity (m/s)')

trunk/anuga_core/validation_tests/produce_results.py

@@ -4 +4 @@
 
 import os
+
+
+#--------------------------------
+# Setup Default values for basis
+# algorithm parameters.
+#--------------------------------
+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()
+
+cfl = args.cfl
+alg = args.alg
+
+
+
+# Create a latex macro file with cfl and flow_algorithm
+f = open('method.tex','w')
+f.write('\\newcommand{\\cfl}{%s}\n' % str(cfl))
+f.write('\\newcommand{\\alg}{%s}\n' % str(alg))
+f.close()
+
+exit()
+
+
+
 
 buildroot = os.getcwd()
@@ -30 +59 @@
         print 'Changing to', os.getcwd()
         try:
-            os.system('python produce_results.py')
+            cmd = 'python produce_results.py -alg %s -cfl %s '% (alg,cfl)
+            print 'Running: '+cmd
+            os.system( cmd )
         except:
             print 'Failed running produce_results in '+os.getcwd()

trunk/anuga_core/validation_tests/report.tex

@@ -7 +7 @@
 \usepackage[section]{placeins} % 'one-shot' command to nicely place figures
 \usepackage{datatool}
+\usepackage{underscore}
 
 \input{local-defs}
+\input{method}
 
 %=========================================
@@ -20 +22 @@
 %======================
 
-Here we collect the results of running our validation tests. 
+Here we collect the results of running our validation tests.
+
+The flow algorithm is \alg.
+The cfl condition was \cfl.
 
 
@@ -70 +75 @@
 \inputresults{Tests/Directory/Name}
 \end{verbatim}
+
+
+
+\section{Specifiying different algorithm}
+One  way to allow the system to run with different algorithms is to add the following
+into your run routines.
+\begin{verbatim}
+#--------------------------------
+# Setup Default values for basic
+# algorithm parameters.
+#--------------------------------
+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()
+
+cfl = args.cfl
+alg = args.alg
+\end{verbatim}
+
+Then in the \texttt{produce\_results.py} you can 
+
 \end{document}