Changeset 2795 for trunk

Show
Ignore:
Timestamp:
11/05/2008 11:04:40 AM (2 months ago)
Author:
wd15
Message:

Fixing trilinos test cases. Reversing pointless change to return solver status. TrilinosSolver?.init was not calling Solver.init

Location:
trunk
Files:
3 modified

Legend:

Unmodified
Added
Removed

  • trunk/FiPy.egg-info/SOURCES.txt

    r2792 r2795  
    2121documentation/TALKS.txt 
    2222documentation/TODOLIST.txt 
    23 documentation/VERSION.txt 
    2423documentation/VKML.txt 
    2524documentation/figures/NIST_right2line.pdf 
    … …  
    3029documentation/manual/fipy.bst 
    3130documentation/manual/fipy.dbj 
    32 documentation/manual/fipy.pdf 
    3331documentation/manual/fipy.sty 
    3432documentation/manual/fipy.tex 
    … …  
    295293fipy/meshes/common/mesh.py 
    296294fipy/meshes/numMesh/GmshTest2D.msh 
    297 fipy/meshes/numMesh/UniformCylindricalGrid2D.py 
    298295fipy/meshes/numMesh/__init__.py 
    299296fipy/meshes/numMesh/cell.py 

  • trunk/fipy/solvers/trilinos/trilinosAztecOOSolver.py

    r2790 r2795  
    7474            self.preconditioner._applyToSolver(solver=Solver, matrix=A) 
    7575         
    76         return Solver.Iterate(self.iterations, self.tolerance) 
     76        Solver.Iterate(self.iterations, self.tolerance) 

  • trunk/fipy/solvers/trilinos/trilinosSolver.py

    r2790 r2795  
    5555        if self.__class__ is TrilinosSolver: 
    5656            raise NotImplementedError, "can't instantiate abstract base class" 
     57        else: 
     58            Solver.__init__(self, *args, **kwargs) 
    5759             
    5860    def _makeTrilinosMatrix(self, L): 
    … …  
    118120        RHS = _numpyToTrilinosVector(b, A.RowMap()) 
    119121         
    120         solverOutput = self._applyTrilinosSolver(A, LHS, RHS) 
     122        self._applyTrilinosSolver(A, LHS, RHS) 
    121123 
    122124        x[:] = _trilinosToNumpyVector(LHS) 
    123         return solverOutput 
    124125 
    125126    def _getMatrixClass(self):