Remove MFEMProblem::setNewtonParameters

Author: alexanderianblair

framework/include/mfem/problem/MFEMProblem.h

@@ -22,7 +22,6 @@ class MFEMProblem : public ExternalProblem
   MFEMProblem(const InputParameters & params);
   virtual ~MFEMProblem() {}
 
-  virtual void initialSetup() override;
   virtual void externalSolve() override {}
   virtual void syncSolutions(Direction) override {}
 
@@ -160,10 +159,12 @@ class MFEMProblem : public ExternalProblem
                      InputParameters & parameters);
 
   /**
-   * Add the nonlinear solver to the system. TODO: allow user to specify solver options,
-   * similar to the linear solvers.
+   * Add the nonlinear solver to the system.
    */
-  void addMFEMNonlinearSolver();
+  void addMFEMNonlinearSolver(unsigned int nl_max_its,
+                              mfem::real_t nl_abs_tol,
+                              mfem::real_t nl_rel_tol,
+                              unsigned int print_level);
 
   /**
    * Method used to get an mfem FEC depending on the variable family specified in the input file.
@@ -211,20 +212,8 @@ class MFEMProblem : public ExternalProblem
    */
   std::shared_ptr<mfem::ParGridFunction> getGridFunction(const std::string & name);
 
-  /**
-   * set newton solver parameters
-   */
-  void setNewtonParamaters(unsigned int nl_max_its,
-                           mfem::real_t nl_abs_tol,
-                           mfem::real_t nl_rel_tol,
-                           unsigned int print_level);
-
 protected:
   MFEMProblemData _problem_data;
-  unsigned int _nl_max_its;
-  mfem::real_t _nl_abs_tol;
-  mfem::real_t _nl_rel_tol;
-  unsigned int _print_level;
 };
 
 #endif

framework/src/mfem/equation_systems/EquationSystem.C

@@ -125,9 +125,6 @@ EquationSystem::Init(Moose::MFEM::GridFunctions & gridfunctions, mfem::AssemblyL
 {
   _assembly_level = assembly_level;
 
-  // Extract which coupled variables are to be trivially eliminated and which are trial variables
-  //  SetTrialVariableNames();
-
   for (auto & test_var_name : _test_var_names)
   {
     if (!gridfunctions.Has(test_var_name))
@@ -145,7 +142,7 @@ EquationSystem::Init(Moose::MFEM::GridFunctions & gridfunctions, mfem::AssemblyL
   }
 
   // Extract which coupled variables are to be trivially eliminated and which are trial variables
-    SetTrialVariableNames();
+  SetTrialVariableNames();
 
   // Store pointers to FESpaces of all coupled variables
   for (auto & coupled_var_name : _coupled_var_names)
@@ -393,7 +390,6 @@ EquationSystem::Mult(const mfem::Vector & sol, mfem::Vector & residual) const
   residual.HostRead();
 }
 
-
 void
 EquationSystem::UpdateJacobian() const
 {
@@ -421,7 +417,6 @@ EquationSystem::UpdateJacobian() const
       }
     }
   }
-
 }
 
 mfem::Operator &

framework/src/mfem/executioners/MFEMProblemSolve.C

@@ -47,7 +47,7 @@ MFEMProblemSolve::MFEMProblemSolve(
                                                  : "",
                        Moose::PassKey<MFEMProblemSolve>());
 
-  _mfem_problem.setNewtonParamaters(_nl_max_its, _nl_abs_tol, _nl_rel_tol, _print_level);
+  _mfem_problem.addMFEMNonlinearSolver(_nl_max_its, _nl_abs_tol, _nl_rel_tol, _print_level);
 }
 
 bool

framework/src/mfem/problem/MFEMProblem.C

@@ -39,13 +39,6 @@ MFEMProblem::MFEMProblem(const InputParameters & params) : ExternalProblem(param
   setMesh();
 }
 
-void
-MFEMProblem::initialSetup()
-{
-  FEProblemBase::initialSetup();
-  addMFEMNonlinearSolver();
-}
-
 void
 MFEMProblem::setMesh()
 {
@@ -76,15 +69,18 @@ MFEMProblem::addMFEMSolver(const std::string & user_object_name,
 }
 
 void
-MFEMProblem::addMFEMNonlinearSolver()
+MFEMProblem::addMFEMNonlinearSolver(unsigned int nl_max_its,
+                                    mfem::real_t nl_abs_tol,
+                                    mfem::real_t nl_rel_tol,
+                                    unsigned int print_level)
 {
   auto nl_solver = std::make_shared<mfem::NewtonSolver>(getComm());
 
   // Defaults to one iteration, without further nonlinear iterations
-  nl_solver->SetRelTol(_nl_rel_tol);
-  nl_solver->SetAbsTol(_nl_abs_tol);
-  nl_solver->SetPrintLevel(_print_level);
-  nl_solver->SetMaxIter(_nl_max_its);
+  nl_solver->SetRelTol(nl_rel_tol);
+  nl_solver->SetAbsTol(nl_abs_tol);
+  nl_solver->SetPrintLevel(print_level);
+  nl_solver->SetMaxIter(nl_max_its);
 
   getProblemData().nonlinear_solver = nl_solver;
 }
@@ -512,18 +508,6 @@ MFEMProblem::getGridFunction(const std::string & name)
   return getUserObject<MFEMVariable>(name).getGridFunction();
 }
 
-void
-MFEMProblem::setNewtonParamaters(unsigned int nl_max_its,
-                                 mfem::real_t nl_abs_tol,
-                                 mfem::real_t nl_rel_tol,
-                                 unsigned int print_level)
-{
-  _nl_max_its = nl_max_its;
-  _nl_abs_tol = nl_abs_tol;
-  _nl_rel_tol = nl_rel_tol;
-  _print_level = print_level;
-}
-
 void
 MFEMProblem::addInitialCondition(const std::string & ic_name,
                                  const std::string & name,

framework/src/mfem/problem_operators/TimeDomainEquationSystemProblemOperator.C

@@ -47,7 +47,7 @@ TimeDomainEquationSystemProblemOperator::Solve()
 
 void
 TimeDomainEquationSystemProblemOperator::ImplicitSolve(const mfem::real_t dt,
-                                                       const mfem::Vector & X,
+                                                       const mfem::Vector & /*X*/,
                                                        mfem::Vector & dX_dt)
 {
   dX_dt = 0.0;