Revert "Patch mfem::HypreGMRES/PCG to reset preconditioning matrix"

This reverts commit d908ec3.

Author: nmnobre

framework/include/mfem/solvers/MFEMHyprePatch.h

@@ -12,7 +12,6 @@
 #pragma once
 
 #include "MFEMGeneralUserObject.h"
-#include "MFEMHyprePatch.h"
 
 /**
  * Base class for wrapping mfem::Solver-derived classes.

framework/include/mfem/solvers/MFEMSolverBase.h

@@ -39,7 +39,7 @@ MFEMHypreGMRES::MFEMHypreGMRES(const InputParameters & parameters) : MFEMSolverB
 void
 MFEMHypreGMRES::constructSolver()
 {
-  auto solver = std::make_unique<mfem::patched::HypreGMRES>(getMFEMProblem().getComm());
+  auto solver = std::make_unique<mfem::HypreGMRES>(getMFEMProblem().getComm());
   solver->SetTol(getParam<mfem::real_t>("l_tol"));
   solver->SetAbsTol(getParam<mfem::real_t>("l_abs_tol"));
   solver->SetMaxIter(getParam<int>("l_max_its"));

framework/src/mfem/solvers/MFEMHypreGMRES.C

@@ -38,7 +38,7 @@ MFEMHyprePCG::MFEMHyprePCG(const InputParameters & parameters) : MFEMSolverBase(
 void
 MFEMHyprePCG::constructSolver()
 {
-  auto solver = std::make_unique<mfem::patched::HyprePCG>(getMFEMProblem().getComm());
+  auto solver = std::make_unique<mfem::HyprePCG>(getMFEMProblem().getComm());
   solver->SetTol(getParam<mfem::real_t>("l_tol"));
   solver->SetAbsTol(getParam<mfem::real_t>("l_abs_tol"));
   solver->SetMaxIter(getParam<int>("l_max_its"));

framework/src/mfem/solvers/MFEMHyprePCG.C

@@ -57,9 +57,6 @@ template void MFEMSolverBase::setPreconditioner(mfem::HypreFGMRES &);
 template void MFEMSolverBase::setPreconditioner(mfem::HypreGMRES &);
 template void MFEMSolverBase::setPreconditioner(mfem::HyprePCG &);
 
-template void MFEMSolverBase::setPreconditioner(mfem::patched::HypreGMRES &);
-template void MFEMSolverBase::setPreconditioner(mfem::patched::HyprePCG &);
-
 void
 MFEMSolverBase::checkSpectralEquivalence(mfem::ParBilinearForm & blf) const
 {

framework/src/mfem/solvers/MFEMSolverBase.C

@@ -2,7 +2,6 @@
 
 #include "gtest/gtest.h"
 #include "Moose.h"
-#include "MFEMHyprePatch.h"
 
 class VectorPowerLawNLFIntegrator : public mfem::NonlinearFormIntegrator
 {
@@ -218,7 +217,7 @@ TEST(CheckData, NonlinearIntegratorTest)
   // Solver for the Jacobian solve in the Newton method
   mfem::Solver * jacobian_solver;
   // Set up the Jacobian solver
-  mfem::patched::HyprePCG j_pcg(h_curl_fe_space.GetComm());
+  mfem::HyprePCG j_pcg(h_curl_fe_space.GetComm());
   mfem::HypreAMS ams(&h_curl_fe_space);
   ams.SetPrintLevel(1);
   j_pcg.SetTol(1e-7);