/[escript]/trunk/finley/benchmarks/runbenchmark.py
ViewVC logotype

Diff of /trunk/finley/benchmarks/runbenchmark.py

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

revision 2344 by jfenwick, Mon Mar 30 02:13:58 2009 UTC revision 2625 by jfenwick, Fri Aug 21 06:30:25 2009 UTC
# Line 1  Line 1 
1    
2  ########################################################  ########################################################
3  #  #
4  # Copyright (c) 2003-2008 by University of Queensland  # Copyright (c) 2003-2009 by University of Queensland
5  # Earth Systems Science Computational Center (ESSCC)  # Earth Systems Science Computational Center (ESSCC)
6  # http://www.uq.edu.au/esscc  # http://www.uq.edu.au/esscc
7  #  #
# Line 11  Line 11 
11  #  #
12  ########################################################  ########################################################
13    
14  __copyright__="""Copyright (c) 2003-2008 by University of Queensland  __copyright__="""Copyright (c) 2003-2009 by University of Queensland
15  Earth Systems Science Computational Center (ESSCC)  Earth Systems Science Computational Center (ESSCC)
16  http://www.uq.edu.au/esscc  http://www.uq.edu.au/esscc
17  Primary Business: Queensland, Australia"""  Primary Business: Queensland, Australia"""
# Line 22  __url__="https://launchpad.net/escript-f Line 22  __url__="https://launchpad.net/escript-f
22  """  """
23  some benchmarks for tetsing the finley solver.  some benchmarks for tetsing the finley solver.
24    
25  @var __author__: name of author  :var __author__: name of author
26  @var __licence__: licence agreement  :var __licence__: licence agreement
27  var __url__: url entry point on documentation  var __url__: url entry point on documentation
28  @var __version__: version  :var __version__: version
29  @var __date__: date of the version  :var __date__: date of the version
30  """  """
31    
32  __author__="Lutz Gross, l.gross@uq.edu.au"  __author__="Lutz Gross, l.gross@uq.edu.au"
33    
 from esys.finley.finleybench import *  
34  from esys.escript.benchmark import BenchmarkSuite,Benchmark  from esys.escript.benchmark import BenchmarkSuite,Benchmark
35    # from esys.finley.finleybench import *
36    from finleybench import *
37    
38  type="all"  type="all"
39  type="mantle"  type="mantle"
# Line 45  thlist=[1,2,4,8,16] Line 46  thlist=[1,2,4,8,16]
46  show=True  show=True
47  ff=FinleyFilter()  ff=FinleyFilter()
48    
49  opt1=FinleyOptions(solver_method=LinearPDE.PCG,preconditioner=LinearPDE.JACOBI,verbose=show)  opt1=FinleyOptions(solver_method=SolverOptions.PCG,preconditioner=SolverOptions.JACOBI,verbose=show)
50  opt2=FinleyOptions(solver_method=LinearPDE.PCG,preconditioner=LinearPDE.ILU0,verbose=show)  opt2=FinleyOptions(solver_method=SolverOptions.PCG,preconditioner=SolverOptions.ILU0,verbose=show)
51  opt3=FinleyOptions(solver_method=LinearPDE.PCG,preconditioner=LinearPDE.RILU,verbose=show)  opt3=FinleyOptions(solver_method=SolverOptions.PCG,preconditioner=SolverOptions.RILU,verbose=show)
52  opt4=FinleyOptions(solver_method=LinearPDE.DIRECT,verbose=show)  opt4=FinleyOptions(solver_method=SolverOptions.DIRECT,verbose=show)
53  ops=(opt1,opt3,opt4)  ops=(opt1,opt3,opt4)
54  ops=(opt1,opt3)  ops=(opt1,opt3)
55    
# Line 1103  if type in ["all"]: Line 1104  if type in ["all"]:
1104     bms.addBenchmark(bm_CLA3D_o2_c2)     bms.addBenchmark(bm_CLA3D_o2_c2)
1105     bms.addBenchmark(bm_CLA3D_o2_c2_n45)     bms.addBenchmark(bm_CLA3D_o2_c2_n45)
1106        
 >>>>>>> .r489  
1107  bms.run(scale=thlist)  bms.run(scale=thlist)
1108  out=bms.getHTML(filter=ff)  out=bms.getHTML(filter=ff)
1109  print out  print out

Legend:
Removed from v.2344  
changed lines
  Added in v.2625

  ViewVC Help
Powered by ViewVC 1.1.26