/[escript]/trunk/finley/py_src/finleybench.py
ViewVC logotype

Diff of /trunk/finley/py_src/finleybench.py

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

revision 416 by gross, Wed Jan 4 05:38:35 2006 UTC revision 452 by gross, Mon Jan 23 23:48:50 2006 UTC
# Line 40  from esys.escript.benchmark import Bench Line 40  from esys.escript.benchmark import Bench
40  import esys.finley  import esys.finley
41  from esys.escript.linearPDEs import LinearPDE  from esys.escript.linearPDEs import LinearPDE
42  import os  import os
43    import math
44    
45  class FinleyFilter(BenchmarkFilter):  class FinleyFilter(BenchmarkFilter):
46     """     """
# Line 112  class FinleyOptions(Options): Line 113  class FinleyOptions(Options):
113                        LinearPDE.SCSL:  "SCSL",                        LinearPDE.SCSL:  "SCSL",
114                        LinearPDE.MKL:  "MKL",                        LinearPDE.MKL:  "MKL",
115                        LinearPDE.UMFPACK: "UMFPACK",                        LinearPDE.UMFPACK: "UMFPACK",
116                        LinearPDE.PASO:  "PASO"                        LinearPDE.PASO:  "PASO",
117                          LinearPDE.RILU: "RILU",
118                          LinearPDE.AMG:  "AMG"
119                    }                    }
120         name=""         name=""
121         if solver_method==None:         if solver_method==None:
# Line 163  class FinleyProblem(BenchmarkProblem): Line 166  class FinleyProblem(BenchmarkProblem):
166         pde.setSolverMethod(options.solver_method,options.preconditioner)         pde.setSolverMethod(options.solver_method,options.preconditioner)
167         pde.setSolverPackage(options.package)         pde.setSolverPackage(options.package)
168         a=os.times()[4]         a=os.times()[4]
169         uh=pde.getSolution(verbose=options.verbose)         uh=pde.getSolution(verbose=options.verbose,iter_max=6000)
170         a=os.times()[4]-a         a=os.times()[4]-a
171         if u==None:         if u==None:
172            return {FinleyFilter.TIME : a , FinleyFilter.ERROR : None }            return {FinleyFilter.TIME : a , FinleyFilter.ERROR : None }
# Line 277  class AnisotropicProblem(RegularFinleyPr Line 280  class AnisotropicProblem(RegularFinleyPr
280              u*=(x[i]-i)              u*=(x[i]-i)
281    
282           gamma_rad=self.gamma/360.*8*math.atan(1.)           gamma_rad=self.gamma/360.*8*math.atan(1.)
283           cg=maths.cos(self.gamma_rad)           cg=math.cos(gamma_rad)
284           sg=maths.sin(self.gamma_rad)           sg=math.sin(gamma_rad)
285           C=kronecker(domain)           C=kronecker(domain)
286           C[0,0]=cg**2+self.c*sg**2           C[0,0]=cg**2+self.c*sg**2
287           C[1,0]=(self.c-1.)*cg*sg           C[1,0]=(self.c-1.)*cg*sg

Legend:
Removed from v.416  
changed lines
  Added in v.452

  ViewVC Help
Powered by ViewVC 1.1.26