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

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

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

revision 387 by gross, Tue Dec 20 00:37:20 2005 UTC revision 430 by gross, Wed Jan 11 06:40:50 2006 UTC
# Line 419  class LinearPDE(object): Line 419  class LinearPDE(object):
419     @cvar MKL: Intel's MKL solver library     @cvar MKL: Intel's MKL solver library
420     @cvar UMFPACK: the UMFPACK library     @cvar UMFPACK: the UMFPACK library
421     @cvar ITERATIVE: The default iterative solver     @cvar ITERATIVE: The default iterative solver
422       @cvar AMG: algebraic multi grid
423       @cvar RILU: recursive ILU
424    
425     """     """
426     DEFAULT= 0     DEFAULT= 0
# Line 443  class LinearPDE(object): Line 445  class LinearPDE(object):
445     UMFPACK= 16     UMFPACK= 16
446     ITERATIVE= 20     ITERATIVE= 20
447     PASO= 21     PASO= 21
448       AMG= 22
449       RILU = 23
450    
451     __TOL=1.e-13     __TOL=1.e-13
452     __PACKAGE_KEY="package"     __PACKAGE_KEY="package"
# Line 843  class LinearPDE(object): Line 847  class LinearPDE(object):
847    
848         m=self.getSolverMethod()         m=self.getSolverMethod()
849         p=self.getSolverPackage()         p=self.getSolverPackage()
850           method=""
851         if m[0]==self.DEFAULT: method="DEFAULT"         if m[0]==self.DEFAULT: method="DEFAULT"
852         elif m[0]==self.DIRECT: method= "DIRECT"         elif m[0]==self.DIRECT: method= "DIRECT"
853         elif m[0]==self.ITERATIVE: method= "ITERATIVE"         elif m[0]==self.ITERATIVE: method= "ITERATIVE"
# Line 855  class LinearPDE(object): Line 860  class LinearPDE(object):
860         elif m[0]==self.GMRES: method= "GMRES"         elif m[0]==self.GMRES: method= "GMRES"
861         elif m[0]==self.PRES20: method= "PRES20"         elif m[0]==self.PRES20: method= "PRES20"
862         elif m[0]==self.LUMPING: method= "LUMPING"         elif m[0]==self.LUMPING: method= "LUMPING"
863         else : method="unknown"         if m[1]==self.DEFAULT: method+="+DEFAULT"
864         if m[1]==self.DEFAULT: method+="DEFAULT"         elif m[1]==self.JACOBI: method+= "+JACOBI"
865         elif m[1]==self.JACOBI: method+= "JACOBI"         elif m[1]==self.ILU0: method+= "+ILU0"
866         elif m[1]==self.ILU0: method+= "ILU0"         elif m[1]==self.ILUT: method+= "+ILUT"
867         elif m[1]==self.ILUT: method+= "ILUT"         elif m[1]==self.SSOR: method+= "+SSOR"
        elif m[1]==self.SSOR: method+= "SSOR"  
        else : method+="unknown"  
868         if p==self.DEFAULT: package="DEFAULT"         if p==self.DEFAULT: package="DEFAULT"
869         elif p==self.PASO: package= "PASO"         elif p==self.PASO: package= "PASO"
870         elif p==self.MKL: package= "MKL"         elif p==self.MKL: package= "MKL"
# Line 2339  class AdvectionDiffusion(LinearPDE): Line 2342  class AdvectionDiffusion(LinearPDE):
2342       @note: This method is called by the assembling routine to map the Possion equation onto the general PDE.       @note: This method is called by the assembling routine to map the Possion equation onto the general PDE.
2343       """       """
2344       if name == "A" :       if name == "A" :
2345           return self.getCoefficient("k")+outer(self.getCoefficient("upwind"),self.getCoefficient("upwind"))           return self.getCoefficient("k")+util.outer(self.getCoefficient("upwind"),self.getCoefficient("upwind"))
2346       elif name == "B" :       elif name == "B" :
2347           return escript.Data()           return escript.Data()
2348       elif name == "C" :       elif name == "C" :
2349           return escript.getCoefficient("v")           return self.getCoefficient("v")
2350       elif name == "D" :       elif name == "D" :
2351           return self.getCoefficient("omega")           return self.getCoefficient("omega")
2352       elif name == "X" :       elif name == "X" :

Legend:
Removed from v.387  
changed lines
  Added in v.430

  ViewVC Help
Powered by ViewVC 1.1.26