Changeset 8912


Ignore:
Timestamp:
Jun 12, 2013, 8:52:14 PM (12 years ago)
Author:
steve
Message:

Changing produce_results to call typeset_report

Location:
trunk/anuga_core/source/anuga_validation_tests
Files:
29 edited
1 moved

Legend:

Unmodified
Added
Removed

  • trunk/anuga_core/source/anuga_validation_tests/analytical_exact/avalanche_dry/produce_results.py

    r8767 r8912  
    44from anuga_validation_tests.utilities.fabricate import *
    55from anuga_validation_tests.utilities.run_validation import run_validation_script
     6from anuga_validation_tests.utilities.typeset_report import typeset_report
    67
    78
    … …  
    1112    run_validation_script('numerical_avalanche_dry.py')
    1213    run_validation_script('plot_results.py')
    13     run('python', 'produce_report.py') 
     14    typeset_report()   
     15
    1416
    1517def clean():

  • trunk/anuga_core/source/anuga_validation_tests/analytical_exact/avalanche_wet/produce_results.py

    r8910 r8912  
    33#--------------------------------
    44from anuga_validation_tests.utilities.fabricate import *
    5 from anuga_validation_tests.utilities.run_validation import run_validation_script
    6 from os.path import join
     5from anuga_validation_tests.utilities import run_validation_script
     6from anuga_validation_tests.utilities import typeset_report
    77
    88# Setup the python scripts which produce the output for this
    … …  
    1111    run_validation_script('numerical_avalanche_wet.py')
    1212    run_validation_script('plot_results.py')
    13     run('python', join('..','..','typeset_report.py'))   
     13    typeset_report()
    1414
    1515def clean():

  • trunk/anuga_core/source/anuga_validation_tests/analytical_exact/carrier_greenspan_periodic/produce_results.py

    r8768 r8912  
    33#--------------------------------
    44from anuga_validation_tests.utilities.fabricate import *
    5 from anuga_validation_tests.utilities.run_validation import run_validation_script
    6 
     5from anuga_validation_tests.utilities import run_validation_script
     6from anuga_validation_tests.utilities import typeset_report
    77
    88# Setup the python scripts which produce the output for this
    … …  
    1212    run_validation_script('plot_results_cross_section.py')
    1313    run_validation_script('plot_results_origin_wrt_time.py')
    14     run('python', 'produce_report.py')     
     14    typeset_report()   
     15
    1516
    1617def clean():

  • trunk/anuga_core/source/anuga_validation_tests/analytical_exact/carrier_greenspan_transient/produce_results.py

    r8773 r8912  
    33#--------------------------------
    44from anuga_validation_tests.utilities.fabricate import *
    5 from anuga_validation_tests.utilities.run_validation import run_validation_script
     5from anuga_validation_tests.utilities import run_validation_script
     6from anuga_validation_tests.utilities import typeset_report
    67
    78
    … …  
    1112    run_validation_script('numerical_cg_transient.py')
    1213    run_validation_script('plot_results.py') 
    13     run('python', 'produce_report.py')   
     14    typeset_report()    
    1415
    1516def clean():

  • trunk/anuga_core/source/anuga_validation_tests/analytical_exact/dam_break_dry/produce_results.py

    r8767 r8912  
    33#--------------------------------
    44from anuga_validation_tests.utilities.fabricate import *
    5 from anuga_validation_tests.utilities.run_validation import run_validation_script
    6 import os
     5from anuga_validation_tests.utilities import run_validation_script
     6from anuga_validation_tests.utilities import typeset_report
    77
    88# Setup the python scripts which produce the output for this
    … …  
    1111    run_validation_script('numerical_dam_break_dry.py')
    1212    run_validation_script('plot_results.py')
    13     run('python', 'produce_report.py')
     13    typeset_report()
     14
    1415   
    1516def clean():

  • trunk/anuga_core/source/anuga_validation_tests/analytical_exact/dam_break_wet/produce_results.py

    r8825 r8912  
    44from anuga_validation_tests.utilities.fabricate import *
    55from anuga_validation_tests.utilities import run_validation_script
    6 from anuga_validation_tests.utilities import produce_report
    7 import os
     6from anuga_validation_tests.utilities import typeset_report
     7
    88
    99# Setup the python scripts which produce the output for this
    … …  
    1212    run_validation_script('numerical_dam_break_wet.py')
    1313    run_validation_script('plot_results.py')
    14     produce_report()
     14    typeset_report()
    1515
    1616def clean():

  • trunk/anuga_core/source/anuga_validation_tests/analytical_exact/deep_wave/produce_results.py

    r8776 r8912  
    44#--------------------------------
    55from anuga_validation_tests.utilities.fabricate import *
    6 from anuga_validation_tests.utilities.run_validation import run_validation_script
     6from anuga_validation_tests.utilities import run_validation_script
     7from anuga_validation_tests.utilities import typeset_report
    78
    89# Setup the python scripts which produce the output for this
    … …  
    1112    run_validation_script('run_wave.py')
    1213    run_validation_script('plot_results.py')
    13     run('python', 'produce_report.py')     
     14    typeset_report()
    1415
    1516def clean():

  • trunk/anuga_core/source/anuga_validation_tests/analytical_exact/lake_at_rest_immersed_bump/produce_results.py

    r8777 r8912  
    33#--------------------------------
    44from anuga_validation_tests.utilities.fabricate import *
    5 from anuga_validation_tests.utilities.run_validation import run_validation_script
     5from anuga_validation_tests.utilities import run_validation_script
     6from anuga_validation_tests.utilities import typeset_report
    67
    78
    … …  
    1112    run_validation_script('numerical_immersed_bump.py')
    1213    run_validation_script('plot_results.py')
    13     run('python', 'produce_report.py')     
     14    typeset_report()
    1415
    1516def clean():

  • trunk/anuga_core/source/anuga_validation_tests/analytical_exact/lake_at_rest_steep_island/produce_results.py

    r8778 r8912  
    33#--------------------------------
    44from anuga_validation_tests.utilities.fabricate import *
    5 from anuga_validation_tests.utilities.run_validation import run_validation_script
     5from anuga_validation_tests.utilities import run_validation_script
     6from anuga_validation_tests.utilities import typeset_report
    67
    78
    … …  
    1112    run_validation_script('numerical_steep_island.py')
    1213    run_validation_script('plot_results.py')
    13     run('python', 'produce_report.py')     
     14    typeset_report()
    1415
    1516def clean():

  • trunk/anuga_core/source/anuga_validation_tests/analytical_exact/landslide_tsunami/produce_results.py

    r8899 r8912  
    33#--------------------------------
    44from anuga_validation_tests.utilities.fabricate import *
    5 from anuga_validation_tests.utilities.run_validation import run_validation_script
     5from anuga_validation_tests.utilities import run_validation_script
     6from anuga_validation_tests.utilities import typeset_report
    67
    78
    … …  
    1112    run_validation_script('runup.py')
    1213    run_validation_script('plot_results.py')
    13     run('python', 'typeset_report.py')
     14    typeset_report()
    1415
    1516def clean():

  • trunk/anuga_core/source/anuga_validation_tests/analytical_exact/mac_donald_short_channel/produce_results.py

    r8783 r8912  
    33#--------------------------------
    44from anuga_validation_tests.utilities.fabricate import *
    5 from anuga_validation_tests.utilities.run_validation import run_validation_script
     5from anuga_validation_tests.utilities import run_validation_script
     6from anuga_validation_tests.utilities import typeset_report
    67
    78
    … …  
    1112    run_validation_script('numerical_MacDonald.py')
    1213    run_validation_script('plot_results.py')
    13     run('python', 'produce_report.py')     
     14    typeset_report()
    1415
    1516def clean():

  • trunk/anuga_core/source/anuga_validation_tests/analytical_exact/parabolic_basin/produce_results.py

    r8788 r8912  
    33#--------------------------------
    44from anuga_validation_tests.utilities.fabricate import *
    5 from anuga_validation_tests.utilities.run_validation import run_validation_script
     5from anuga_validation_tests.utilities import run_validation_script
     6from anuga_validation_tests.utilities import typeset_report
    67
    78
    … …  
    1213    run_validation_script('plot_results_cross_section.py')
    1314    run_validation_script('plot_results_origin_wrt_time.py')   
    14     run('python', 'produce_report.py')   
     15    typeset_report()
    1516
    1617def clean():

  • trunk/anuga_core/source/anuga_validation_tests/analytical_exact/paraboloid_basin/produce_results.py

    r8825 r8912  
    33#--------------------------------
    44from anuga_validation_tests.utilities.fabricate import *
    5 from anuga_validation_tests.utilities.run_validation import run_validation_script
     5from anuga_validation_tests.utilities import run_validation_script
     6from anuga_validation_tests.utilities import typeset_report
    67
    78
    … …  
    1213    run_validation_script('plot_results_cross_section.py')
    1314    run_validation_script('plot_results_origin_wrt_time.py')   
    14     run('python', 'produce_report.py')   
     15    typeset_report()
    1516
    1617def clean():

  • trunk/anuga_core/source/anuga_validation_tests/analytical_exact/river_at_rest_varying_topo_width/produce_results.py

    r8897 r8912  
    33#--------------------------------
    44from anuga_validation_tests.utilities.fabricate import *
    5 from anuga_validation_tests.utilities.run_validation import run_validation_script
     5from anuga_validation_tests.utilities import run_validation_script
     6from anuga_validation_tests.utilities import typeset_report
    67
    78
    … …  
    1112    run_validation_script('numerical_varying_width.py')
    1213    run_validation_script('plot_results.py')
    13     run('python', 'produce_report.py')     
     14    typeset_report()
    1415
    1516def clean():

  • trunk/anuga_core/source/anuga_validation_tests/analytical_exact/rundown_mild_slope/produce_results.py

    r8793 r8912  
    88
    99from anuga_validation_tests.utilities.fabricate import *
    10 from anuga_validation_tests.utilities.run_validation import run_validation_script
     10from anuga_validation_tests.utilities import run_validation_script
     11from anuga_validation_tests.utilities import typeset_report
    1112
    1213# Setup the python scripts which produce the output for this
    … …  
    1516    run_validation_script('numerical_rundown_channel.py')
    1617    run_validation_script('plot_results.py')
    17     run('python', 'produce_report.py')   
     18    typeset_report()
    1819
    1920def clean():

  • trunk/anuga_core/source/anuga_validation_tests/analytical_exact/runup_on_beach/produce_results.py

    r8801 r8912  
    33#--------------------------------
    44from anuga_validation_tests.utilities.fabricate import *
    5 from anuga_validation_tests.utilities.run_validation import run_validation_script
     5from anuga_validation_tests.utilities import run_validation_script
     6from anuga_validation_tests.utilities import typeset_report
    67
    78
    … …  
    1112    run_validation_script('numerical_runup.py')
    1213    run_validation_script('plot_results.py')
    13     run('python', 'produce_report.py')   
     14    typeset_report()
    1415
    1516def clean():

  • trunk/anuga_core/source/anuga_validation_tests/analytical_exact/runup_on_sinusoid_beach/produce_results.py

    r8796 r8912  
    33#--------------------------------
    44from anuga_validation_tests.utilities.fabricate import *
    5 from anuga_validation_tests.utilities.run_validation import run_validation_script
     5from anuga_validation_tests.utilities import run_validation_script
     6from anuga_validation_tests.utilities import typeset_report
    67
    78# Setup the python scripts which produce the output for this
    … …  
    1011    run_validation_script('numerical_runup_sinusoid.py')
    1112    run_validation_script('plot_results.py')
    12     run('python', 'produce_report.py')   
     13    typeset_report()
    1314
    1415def clean():

  • trunk/anuga_core/source/anuga_validation_tests/analytical_exact/subcritical_over_bump/produce_results.py

    r8797 r8912  
    33#--------------------------------
    44from anuga_validation_tests.utilities.fabricate import *
    5 from anuga_validation_tests.utilities.run_validation import run_validation_script
     5from anuga_validation_tests.utilities import run_validation_script
     6from anuga_validation_tests.utilities import typeset_report
    67
    78
    … …  
    1112    run_validation_script('numerical_subcritical.py')
    1213    run_validation_script('plot_results.py')
    13     run('python', 'produce_report.py')     
     14    typeset_report()
    1415
    1516def clean():

  • trunk/anuga_core/source/anuga_validation_tests/analytical_exact/transcritical_with_shock/produce_results.py

    r8799 r8912  
    33#--------------------------------
    44from anuga_validation_tests.utilities.fabricate import *
    5 from anuga_validation_tests.utilities.run_validation import run_validation_script
     5from anuga_validation_tests.utilities import run_validation_script
     6from anuga_validation_tests.utilities import typeset_report
    67
    78
    … …  
    1112    run_validation_script('numerical_transcritical.py')
    1213    run_validation_script('plot_results.py')
    13     run('python', 'produce_report.py') 
     14    typeset_report()
    1415   
    1516def clean():

  • trunk/anuga_core/source/anuga_validation_tests/analytical_exact/transcritical_without_shock/produce_results.py

    r8800 r8912  
    33#--------------------------------
    44from anuga_validation_tests.utilities.fabricate import *
    5 from anuga_validation_tests.utilities.run_validation import run_validation_script
     5from anuga_validation_tests.utilities import run_validation_script
     6from anuga_validation_tests.utilities import typeset_report
    67
    78
    … …  
    1112    run_validation_script('numerical_transcritical.py')
    1213    run_validation_script('plot_results.py')
    13     run('python', 'produce_report.py')     
     14    typeset_report()
    1415
    1516def clean():

  • trunk/anuga_core/source/anuga_validation_tests/analytical_exact/trapezoidal_channel/produce_results.py

    r8801 r8912  
    33#--------------------------------
    44from anuga_validation_tests.utilities.fabricate import *
    5 from anuga_validation_tests.utilities.run_validation import run_validation_script
     5from anuga_validation_tests.utilities import run_validation_script
     6from anuga_validation_tests.utilities import typeset_report
    67
    78# Setup the python scripts which produce the output for this
    … …  
    1011    run_validation_script('numerical_channel_floodplain.py')
    1112    run_validation_script('plot_results.py')
    12     run('python', 'produce_report.py') 
     13    typeset_report()
    1314
    1415def clean():

  • trunk/anuga_core/source/anuga_validation_tests/analytical_exact/trapezoidal_channel/results.tex

    r8801 r8912  
    3333
    3434
    35 \DTLloaddb{dischargeout}{Analytical_exact/trapezoidal_channel/discharge_outputs.txt}
     35\DTLloaddb{dischargeout}{analytical_exact/trapezoidal_channel/discharge_outputs.txt}
    3636%\DTLloaddb{dischargeout}{discharge_outputs.txt}
    3737\begin{table}

  • trunk/anuga_core/source/anuga_validation_tests/behaviour_only/lid_driven_cavity/produce_results.py

    r8803 r8912  
    33#--------------------------------
    44from anuga_validation_tests.utilities.fabricate import *
    5 from anuga_validation_tests.utilities.run_validation import run_validation_script
     5from anuga_validation_tests.utilities import run_validation_script
     6from anuga_validation_tests.utilities import typeset_report
    67
    78
    … …  
    1112    run_validation_script('numerical_lid_driven_cavity.py')
    1213    run_validation_script('plot_results.py')
    13     run('python', 'produce_report.py') 
     14    typeset_report()
    1415
    1516def clean():

  • trunk/anuga_core/source/anuga_validation_tests/case_studies/isolated_building/produce_results.py

    r8739 r8912  
    33#--------------------------------
    44from anuga_validation_tests.utilities.fabricate import *
    5 from anuga_validation_tests.utilities.run_validation import run_validation_script
     5from anuga_validation_tests.utilities import run_validation_script
     6from anuga_validation_tests.utilities import typeset_report
    67
    78# Setup the python scripts which produce the output for this
    … …  
    1011    #run_validation_script('run_problem.py')
    1112    #run_validation_script('plot_problem.py')
     13    #typeset_report()
    1214    pass
    1315

  • trunk/anuga_core/source/anuga_validation_tests/case_studies/okushiri/produce_results.py

    r8809 r8912  
    33#--------------------------------
    44from anuga_validation_tests.utilities.fabricate import *
    5 from anuga_validation_tests.utilities.run_validation import run_validation_script
     5from anuga_validation_tests.utilities import run_validation_script
     6from anuga_validation_tests.utilities import typeset_report
    67
    78# Setup the python scripts which produce the output for this
    … …  
    1213    run_validation_script('run_okushiri.py')
    1314    run_validation_script('compare_timeseries_with_measures.py')
    14     run('python', 'produce_report.py')
     15    typeset_report()
    1516
    1617def clean():

  • trunk/anuga_core/source/anuga_validation_tests/report.tex

    r8899 r8912  
    55\usepackage[section]{placeins} % 'one-shot' command to nicely place figures
    66\usepackage{datatool}
     7\usepackage{hyperref}
    78\usepackage{url}
    89\usepackage{amsmath}
    … …  
    3435%======================
    3536
    36 \inputresults{Analytical_exact/dam_break_dry}
    37 \inputresults{Analytical_exact/dam_break_wet}
    38 \inputresults{Analytical_exact/avalanche_dry}
    39 \inputresults{Analytical_exact/avalanche_wet}
    40 \inputresults{Analytical_exact/carrier_greenspan_periodic}
    41 \inputresults{Analytical_exact/carrier_greenspan_transient}
    42 \inputresults{Analytical_exact/deep_wave}
    43 \inputresults{Analytical_exact/MacDonald_short_channel}
    44 \inputresults{Analytical_exact/parabolic_basin}
    45 \inputresults{Analytical_exact/paraboloid_basin}
     37\inputresults{analytical_exact/dam_break_dry}
     38\inputresults{analytical_exact/dam_break_wet}
     39\inputresults{analytical_exact/avalanche_dry}
     40\inputresults{analytical_exact/avalanche_wet}
     41\inputresults{analytical_exact/carrier_greenspan_periodic}
     42\inputresults{analytical_exact/carrier_greenspan_transient}
     43\inputresults{analytical_exact/deep_wave}
     44\inputresults{analytical_exact/mac_donald_short_channel}
     45\inputresults{analytical_exact/parabolic_basin}
     46\inputresults{analytical_exact/paraboloid_basin}
    4647
    47 \inputresults{Analytical_exact/runup_on_beach}
    48 \inputresults{Analytical_exact/runup_on_sinusoid_beach}
    49 \inputresults{Analytical_exact/landslide_tsunami}
     48\inputresults{analytical_exact/runup_on_beach}
     49\inputresults{analytical_exact/runup_on_sinusoid_beach}
     50\inputresults{analytical_exact/landslide_tsunami}
    5051
    51 \inputresults{Analytical_exact/lake_at_rest_immersed_bump}
    52 \inputresults{Analytical_exact/lake_at_rest_steep_island}
    53 \inputresults{Analytical_exact/river_at_rest_varying_topo_width}
    54 \inputresults{Analytical_exact/rundown_mild_slope}
    55 \inputresults{Analytical_exact/subcritical_over_bump}
    56 \inputresults{Analytical_exact/transcritical_with_shock}
    57 \inputresults{Analytical_exact/transcritical_without_shock}
    58 \inputresults{Analytical_exact/trapezoidal_channel}
     52\inputresults{analytical_exact/lake_at_rest_immersed_bump}
     53\inputresults{analytical_exact/lake_at_rest_steep_island}
     54\inputresults{analytical_exact/river_at_rest_varying_topo_width}
     55\inputresults{analytical_exact/rundown_mild_slope}
     56\inputresults{analytical_exact/subcritical_over_bump}
     57\inputresults{analytical_exact/transcritical_with_shock}
     58\inputresults{analytical_exact/transcritical_without_shock}
     59\inputresults{analytical_exact/trapezoidal_channel}
    5960
    6061%%======================
    61 \chapter{Tests using experimental data}
     62\chapter{Tests against reference data or solutions}
    6263%%======================
    63 \inputresults{Experimental_data/dam_break_Yeh_Petroff}
     64\inputresults{experimental_data/dam_break_yeh_petroff}
    6465
     66\inputresults{behaviour_only/lid_driven_cavity}
     67%\inputresults{behaviour_only/river_flow_varying_topo_width}
    6568
     69\inputresults{other_references/radial_dam_break_dry}
     70\inputresults{other_references/radial_dam_break_wet}
    6671
    67 %%======================
    68 \chapter{Tests for shallow water behaviour}
    69 %%======================
    70 \inputresults{Behaviour_only/lid_driven_cavity}
    71 %\inputresults{Behaviour_only/river_flow_varying_topo_width}
     72\inputresults{case_studies/okushiri}
    7273
    73 
    74 
    75 %%======================
    76 \chapter{Tests against Other Referece Solutions}
    77 %%======================
    78 \inputresults{Other_references/radial_dam_break_dry}
    79 \inputresults{Other_references/radial_dam_break_wet}
    80 
    81 
    82 %%======================
    83 \chapter{Case studies}
    84 %%======================
    85 %\inputresults{Tests/Benchmarks/Isolated_Building}
    86 \inputresults{Case_studies/Okushiri}
    87 %\inputresults{Tests/Real_World/Patong}
    8874
    8975%======================

  • trunk/anuga_core/source/anuga_validation_tests/saved_parameters.tex

    r8899 r8912  
    1 \newcommand{\cfl}{\UScore{0.9}}
    2 \newcommand{\alg}{\UScore{tsunami}}
     1\newcommand{\cfl}{\UScore{1.0}}
     2\newcommand{\alg}{\UScore{1_5}}
    33\newcommand{\majorR}{\UScore{1.3.0-beta}}
    4 \newcommand{\minorR}{\UScore{8897}}
    5 \newcommand{\timeR}{{Tue Jun 11 15:51:09 2013}}
     4\newcommand{\minorR}{\UScore{8909}}
     5\newcommand{\timeR}{{Wed Jun 12 20:31:08 2013}}

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

    r8899 r8912  
    1414os.system('bibtex report')
    1515os.system('pdflatex -shell-escape  -interaction=batchmode report.tex')
     16os.system('pdflatex -shell-escape  -interaction=batchmode report.tex')
    1617

  • trunk/anuga_core/source/anuga_validation_tests/utilities/__init__.py

    r8825 r8912  
    88
    99
    10 from produce_report import produce_report
     10from typeset_report import typeset_report
    1111from run_validation import run_validation_script
    1212

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

    r8909 r8912  
    1111
    1212
    13 def produce_report():
     13def typeset_report():
    1414
    15     from fabricate import run
     15    #import os
    1616
    17     run('pdflatex', '-shell-escape', '-interaction=batchmode', 'report.tex')
     17    #os.system('pdflatex -shell-escape  -interaction=batchmode report.tex')
     18    #os.system('bibtex report')
     19    #os.system('pdflatex -shell-escape  -interaction=batchmode report.tex')
     20    #os.system('pdflatex -shell-escape  -interaction=batchmode report.tex')
     21
     22    from fabricate import *
     23
     24    run('pdflatex', '-shell-escape',  '-interaction=batchmode',  'report.tex')
    1825    run('bibtex', 'report')
    19     run('pdflatex', '-shell-escape', '-interaction=batchmode', 'report.tex')
    20 
    21 
     26    run('pdflatex', '-shell-escape',  '-interaction=batchmode',  'report.tex')
     27    run('pdflatex', '-shell-escape',  '-interaction=batchmode',  'report.tex')
Note: See TracChangeset for help on using the changeset viewer.