Clang formatted #31772

Author: karthichockalingam

framework/include/mfem/equation_systems/EquationSystem.h

@@ -61,7 +61,8 @@ class EquationSystem : public mfem::Operator
   /// Build bilinear forms
   virtual void BuildBilinearForms();
   virtual void BuildMixedBilinearForms();
-  virtual void BuildEquationSystem(Moose::MFEM::GridFunctions & gridfunctions, mfem::Array<int> & btoffsets);
+  virtual void BuildEquationSystem(Moose::MFEM::GridFunctions & gridfunctions,
+                                   mfem::Array<int> & btoffsets);
 
   /// Form linear system, with essential boundary conditions accounted for
   virtual void FormLinearSystem(mfem::OperatorHandle & op,
@@ -89,7 +90,7 @@ class EquationSystem : public mfem::Operator
   virtual void RecoverFEMSolution(mfem::BlockVector & trueX,
                                   Moose::MFEM::GridFunctions & gridfunctions);
 
-  void CopyVec(const mfem::Vector & x, mfem::Vector & y){ y = x;}
+  void CopyVec(const mfem::Vector & x, mfem::Vector & y) { y = x; }
 
   std::vector<mfem::Array<int>> _ess_tdof_lists;
 
@@ -259,7 +260,6 @@ EquationSystem::ApplyDomainLFIntegrators(
   }
 }
 
-
 inline void
 EquationSystem::ApplyDomainNLActionIntegrators(
     const std::string & test_var_name,
@@ -284,8 +284,6 @@ EquationSystem::ApplyDomainNLActionIntegrators(
   }
 }
 
-
-
 template <class FormType>
 void
 EquationSystem::ApplyBoundaryBLFIntegrators(
@@ -349,7 +347,8 @@ class TimeDependentEquationSystem : public EquationSystem
   void AddCoupledVariableNameIfMissing(const std::string & coupled_var_name) override;
 
   virtual void SetTimeStep(mfem::real_t dt);
-  virtual void UpdateEquationSystem(Moose::MFEM::GridFunctions & gridfunctions, mfem::Array<int> & btoffsets);
+  virtual void UpdateEquationSystem(Moose::MFEM::GridFunctions & gridfunctions,
+                                    mfem::Array<int> & btoffsets);
 
   virtual void AddKernel(std::shared_ptr<MFEMKernel> kernel) override;
   virtual void BuildBilinearForms() override;

framework/include/mfem/functions/MFEMGradientGridFunction.h

@@ -29,4 +29,4 @@ class MFEMGradientGridFunction : public MFEMGeneralUserObject
   const VariableName & _var_name;
 };
 
-#endif
+#endif

framework/include/mfem/problem/MFEMProblem.h

