set convergence conditions

Author: shakedregev

resolve/LinSolverIterative.cpp

@@ -57,6 +57,17 @@ namespace ReSolve
     return maxit_;
   }
 
+  int LinSolverIterative::setConvergenceCondition(index_type conv_cond)
+  {
+    if (conv_cond < 0 || conv_cond > 2)
+    {
+      out::error() << "Convergence condition must be 0, 1, or 2.\n";
+      return 1;
+    }
+    this->conv_cond_ = conv_cond;
+    return 0;
+  }
+
   int LinSolverIterative::setOrthogonalization(GramSchmidt* /* gs */)
   {
     out::error() << "Solver does not implement setting orthogonalization.\n";

resolve/LinSolverIterative.hpp

@@ -36,13 +36,16 @@ namespace ReSolve
     real_type  getTol() const;
     index_type getMaxit() const;
 
+    int setConvergenceCondition(index_type conv_cond);
+
     void setTol(real_type new_tol);
     void setMaxit(index_type new_maxit);
 
   protected:
     real_type  initial_residual_norm_;
     real_type  final_residual_norm_;
     index_type total_iters_;
+    index_type conv_cond_{0}; ///< Convergence condition (0: absolute, 1: relative to tol, 2: relative to rhs norm)
 
     // Parameters common for all iterative solvers
     real_type  tol_{1e-14}; ///< Solver tolerance

resolve/LinSolverIterativeFGMRES.cpp

@@ -141,17 +141,17 @@ namespace ReSolve
     initial_residual_norm_ = rnorm;
     while (outer_flag)
     {
-      if (rnorm / bnorm <= ReSolve::constants::MACHINE_EPSILON) // addressed comment to check if residual is small enough
-      {
-        io::Logger::misc() << "Early exit, relative norm of residual "
-                           << std::scientific << std::setprecision(16)
-                           << rnorm / bnorm << "\n";
-        outer_flag             = 0;
-        final_residual_norm_   = rnorm;
-        initial_residual_norm_ = rnorm;
-        total_iters_           = it;
-        break;
-      }
+      // if (rnorm / bnorm <= ReSolve::constants::MACHINE_EPSILON) // addressed comment to check if residual is small enough
+      // {
+      //   io::Logger::misc() << "Early exit, relative norm of residual "
+      //                      << std::scientific << std::setprecision(16)
+      //                      << rnorm / bnorm << "\n";
+      //   outer_flag             = 0;
+      //   final_residual_norm_   = rnorm;
+      //   initial_residual_norm_ = rnorm;
+      //   total_iters_           = it;
+      //   break;
+      // }
       if (it == 0)
       {
         tolrel = tol_ * rnorm;

resolve/LinSolverIterativeRandFGMRES.cpp

@@ -184,17 +184,17 @@ namespace ReSolve
     initial_residual_norm_ = rnorm;
     while (outer_flag)
     {
-      if (rnorm / bnorm <= ReSolve::constants::MACHINE_EPSILON) // addressed comment to check if residual is small enough
-      {
-        io::Logger::misc() << "Early exit, relative norm of residual "
-                           << std::scientific << std::setprecision(16)
-                           << rnorm / bnorm << "\n";
-        outer_flag             = 0;
-        final_residual_norm_   = rnorm;
-        initial_residual_norm_ = rnorm;
-        total_iters_           = it;
-        break;
-      }
+      // if (rnorm / bnorm <= ReSolve::constants::MACHINE_EPSILON) // addressed comment to check if residual is small enough
+      // {
+      //   io::Logger::misc() << "Early exit, relative norm of residual "
+      //                      << std::scientific << std::setprecision(16)
+      //                      << rnorm / bnorm << "\n";
+      //   outer_flag             = 0;
+      //   final_residual_norm_   = rnorm;
+      //   initial_residual_norm_ = rnorm;
+      //   total_iters_           = it;
+      //   break;
+      // }
       if (it == 0)
       {
         tolrel = tol_ * rnorm;

tests/functionality/testKlu.cpp

@@ -152,7 +152,7 @@ int runTest(int argc, char* argv[], std::string& solver_name)
 
     status = FGMRES.setupPreconditioner("LU", &KLU);
     error_sum += status;
-
+    FGMRES.setConvergenceCondition(2); // set convergence condition to 2 to look at relative residual
     status = FGMRES.solve(&vec_rhs, &vec_x);
     error_sum += status;
   }
@@ -200,7 +200,7 @@ int runTest(int argc, char* argv[], std::string& solver_name)
     FGMRES.resetMatrix(A);
     status = FGMRES.setupPreconditioner("LU", &KLU);
     error_sum += status;
-
+    FGMRES.setConvergenceCondition(2); // set convergence condition to 2 to look at relative residual
     status = FGMRES.solve(&vec_rhs, &vec_x);
     error_sum += status;
   }

tests/functionality/testSysRefactor.cpp

@@ -139,14 +139,15 @@ static int runTest(int argc, char* argv[], std::string backend)
   // settings than HIP-based one)
   solver.setRefinementMethod("fgmres", "cgs2");
   solver.getIterativeSolver().setCliParam("restart", "100");
+  solver.getIterativeSolver().setTol(ReSolve::constants::MACHINE_EPSILON);
+  solver.getIterativeSolver().setConvergenceCondition(2); // relative residual norm
   if (backend == "hip")
   {
     solver.getIterativeSolver().setMaxit(200);
   }
   if (backend == "cuda")
   {
     solver.getIterativeSolver().setMaxit(400);
-    solver.getIterativeSolver().setTol(1e-17);
   }
 
   // Read first matrix