/[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 479 by gross, Wed Feb 1 04:36:53 2006 UTC revision 626 by elspeth, Thu Mar 23 02:16:36 2006 UTC
# Line 1  Line 1 
1  #/usr/bin/python  #/usr/bin/python
2  # $Id:$  # $Id:$
3    
 #  
 #      COPYRIGHT ACcESS 2004 -  All Rights Reserved  
 #  
 #   This software is the property of ACcESS.  No part of this code  
 #   may be copied in any form or by any means without the expressed written  
 #   consent of ACcESS.  Copying, use or modification of this software  
 #   by any unauthorised person is illegal unless that  
 #   person has a software license agreement with ACcESS.  
 #  
4    
5  """  """
6  some benchmarks for tetsing the finley solver.  some benchmarks for tetsing the finley solver.
# Line 21  var __url__: url entry point on document Line 12  var __url__: url entry point on document
12  @var __date__: date of the version  @var __date__: date of the version
13  """  """
14    
15    __copyright__="""  Copyright (c) 2006 by ACcESS MNRF
16                        http://www.access.edu.au
17                    Primary Business: Queensland, Australia"""
18    __license__="""Licensed under the Open Software License version 3.0
19                 http://www.opensource.org/licenses/osl-3.0.php"""
20  __author__="Lutz Gross, l.gross@uq.edu.au"  __author__="Lutz Gross, l.gross@uq.edu.au"
 __licence__="contact: esys@access.uq.edu.au"  
21  __url__="http://www.iservo.edu.au/esys/escript"  __url__="http://www.iservo.edu.au/esys/escript"
22  __version__="$Revision:$"  __version__="$Revision:$"
23  __date__="$Date:$"  __date__="$Date:$"
# Line 32  from esys.escript.benchmark import Bench Line 27  from esys.escript.benchmark import Bench
27    
28  type="all"  type="all"
29  type="mantle"  type="mantle"
30    type="simple"
31    
32  thlist=[1,2,4,8,16]  thlist=[1,2,4,8,16]
33  # thlist=[1,2,4,8,16,32]  # thlist=[1,2,4,8,16,32]
# Line 45  opt2=FinleyOptions(solver_method=LinearP Line 41  opt2=FinleyOptions(solver_method=LinearP
41  opt3=FinleyOptions(solver_method=LinearPDE.PCG,preconditioner=LinearPDE.RILU,verbose=show)  opt3=FinleyOptions(solver_method=LinearPDE.PCG,preconditioner=LinearPDE.RILU,verbose=show)
42  opt4=FinleyOptions(solver_method=LinearPDE.DIRECT,verbose=show)  opt4=FinleyOptions(solver_method=LinearPDE.DIRECT,verbose=show)
43  ops=(opt1,opt3,opt4)  ops=(opt1,opt3,opt4)
44    ops=(opt1,opt3)
45    
46  bm_L2Do1=Benchmark(name="Laplace 2D (order 1)")  bm_L2Do1=Benchmark(name="Laplace 2D (order 1)")
47  bm_L2Do1.addProblem(Laplace2DOrder1_30k())  bm_L2Do1.addProblem(Laplace2DOrder1_30k())
# Line 987  map(bm_CLA3D_o2_c6_n45.addOptions,ops) Line 984  map(bm_CLA3D_o2_c6_n45.addOptions,ops)
984    
985  bms=BenchmarkSuite("Paso/Finley (%s benchmark)"%type)  bms=BenchmarkSuite("Paso/Finley (%s benchmark)"%type)
986    
987  if type in ["all", "mantle"]:  # 2D ==========================================================
988     bms.addBenchmark(bm_L2Do1)  bms.addBenchmark(bm_L2Do1)
989     bms.addBenchmark(bm_L2Do2)  bms.addBenchmark(bm_L2Do2)
    bms.addBenchmark(bm_L3Do1)  
    bms.addBenchmark(bm_L3Do2)  
   
    bms.addBenchmark(bm_LA2D_o2)  
    bms.addBenchmark(bm_LA2D_o2_pen100_c6)  
    bms.addBenchmark(bm_LA2D_o2_pen100_c6_n45)  
990    
991     bms.addBenchmark(bm_LA3D_o2)  if type in ["simple"]:
992     bms.addBenchmark(bm_LA3D_o2_pen100_c6)     bms.addBenchmark(bm_CLA2D_o1)
993     bms.addBenchmark(bm_LA3D_o2_pen100_c6_n45)     bms.addBenchmark(bm_CLA2D_o2)
994    
995    if type in ["all", "mantle"]:
996     bms.addBenchmark(bm_CLA2D_o2)     bms.addBenchmark(bm_CLA2D_o2)
997       bms.addBenchmark(bm_LA2D_o2_pen100)
998    
999     bms.addBenchmark(bm_CLA2D_o2_c6)     bms.addBenchmark(bm_CLA2D_o2_c6)
1000       bms.addBenchmark(bm_LA2D_o2_pen100_c6)
1001    
1002     bms.addBenchmark(bm_CLA2D_o2_c6_n45)     bms.addBenchmark(bm_CLA2D_o2_c6_n45)
1003       bms.addBenchmark(bm_LA2D_o2_pen100_c6_n45)
1004    
1005    if type in ["all", "linear elastic"]:
1006       bms.addBenchmark(bm_LA2D_o2)
1007       bms.addBenchmark(bm_LA2D_o2_c6)
1008       bms.addBenchmark(bm_LA2D_o2_c6_n45)
1009    
1010    # 3D ==========================================================
1011    bms.addBenchmark(bm_L3Do1)
1012    bms.addBenchmark(bm_L3Do2)
1013    if type in ["simple"]:
1014       bms.addBenchmark(bm_CLA3D_o1)
1015     bms.addBenchmark(bm_CLA3D_o2)     bms.addBenchmark(bm_CLA3D_o2)
1016        
1017    if type in ["all", "mantle"]:
1018       bms.addBenchmark(bm_CLA3D_o2)
1019       bms.addBenchmark(bm_LA3D_o2_pen100)
1020    
1021     bms.addBenchmark(bm_CLA3D_o2_c6)     bms.addBenchmark(bm_CLA3D_o2_c6)
1022       bms.addBenchmark(bm_LA3D_o2_pen100_c6)
1023    
1024     bms.addBenchmark(bm_CLA3D_o2_c6_n45)     bms.addBenchmark(bm_CLA3D_o2_c6_n45)
1025       bms.addBenchmark(bm_LA3D_o2_pen100_c6_n45)
1026    
1027    if type in ["all", "linear elastic"]:
1028       bms.addBenchmark(bm_LA3D_o2)
1029       bms.addBenchmark(bm_LA3D_o2_c6)
1030       bms.addBenchmark(bm_LA3D_o2_c6_n45)
1031    
1032  if type in ["all"]:  if type in ["all"]:
1033     bms.addBenchmark(bm_A2Do1g30)     bms.addBenchmark(bm_A2Do1g30)
# Line 1034  if type in ["all"]: Line 1054  if type in ["all"]:
1054     bms.addBenchmark(bm_LA2D_o1_pen100_c6_n45)     bms.addBenchmark(bm_LA2D_o1_pen100_c6_n45)
1055    
1056     bms.addBenchmark(bm_LA2D_o2_c2)     bms.addBenchmark(bm_LA2D_o2_c2)
    bms.addBenchmark(bm_LA2D_o2_c6)  
1057    
    bms.addBenchmark(bm_LA2D_o2_c6_n45)  
1058     bms.addBenchmark(bm_LA2D_o2_c2_n45)     bms.addBenchmark(bm_LA2D_o2_c2_n45)
1059     bms.addBenchmark(bm_LA2D_o2_pen100_c2)     bms.addBenchmark(bm_LA2D_o2_pen100_c2)
1060     bms.addBenchmark(bm_LA2D_o2_pen100_c2_n45)     bms.addBenchmark(bm_LA2D_o2_pen100_c2_n45)
# Line 1055  if type in ["all"]: Line 1073  if type in ["all"]:
1073     bms.addBenchmark(bm_LA3D_o2_c2)     bms.addBenchmark(bm_LA3D_o2_c2)
1074     bms.addBenchmark(bm_LA3D_o2_pen100)     bms.addBenchmark(bm_LA3D_o2_pen100)
1075     bms.addBenchmark(bm_LA3D_o2_pen100_c2)     bms.addBenchmark(bm_LA3D_o2_pen100_c2)
    bms.addBenchmark(bm_LA3D_o2_c6)  
1076     bms.addBenchmark(bm_LA3D_o2_c2_n45)     bms.addBenchmark(bm_LA3D_o2_c2_n45)
1077     bms.addBenchmark(bm_LA3D_o2_pen100_c2_n45)     bms.addBenchmark(bm_LA3D_o2_pen100_c2_n45)
    bms.addBenchmark(bm_LA3D_o2_c6_n45)  
1078        
1079     bms.addBenchmark(bm_CLA2D_o1)     bms.addBenchmark(bm_CLA2D_o1)
1080     bms.addBenchmark(bm_CLA2D_o1_c2)     bms.addBenchmark(bm_CLA2D_o1_c2)
# Line 1078  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        
1097    >>>>>>> .r489
1098  bms.run(scale=thlist)  bms.run(scale=thlist)
1099  out=bms.getHTML(filter=ff)  out=bms.getHTML(filter=ff)
1100  print out  print out

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

  ViewVC Help
Powered by ViewVC 1.1.26