break header dependency in material property interface idaholab#17586

aeslaughter · Jun 2, 2021 · bedf923 · bedf923
1 parent f6530c2
commit bedf923
Show file tree

Hide file tree

Showing 4 changed files with 35 additions and 8 deletions.
diff --git a/framework/include/materials/MaterialPropertyInterface.h b/framework/include/materials/MaterialPropertyInterface.h
@@ -11,16 +11,16 @@
 
 // MOOSE includes
 #include "MaterialProperty.h"
-#include "FEProblemBase.h"
 #include "MooseTypes.h"
 #include "MaterialData.h"
 #include "MathUtils.h"
 #include "MooseObjectName.h"
+#include "InputParameters.h"
 
 // Forward declarations
-class InputParameters;
 class MaterialPropertyInterface;
 class MooseObject;
+class FEProblemBase;
 
 template <>
 InputParameters validParams<MaterialPropertyInterface>();
@@ -345,6 +345,16 @@ class MaterialPropertyInterface
   std::set<unsigned int> _material_property_dependencies;
 
 private:
+  /*
+   * A proxy method for _mi_feproblem.getMaxQps()
+   */
+  unsigned int getMaxQps() const;
+
+  /*
+   * A proxy method for _mi_feproblem.addConsumedPropertyName()
+   */
+  void addConsumedPropertyName(const MooseObjectName & obj_name, const std::string & prop_name);
+
   /// BoundaryRestricted flag
   const bool _mi_boundary_restricted;
 
@@ -476,7 +486,7 @@ MaterialPropertyInterface::getMaterialPropertyByName(const MaterialPropertyName
   _material_property_dependencies.insert(_material_data->getPropertyId(name));
 
   // Update consumed properties in MaterialPropertyDebugOutput
-  _mi_feproblem.addConsumedPropertyName(_mi_moose_object_name, name);
+  addConsumedPropertyName(_mi_moose_object_name, name);
 
   return _material_data->getProperty<T>(name);
 }
@@ -497,7 +507,7 @@ MaterialPropertyInterface::getADMaterialPropertyByName(const MaterialPropertyNam
   _material_property_dependencies.insert(_material_data->getPropertyId(name));
 
   // Update consumed properties in MaterialPropertyDebugOutput
-  _mi_feproblem.addConsumedPropertyName(_mi_moose_object_name, name);
+  addConsumedPropertyName(_mi_moose_object_name, name);
 
   return _material_data->getADProperty<T>(name);
 }
@@ -552,10 +562,10 @@ MaterialPropertyInterface::getBlockMaterialProperty(const MaterialPropertyName &
   _material_property_dependencies.insert(_material_data->getPropertyId(name));
 
   // Update consumed properties in MaterialPropertyDebugOutput
-  _mi_feproblem.addConsumedPropertyName(_mi_moose_object_name, name);
+  addConsumedPropertyName(_mi_moose_object_name, name);
 
   return std::pair<const MaterialProperty<T> *, std::set<SubdomainID>>(
-      &_material_data->getProperty<T>(name), _mi_feproblem.getMaterialPropertyBlocks(name));
+      &_material_data->getProperty<T>(name), getMaterialPropertyBlocks(name));
 }
 
 template <typename T>
@@ -595,7 +605,7 @@ MaterialPropertyInterface::getGenericZeroMaterialPropertyByName(const std::strin
 
   // resize to accomodate maximum number of qpoints
   // (in multiapp scenarios getMaxQps can return different values in each app; we need the max)
-  unsigned int nqp = _mi_feproblem.getMaxQps();
+  unsigned int nqp = getMaxQps();
   if (nqp > zero.size())
     zero.resize(nqp);
 
@@ -615,7 +625,7 @@ MaterialPropertyInterface::getGenericZeroMaterialProperty()
 
   // resize to accomodate maximum number of qpoints
   // (in multiapp scenarios getMaxQps can return different values in each app; we need the max)
-  unsigned int nqp = _mi_feproblem.getMaxQps();
+  unsigned int nqp = getMaxQps();
   if (nqp > zero.size())
     zero.resize(nqp);
 

diff --git a/framework/src/fvkernels/FVFluxKernel.C b/framework/src/fvkernels/FVFluxKernel.C
@@ -13,7 +13,9 @@
 #include "SystemBase.h"
 #include "MooseMesh.h"
 #include "ADUtils.h"
+
 #include "libmesh/elem.h"
+#include "libmesh/system.h"
 
 InputParameters
 FVFluxKernel::validParams()

diff --git a/framework/src/materials/MaterialPropertyInterface.C b/framework/src/materials/MaterialPropertyInterface.C
@@ -11,6 +11,7 @@
 #include "MaterialPropertyInterface.h"
 #include "MooseApp.h"
 #include "MaterialBase.h"
+#include "FEProblemBase.h"
 
 defineLegacyParams(MaterialPropertyInterface);
 
@@ -205,6 +206,19 @@ MaterialPropertyInterface::getMaterialPropertyBoundaryNames(const std::string &
   return _mi_feproblem.getMaterialPropertyBoundaryNames(name);
 }
 
+unsigned int
+MaterialPropertyInterface::getMaxQps() const
+{
+  return _mi_feproblem.getMaxQps();
+}
+
+void
+MaterialPropertyInterface::addConsumedPropertyName(const MooseObjectName & obj_name,
+                                                   const std::string & prop_name)
+{
+  return _mi_feproblem.addConsumedPropertyName(obj_name, prop_name);
+}
+
 void
 MaterialPropertyInterface::checkMaterialProperty(const std::string & name)
 {

diff --git a/framework/src/materials/TwoMaterialPropertyInterface.C b/framework/src/materials/TwoMaterialPropertyInterface.C
@@ -10,6 +10,7 @@
 #include "TwoMaterialPropertyInterface.h"
 #include "MaterialData.h"
 #include "InputParameters.h"
+#include "FEProblemBase.h"
 
 defineLegacyParams(TwoMaterialPropertyInterface);