@@ -208,7 +208,10 @@ class MFEMProblem : public ExternalProblem
   /**
    * 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);
+  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;

framework/src/mfem/equation_systems/EquationSystem.C

@@ -11,7 +11,6 @@
 
 #include "EquationSystem.h"
 #include "libmesh/int_range.h"
-#include "../../../contrib/mfem/general/forall.hpp"
 
 namespace Moose::MFEM
 {
@@ -130,7 +129,7 @@ EquationSystem::Init(Moose::MFEM::GridFunctions & gridfunctions,
                      mfem::AssemblyLevel assembly_level)
 {
   _assembly_level = assembly_level;
-  
+
   // Extract which coupled variables are to be trivially eliminated and which are trial variables
   SetTrialVariableNames();
 
@@ -328,19 +327,19 @@ EquationSystem::BuildJacobian(mfem::BlockVector & trueX, mfem::BlockVector & tru
 void
 EquationSystem::Mult(const mfem::Vector & sol, mfem::Vector & residual) const
 {
-  const_cast<EquationSystem*>(this)->CopyVec(sol,_trueBlockSol);
+  const_cast<EquationSystem *>(this)->CopyVec(sol, _trueBlockSol);
 
-  for (int i = 0; i < _trial_var_names.size(); i++)
+  for (unsigned int i = 0; i < _trial_var_names.size(); i++)
   {
     auto & trial_var_name = _trial_var_names.at(i);
     _gfuncs->Get(trial_var_name)->Distribute(&(_trueBlockSol.GetBlock(i)));
   }
 
   UpdateJacobian();
 
-  _BlockResidual=0.0;
+  _BlockResidual = 0.0;
 
-  for (int i = 0; i < _test_var_names.size(); i++)
+  for (unsigned int i = 0; i < _test_var_names.size(); i++)
   {
     auto & test_var_name = _test_var_names.at(i);
 
@@ -358,77 +357,81 @@ EquationSystem::Mult(const mfem::Vector & sol, mfem::Vector & residual) const
     _BlockResidual.GetBlock(i) -= b;
     _BlockResidual.GetBlock(i) *= -1;
 
-    if(_non_linear)
-      _BlockResidual.GetBlock(i).SetSubVector(_ess_tdof_lists.at(i),0.0);
+    if (_non_linear)
+      _BlockResidual.GetBlock(i).SetSubVector(_ess_tdof_lists.at(i), 0.0);
   }
 
-  if(!_non_linear){
-    const_cast<EquationSystem*>(this)->FormLinearSystem(_jacobian,  _trueBlockSol, _BlockResidual);
-    const_cast<EquationSystem*>(this)->CopyVec(_BlockResidual, residual);
-  }else{
-    const_cast<EquationSystem*>(this)->CopyVec(_BlockResidual, residual);
-    const_cast<EquationSystem*>(this)->FormLinearSystem(_jacobian,  _trueBlockSol, _BlockResidual);
+  if (!_non_linear)
+  {
+    const_cast<EquationSystem *>(this)->FormLinearSystem(_jacobian, _trueBlockSol, _BlockResidual);
+    const_cast<EquationSystem *>(this)->CopyVec(_BlockResidual, residual);
+  }
+  else
+  {
+    const_cast<EquationSystem *>(this)->CopyVec(_BlockResidual, residual);
+    const_cast<EquationSystem *>(this)->FormLinearSystem(_jacobian, _trueBlockSol, _BlockResidual);
   }
 
   residual *= -1.0;
 
-  if(!_non_linear)
-    {
-      _jacobian->AddMult(sol, residual);
-    }
+  if (!_non_linear)
+  {
+    _jacobian->AddMult(sol, residual);
+  }
 
   sol.HostRead();
   residual.HostRead();
 }
 
 void
-TimeDependentEquationSystem::UpdateEssDerivativeVals(const mfem::real_t & dt, const mfem::Vector & x_old)
+TimeDependentEquationSystem::UpdateEssDerivativeVals(const mfem::real_t & dt,
+                                                     const mfem::Vector & x_old)
 {
-  //Update the old vector
+  // Update the old vector
   mfem::BlockVector block_x_old;
   block_x_old.Update(*_block_true_offsets);
 
-  //Update the old vector
+  // Update the old vector
   CopyVec(x_old, block_x_old);
 
-  //Update the xs boundary conditions
+  // Update the xs boundary conditions
   ApplyEssentialBCs();
 
   // Update the dxdts boundary conditions
-  for (int i = 0; i < _test_var_names.size(); i++)
+  for (unsigned int i = 0; i < _test_var_names.size(); i++)
   {
     *(_var_ess_constraints.at(i)) -= block_x_old.GetBlock(i);
     *(_var_ess_constraints.at(i)) /= dt;
   }
-};
+}
 
 void
 EquationSystem::UpdateJacobian() const
 {
 
-  for (int i = 0; i < _test_var_names.size(); i++)
-    {
-      auto & test_var_name = _test_var_names.at(i);
-      auto blf = _blfs.Get(test_var_name);
-      blf->Update();
-      blf->Assemble();
-    }
+  for (unsigned int i = 0; i < _test_var_names.size(); i++)
+  {
+    auto & test_var_name = _test_var_names.at(i);
+    auto blf = _blfs.Get(test_var_name);
+    blf->Update();
+    blf->Assemble();
+  }
 
-    // Form off-diagonal blocks
-    for (int i = 0; i < _test_var_names.size(); i++)
+  // Form off-diagonal blocks
+  for (unsigned int i = 0; i < _test_var_names.size(); i++)
+  {
+    auto test_var_name = _test_var_names.at(i);
+    for (unsigned int j = 0; j < _test_var_names.size(); j++)
     {
-      auto test_var_name = _test_var_names.at(i);
-      for (int j = 0; j < _test_var_names.size(); j++)
+      auto trial_var_name = _test_var_names.at(j);
+      if (_mblfs.Has(test_var_name) && _mblfs.Get(test_var_name)->Has(trial_var_name))
       {
-        auto trial_var_name = _test_var_names.at(j);
-        if (_mblfs.Has(test_var_name) && _mblfs.Get(test_var_name)->Has(trial_var_name))
-        {
-          auto mblf = _mblfs.Get(test_var_name)->Get(trial_var_name);
-          mblf->Update();
-          mblf->Assemble();
-        }
+        auto mblf = _mblfs.Get(test_var_name)->Get(trial_var_name);
+        mblf->Update();
+        mblf->Assemble();
       }
     }
+  }
 }
 
 mfem::Operator &
@@ -554,7 +557,8 @@ EquationSystem::BuildMixedBilinearForms()
 }
 
 void
-EquationSystem::BuildEquationSystem(Moose::MFEM::GridFunctions & gridfunctions, mfem::Array<int> & btoffsets)
+EquationSystem::BuildEquationSystem(Moose::MFEM::GridFunctions & gridfunctions,
+                                    mfem::Array<int> & btoffsets)
 {
   _gfuncs = &gridfunctions;
   _block_true_offsets = &btoffsets;
@@ -721,13 +725,14 @@ TimeDependentEquationSystem::FormLegacySystem(mfem::OperatorHandle & op,
     // }
     mfem::Vector aux_x, aux_rhs;
     // Update solution values on Dirichlet values to be in terms of du/dt instead of u
-    //mfem::Vector bc_x = *(_var_ess_constraints.at(i).get());
-    //bc_x -= *_eliminated_variables.Get(test_var_name);
-    //bc_x /= _dt_coef.constant;
+    // mfem::Vector bc_x = *(_var_ess_constraints.at(i).get());
+    // bc_x -= *_eliminated_variables.Get(test_var_name);
+    // bc_x /= _dt_coef.constant;
 
     // Form linear system for operator acting on vector of du/dt
     mfem::HypreParMatrix * aux_a = new mfem::HypreParMatrix;
-    td_blf->FormLinearSystem(_ess_tdof_lists.at(i), *(_var_ess_constraints.at(i)), *lf, *aux_a, aux_x, aux_rhs);
+    td_blf->FormLinearSystem(
+        _ess_tdof_lists.at(i), *(_var_ess_constraints.at(i)), *lf, *aux_a, aux_x, aux_rhs);
     _h_blocks(i, i) = aux_a;
     truedXdt.GetBlock(i) = aux_x;
     trueRHS.GetBlock(i) = aux_rhs;
@@ -759,13 +764,14 @@ TimeDependentEquationSystem::FormSystem(mfem::OperatorHandle & op,
   // }
   mfem::Vector aux_x, aux_rhs;
   // Update solution values on Dirichlet values to be in terms of du/dt instead of u
-  //mfem::Vector bc_x = *(_var_ess_constraints.at(0).get());
-  //bc_x -= *_eliminated_variables.Get(test_var_name);
-  //bc_x /= _dt_coef.constant;
+  // mfem::Vector bc_x = *(_var_ess_constraints.at(0).get());
+  // bc_x -= *_eliminated_variables.Get(test_var_name);
+  // bc_x /= _dt_coef.constant;
 
   // Form linear system for operator acting on vector of du/dt
   mfem::OperatorPtr aux_a;
-  td_blf->FormLinearSystem(_ess_tdof_lists.at(0), *(_var_ess_constraints.at(0)), *lf, aux_a, aux_x, aux_rhs);
+  td_blf->FormLinearSystem(
+      _ess_tdof_lists.at(0), *(_var_ess_constraints.at(0)), *lf, aux_a, aux_x, aux_rhs);
 
   truedXdt.GetBlock(0) = aux_x;
   trueRHS.GetBlock(0) = aux_rhs;
@@ -778,7 +784,8 @@ TimeDependentEquationSystem::FormSystem(mfem::OperatorHandle & op,
 }
 
 void
-TimeDependentEquationSystem::UpdateEquationSystem(Moose::MFEM::GridFunctions & gridfunctions, mfem::Array<int> & btoffsets)
+TimeDependentEquationSystem::UpdateEquationSystem(Moose::MFEM::GridFunctions & gridfunctions,
+                                                  mfem::Array<int> & btoffsets)
 {
   EquationSystem::BuildEquationSystem(gridfunctions, btoffsets);
 }

framework/src/mfem/executioners/MFEMProblemSolve.C

@@ -46,7 +46,7 @@ MFEMProblemSolve::MFEMProblemSolve(
                        : _app.isUltimateMaster() ? "cpu"
                                                  : "",
                        Moose::PassKey<MFEMProblemSolve>());
-  
+
   _mfem_problem.setNewtonParamaters(_nl_max_its, _nl_abs_tol, _nl_rel_tol, _print_level);
 }
 

framework/src/mfem/functions/MFEMGradientGridFunction.C

@@ -20,14 +20,12 @@ MFEMGradientGridFunction::validParams()
   InputParameters params = MFEMGeneralUserObject::validParams();
   params.registerBase("Function");
   params.addClassDescription("Creates a GradientGridFunctionCoefficient out of a variable");
-  params.addRequiredParam<VariableName>("var_name",
-                                        "The names of the gridfunction variable");
+  params.addRequiredParam<VariableName>("var_name", "The names of the gridfunction variable");
   return params;
 }
 
 MFEMGradientGridFunction::MFEMGradientGridFunction(const InputParameters & parameters)
-  : MFEMGeneralUserObject(parameters),
-    _var_name(getParam<VariableName>("var_name"))
+  : MFEMGeneralUserObject(parameters), _var_name(getParam<VariableName>("var_name"))
 {
   // declares GradientGridFunctionCoefficient
   getMFEMProblem().getCoefficients().declareVector<mfem::GradientGridFunctionCoefficient>(
@@ -36,4 +34,4 @@ MFEMGradientGridFunction::MFEMGradientGridFunction(const InputParameters & param
 
 MFEMGradientGridFunction::~MFEMGradientGridFunction() {}
 
-#endif
+#endif

framework/src/mfem/kernels/MFEMDomainLFGradKernel.C

@@ -37,10 +37,10 @@ MFEMDomainLFGradKernel::MFEMDomainLFGradKernel(const InputParameters & parameter
 mfem::LinearFormIntegrator *
 MFEMDomainLFGradKernel::createNLActionIntegrator()
 {
-  mfem::VectorCoefficient & vec_coef = getMFEMProblem().getCoefficients().getVectorCoefficient(name());
+  mfem::VectorCoefficient & vec_coef =
+      getMFEMProblem().getCoefficients().getVectorCoefficient(name());
   _product_coeff = new mfem::ScalarVectorProductCoefficient(_coef, vec_coef);
   return new mfem::DomainLFGradIntegrator(*_product_coeff);
 }
 
-
 #endif

framework/src/mfem/kernels/MFEMMixedScalarWeakDivergenceKernel.C

@@ -27,20 +27,22 @@ MFEMMixedScalarWeakDivergenceKernel::validParams()
   return params;
 }
 
-MFEMMixedScalarWeakDivergenceKernel::MFEMMixedScalarWeakDivergenceKernel(const InputParameters & parameters)
+MFEMMixedScalarWeakDivergenceKernel::MFEMMixedScalarWeakDivergenceKernel(
+    const InputParameters & parameters)
   : MFEMKernel(parameters), _coef(getScalarCoefficient("coefficient"))
 // FIXME: The MFEM bilinear form can also handle vector and matrix
 // coefficients, so ideally we'd handle all three too.
 {
-    // declares GradientGridFunctionCoefficient
+  // declares GradientGridFunctionCoefficient
   getMFEMProblem().getCoefficients().declareVector<mfem::GradientGridFunctionCoefficient>(
       name(), getMFEMProblem().getProblemData().gridfunctions.Get(_test_var_name));
 }
 
 mfem::BilinearFormIntegrator *
 MFEMMixedScalarWeakDivergenceKernel::createBFIntegrator()
 {
-  mfem::VectorCoefficient & vec_coef = getMFEMProblem().getCoefficients().getVectorCoefficient(name());
+  mfem::VectorCoefficient & vec_coef =
+      getMFEMProblem().getCoefficients().getVectorCoefficient(name());
   _product_coef = new mfem::ScalarVectorProductCoefficient(_coef, vec_coef);
   return new mfem::MixedScalarWeakDivergenceIntegrator(*_product_coef);
 }

framework/src/mfem/problem/MFEMProblem.C

@@ -510,8 +510,11 @@ 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)
+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;

framework/src/mfem/problem_operators/EquationSystemProblemOperator.C

@@ -35,10 +35,11 @@ EquationSystemProblemOperator::Solve()
 
   for (const auto i : index_range(_test_var_names))
   {
-     auto & test_var_name = _test_var_names.at(i);
-     *(GetEquationSystem()->_var_ess_constraints.at(i)) = *(_problem_data.gridfunctions.GetShared(test_var_name));
+    auto & test_var_name = _test_var_names.at(i);
+    *(GetEquationSystem()->_var_ess_constraints.at(i)) =
+        *(_problem_data.gridfunctions.GetShared(test_var_name));
   }
-  
+
   GetEquationSystem()->ApplyEssentialBCs();
   GetEquationSystem()->BuildJacobian(_true_x, _true_rhs);