Changeset 8915

Timestamp:

Jun 12, 2013, 10:50:35 PM (12 years ago)

Author:

steve

Message:

Changes to typesetting the validation_tests

Location:

trunk/anuga_core/source/anuga_validation_tests

Files:

• analytical_exact/carrier_greenspan_transient/numerical_cg_transient.py (modified) (2 diffs)
• analytical_exact/landslide_tsunami/typeset_report.py (deleted)
• experimental_data/dam_break_yeh_petroff/produce_results.py (modified) (2 diffs)
• other_references/radial_dam_break_dry/produce_results.py (modified) (2 diffs)
• other_references/radial_dam_break_wet/produce_results.py (modified) (2 diffs)
• produce_results.py (modified) (1 diff)
• saved_parameters.tex (modified) (1 diff)
• utilities/typeset_report.py (modified) (1 diff)

trunk/anuga_core/source/anuga_validation_tests/analytical_exact/carrier_greenspan_transient/numerical_cg_transient.py

@@ -11 +11 @@
 import anuga
 from anuga import Domain as Domain
-from numpy import zeros, array, float
+from numpy import zeros, array, float, hstack
 from time import localtime, strftime, gmtime
 from scipy.optimize import fsolve
@@ -87 +87 @@
     pB = uB * hB                 # dimensional
     #[    'stage', 'Xmomentum', 'Ymomentum']    
-    return [wB,  pB, 0.0]        # dimensional
+    return hstack( (wB,  pB, array([0.0])) )        # dimensional
 
 Br = anuga.Reflective_boundary(domain)      # Solid reflective wall

trunk/anuga_core/source/anuga_validation_tests/experimental_data/dam_break_yeh_petroff/produce_results.py

@@ -3 +3 @@
 #--------------------------------
 from anuga_validation_tests.utilities.fabricate import *
-from anuga_validation_tests.utilities.run_validation import run_validation_script
+from anuga_validation_tests.utilities import run_validation_script
+from anuga_validation_tests.utilities import typeset_report
 
 
@@ -11 +12 @@
     run_validation_script('numerical_Yeh_Petroff.py')
     run_validation_script('plot_results.py')
-    run('python', 'produce_report.py')  
+    typeset_report()
 
 def clean():

trunk/anuga_core/source/anuga_validation_tests/other_references/radial_dam_break_dry/produce_results.py

@@ -3 +3 @@
 #--------------------------------
 from anuga_validation_tests.utilities.fabricate import *
-from anuga_validation_tests.utilities.run_validation import run_validation_script
+from anuga_validation_tests.utilities import run_validation_script
+from anuga_validation_tests.utilities import typeset_report
 
 
@@ -11 +12 @@
     run_validation_script('radial_dam_break.py')
     run_validation_script('plot_results.py')
-    run('python', 'produce_report.py') 
+    typeset_report() 
     
 def clean():

trunk/anuga_core/source/anuga_validation_tests/other_references/radial_dam_break_wet/produce_results.py

@@ -3 +3 @@
 #--------------------------------
 from anuga_validation_tests.utilities.fabricate import *
-from anuga_validation_tests.utilities.run_validation import run_validation_script
+from anuga_validation_tests.utilities import run_validation_script
+from anuga_validation_tests.utilities import typeset_report
 
 
@@ -11 +12 @@
     run_validation_script('radial_dam_break.py')
     run_validation_script('plot_results.py')
-    run('python', 'produce_report.py')       
+    typeset_report()      
 
 def clean():

trunk/anuga_core/source/anuga_validation_tests/produce_results.py

@@ -119 +119 @@
 import os
 
+from aunga_validation_tests.utilities.fabricate import *
+
 os.system('python typeset_report.py')
+
 #cmd = 'pdflatex -shell-escape -interaction=batchmode report.tex'
 #print cmd

trunk/anuga_core/source/anuga_validation_tests/saved_parameters.tex

@@ -3 +3 @@
 \newcommand{\majorR}{\UScore{1.3.0-beta}}
 \newcommand{\minorR}{\UScore{8911}}
-\newcommand{\timeR}{{Wed Jun 12 20:52:38 2013}}
+\newcommand{\timeR}{{Wed Jun 12 22:48:35 2013}}

trunk/anuga_core/source/anuga_validation_tests/utilities/typeset_report.py

@@ -8 +8 @@
 
 
+from fabricate import *
+
+def typeset_report():
+
+    source =  __file__
+    if source.endswith('.pyc'):
+        source = source[:-1]
+    #print source
+
+    run('python', source)
 
 
 
-def typeset_report():
+if __name__ == "__main__":
 
-    #import os
+    import os
 
-    #os.system('pdflatex -shell-escape  -interaction=batchmode report.tex')
-    #os.system('bibtex report')
-    #os.system('pdflatex -shell-escape  -interaction=batchmode report.tex')
-    #os.system('pdflatex -shell-escape  -interaction=batchmode report.tex')
-
-    from fabricate import *
-
-    run('pdflatex', '-shell-escape',  '-interaction=batchmode',  'report.tex')
-    run('bibtex', 'report')
-    run('pdflatex', '-shell-escape',  '-interaction=batchmode',  'report.tex')
-    run('pdflatex', '-shell-escape',  '-interaction=batchmode',  'report.tex')
+    os.system('pdflatex -shell-escape  -interaction=batchmode report.tex')
+    os.system('bibtex report')
+    os.system('pdflatex -shell-escape  -interaction=batchmode report.tex')
+    os.system('pdflatex -shell-escape  -interaction=batchmode report.tex')