/[escript]/branches/trilinos_from_5897/escriptcore/src/SolverOptions.cpp
ViewVC logotype

Diff of /branches/trilinos_from_5897/escriptcore/src/SolverOptions.cpp

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

revision 5913 by caltinay, Fri Feb 5 03:37:49 2016 UTC revision 5914 by caltinay, Wed Feb 10 06:15:12 2016 UTC
# Line 89  std::string SolverBuddy::getSummary() co Line 89  std::string SolverBuddy::getSummary() co
89          << "Adapt innner tolerance = " << adaptInnerTolerance() << std::endl;          << "Adapt innner tolerance = " << adaptInnerTolerance() << std::endl;
90    
91      if (getPackage() == SO_DEFAULT || getPackage() == SO_PACKAGE_PASO ||      if (getPackage() == SO_DEFAULT || getPackage() == SO_PACKAGE_PASO ||
92              getPackage() == SO_PACKAGE_CUSP) {              getPackage() == SO_PACKAGE_CUSP ||
93                getPackage() == SO_PACKAGE_TRILINOS) {
94          out << "Solver method = " << getName(getSolverMethod()) << std::endl;          out << "Solver method = " << getName(getSolverMethod()) << std::endl;
95          if (getSolverMethod() == SO_METHOD_GMRES) {          if (getSolverMethod() == SO_METHOD_GMRES) {
96              out << "Truncation  = " << getTruncation() << std::endl              out << "Truncation  = " << getTruncation() << std::endl
# Line 407  void SolverBuddy::setPreconditioner(int Line 408  void SolverBuddy::setPreconditioner(int
408      SolverOptions preconditioner = static_cast<SolverOptions>(precon);      SolverOptions preconditioner = static_cast<SolverOptions>(precon);
409      switch(preconditioner) {      switch(preconditioner) {
410          case SO_PRECONDITIONER_AMG:          case SO_PRECONDITIONER_AMG:
411    /*
412  #ifdef ESYS_MPI  #ifdef ESYS_MPI
413              throw SolverOptionsException("AMG preconditioner is not supported in MPI builds");              throw SolverOptionsException("AMG preconditioner is not supported in MPI builds");
414              break;              break;
415  #endif  #endif
416    */
417          case SO_PRECONDITIONER_AMLI:          case SO_PRECONDITIONER_AMLI:
418          case SO_PRECONDITIONER_BOOMERAMG:          case SO_PRECONDITIONER_BOOMERAMG:
419          case SO_PRECONDITIONER_GAUSS_SEIDEL:          case SO_PRECONDITIONER_GAUSS_SEIDEL:

Legend:
Removed from v.5913  
changed lines
  Added in v.5914

  ViewVC Help
Powered by ViewVC 1.1.26