Changeset 8899


Ignore:
Timestamp:
Jun 11, 2013, 5:25:13 PM (11 years ago)
Author:
steve
Message:

Good number of changes to the produce report.py

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

Legend:

Unmodified
Added
Removed

  • trunk/anuga_core/source/anuga_validation_tests/Analytical_exact/MacDonald_short_channel

    • Property svn:ignore set to
      .deps

  • trunk/anuga_core/source/anuga_validation_tests/Analytical_exact/MacDonald_short_channel/produce_report.py

    r8783 r8899  
    1313
    1414
    15 os.system('pdflatex report.tex')
     15os.system('pdflatex -shell-escape  -interaction=batchmode report.tex')
    1616os.system('bibtex report')
    17 os.system('pdflatex report.tex')
     17os.system('pdflatex -shell-escape  -interaction=batchmode report.tex')
    1818os.system('bibtex report')
    19 os.system('pdflatex report.tex')
     19os.system('pdflatex -shell-escape  -interaction=batchmode report.tex')
    2020os.system('bibtex report')
    21 os.system('pdflatex report.tex')
     21os.system('pdflatex -shell-escape  -interaction=batchmode report.tex')

  • trunk/anuga_core/source/anuga_validation_tests/Analytical_exact/avalanche_dry/produce_report.py

    r8767 r8899  
    1313
    1414
    15 os.system('pdflatex report.tex')
     15os.system('pdflatex -shell-escape  -interaction=batchmode report.tex')
    1616os.system('bibtex report')
    17 os.system('pdflatex report.tex')
     17os.system('pdflatex -shell-escape  -interaction=batchmode report.tex')
    1818os.system('bibtex report')
    19 os.system('pdflatex report.tex')
     19os.system('pdflatex -shell-escape  -interaction=batchmode report.tex')
    2020os.system('bibtex report')
    21 os.system('pdflatex report.tex')
     21os.system('pdflatex -shell-escape  -interaction=batchmode report.tex')

  • trunk/anuga_core/source/anuga_validation_tests/Analytical_exact/avalanche_wet/produce_report.py

    r8767 r8899  
    1313
    1414
    15 os.system('pdflatex report.tex')
     15os.system('pdflatex -shell-escape  -interaction=batchmode report.tex')
    1616os.system('bibtex report')
    17 os.system('pdflatex report.tex')
     17os.system('pdflatex -shell-escape  -interaction=batchmode report.tex')
    1818os.system('bibtex report')
    19 os.system('pdflatex report.tex')
     19os.system('pdflatex -shell-escape  -interaction=batchmode report.tex')
    2020os.system('bibtex report')
    21 os.system('pdflatex report.tex')
     21os.system('pdflatex -shell-escape  -interaction=batchmode report.tex')

  • trunk/anuga_core/source/anuga_validation_tests/Analytical_exact/carrier_greenspan_periodic/produce_report.py

    r8768 r8899  
    1313
    1414
    15 os.system('pdflatex report.tex')
     15os.system('pdflatex -shell-escape  -interaction=batchmode report.tex')
    1616os.system('bibtex report')
    17 os.system('pdflatex report.tex')
     17os.system('pdflatex -shell-escape  -interaction=batchmode report.tex')
    1818os.system('bibtex report')
    19 os.system('pdflatex report.tex')
     19os.system('pdflatex -shell-escape  -interaction=batchmode report.tex')
    2020os.system('bibtex report')
    21 os.system('pdflatex report.tex')
     21os.system('pdflatex -shell-escape  -interaction=batchmode report.tex')

  • trunk/anuga_core/source/anuga_validation_tests/Analytical_exact/carrier_greenspan_transient

    • Property svn:ignore set to
      .deps

  • trunk/anuga_core/source/anuga_validation_tests/Analytical_exact/carrier_greenspan_transient/produce_report.py

    r8773 r8899  
    1313
    1414
    15 os.system('pdflatex report.tex')
     15os.system('pdflatex -shell-escape  -interaction=batchmode report.tex')
    1616os.system('bibtex report')
    17 os.system('pdflatex report.tex')
     17os.system('pdflatex -shell-escape  -interaction=batchmode report.tex')
    1818os.system('bibtex report')
    19 os.system('pdflatex report.tex')
     19os.system('pdflatex -shell-escape  -interaction=batchmode report.tex')
    2020os.system('bibtex report')
    21 os.system('pdflatex report.tex')
     21os.system('pdflatex -shell-escape  -interaction=batchmode report.tex')

  • trunk/anuga_core/source/anuga_validation_tests/Analytical_exact/dam_break_dry/produce_report.py

    r8755 r8899  
    1313
    1414
    15 os.system('pdflatex report.tex')
     15os.system('pdflatex -shell-escape  -interaction=batchmode report.tex')
    1616os.system('bibtex report')
    17 os.system('pdflatex report.tex')
     17os.system('pdflatex -shell-escape  -interaction=batchmode report.tex')
    1818os.system('bibtex report')
    19 os.system('pdflatex report.tex')
     19os.system('pdflatex -shell-escape  -interaction=batchmode report.tex')
    2020os.system('bibtex report')
    21 os.system('pdflatex report.tex')
     21os.system('pdflatex -shell-escape  -interaction=batchmode report.tex')

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

    r8743 r8899  
    2020%\tableofcontents
    2121
     22
    2223%======================
    2324%\chapter{Wet Dam Break}

  • trunk/anuga_core/source/anuga_validation_tests/Analytical_exact/dam_break_wet/results.tex

    r8801 r8899  
    22\section{Dam break on wet areas}
    33
    4 The dam break problem on wet areas was solved analytically by Stoker~\cite{Stoker1948, Stoker1957}. The analytical solution exhibits a rarefaction and involves a shock. Generally this problem is easier to solve numerically than the dry dam break (the dam break on a dry area).
     4The dam break problem on wet areas was solved analytically by
     5Stoker~\cite{Stoker1948, Stoker1957}.
     6The analytical solution exhibits a rarefaction and involves a shock. Generally this problem is easier to solve numerically than the dry dam break (the dam break on a dry area).
    57
    68The initial condition is
    … …  
    1416where $h_1>h_0>0$. The topography is a horizontal flat bed.
    1517
    16 The analytical solution~\cite{Stoker1948, Stoker1957} to the wet dam break problem is
     18The analytical solution~\cite{Stoker1948, Stoker1957}
     19to the wet dam break problem is
    1720\begin{equation}
    1821h(x) = \left\{ \begin{array}{ll}

  • trunk/anuga_core/source/anuga_validation_tests/Analytical_exact/deep_wave/produce_report.py

    r8776 r8899  
    1313
    1414
    15 os.system('pdflatex report.tex')
     15os.system('pdflatex -shell-escape  -interaction=batchmode report.tex')
    1616os.system('bibtex report')
    17 os.system('pdflatex report.tex')
     17os.system('pdflatex -shell-escape  -interaction=batchmode report.tex')
    1818os.system('bibtex report')
    19 os.system('pdflatex report.tex')
     19os.system('pdflatex -shell-escape  -interaction=batchmode report.tex')
    2020os.system('bibtex report')
    21 os.system('pdflatex report.tex')
     21os.system('pdflatex -shell-escape  -interaction=batchmode report.tex')

  • trunk/anuga_core/source/anuga_validation_tests/Analytical_exact/lake_at_rest_immersed_bump/produce_report.py

    r8777 r8899  
    1313
    1414
    15 os.system('pdflatex report.tex')
     15os.system('pdflatex -shell-escape  -interaction=batchmode report.tex')
    1616os.system('bibtex report')
    17 os.system('pdflatex report.tex')
     17os.system('pdflatex -shell-escape  -interaction=batchmode report.tex')
    1818os.system('bibtex report')
    19 os.system('pdflatex report.tex')
     19os.system('pdflatex -shell-escape  -interaction=batchmode report.tex')
    2020os.system('bibtex report')
    21 os.system('pdflatex report.tex')
     21os.system('pdflatex -shell-escape  -interaction=batchmode report.tex')

  • trunk/anuga_core/source/anuga_validation_tests/Analytical_exact/landslide_tsunami/plot_results.py

    r8887 r8899  
    2828    tmp=abs(p2.time-t)
    2929    p2_ind=tmp.argmin()
    30     pyplot.plot(p2.x[v], p2.stage[p2_ind,v], '-',label='Numerical')
     30    pyplot.plot(p2.x[v], p2.stage[p2_ind,v], 'o',label='Numerical')
    3131    if(i==0):
    3232        pyplot.plot(t160[:,0], t160[:,1],'-', color='red', label='Analytical')
    … …  
    4343    pyplot.clf()
    4444
    45     pyplot.plot(p2.x[v], p2.xvel[p2_ind,v], '-', label='Numerical')
     45    pyplot.plot(p2.x[v], p2.xvel[p2_ind,v], 'o', label='Numerical')
    4646    if(i==0):
    4747        pyplot.plot(t160[:,0], t160[:,2],'-',color='red', label='Analytical')
    … …  
    6262# Hacks to identify the location of the shoreline
    6363shoreline_depth_thresh1=0.01
    64 shoreline_depth_thresh2=1.0
     64shoreline_depth_thresh2=4.0
    6565
    6666for i in range(len(model_shore_x)):
    6767    # Compute index of shoreline
    6868    vtmp = p2.stage[i,:]>p2.elev+shoreline_depth_thresh1
    69    
     69
    7070    model_shore_x[i]=p2.x[vtmp].min()
    7171
    … …  
    7474    vtmp2= (p2.stage[i,:]>p2.elev+shoreline_depth_thresh1)*\
    7575           (p2.stage[i,:]<p2.elev+shoreline_depth_thresh2)
     76
     77    #print 'vtmp2 ', numpy.any(vtmp2)
    7678    mloc=abs(p2.xvel[i,vtmp2]).argmax()
    7779    model_shore_u[i]=p2.xvel[i,vtmp2][mloc]
    7880
    79 pyplot.plot(p2.time, model_shore_x-200.,'-o', label='Numerical')
     81pyplot.plot(p2.time, model_shore_x-200.,'o', label='Numerical')
    8082pyplot.plot(shoreline[:,0], shoreline[:,1],'-', color='red', label='Analytical')
    8183pyplot.legend(loc='best')
    … …  
    8587# Can plot velocity as well
    8688pyplot.clf()
    87 pyplot.plot(p2.time, model_shore_u,'-o',label='Numerical')
     89pyplot.plot(p2.time, model_shore_u,'o',label='Numerical')
    8890pyplot.plot(shoreline[:,0], shoreline[:,2],'-',color='red',label='Analytical')
    8991pyplot.title('Shoreline velocity: Peak speed where depth >'\

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

    r8898 r8899  
    1010def build():
    1111    run_validation_script('runup.py')
    12     run_validation_script('plotme.py')
     12    run_validation_script('plot_results.py')
    1313    run('python', 'typeset_report.py')
    1414

  • trunk/anuga_core/source/anuga_validation_tests/Analytical_exact/parabolic_basin/produce_report.py

    r8788 r8899  
    1313
    1414
    15 os.system('pdflatex report.tex')
     15os.system('pdflatex -shell-escape  -interaction=batchmode report.tex')
    1616os.system('bibtex report')
    17 os.system('pdflatex report.tex')
     17os.system('pdflatex -shell-escape  -interaction=batchmode report.tex')
    1818os.system('bibtex report')
    19 os.system('pdflatex report.tex')
     19os.system('pdflatex -shell-escape  -interaction=batchmode report.tex')
    2020os.system('bibtex report')
    21 os.system('pdflatex report.tex')
     21os.system('pdflatex -shell-escape  -interaction=batchmode report.tex')

  • trunk/anuga_core/source/anuga_validation_tests/Analytical_exact/paraboloid_basin/produce_report.py

    r8790 r8899  
    1313
    1414
    15 os.system('pdflatex report.tex')
     15os.system('pdflatex -shell-escape  -interaction=batchmode report.tex')
    1616os.system('bibtex report')
    17 os.system('pdflatex report.tex')
     17os.system('pdflatex -shell-escape  -interaction=batchmode report.tex')
    1818os.system('bibtex report')
    19 os.system('pdflatex report.tex')
     19os.system('pdflatex -shell-escape  -interaction=batchmode report.tex')
    2020os.system('bibtex report')
    21 os.system('pdflatex report.tex')
     21os.system('pdflatex -shell-escape  -interaction=batchmode report.tex')

  • trunk/anuga_core/source/anuga_validation_tests/Analytical_exact/river_at_rest_varying_topo_width

    • Property svn:ignore set to
      .deps

  • trunk/anuga_core/source/anuga_validation_tests/Analytical_exact/rundown_mild_slope/produce_report.py

    r8792 r8899  
    1313
    1414
    15 os.system('pdflatex report.tex')
     15os.system('pdflatex -shell-escape  -interaction=batchmode report.tex')
    1616os.system('bibtex report')
    17 os.system('pdflatex report.tex')
     17os.system('pdflatex -shell-escape  -interaction=batchmode report.tex')
    1818os.system('bibtex report')
    19 os.system('pdflatex report.tex')
     19os.system('pdflatex -shell-escape  -interaction=batchmode report.tex')
    2020os.system('bibtex report')
    21 os.system('pdflatex report.tex')
     21os.system('pdflatex -shell-escape  -interaction=batchmode report.tex')

  • trunk/anuga_core/source/anuga_validation_tests/Analytical_exact/runup_on_beach/produce_report.py

    r8795 r8899  
    1313
    1414
    15 os.system('pdflatex report.tex')
     15os.system('pdflatex -shell-escape  -interaction=batchmode report.tex')
    1616os.system('bibtex report')
    17 os.system('pdflatex report.tex')
     17os.system('pdflatex -shell-escape  -interaction=batchmode report.tex')
    1818os.system('bibtex report')
    19 os.system('pdflatex report.tex')
     19os.system('pdflatex -shell-escape  -interaction=batchmode report.tex')
    2020os.system('bibtex report')
    21 os.system('pdflatex report.tex')
     21os.system('pdflatex -shell-escape  -interaction=batchmode report.tex')

  • trunk/anuga_core/source/anuga_validation_tests/Analytical_exact/runup_on_sinusoid_beach/produce_report.py

    r8796 r8899  
    1313
    1414
    15 os.system('pdflatex report.tex')
     15os.system('pdflatex -shell-escape  -interaction=batchmode report.tex')
    1616os.system('bibtex report')
    17 os.system('pdflatex report.tex')
     17os.system('pdflatex -shell-escape  -interaction=batchmode report.tex')
    1818os.system('bibtex report')
    19 os.system('pdflatex report.tex')
     19os.system('pdflatex -shell-escape  -interaction=batchmode report.tex')
    2020os.system('bibtex report')
    21 os.system('pdflatex report.tex')
     21os.system('pdflatex -shell-escape  -interaction=batchmode report.tex')

  • trunk/anuga_core/source/anuga_validation_tests/Analytical_exact/subcritical_over_bump

    • Property svn:ignore set to
      .deps

  • trunk/anuga_core/source/anuga_validation_tests/Analytical_exact/subcritical_over_bump/produce_report.py

    r8797 r8899  
    1313
    1414
    15 os.system('pdflatex report.tex')
     15os.system('pdflatex -shell-escape  -interaction=batchmode report.tex')
    1616os.system('bibtex report')
    17 os.system('pdflatex report.tex')
     17os.system('pdflatex -shell-escape  -interaction=batchmode report.tex')
    1818os.system('bibtex report')
    19 os.system('pdflatex report.tex')
     19os.system('pdflatex -shell-escape  -interaction=batchmode report.tex')
    2020os.system('bibtex report')
    21 os.system('pdflatex report.tex')
     21os.system('pdflatex -shell-escape  -interaction=batchmode report.tex')

  • trunk/anuga_core/source/anuga_validation_tests/Analytical_exact/transcritical_with_shock/produce_report.py

    r8799 r8899  
    1313
    1414
    15 os.system('pdflatex report.tex')
     15os.system('pdflatex -shell-escape  -interaction=batchmode report.tex')
    1616os.system('bibtex report')
    17 os.system('pdflatex report.tex')
     17os.system('pdflatex -shell-escape  -interaction=batchmode report.tex')
    1818os.system('bibtex report')
    19 os.system('pdflatex report.tex')
     19os.system('pdflatex -shell-escape  -interaction=batchmode report.tex')
    2020os.system('bibtex report')
    21 os.system('pdflatex report.tex')
     21os.system('pdflatex -shell-escape  -interaction=batchmode report.tex')

  • trunk/anuga_core/source/anuga_validation_tests/Analytical_exact/transcritical_without_shock/produce_report.py

    r8800 r8899  
    1313
    1414
    15 os.system('pdflatex report.tex')
     15os.system('pdflatex -shell-escape  -interaction=batchmode report.tex')
    1616os.system('bibtex report')
    17 os.system('pdflatex report.tex')
     17os.system('pdflatex -shell-escape  -interaction=batchmode report.tex')
    1818os.system('bibtex report')
    19 os.system('pdflatex report.tex')
     19os.system('pdflatex -shell-escape  -interaction=batchmode report.tex')
    2020os.system('bibtex report')
    21 os.system('pdflatex report.tex')
     21os.system('pdflatex -shell-escape  -interaction=batchmode report.tex')

  • trunk/anuga_core/source/anuga_validation_tests/Analytical_exact/trapezoidal_channel/numerical_channel_floodplain.py

    r8801 r8899  
    1616# Useful parameters for controlling this case
    1717#------------------------------------------------------------------------------
    18 floodplain_length = 1000.0 # Model domain length
     18floodplain_length = 800.0 # Model domain length
    1919floodplain_width = 14.0    # Model domain width
    2020floodplain_slope = 1./300.
    … …  
    2424bankwidth = 2.             # Width of the bank regions -- note that these protrude into the channel
    2525man_n=0.03                 # Manning's n
    26 l0 = 1.000 # Length scale associated with triangle side length in channel (min_triangle area = 0.5*l0^2)
     26l0 = 2.00 # Length scale associated with triangle side length in channel (min_triangle area = 0.5*l0^2)
    2727
    2828assert chan_width < floodplain_width, \
    … …  
    175175# Evolve system through time
    176176#------------------------------------------------------------------------------
    177 for t in domain.evolve(yieldstep=2.0, finaltime=1200.0):
     177for t in domain.evolve(yieldstep=10.0, finaltime=1200.0):
    178178    print domain.timestepping_statistics()
    179179    xx=domain.quantities['ymomentum'].centroid_values

  • trunk/anuga_core/source/anuga_validation_tests/Analytical_exact/trapezoidal_channel/plot_results.py

    r8646 r8899  
    11from anuga.utilities import plot_utils as util
    22from matplotlib import pyplot as pyplot
     3import numpy
     4
    35
    46# Time-index to plot outputs from
    5 index=600
     7index=120
    68p2 = util.get_output('channel_floodplain.sww')
    79p=util.get_centroids(p2, velocity_extrapolation=True)
    810v = (p.x>6.0)*(p.x<8.0)
    911
     12print numpy.any(v)
    1013# Numerical results along a central channel 'slice'
    1114V1 = p.stage[index,v] - p.elev[v]
    … …  
    6871pyplot.clf()
    6972v1 = (p.y<105.0)&(p.y>95.0)
     73
     74
    7075analytical_stage = min(p.elev[v1]) + dc_analytical
    7176analytic_vel = ( (1./300.)*(analytical_stage-p.elev[v1])**(4./3.)*(1./0.03)**2.)**0.5
    … …  
    9499pyplot.clf()
    95100v1 = (p.y<505.0)&(p.y>495.0)
     101
     102
     103
    96104analytical_stage = min(p.elev[v1]) + dc_analytical
    97105analytic_vel = ( (1./300.)*(analytical_stage-p.elev[v1])**(4./3.)*(1./0.03)**2.)**0.5
    … …  
    119127# Plot velocity over the cross-section
    120128pyplot.clf()
    121 v1 = (p.y<905.0)&(p.y>895.0)
     129v1 = (p.y<705.0)&(p.y>695.0)
     130
     131
     132
     133
    122134analytical_stage = min(p.elev[v1]) + dc_analytical
    123135analytic_vel = ( (1./300.)*(analytical_stage-p.elev[v1])**(4./3.)*(1./0.03)**2.)**0.5
    … …  
    136148pyplot.plot(p.x[v1],p.elev[v1],'o', label='bed elevation')
    137149pyplot.legend(loc=10)
    138 pyplot.title('Velocity (analytical and numerical) and Stage:' + '\n' +'Downstream channel regions (895 to 905m)' +'\n')
     150pyplot.title('Velocity (analytical and numerical) and Stage:' + '\n' +'Downstream channel regions (695 to 705m)' +'\n')
    139151pyplot.xlabel('Cross-channel distance (m)')
    140152pyplot.ylabel('Generic scale (m or m/s)')

  • trunk/anuga_core/source/anuga_validation_tests/Analytical_exact/trapezoidal_channel/produce_report.py

    r8801 r8899  
    1313
    1414
    15 os.system('pdflatex report.tex')
     15os.system('pdflatex -shell-escape  -interaction=batchmode report.tex')
    1616os.system('bibtex report')
    17 os.system('pdflatex report.tex')
     17os.system('pdflatex -shell-escape  -interaction=batchmode report.tex')
    1818os.system('bibtex report')
    19 os.system('pdflatex report.tex')
     19os.system('pdflatex -shell-escape  -interaction=batchmode report.tex')
    2020os.system('bibtex report')
    21 os.system('pdflatex report.tex')
     21os.system('pdflatex -shell-escape  -interaction=batchmode report.tex')

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

    r8801 r8899  
    2222
    2323%======================
    24 %\chapter{Dry Dam Break}
     24%\chapter{Trapezoidal channel steady uniform flow case}
    2525%======================
    2626

  • trunk/anuga_core/source/anuga_validation_tests/Behaviour_only/lid_driven_cavity

    • Property svn:ignore set to
      .deps

  • trunk/anuga_core/source/anuga_validation_tests/Behaviour_only/lid_driven_cavity/numerical_lid_driven_cavity.py

    r8803 r8899  
    1313#Setup computational domain
    1414#---------
    15 domain = anuga.rectangular_cross_domain(20,20, len1=1., len2=1.)
     15domain = anuga.rectangular_cross_domain(15,15, len1=1., len2=1.)
    1616
    1717
    … …  
    2424domain.set_flow_algorithm(alg)
    2525domain.set_CFL(cfl)
     26
    2627domain.set_name('dimensional_lid_driven')   # Output to file runup.sww
    2728domain.set_datadir('.')         # Use current folder

  • trunk/anuga_core/source/anuga_validation_tests/Behaviour_only/lid_driven_cavity/produce_report.py

    r8803 r8899  
    1313
    1414
    15 os.system('pdflatex report.tex')
     15os.system('pdflatex -shell-escape  -interaction=batchmode report.tex')
    1616os.system('bibtex report')
    17 os.system('pdflatex report.tex')
     17os.system('pdflatex -shell-escape  -interaction=batchmode report.tex')
    1818os.system('bibtex report')
    19 os.system('pdflatex report.tex')
     19os.system('pdflatex -shell-escape  -interaction=batchmode report.tex')
    2020os.system('bibtex report')
    21 os.system('pdflatex report.tex')
     21os.system('pdflatex -shell-escape  -interaction=batchmode report.tex')

  • trunk/anuga_core/source/anuga_validation_tests/Case_studies/Okushiri/produce_report.py

    r8789 r8899  
    1313
    1414
    15 os.system('pdflatex report.tex')
     15os.system('pdflatex -shell-escape  -interaction=batchmode report.tex')
    1616os.system('bibtex report')
    17 os.system('pdflatex report.tex')
     17os.system('pdflatex -shell-escape  -interaction=batchmode report.tex')
    1818os.system('bibtex report')
    19 os.system('pdflatex report.tex')
     19os.system('pdflatex -shell-escape  -interaction=batchmode report.tex')
    2020os.system('bibtex report')
    21 os.system('pdflatex report.tex')
     21os.system('pdflatex -shell-escape  -interaction=batchmode report.tex')

  • trunk/anuga_core/source/anuga_validation_tests/Experimental_data/dam_break_Yeh_Petroff/produce_report.py

    r8804 r8899  
    1313
    1414
    15 os.system('pdflatex report.tex')
     15os.system('pdflatex -shell-escape  -interaction=batchmode report.tex')
    1616os.system('bibtex report')
    17 os.system('pdflatex report.tex')
     17os.system('pdflatex -shell-escape  -interaction=batchmode report.tex')
    1818os.system('bibtex report')
    19 os.system('pdflatex report.tex')
     19os.system('pdflatex -shell-escape  -interaction=batchmode report.tex')
    2020os.system('bibtex report')
    21 os.system('pdflatex report.tex')
     21os.system('pdflatex -shell-escape  -interaction=batchmode report.tex')

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

    r8825 r8899  
    99
    1010
    11 alg = '1_5'
    12 cfl = 0.9
     11try:
     12    from anuga_validation_tests.local_parameters import *
     13except:
     14    alg = '1_5'
     15    cfl = 1.0
    1316
    1417
     18
     19
     20

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

    r8825 r8899  
    5151print Upper_dirs
    5252
     53time_total = 0.0
    5354for dir in Upper_dirs:
    5455
    5556    os.chdir(dir)
    5657
    57     print indent + dir
     58    print 72*'='
     59    print 'Directory: ' + dir
     60    print 72*'='
     61   
    5862    #print 'Changing to', os.getcwd()
    5963    dir = '.'
    … …  
    6468        pass
    6569    #print Lower_dirs
     70
     71
     72
     73
    6674    for l_dir in Lower_dirs:
    6775        os.chdir(l_dir)
    6876        #print os.getcwd()
    69         print 2 * indent + l_dir
     77        print 50*'-'
     78        print 'Subdirectory: ' + l_dir
     79        print 50*'-'
    7080        try:
     81            t0 = time.time()
    7182            cmd = 'python produce_results.py'
    72             print 3 * indent + 'Running: ' + cmd
     83            print 2 * indent + 'Running: ' + cmd
    7384            os.system(cmd)
     85            t1 = time.time() - t0
     86            time_total += t1
     87            print 2 * indent + 'That took ' + str(t1) + ' secs'
    7488        except:
    75             print 3 * indent + 'Failed running produce_results in ' + os.getcwd()
     89            print 2 * indent + 'Failed running produce_results in ' + os.getcwd()
    7690            pass
    7791
    … …  
    8397   
    8498os.chdir(buildroot)
     99
     100print 72*'='
     101print 'That took ' + str(time_total) + ' secs'
     102print 72*'='
     103
    85104#----------------------------------
    86105# Now it is ok to create the latex
    … …  
    100119import os
    101120
    102 os.system('python produce_report.py')
    103 cmd = 'pdflatex -shell-escape -interaction=batchmode report.tex'
     121os.system('python typeset_report.py')
     122#cmd = 'pdflatex -shell-escape -interaction=batchmode report.tex'
    104123#print cmd
    105124#import subprocess

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

    r8896 r8899  
    109109
    110110\section{Algorithm Parameters}
    111 Note that parameters can be communicated from the \verb|parameters.py|
    112 file in the \verb|validation_tests| directory.
     111Note that parameters can be communicated from the \verb|local_parameters.py|
     112file in the \verb|anuga_validation_tests| directory. If there is no file
     113\verb|local_parameters.py| then the parameters are taken from the
     114\verb|parameters.py| file. You should not change this file.
    113115
    114116In particular the
    … …  
    119121You can pass though the parameters straight from the \verb|parameters.py| file as follows
    120122\begin{verbatim}
    121 from validation_tests.parameters import alg
    122 from validation_tests.parameters import cfl
     123from anuga_validation_tests.parameters import alg
     124from anuga_validation_tests.parameters import cfl
    123125\end{verbatim}
    124126

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

    r8825 r8899  
    11\newcommand{\cfl}{\UScore{0.9}}
    2 \newcommand{\alg}{\UScore{1_5}}
     2\newcommand{\alg}{\UScore{tsunami}}
    33\newcommand{\majorR}{\UScore{1.3.0-beta}}
    4 \newcommand{\minorR}{\UScore{8821}}
    5 \newcommand{\timeR}{{Wed Apr 10 18:02:17 2013}}
     4\newcommand{\minorR}{\UScore{8897}}
     5\newcommand{\timeR}{{Tue Jun 11 15:51:09 2013}}

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

    r8897 r8899  
    1414os.system('bibtex report')
    1515os.system('pdflatex -shell-escape  -interaction=batchmode report.tex')
    16 os.system('bibtex report')
    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')
     16

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

    r8825 r8899  
    99
    1010
     11
     12
    1113def produce_report():
    12     import os
    1314
    14     os.system('pdflatex -shell-escape  -interaction=batchmode report.tex')
    15     os.system('bibtex report')
    16     os.system('pdflatex -shell-escape  -interaction=batchmode report.tex')
    17     os.system('bibtex report')
    18     os.system('pdflatex -shell-escape  -interaction=batchmode report.tex')
    19     os.system('bibtex report')
    20     os.system('pdflatex -shell-escape  -interaction=batchmode report.tex')
     15    from fabricate import run
     16
     17    run('pdflatex', '-shell-escape', '-interaction=batchmode', 'report.tex')
     18    run('bibtex', 'report')
     19    run('pdflatex', '-shell-escape', '-interaction=batchmode', 'report.tex')
     20
     21
Note: See TracChangeset for help on using the changeset viewer.