Code linting from automated moose patch

Author: sohail-GLADOS

framework/include/mfem/bcs/MFEMIntegratedBC.h

@@ -25,7 +25,7 @@ class MFEMIntegratedBC : public MFEMBoundaryCondition
   virtual mfem::LinearFormIntegrator * createLFIntegrator() = 0;
 
   /// Create MFEM integrator to apply non-linear residual form. Ownership managed by the caller.
-  virtual mfem::LinearFormIntegrator * createNLAIntegrator(){return nullptr;};
+  virtual mfem::LinearFormIntegrator * createNLAIntegrator() { return nullptr; };
 
   /// Create MFEM integrator to apply to the LHS of the weak form. Ownership managed by the caller.
   virtual mfem::BilinearFormIntegrator * createBFIntegrator() = 0;

framework/include/mfem/equation_systems/EquationSystem.h

@@ -97,7 +97,7 @@ class EquationSystem : public mfem::Operator
   virtual void BuildMixedBilinearForms();
   /// Build all forms comprising this EquationSystem
   virtual void BuildEquationSystem();
-  //Reassemble the Jacobian matrix/Operator (Assuming Gridfunction dependant Operator)
+  // Reassemble the Jacobian matrix/Operator (Assuming Gridfunction dependant Operator)
   virtual void ReassembleJacobian(mfem::BlockVector & x, mfem::BlockVector & rhs);
   virtual void UpdateJacobian() const;
 
@@ -182,8 +182,8 @@ class EquationSystem : public mfem::Operator
   NamedFieldsMap<mfem::ParBilinearForm> _blfs;
   NamedFieldsMap<mfem::ParLinearForm> _lfs;
   NamedFieldsMap<mfem::ParNonlinearForm> _nlfs;
-  NamedFieldsMap<mfem::ParLinearForm>    _nlAs;
-  NamedFieldsMap<NamedFieldsMap<mfem::ParMixedBilinearForm>> _mblfs; //named according to trial var
+  NamedFieldsMap<mfem::ParLinearForm> _nlAs;
+  NamedFieldsMap<NamedFieldsMap<mfem::ParMixedBilinearForm>> _mblfs; // named according to trial var
 
   /// Gridfunctions holding essential constraints from Dirichlet BCs
   std::vector<std::unique_ptr<mfem::ParGridFunction>> _var_ess_constraints;
@@ -200,19 +200,18 @@ class EquationSystem : public mfem::Operator
   /// Named according to test variable.
   NamedFieldsMap<std::vector<std::shared_ptr<MFEMEssentialBC>>> _essential_bc_map;
 
-  //Operator handle for the jacobian matrix
+  // Operator handle for the jacobian matrix
   mutable mfem::OperatorHandle _jacobian;
   mfem::AssemblyLevel _assembly_level;
 
-  //Temporary vectors used for non-linear action
-  //assembly process
+  // Temporary vectors used for non-linear action
+  // assembly process
   mutable mfem::BlockVector _trueBlockSol, _blockForces, _blockResidual;
   Moose::MFEM::GridFunctions * _gfuncs;
-  mfem::Array<int> *_block_true_offsets=NULL;
+  mfem::Array<int> * _block_true_offsets = NULL;
   mfem::Array<int> empty_tdof;
   bool _non_linear = false;
 
-
 private:
   friend class EquationSystemProblemOperator;
   /// Disallowed inherited method
