/[escript]/trunk/escript/py_src/linearPDEs.py
ViewVC logotype

Diff of /trunk/escript/py_src/linearPDEs.py

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

revision 1639 by gross, Mon Jul 14 08:55:25 2008 UTC revision 1787 by artak, Mon Sep 15 01:36:34 2008 UTC
# Line 445  class LinearPDE(object): Line 445  class LinearPDE(object):
445     @cvar CR: The conjugate residual method     @cvar CR: The conjugate residual method
446     @cvar CGS: The conjugate gardient square method     @cvar CGS: The conjugate gardient square method
447     @cvar BICGSTAB: The stabilized BiConjugate Gradient method.     @cvar BICGSTAB: The stabilized BiConjugate Gradient method.
448       @cvar TFQMR: Transport Free Quasi Minimal Residual method.
449       @cvar MINRES: Minimum residual method.
450     @cvar SSOR: The symmetric overrealaxtion method     @cvar SSOR: The symmetric overrealaxtion method
451     @cvar ILU0: The incomplete LU factorization preconditioner  with no fill in     @cvar ILU0: The incomplete LU factorization preconditioner  with no fill in
452     @cvar ILUT: The incomplete LU factorization preconditioner with will in     @cvar ILUT: The incomplete LU factorization preconditioner with will in
# Line 491  class LinearPDE(object): Line 493  class LinearPDE(object):
493     RILU = 23     RILU = 23
494     TRILINOS = 24     TRILINOS = 24
495     NONLINEAR_GMRES = 25     NONLINEAR_GMRES = 25
496       TFQMR = 26
497       MINRES = 27
498    
499     SMALL_TOLERANCE=1.e-13     SMALL_TOLERANCE=1.e-13
500     __PACKAGE_KEY="package"     __PACKAGE_KEY="package"
# Line 949  class LinearPDE(object): Line 953  class LinearPDE(object):
953         sets a new solver         sets a new solver
954    
955         @param solver: sets a new solver method.         @param solver: sets a new solver method.
956         @type solver: one of L{DEFAULT}, L{ITERATIVE} L{DIRECT}, L{CHOLEVSKY}, L{PCG}, L{CR}, L{CGS}, L{BICGSTAB}, L{SSOR}, L{GMRES}, L{PRES20}, L{LUMPING}, L{AMG}         @type solver: one of L{DEFAULT}, L{ITERATIVE} L{DIRECT}, L{CHOLEVSKY}, L{PCG}, L{CR}, L{CGS}, L{BICGSTAB}, L{SSOR}, L{GMRES}, L{TFQMR}, L{MINRES}, L{PRES20}, L{LUMPING}, L{AMG}
957         @param preconditioner: sets a new solver method.         @param preconditioner: sets a new solver method.
958         @type preconditioner: one of L{DEFAULT}, L{JACOBI} L{ILU0}, L{ILUT},L{SSOR}, L{RILU}         @type preconditioner: one of L{DEFAULT}, L{JACOBI} L{ILU0}, L{ILUT},L{SSOR}, L{RILU}
959         """         """
# Line 979  class LinearPDE(object): Line 983  class LinearPDE(object):
983         elif m[0]==self.ITERATIVE: method= "ITERATIVE"         elif m[0]==self.ITERATIVE: method= "ITERATIVE"
984         elif m[0]==self.CHOLEVSKY: method= "CHOLEVSKY"         elif m[0]==self.CHOLEVSKY: method= "CHOLEVSKY"
985         elif m[0]==self.PCG: method= "PCG"         elif m[0]==self.PCG: method= "PCG"
986           elif m[0]==self.TFQMR: method= "TFQMR"
987           elif m[0]==self.MINRES: method= "MINRES"
988         elif m[0]==self.CR: method= "CR"         elif m[0]==self.CR: method= "CR"
989         elif m[0]==self.CGS: method= "CGS"         elif m[0]==self.CGS: method= "CGS"
990         elif m[0]==self.BICGSTAB: method= "BICGSTAB"         elif m[0]==self.BICGSTAB: method= "BICGSTAB"
# Line 1748  class LinearPDE(object): Line 1754  class LinearPDE(object):
1754                      d_reduced_times_e=escript.Data()                      d_reduced_times_e=escript.Data()
1755    
1756                   self.__operator=self.__getNewRightHandSide()                   self.__operator=self.__getNewRightHandSide()
1757                   if hasattr(self.getDomain(), "addPDEToLumpedSystem") :                   if False and hasattr(self.getDomain(), "addPDEToLumpedSystem") :
1758                      self.getDomain().addPDEToLumpedSystem(self.__operator, D_times_e, d_times_e)                      self.getDomain().addPDEToLumpedSystem(self.__operator, D_times_e, d_times_e)
1759                      self.getDomain().addPDEToLumpedSystem(self.__operator, D_reduced_times_e, d_reduced_times_e)                      self.getDomain().addPDEToLumpedSystem(self.__operator, D_reduced_times_e, d_reduced_times_e)
1760                   else:                   else:

Legend:
Removed from v.1639  
changed lines
  Added in v.1787

  ViewVC Help
Powered by ViewVC 1.1.26