Manage string GS identifiers in SystemSolver class only.

ORNL · Mar 21, 2024 · 4e67be2 · 4e67be2
1 parent db62874
commit 4e67be2
Show file tree

Hide file tree

Showing 4 changed files with 22 additions and 47 deletions.
diff --git a/resolve/GramSchmidt.cpp b/resolve/GramSchmidt.cpp
@@ -48,32 +48,6 @@ namespace ReSolve
     return 0;  
   }
 
-  int GramSchmidt::setVariant(std::string variant)
-  {
-    if (setup_complete_) {
-      freeGramSchmidtData();
-      setup_complete_ = false;
-    }
-
-    if (variant == "cgs2") {
-      variant_ = GramSchmidt::cgs2;
-    } else if (variant == "mgs") {
-      variant_ = GramSchmidt::mgs;
-    } else if (variant == "mgs_two_synch") {
-      variant_ = GramSchmidt::mgs_two_synch;
-    } else if (variant == "mgs_pm") {
-      variant_ = GramSchmidt::mgs_pm;
-    } else if (variant == "cgs1") {
-      variant_ = GramSchmidt::cgs1;
-    } else {
-      out::warning() << "Gram-Schmidt variant " << variant << " not recognized.\n";
-      out::warning() << "Using default cgs2 Gram-Schmidt variant.\n";
-      variant_ = GramSchmidt::cgs2;
-    }
-
-    return 0;  
-  }
-
   GramSchmidt::GSVariant GramSchmidt::getVariant()
   {
     return variant_;  

diff --git a/resolve/GramSchmidt.hpp b/resolve/GramSchmidt.hpp
@@ -20,7 +20,6 @@ namespace ReSolve
       GramSchmidt(VectorHandler* vh, GSVariant variant);
       ~GramSchmidt();
       int setVariant(GramSchmidt::GSVariant variant);
-      int setVariant(std::string variant);
       GSVariant  getVariant();
       real_type* getL(); //only for low synch, returns null ptr otherwise 
 

diff --git a/resolve/LinSolver.cpp b/resolve/LinSolver.cpp
@@ -171,7 +171,7 @@ namespace ReSolve
     return flexible_;
   }
 
-  int LinSolverIterative::setOrthogonalization(GramSchmidt* gs)
+  int LinSolverIterative::setOrthogonalization(GramSchmidt* /* gs */)
   {
     out::error() << "Solver does not implement setting orthogonalization.\n";
     return 1;

diff --git a/resolve/SystemSolver.cpp b/resolve/SystemSolver.cpp
@@ -756,28 +756,30 @@ namespace ReSolve
   // Private methods
   //
 
-  int SystemSolver::setGramSchmidtMethod(std::string gsMethod)
+  int SystemSolver::setGramSchmidtMethod(std::string variant)
   {
-    if (gs_ != nullptr) {
-      gs_->setVariant(gsMethod);
-      return 0;
-    }
-
-    if (gsMethod == "cgs2") {
-      gs_ = new GramSchmidt(vectorHandler_, GramSchmidt::cgs2);
-    } else if (gsMethod == "mgs") {
-      gs_ = new GramSchmidt(vectorHandler_, GramSchmidt::mgs);
-    } else if (gsMethod == "mgs_two_synch") {
-      gs_ = new GramSchmidt(vectorHandler_, GramSchmidt::mgs_two_synch);
-    } else if (gsMethod == "mgs_pm") {
-      gs_ = new GramSchmidt(vectorHandler_, GramSchmidt::mgs_pm);
-    } else if (gsMethod == "cgs1") {
-      gs_ = new GramSchmidt(vectorHandler_, GramSchmidt::cgs1);
+    // Map string input to the Gram-Schmidt variant enum
+    GramSchmidt::GSVariant gs_variant;
+    if (variant == "cgs2") {
+      gs_variant = GramSchmidt::cgs2;
+    } else if (variant == "mgs") {
+      gs_variant = GramSchmidt::mgs;
+    } else if (variant == "mgs_two_synch") {
+      gs_variant = GramSchmidt::mgs_two_synch;
+    } else if (variant == "mgs_pm") {
+      gs_variant = GramSchmidt::mgs_pm;
+    } else if (variant == "cgs1") {
+      gs_variant = GramSchmidt::cgs1;
     } else {
-      out::warning() << "Gram-Schmidt variant " << gsMethod_ << " not recognized.\n";
+      out::warning() << "Gram-Schmidt variant " << variant << " not recognized.\n";
       out::warning() << "Using default cgs2 Gram-Schmidt variant.\n";
-      gs_ = new GramSchmidt(vectorHandler_, GramSchmidt::cgs2);
-      gsMethod_ = "cgs2";
+      gs_variant = GramSchmidt::cgs2;
+    }
+
+    if (gs_) {
+      gs_->setVariant(gs_variant);
+    } else {
+      gs_ = new GramSchmidt(vectorHandler_, gs_variant);
     }
 
     return 0;