@@ -284,7 +283,7 @@ EquationSystem::ApplyDomainNLAFIntegrators(
       mfem::LinearFormIntegrator * integ = kernel->createNLAIntegrator();
       if (integ)
       {
-        _non_linear=true;
+        _non_linear = true;
         kernel->isSubdomainRestricted()
             ? form->AddDomainIntegrator(std::move(integ), kernel->getSubdomainMarkers())
             : form->AddDomainIntegrator(std::move(integ));
@@ -348,7 +347,6 @@ EquationSystem::ApplyBoundaryLFIntegrators(
   }
 }
 
-
 inline void
 EquationSystem::ApplyBoundaryNLAFIntegrators(
     const std::string & test_var_name,

framework/include/mfem/kernels/MFEMKernel.h

@@ -30,7 +30,7 @@ class MFEMKernel : public MFEMGeneralUserObject, public MFEMBlockRestrictable
   /// Create a new MFEM integrator to apply to the weak form. Ownership managed by the caller.
   virtual mfem::LinearFormIntegrator * createLFIntegrator() { return nullptr; }
   virtual mfem::BilinearFormIntegrator * createBFIntegrator() { return nullptr; }
-  virtual mfem::LinearFormIntegrator * createNLAIntegrator(){return nullptr; }
+  virtual mfem::LinearFormIntegrator * createNLAIntegrator() { return nullptr; }
 
   /// Get name of the test variable labelling the weak form this kernel is added to
   const VariableName & getTestVariableName() const { return _test_var_name; }

framework/include/mfem/kernels/MFEMNLDiffusionKernel.h

@@ -25,13 +25,13 @@ class MFEMNLDiffusionKernel : public MFEMKernel
   MFEMNLDiffusionKernel(const InputParameters & parameters);
 
   virtual mfem::BilinearFormIntegrator * createBFIntegrator() override;
-  virtual mfem::LinearFormIntegrator *  createNLAIntegrator() override;
+  virtual mfem::LinearFormIntegrator * createNLAIntegrator() override;
 
 protected:
   mfem::Coefficient & _coef;
   mfem::ScalarVectorProductCoefficient * _product_coef_res;
   mfem::ScalarVectorProductCoefficient * _product_coef_jac;
-  mfem::SumIntegrator * _sum; 
+  mfem::SumIntegrator * _sum;
   mfem::ConstantCoefficient * _one;
 };
 

framework/src/mfem/equation_systems/ComplexEquationSystem.C

@@ -269,7 +269,7 @@ ComplexEquationSystem::FormSystemMatrix(mfem::OperatorHandle & op,
   op.Reset(mfem::HypreParMatrixFromBlocks(_h_blocks));
 }
 
-//Equation system Mult
+// Equation system Mult
 void
 ComplexEquationSystem::Mult(const mfem::Vector & x, mfem::Vector & residual) const
 {
@@ -278,7 +278,6 @@ ComplexEquationSystem::Mult(const mfem::Vector & x, mfem::Vector & residual) con
   residual.HostRead();
 }
 
-
 void
 ComplexEquationSystem::RecoverComplexFEMSolution(
     mfem::BlockVector & trueX,

framework/src/mfem/equation_systems/EquationSystem.C

@@ -17,8 +17,10 @@ namespace Moose::MFEM
 
 EquationSystem::~EquationSystem()
 {
-  if(_gfuncs != NULL) delete _gfuncs;
-  if(_block_true_offsets != NULL) delete _block_true_offsets;
+  if (_gfuncs != NULL)
+    delete _gfuncs;
+  if (_block_true_offsets != NULL)
+    delete _block_true_offsets;
   DeleteAllBlocks();
 }
 
@@ -165,15 +167,16 @@ EquationSystem::Init(Moose::MFEM::GridFunctions & gridfunctions,
     _eliminated_variables.Register(eliminated_var_name,
                                    gridfunctions.GetShared(eliminated_var_name));
 
-  //Get a reference to the GridFunctions
+  // Get a reference to the GridFunctions
   _gfuncs = new Moose::MFEM::GridFunctions(gridfunctions);
 
-  //Build the temporary BlockVectors
-  _block_true_offsets = new mfem::Array<int>(_trial_var_names.size()+1);
+  // Build the temporary BlockVectors
+  _block_true_offsets = new mfem::Array<int>(_trial_var_names.size() + 1);
   (*_block_true_offsets)[0] = 0;
 
-  for(unsigned I=0; I<_trial_var_names.size(); I++){
-    (*_block_true_offsets)[I+1] = _gfuncs->Get(_trial_var_names.at(I))->ParFESpace()->TrueVSize();
+  for (unsigned I = 0; I < _trial_var_names.size(); I++)
+  {
+    (*_block_true_offsets)[I + 1] = _gfuncs->Get(_trial_var_names.at(I))->ParFESpace()->TrueVSize();
   }
   _block_true_offsets->PartialSum();
   _trueBlockSol.Update(*_block_true_offsets);
@@ -342,15 +345,17 @@ EquationSystem::FormSystemMatrix(mfem::OperatorHandle & op,
   op.Reset(mfem::HypreParMatrixFromBlocks(_h_blocks));
 }
 
-void EquationSystem::ReassembleJacobian(mfem::BlockVector & x, mfem::BlockVector & rhs)
+void
+EquationSystem::ReassembleJacobian(mfem::BlockVector & x, mfem::BlockVector & rhs)
 {
-  //Reassemble all the Forms
+  // Reassemble all the Forms
   for (const auto I : index_range(_test_var_names))
   {
     auto test_var_name = _test_var_names.at(I);
     _blfs.GetShared(test_var_name)->Update();
     _blfs.GetShared(test_var_name)->Assemble();
-    if (_mblfs.Has(test_var_name)){
+    if (_mblfs.Has(test_var_name))
+    {
       for (const auto J : index_range(_coupled_var_names))
       {
         auto coupled_var_name = _coupled_var_names.at(J);
@@ -363,9 +368,9 @@ void EquationSystem::ReassembleJacobian(mfem::BlockVector & x, mfem::BlockVector
     }
   }
 
-  //Form the system matrix
-  //This uses dummy arguments
-  //for the vectors
+  // Form the system matrix
+  // This uses dummy arguments
+  // for the vectors
   FormLinearSystem(_jacobian, x, rhs);
 };
 
@@ -406,7 +411,11 @@ EquationSystem::UpdateJacobian() const
   }
 }
 
-void CopyVec(const mfem::Vector & x, mfem::Vector & y){y = x;};
+void
+CopyVec(const mfem::Vector & x, mfem::Vector & y)
+{
+  y = x;
+};
 
 void
 EquationSystem::Mult(const mfem::Vector & sol, mfem::Vector & residual) const
@@ -460,8 +469,6 @@ EquationSystem::Mult(const mfem::Vector & sol, mfem::Vector & residual) const
   residual.HostRead();
 }
 
-
-
 mfem::Operator &
 EquationSystem::GetGradient(const mfem::Vector & x) const
 {

framework/src/mfem/kernels/MFEMNLDiffusionKernel.C

@@ -27,8 +27,7 @@ MFEMNLDiffusionKernel::validParams()
   return params;
 }
 
-MFEMNLDiffusionKernel::MFEMNLDiffusionKernel(
-    const InputParameters & parameters)
+MFEMNLDiffusionKernel::MFEMNLDiffusionKernel(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.

framework/src/mfem/problem_operators/EquationSystemProblemOperator.C

@@ -37,11 +37,11 @@ EquationSystemProblemOperator::Solve()
   _problem_data.jacobian_solver->updateSolver(
       *GetEquationSystem()->_blfs.Get(GetEquationSystem()->GetTestVarNames().at(0)),
       GetEquationSystem()->_ess_tdof_lists.at(0));
-/*
-  _problem_data.nonlinear_solver->SetSolver(_problem_data.jacobian_solver->getSolver());
-  _problem_data.nonlinear_solver->SetOperator(*GetEquationSystem());
-  _problem_data.nonlinear_solver->Mult(_true_rhs, _true_x);
-*/
+  /*
+    _problem_data.nonlinear_solver->SetSolver(_problem_data.jacobian_solver->getSolver());
+    _problem_data.nonlinear_solver->SetOperator(*GetEquationSystem());
+    _problem_data.nonlinear_solver->Mult(_true_rhs, _true_x);
+  */
   mfem::Vector zero_vec(_true_rhs.Size());
   zero_vec = 0.0;
   _problem_data.nonlinear_solver->SetSolver(_problem_data.jacobian_solver->getSolver());
@@ -52,7 +52,6 @@ EquationSystemProblemOperator::Solve()
   else
     _problem_data.nonlinear_solver->Mult(zero_vec, _true_x);
 
-
   GetEquationSystem()->RecoverFEMSolution(
       _true_x, _problem_data.gridfunctions, _problem_data.cmplx_gridfunctions);
 }