diff --git a/framework/include/mfem/equation_systems/equation_system.h b/framework/include/mfem/equation_systems/equation_system.h index 3c631349..aec26891 100644 --- a/framework/include/mfem/equation_systems/equation_system.h +++ b/framework/include/mfem/equation_systems/equation_system.h @@ -1,5 +1,5 @@ #pragma once -#include "../common/pfem_extras.hpp" +#include "mfem/miniapps/common/pfem_extras.hpp" #include "boundary_conditions.h" #include "MFEMContainers.h" #include "MFEMKernel.h" diff --git a/framework/include/mfem/integrators/ScaleIntegrator.h b/framework/include/mfem/integrators/ScaleIntegrator.h index c57b4a58..4a76b334 100644 --- a/framework/include/mfem/integrators/ScaleIntegrator.h +++ b/framework/include/mfem/integrators/ScaleIntegrator.h @@ -1,6 +1,6 @@ #pragma once #include "MFEMGeneralUserObject.h" -#include "../common/pfem_extras.hpp" +#include "mfem/miniapps/common/pfem_extras.hpp" namespace platypus { diff --git a/framework/include/mfem/problem/MFEMProblem.h b/framework/include/mfem/problem/MFEMProblem.h index 0cb766da..f072f20a 100644 --- a/framework/include/mfem/problem/MFEMProblem.h +++ b/framework/include/mfem/problem/MFEMProblem.h @@ -1,6 +1,6 @@ #pragma once #include -#include "../common/pfem_extras.hpp" +#include "mfem/miniapps/common/pfem_extras.hpp" #include "ExternalProblem.h" #include "MFEMProblemData.h" #include "MFEMMesh.h" @@ -22,12 +22,12 @@ class MFEMProblem : public ExternalProblem static InputParameters validParams(); MFEMProblem(const InputParameters & params); - virtual ~MFEMProblem(){}; + virtual ~MFEMProblem() {} virtual void initialSetup() override; - virtual void externalSolve() override{}; - virtual bool nlConverged(const unsigned int nl_sys_num) override { return true; }; - virtual void syncSolutions(Direction direction) override{}; + virtual void externalSolve() override {} + virtual bool nlConverged(const unsigned int) override { return true; } + virtual void syncSolutions(Direction) override {} /** * Overwritten mesh() method from base MooseMesh to retrieve the correct mesh type, in this case diff --git a/framework/include/mfem/problem_operators/problem_operator.h b/framework/include/mfem/problem_operators/problem_operator.h index 6d39ec03..ef3dd02a 100644 --- a/framework/include/mfem/problem_operators/problem_operator.h +++ b/framework/include/mfem/problem_operators/problem_operator.h @@ -1,5 +1,5 @@ #pragma once -#include "../common/pfem_extras.hpp" +#include "mfem/miniapps/common/pfem_extras.hpp" #include "MFEMProblemData.h" #include "problem_operator_interface.h" @@ -15,7 +15,7 @@ class ProblemOperator : public mfem::Operator, public ProblemOperatorInterface void SetGridFunctions() override; virtual void Solve(mfem::Vector & X) {} - void Mult(const mfem::Vector & x, mfem::Vector & y) const override {} + void Mult(const mfem::Vector &, mfem::Vector &) const override {} }; -} // namespace platypus \ No newline at end of file +} // namespace platypus diff --git a/framework/include/mfem/problem_operators/time_domain_equation_system_problem_operator.h b/framework/include/mfem/problem_operators/time_domain_equation_system_problem_operator.h index 71200b45..c2c45288 100644 --- a/framework/include/mfem/problem_operators/time_domain_equation_system_problem_operator.h +++ b/framework/include/mfem/problem_operators/time_domain_equation_system_problem_operator.h @@ -1,5 +1,5 @@ #pragma once -#include "../common/pfem_extras.hpp" +#include "mfem/miniapps/common/pfem_extras.hpp" #include "time_domain_problem_operator.h" #include "problem_operator_interface.h" #include "equation_system_interface.h" @@ -42,4 +42,4 @@ class TimeDomainEquationSystemProblemOperator : public TimeDomainProblemOperator std::shared_ptr _equation_system{nullptr}; }; -} // namespace platypus \ No newline at end of file +} // namespace platypus diff --git a/framework/include/mfem/problem_operators/time_domain_problem_operator.h b/framework/include/mfem/problem_operators/time_domain_problem_operator.h index 4c902186..e99576ea 100644 --- a/framework/include/mfem/problem_operators/time_domain_problem_operator.h +++ b/framework/include/mfem/problem_operators/time_domain_problem_operator.h @@ -1,5 +1,5 @@ #pragma once -#include "../common/pfem_extras.hpp" +#include "mfem/miniapps/common/pfem_extras.hpp" #include "MFEMProblemData.h" #include "problem_operator_interface.h" @@ -18,7 +18,7 @@ class TimeDomainProblemOperator : public mfem::TimeDependentOperator, void SetGridFunctions() override; - void ImplicitSolve(const double dt, const mfem::Vector & X, mfem::Vector & dX_dt) override {} + void ImplicitSolve(const double, const mfem::Vector &, mfem::Vector &) override {} }; -} // namespace platypus \ No newline at end of file +} // namespace platypus diff --git a/framework/src/mfem/bcs/MFEMBoundaryCondition.C b/framework/src/mfem/bcs/MFEMBoundaryCondition.C index 227fdaa2..4949e4f7 100644 --- a/framework/src/mfem/bcs/MFEMBoundaryCondition.C +++ b/framework/src/mfem/bcs/MFEMBoundaryCondition.C @@ -1,5 +1,5 @@ #include "MFEMBoundaryCondition.h" -#include "mesh_extras.hpp" +#include "mfem/miniapps/common/mesh_extras.hpp" InputParameters MFEMBoundaryCondition::validParams() diff --git a/unit/src/MFEMEssentialBCTest.C b/unit/src/MFEMEssentialBCTest.C index 43934cd3..ab171474 100644 --- a/unit/src/MFEMEssentialBCTest.C +++ b/unit/src/MFEMEssentialBCTest.C @@ -1,4 +1,4 @@ -#include "mfem-common.hpp" +#include "mfem/miniapps/common/mfem-common.hpp" #include "MFEMObjectUnitTest.h" #include "MFEMScalarDirichletBC.h" #include "MFEMScalarFunctionDirichletBC.h"