/[escript]/trunk/finley/test/python/runbenchmark.py
ViewVC logotype

Diff of /trunk/finley/test/python/runbenchmark.py

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

revision 583 by gross, Wed Mar 8 05:45:51 2006 UTC revision 584 by gross, Thu Mar 9 23:03:38 2006 UTC
# Line 32  from esys.escript.benchmark import Bench Line 32  from esys.escript.benchmark import Bench
32    
33  type="all"  type="all"
34  type="mantle"  type="mantle"
35    type="simple"
36    
37  thlist=[1,2,4,8,16]  thlist=[1,2,4,8,16]
38  # thlist=[1,2,4,8,16,32]  # thlist=[1,2,4,8,16,32]
# Line 45  opt2=FinleyOptions(solver_method=LinearP Line 46  opt2=FinleyOptions(solver_method=LinearP
46  opt3=FinleyOptions(solver_method=LinearPDE.PCG,preconditioner=LinearPDE.RILU,verbose=show)  opt3=FinleyOptions(solver_method=LinearPDE.PCG,preconditioner=LinearPDE.RILU,verbose=show)
47  opt4=FinleyOptions(solver_method=LinearPDE.DIRECT,verbose=show)  opt4=FinleyOptions(solver_method=LinearPDE.DIRECT,verbose=show)
48  ops=(opt1,opt3,opt4)  ops=(opt1,opt3,opt4)
49    ops=(opt1,opt3)
50    
51  bm_L2Do1=Benchmark(name="Laplace 2D (order 1)")  bm_L2Do1=Benchmark(name="Laplace 2D (order 1)")
52  bm_L2Do1.addProblem(Laplace2DOrder1_30k())  bm_L2Do1.addProblem(Laplace2DOrder1_30k())
# Line 987  map(bm_CLA3D_o2_c6_n45.addOptions,ops) Line 989  map(bm_CLA3D_o2_c6_n45.addOptions,ops)
989    
990  bms=BenchmarkSuite("Paso/Finley (%s benchmark)"%type)  bms=BenchmarkSuite("Paso/Finley (%s benchmark)"%type)
991    
992  if type in ["all", "mantle"]:  # 2D ==========================================================
993     bms.addBenchmark(bm_L2Do1)  bms.addBenchmark(bm_L2Do1)
994     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)  
995    
996     bms.addBenchmark(bm_LA3D_o2)  if type in ["simple"]:
997     bms.addBenchmark(bm_LA3D_o2_pen100_c6)     bms.addBenchmark(bm_CLA2D_o1)
998     bms.addBenchmark(bm_LA3D_o2_pen100_c6_n45)     bms.addBenchmark(bm_CLA2D_o2)
999    
1000    if type in ["all", "mantle"]:
1001     bms.addBenchmark(bm_CLA2D_o2)     bms.addBenchmark(bm_CLA2D_o2)
1002       bms.addBenchmark(bm_LA2D_o2_pen100)
1003    
1004     bms.addBenchmark(bm_CLA2D_o2_c6)     bms.addBenchmark(bm_CLA2D_o2_c6)
1005       bms.addBenchmark(bm_LA2D_o2_pen100_c6)
1006    
1007     bms.addBenchmark(bm_CLA2D_o2_c6_n45)     bms.addBenchmark(bm_CLA2D_o2_c6_n45)
1008       bms.addBenchmark(bm_LA2D_o2_pen100_c6_n45)
1009    
1010    if type in ["all", "linear elastic"]:
1011       bms.addBenchmark(bm_LA2D_o2)
1012       bms.addBenchmark(bm_LA2D_o2_c6)
1013       bms.addBenchmark(bm_LA2D_o2_c6_n45)
1014    
1015    # 3D ==========================================================
1016    bms.addBenchmark(bm_L3Do1)
1017    bms.addBenchmark(bm_L3Do2)
1018    if type in ["simple"]:
1019       bms.addBenchmark(bm_CLA3D_o1)
1020     bms.addBenchmark(bm_CLA3D_o2)     bms.addBenchmark(bm_CLA3D_o2)
1021        
1022    if type in ["all", "mantle"]:
1023       bms.addBenchmark(bm_CLA3D_o2)
1024       bms.addBenchmark(bm_LA3D_o2_pen100)
1025    
1026     bms.addBenchmark(bm_CLA3D_o2_c6)     bms.addBenchmark(bm_CLA3D_o2_c6)
1027       bms.addBenchmark(bm_LA3D_o2_pen100_c6)
1028    
1029     bms.addBenchmark(bm_CLA3D_o2_c6_n45)     bms.addBenchmark(bm_CLA3D_o2_c6_n45)
1030       bms.addBenchmark(bm_LA3D_o2_pen100_c6_n45)
1031    
1032    if type in ["all", "linear elastic"]:
1033       bms.addBenchmark(bm_LA3D_o2)
1034       bms.addBenchmark(bm_LA3D_o2_c6)
1035       bms.addBenchmark(bm_LA3D_o2_c6_n45)
1036    
1037  if type in ["all"]:  if type in ["all"]:
1038     bms.addBenchmark(bm_A2Do1g30)     bms.addBenchmark(bm_A2Do1g30)
# Line 1034  if type in ["all"]: Line 1059  if type in ["all"]:
1059     bms.addBenchmark(bm_LA2D_o1_pen100_c6_n45)     bms.addBenchmark(bm_LA2D_o1_pen100_c6_n45)
1060    
1061     bms.addBenchmark(bm_LA2D_o2_c2)     bms.addBenchmark(bm_LA2D_o2_c2)
    bms.addBenchmark(bm_LA2D_o2_c6)  
1062    
    bms.addBenchmark(bm_LA2D_o2_c6_n45)  
1063     bms.addBenchmark(bm_LA2D_o2_c2_n45)     bms.addBenchmark(bm_LA2D_o2_c2_n45)
1064     bms.addBenchmark(bm_LA2D_o2_pen100_c2)     bms.addBenchmark(bm_LA2D_o2_pen100_c2)
1065     bms.addBenchmark(bm_LA2D_o2_pen100_c2_n45)     bms.addBenchmark(bm_LA2D_o2_pen100_c2_n45)
# Line 1055  if type in ["all"]: Line 1078  if type in ["all"]:
1078     bms.addBenchmark(bm_LA3D_o2_c2)     bms.addBenchmark(bm_LA3D_o2_c2)
1079     bms.addBenchmark(bm_LA3D_o2_pen100)     bms.addBenchmark(bm_LA3D_o2_pen100)
1080     bms.addBenchmark(bm_LA3D_o2_pen100_c2)     bms.addBenchmark(bm_LA3D_o2_pen100_c2)
    bms.addBenchmark(bm_LA3D_o2_c6)  
1081     bms.addBenchmark(bm_LA3D_o2_c2_n45)     bms.addBenchmark(bm_LA3D_o2_c2_n45)
1082     bms.addBenchmark(bm_LA3D_o2_pen100_c2_n45)     bms.addBenchmark(bm_LA3D_o2_pen100_c2_n45)
    bms.addBenchmark(bm_LA3D_o2_c6_n45)  
1083        
1084     bms.addBenchmark(bm_CLA2D_o1)     bms.addBenchmark(bm_CLA2D_o1)
1085     bms.addBenchmark(bm_CLA2D_o1_c2)     bms.addBenchmark(bm_CLA2D_o1_c2)

Legend:
Removed from v.583  
changed lines
  Added in v.584

  ViewVC Help
Powered by ViewVC 1.1.26