Changeset 8527

Timestamp:

Aug 21, 2012, 7:43:27 AM (13 years ago)

Author:

steve

Message:

Adding fabricate to the validation tests (like make files)

Location:

trunk/anuga_core/validation_tests

Files:

• Tests/Simple/deep_wave (modified) (1 prop)
• Tests/Simple/deep_wave/produce_results.py (modified) (1 diff)
• Tests/Simple/deep_wave/run_wave.py (modified) (1 diff)
• Tests/Simple/runup1/runup.py (modified) (1 diff)
• __init__.py (added)
• fabricate.py (added)
• report.tex (modified) (2 diffs)

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

@@ -1 @@
-
-from anuga.utilities.argparsing import run_validation_script
 
 
-run_validation_script('run_wave.py')
-run_validation_script('plotme.py')
+from fabricate import *
 
+# Get the values of alg and cfl and any other
+# paarameters set for these validation tests
+from validation_tests.parameters import *
+
+
+# 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 )
+
+def clean():
+    autoclean()
+
+main()

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

@@ -90 +90 @@
 Bw = anuga.Time_boundary(domain=domain,     # Time dependent boundary
 ## Sine wave
-                  f=lambda t: [(-amplitude*sin((1./wave_length)*t*2*pi)), 0.0, 0.0])
+                  function=lambda t: [(-amplitude*sin((1./wave_length)*t*2*pi)), 0.0, 0.0])
 ## Sawtooth?
-#                   f=lambda t: [(-8.0*(sin((1./180.)*t*2*pi))+(1./2.)*sin((2./180.)*t*2*pi)+(1./3.)*sin((3./180.)*t*2*pi)), 0.0, 0.0])
+#                   function=lambda t: [(-8.0*(sin((1./180.)*t*2*pi))+(1./2.)*sin((2./180.)*t*2*pi)+(1./3.)*sin((3./180.)*t*2*pi)), 0.0, 0.0])
 ## Sharp rise, linear fall
-#                   f=lambda t: [(5.0*(-((t-0.)/300.)*(t<300.)-cos((t-300.)*2.*pi*(1./240.))*(t>=300. and t<420.)+(1.-(t-420.)/300.)*(t>=420. and t <720.))), 0.0, 0.0])
-#                   f=lambda t: [amplitude*(1.-2.*(pi*(1./720.)*(t-720.))**2)/exp((pi*(1./720.)*(t-720.))**2) , 0.0, 0.0])
-#                   f=lambda t: [(-8.0*sin((1./720.)*t*2*pi))*((t<720.)-0.5*(t<360.)), 0.0, 0.0])
+#                   function=lambda t: [(5.0*(-((t-0.)/300.)*(t<300.)-cos((t-300.)*2.*pi*(1./240.))*(t>=300. and t<420.)+(1.-(t-420.)/300.)*(t>=420. and t <720.))), 0.0, 0.0])
+#                   function=lambda t: [amplitude*(1.-2.*(pi*(1./720.)*(t-720.))**2)/exp((pi*(1./720.)*(t-720.))**2) , 0.0, 0.0])
+#                   function=lambda t: [(-8.0*sin((1./720.)*t*2*pi))*((t<720.)-0.5*(t<360.)), 0.0, 0.0])
 def waveform(t):
     return -amplitude*sin((1./wave_length)*t*2*pi)

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

@@ -62 +62 @@
 Bd=anuga.Dirichlet_boundary([-0.2,0.,0.])       # Constant boundary values -- not used in this example
 Bw=anuga.Time_boundary(domain=domain,
-        f=lambda t: [(0.0*sin(t*2*pi)-0.1)*exp(-t)-0.1,0.0,0.0]) # Time varying boundary -- get rid of the 0.0 to do a runup.
+        function=lambda t: [(0.0*sin(t*2*pi)-0.1)*exp(-t)-0.1,0.0,0.0]) # Time varying boundary -- get rid of the 0.0 to do a runup.
 
 #----------------------------------------------

trunk/anuga_core/validation_tests/report.tex

@@ -16 +16 @@
 %=========================================
 
-\title{Automated Report on the Performance of \anuga ~on Various Test Problems}
+\title{Automated Report on the Performance of \anuga on Various Test Problems}
 \maketitle
 \tableofcontents
@@ -50 +50 @@
 %======================
 
-%\inputresults{Tests/Experimental/Isolated_Building}
+%\inputresults{Tests/Benchmarks/Isolated_Building}
 
-\inputresults{Tests/Experimental/Okushiri}
+\inputresults{Tests/Benchmarks/Okushiri}
 
 %======================