diff --git a/framework/include/mfem/equation_systems/equation_system.h b/framework/include/mfem/equation_systems/equation_system.h index 62437cb8..7784051f 100644 --- a/framework/include/mfem/equation_systems/equation_system.h +++ b/framework/include/mfem/equation_systems/equation_system.h @@ -67,7 +67,7 @@ class EquationSystem : public mfem::Operator virtual void Init(platypus::GridFunctions & gridfunctions, const platypus::FESpaces & fespaces, platypus::BCMap & bc_map, - Coefficients & coefficients); + platypus::Coefficients & coefficients); virtual void BuildLinearForms(platypus::BCMap & bc_map, platypus::Sources & sources); virtual void BuildBilinearForms(); virtual void BuildMixedBilinearForms(); diff --git a/framework/include/mfem/materials/MFEMMaterial.h b/framework/include/mfem/materials/MFEMMaterial.h index 14c49fde..d4a3e5c5 100644 --- a/framework/include/mfem/materials/MFEMMaterial.h +++ b/framework/include/mfem/materials/MFEMMaterial.h @@ -16,7 +16,7 @@ class MFEMMaterial : public GeneralUserObject virtual void initialize() override {} virtual void finalize() override {} - virtual void storeCoefficients(Subdomain & subdomain) {} + virtual void storeCoefficients(platypus::Subdomain & subdomain) {} std::vector blocks; }; diff --git a/framework/include/mfem/problem/MFEMProblem.h b/framework/include/mfem/problem/MFEMProblem.h index e5d96002..55b93d98 100644 --- a/framework/include/mfem/problem/MFEMProblem.h +++ b/framework/include/mfem/problem/MFEMProblem.h @@ -173,7 +173,7 @@ class MFEMProblem : public ExternalProblem std::string _formulation_name; int _order; - Coefficients _coefficients; + platypus::Coefficients _coefficients; platypus::InputParameters _solver_options; platypus::Outputs _outputs; platypus::InputParameters _exec_params; diff --git a/framework/src/mfem/equation_systems/equation_system.C b/framework/src/mfem/equation_systems/equation_system.C index ac57a714..216d8fe7 100644 --- a/framework/src/mfem/equation_systems/equation_system.C +++ b/framework/src/mfem/equation_systems/equation_system.C @@ -225,7 +225,7 @@ void EquationSystem::Init(platypus::GridFunctions & gridfunctions, const platypus::FESpaces & fespaces, platypus::BCMap & bc_map, - Coefficients & coefficients) + platypus::Coefficients & coefficients) { // Add optional kernels to the EquationSystem diff --git a/framework/src/mfem/problem/MFEMProblem.C b/framework/src/mfem/problem/MFEMProblem.C index 34361880..ccb3c249 100644 --- a/framework/src/mfem/problem/MFEMProblem.C +++ b/framework/src/mfem/problem/MFEMProblem.C @@ -172,7 +172,7 @@ MFEMProblem::addMaterial(const std::string & kernel_name, for (unsigned int bid = 0; bid < mfem_material.blocks.size(); ++bid) { int block = std::stoi(mfem_material.blocks[bid]); - Subdomain mfem_subdomain(name, block); + platypus::Subdomain mfem_subdomain(name, block); mfem_material.storeCoefficients(mfem_subdomain); _coefficients._subdomains.push_back(mfem_subdomain); }