/[escript]/branches/arrexp_2137_win_merge/finley/benchmarks/runbenchmark.py
ViewVC logotype

Diff of /branches/arrexp_2137_win_merge/finley/benchmarks/runbenchmark.py

Parent Directory Parent Directory | Revision Log Revision Log | View Patch Patch

trunk/finley/test/python/runbenchmark.py revision 626 by elspeth, Thu Mar 23 02:16:36 2006 UTC trunk/finley/benchmarks/runbenchmark.py revision 1046 by gross, Tue Mar 20 02:52:24 2007 UTC
# Line 22  __url__="http://www.iservo.edu.au/esys/e Line 22  __url__="http://www.iservo.edu.au/esys/e
22  __version__="$Revision:$"  __version__="$Revision:$"
23  __date__="$Date:$"  __date__="$Date:$"
24    
25  from esys.finley.finleybench import *  from finleybench import *
26  from esys.escript.benchmark import BenchmarkSuite,Benchmark  from esys.escript.benchmark import BenchmarkSuite,Benchmark
27    
28  type="all"  type="all"
# Line 1094  if type in ["all"]: Line 1094  if type in ["all"]:
1094     bms.addBenchmark(bm_CLA3D_o2_c2)     bms.addBenchmark(bm_CLA3D_o2_c2)
1095     bms.addBenchmark(bm_CLA3D_o2_c2_n45)     bms.addBenchmark(bm_CLA3D_o2_c2_n45)
1096        
 >>>>>>> .r489  
1097  bms.run(scale=thlist)  bms.run(scale=thlist)
1098  out=bms.getHTML(filter=ff)  out=bms.getHTML(filter=ff)
1099  print out  print out

Legend:
Removed from v.626  
changed lines
  Added in v.1046

  ViewVC Help
Powered by ViewVC 1.1.26