[MaterialLib/PorousMedium] Use parameter in Porosity impl.

trantvi · Nov 20, 2017 · 92e9c3b · 92e9c3b
1 parent e55152b
commit 92e9c3b
Show file tree

Hide file tree

Showing 32 changed files with 116 additions and 105 deletions.
diff --git a/MaterialLib/PorousMedium/CreatePorousMediaProperties.cpp b/MaterialLib/PorousMedium/CreatePorousMediaProperties.cpp
@@ -52,7 +52,8 @@ PorousMediaProperties createPorousMediaProperties(
             //! \ogs_file_param{material__porous_medium__porous_medium__porosity}
             porous_medium_config.getConfigSubtree("porosity");
         porosity_models.emplace_back(
-            MaterialLib::PorousMedium::createPorosityModel(porosity_config));
+            MaterialLib::PorousMedium::createPorosityModel(porosity_config,
+                                                           parameters));
 
         // Configuration for the intrinsic permeability (only one scalar per
         // element, i.e., the isotropic case is handled at the moment)

diff --git a/MaterialLib/PorousMedium/Porosity/ConstantPorosity.h b/MaterialLib/PorousMedium/Porosity/ConstantPorosity.h
diff --git a/MaterialLib/PorousMedium/Porosity/Porosity.h b/MaterialLib/PorousMedium/Porosity/Porosity.h
@@ -14,23 +14,41 @@
 
 #include <string>
 
+#include "ProcessLib/Parameter/Parameter.h"
+
 namespace MaterialLib
 {
 namespace PorousMedium
 {
 class Porosity
 {
 public:
+    explicit Porosity(
+        ProcessLib::Parameter<double> const& parameter)
+        : _parameter(parameter)
+    {
+    }
     virtual ~Porosity() = default;
 
     /**
      *  Get property value.
-     *  @param variable    A variable that can be saturation, or an invariant
-     *                     of stress or strain.
-     *  @param temperature Temperature.
+     *  @param t point in time
+     *  @param pos spatial position
+     *  @param variable    A variable with any double type value.
+     *  @param temperature Temperature with any double type value.
      */
-    virtual double getValue(const double variable,
-                            const double temperature) const = 0;
+    virtual double getValue(const double t,
+                            ProcessLib::SpatialPosition const& pos,
+                            const double variable,
+                            const double temperature) const
+    {
+        (void)variable;
+        (void)temperature;
+        return _parameter(t, pos)[0];
+    }
+
+private:
+    ProcessLib::Parameter<double> const& _parameter;
 };
 
 }  // end of namespace

diff --git a/MaterialLib/PorousMedium/Porosity/createPorosityModel.cpp b/MaterialLib/PorousMedium/Porosity/createPorosityModel.cpp
@@ -15,25 +15,33 @@
 #include "BaseLib/Error.h"
 #include "BaseLib/ConfigTree.h"
 
+#include "ProcessLib/Utils/ProcessUtils.h"
+
 #include "Porosity.h"
-#include "ConstantPorosity.h"
 
 namespace MaterialLib
 {
 namespace PorousMedium
 {
-std::unique_ptr<Porosity> createPorosityModel(BaseLib::ConfigTree const& config)
+std::unique_ptr<Porosity> createPorosityModel(BaseLib::ConfigTree const& config,
+    std::vector<std::unique_ptr<ProcessLib::ParameterBase>> const& parameters)
 {
     //! \ogs_file_param{material__porous_medium__porosity__type}
     auto const type = config.getConfigParameter<std::string>("type");
 
     if (type == "Constant")
-        return std::make_unique<ConstantPorosity>(
-            //! \ogs_file_param{material__porous_medium__porosity__Constant__value}
-            config.getConfigParameter<double>("value"));
+    {
+        auto const& constant_porosity = ProcessLib::findParameter<double>(
+            config,
+            //! \ogs_file_param_special{material__porous_medium__porosity__porosity_parameter}
+            "porosity_parameter", parameters, 1);
+
+        return std::make_unique<Porosity>(constant_porosity);
+    }
 
     OGS_FATAL("The porosity type %s is unavailable.\n",
-              "The available type is \n\tConstant.", type.data());
+              "The available type is Constant.",
+              type.data());
 }
 
 }  // end namespace

diff --git a/MaterialLib/PorousMedium/Porosity/createPorosityModel.h b/MaterialLib/PorousMedium/Porosity/createPorosityModel.h
@@ -13,6 +13,7 @@
 #pragma once
 
 #include <memory>
+#include "ProcessLib/Parameter/Parameter.h"
 
 namespace BaseLib
 {
@@ -26,10 +27,13 @@ namespace PorousMedium
 class Porosity;
 
 /** Create a porosity model
- *  @param config  ConfigTree object has a tag of `<porosity>`
+ *  @param config  ConfigTree object has a tag of `<porosity>` that describes
+ *  the porosity relationsship and contains the name of the parameter
+ *  @param parameters a vector containing the available parameters
  */
 std::unique_ptr<Porosity> createPorosityModel(
-    BaseLib::ConfigTree const& config);
+    BaseLib::ConfigTree const& config,
+    std::vector<std::unique_ptr<ProcessLib::ParameterBase>> const& parameters);
 
 }  // end namespace
 }  // end namespace
diff --git a/MaterialLib/TwoPhaseModels/CreateTwoPhaseFlowMaterialProperties.cpp b/MaterialLib/TwoPhaseModels/CreateTwoPhaseFlowMaterialProperties.cpp
@@ -33,7 +33,8 @@ std::tuple<std::unique_ptr<TwoPhaseFlowWithPPMaterialProperties>,
            BaseLib::ConfigTree>
 createTwoPhaseFlowMaterialProperties(
     BaseLib::ConfigTree const& config,
-    MeshLib::PropertyVector<int> const& material_ids)
+    MeshLib::PropertyVector<int> const& material_ids,
+    std::vector<std::unique_ptr<ProcessLib::ParameterBase>> const& parameters)
 {
     DBUG("Reading material properties of two-phase flow process.");
 
@@ -87,7 +88,8 @@ createTwoPhaseFlowMaterialProperties(
 
         //! \ogs_file_param{material__twophase_flow__material_property__porous_medium__porous_medium__porosity}
         auto const& porosity_conf = conf.getConfigSubtree("porosity");
-        auto n = MaterialLib::PorousMedium::createPorosityModel(porosity_conf);
+        auto n = MaterialLib::PorousMedium::createPorosityModel(porosity_conf,
+                                                                parameters);
         porosity_models.emplace_back(std::move(n));
 
         //! \ogs_file_param{material__twophase_flow__material_property__porous_medium__porous_medium__storage}

diff --git a/MaterialLib/TwoPhaseModels/CreateTwoPhaseFlowMaterialProperties.h b/MaterialLib/TwoPhaseModels/CreateTwoPhaseFlowMaterialProperties.h
@@ -31,7 +31,8 @@ std::tuple<std::unique_ptr<TwoPhaseFlowWithPPMaterialProperties>,
            BaseLib::ConfigTree>
 createTwoPhaseFlowMaterialProperties(
     BaseLib::ConfigTree const& config,
-    MeshLib::PropertyVector<int> const& material_ids);
+    MeshLib::PropertyVector<int> const& material_ids,
+    std::vector<std::unique_ptr<ProcessLib::ParameterBase>> const& parameters);
 
 }  // end namespace
 }  // end namespace
diff --git a/MaterialLib/TwoPhaseModels/TwoPhaseFlowWithPPMaterialProperties.cpp b/MaterialLib/TwoPhaseModels/TwoPhaseFlowWithPPMaterialProperties.cpp
@@ -126,11 +126,12 @@ Eigen::MatrixXd const& TwoPhaseFlowWithPPMaterialProperties::getPermeability(
 }
 
 double TwoPhaseFlowWithPPMaterialProperties::getPorosity(
-    const int material_id, const double /*t*/,
-    const ProcessLib::SpatialPosition& /*pos*/, const double /*p*/,
+    const int material_id, const double t,
+    const ProcessLib::SpatialPosition& pos, const double /*p*/,
     const double T, const double porosity_variable) const
 {
-    return _porosity_models[material_id]->getValue(porosity_variable, T);
+    return _porosity_models[material_id]->getValue(t, pos, porosity_variable,
+                                                   T);
 }
 
 double TwoPhaseFlowWithPPMaterialProperties::getSaturation(

diff --git a/ProcessLib/ComponentTransport/ComponentTransportFEM.h b/ProcessLib/ComponentTransport/ComponentTransportFEM.h
@@ -181,7 +181,7 @@ class LocalAssemblerData : public ComponentTransportLocalAssemblerInterface
             // porosity model
             auto const porosity =
                 _process_data.porous_media_properties.getPorosity(t, pos)
-                    .getValue(0.0, C_int_pt);
+                    .getValue(t, pos, 0.0, C_int_pt);
 
             auto const retardation_factor =
                 _process_data.retardation_factor(t, pos)[0];

diff --git a/ProcessLib/HT/HTFEM.h b/ProcessLib/HT/HTFEM.h
@@ -195,7 +195,7 @@ class LocalAssemblerData : public HTLocalAssemblerInterface
             // porosity model
             auto const porosity =
                 _process_data.porous_media_properties.getPorosity(t, pos)
-                    .getValue(0.0, T_int_pt);
+                    .getValue(t, pos, 0.0, T_int_pt);
 
             double const thermal_conductivity =
                 thermal_conductivity_solid * (1 - porosity) +

diff --git a/ProcessLib/HeatConduction/HeatConductionFEM-impl.h b/ProcessLib/HeatConduction/HeatConductionFEM-impl.h
@@ -74,7 +74,7 @@ void LocalAssemblerData<ShapeFunction, IntegrationMethod, GlobalDim>::
 
         // Porosity of porous media.
         double const n = liquid_flow_properties.getPorosity(
-            material_id, porosity_variable, T);
+            material_id, t, pos, porosity_variable, T);
 
         // Effective specific heat capacity.
         double const effective_cp = (1.0 - n) * cp_s * rho_s + n * cp_f * rho_f;

diff --git a/ProcessLib/LiquidFlow/CreateLiquidFlowMaterialProperties.cpp b/ProcessLib/LiquidFlow/CreateLiquidFlowMaterialProperties.cpp
@@ -80,8 +80,8 @@ createLiquidFlowMaterialProperties(
         auto const& porosity_config =
             //! \ogs_file_param{prj__processes__process__LIQUID_FLOW__material_property__porous_medium__porous_medium__porosity}
             porous_medium_config.getConfigSubtree("porosity");
-        auto n =
-            MaterialLib::PorousMedium::createPorosityModel(porosity_config);
+        auto n = MaterialLib::PorousMedium::createPorosityModel(porosity_config,
+                                                                parameters);
         porosity_models.emplace_back(std::move(n));
 
         auto const& storage_config =

diff --git a/ProcessLib/LiquidFlow/LiquidFlowLocalAssembler-impl.h b/ProcessLib/LiquidFlow/LiquidFlowLocalAssembler-impl.h
@@ -231,8 +231,8 @@ void LiquidFlowLocalAssembler<ShapeFunction, IntegrationMethod, GlobalDim>::
         auto const solid_thermal_expansion =
             _material_properties.getSolidThermalExpansion(t, pos);
         auto const biot_constant = _material_properties.getBiotConstant(t, pos);
-        auto const porosity =
-            _material_properties.getPorosity(material_id, porosity_variable, T);
+        auto const porosity = _material_properties.getPorosity(
+            material_id, t, pos, porosity_variable, T);
         const double eff_thermal_expansion =
             3.0 * (biot_constant - porosity) * solid_thermal_expansion -
             porosity * _material_properties.getdLiquidDensity_dT(p, T) / rho;

diff --git a/ProcessLib/LiquidFlow/LiquidFlowMaterialProperties.cpp b/ProcessLib/LiquidFlow/LiquidFlowMaterialProperties.cpp
@@ -96,7 +96,7 @@ double LiquidFlowMaterialProperties::getThermalConductivity(
 }
 
 double LiquidFlowMaterialProperties::getMassCoefficient(
-    const int material_id, const double /*t*/, const SpatialPosition& /*pos*/,
+    const int material_id, const double t, const SpatialPosition& pos,
     const double p, const double T, const double porosity_variable,
     const double storage_variable) const
 {
@@ -111,7 +111,7 @@ double LiquidFlowMaterialProperties::getMassCoefficient(
     assert(rho > 0.);
 
     const double porosity =
-        _porosity_models[material_id]->getValue(porosity_variable, T);
+        _porosity_models[material_id]->getValue(t, pos, porosity_variable, T);
     const double storage =
         _storage_models[material_id]->getValue(storage_variable);
     return porosity * drho_dp / rho + storage;

diff --git a/ProcessLib/LiquidFlow/LiquidFlowMaterialProperties.h b/ProcessLib/LiquidFlow/LiquidFlowMaterialProperties.h
@@ -121,10 +121,12 @@ class LiquidFlowMaterialProperties
 
     double getThermalConductivity(const double p, const double T) const;
 
-    double getPorosity(const int material_id, const double porosity_variable,
-                       const double T) const
+    double getPorosity(const int material_id, const double t,
+                       const SpatialPosition& pos,
+                       const double porosity_variable, const double T) const
     {
-        return _porosity_models[material_id]->getValue(porosity_variable, T);
+        return _porosity_models[material_id]->getValue(t, pos,
+                                                       porosity_variable, T);
     }
 
     double getSolidThermalExpansion(const double t,

diff --git a/ProcessLib/RichardsComponentTransport/CreatePorousMediaProperties.cpp b/ProcessLib/RichardsComponentTransport/CreatePorousMediaProperties.cpp
@@ -56,7 +56,8 @@ PorousMediaProperties createPorousMediaProperties(
             //! \ogs_file_param{prj__processes__process__RichardsComponentTransport__porous_medium__porous_medium__porosity}
             porous_medium_config.getConfigSubtree("porosity");
         porosity_models.emplace_back(
-            MaterialLib::PorousMedium::createPorosityModel(porosity_config));
+            MaterialLib::PorousMedium::createPorosityModel(porosity_config,
+                                                           parameters));
 
         // Configuration for the intrinsic permeability
         auto const& permeability_config =

diff --git a/ProcessLib/RichardsComponentTransport/RichardsComponentTransportFEM-impl.h b/ProcessLib/RichardsComponentTransport/RichardsComponentTransportFEM-impl.h
@@ -134,7 +134,7 @@ void LocalAssemblerData<ShapeFunction, IntegrationMethod, GlobalDim>::assemble(
         // porosity model
         auto const porosity =
             _process_data.porous_media_properties.getPorosity(t, pos).getValue(
-                0.0, C_int_pt);
+                t, pos, 0.0, C_int_pt);
 
         auto const retardation_factor =
             _process_data.retardation_factor(t, pos)[0];

diff --git a/ProcessLib/RichardsFlow/CreateRichardsFlowMaterialProperties.cpp b/ProcessLib/RichardsFlow/CreateRichardsFlowMaterialProperties.cpp
@@ -36,7 +36,8 @@ std::unique_ptr<RichardsFlowMaterialProperties>
 createRichardsFlowMaterialProperties(
     BaseLib::ConfigTree const& config,
     boost::optional<MeshLib::PropertyVector<int> const&>
-        material_ids)
+        material_ids,
+    std::vector<std::unique_ptr<ParameterBase>> const& parameters)
 {
     DBUG("Reading material properties of Richards flow process.");
 
@@ -77,7 +78,8 @@ createRichardsFlowMaterialProperties(
 
         //! \ogs_file_param{prj__processes__process__RICHARDS_FLOW__material_property__porous_medium__porous_medium__porosity}
         auto const& porosity_conf = conf.getConfigSubtree("porosity");
-        auto n = MaterialLib::PorousMedium::createPorosityModel(porosity_conf);
+        auto n = MaterialLib::PorousMedium::createPorosityModel(porosity_conf,
+                                                                parameters);
         porosity_models.emplace_back(std::move(n));
 
         //! \ogs_file_param{prj__processes__process__RICHARDS_FLOW__material_property__porous_medium__porous_medium__storage}

diff --git a/ProcessLib/RichardsFlow/CreateRichardsFlowMaterialProperties.h b/ProcessLib/RichardsFlow/CreateRichardsFlowMaterialProperties.h
@@ -23,7 +23,8 @@ std::unique_ptr<RichardsFlowMaterialProperties>
 createRichardsFlowMaterialProperties(
     BaseLib::ConfigTree const& config,
     boost::optional<MeshLib::PropertyVector<int> const&>
-        material_ids);
+        material_ids,
+    std::vector<std::unique_ptr<ParameterBase>> const& parameters);
 
 }  // end namespace
 }  // end namespace
diff --git a/ProcessLib/RichardsFlow/CreateRichardsFlowProcess.cpp b/ProcessLib/RichardsFlow/CreateRichardsFlowProcess.cpp
@@ -89,7 +89,8 @@ std::unique_ptr<Process> createRichardsFlowProcess(
         INFO("The Richards flow is in homogeneous porous media.");
     }
     std::unique_ptr<RichardsFlowMaterialProperties> material =
-        createRichardsFlowMaterialProperties(mat_config, material_ids);
+        createRichardsFlowMaterialProperties(mat_config, material_ids,
+                                             parameters);
     RichardsFlowProcessData process_data{std::move(material),
                                          specific_body_force, has_gravity,
                                          mass_lumping, temperature};

diff --git a/ProcessLib/RichardsFlow/RichardsFlowMaterialProperties.cpp b/ProcessLib/RichardsFlow/RichardsFlowMaterialProperties.cpp
@@ -92,11 +92,12 @@ Eigen::MatrixXd const& RichardsFlowMaterialProperties::getPermeability(
 }
 
 double RichardsFlowMaterialProperties::getPorosity(
-    const int material_id, const double /*t*/,
-    const ProcessLib::SpatialPosition& /*pos*/, const double /*p*/,
+    const int material_id, const double t,
+    const ProcessLib::SpatialPosition& pos, const double /*p*/,
     const double T, const double porosity_variable) const
 {
-    return _porosity_models[material_id]->getValue(porosity_variable, T);
+    return _porosity_models[material_id]->getValue(t, pos, porosity_variable,
+                                                   T);
 }
 
 double RichardsFlowMaterialProperties::getStorage(

diff --git a/ProcessLib/ThermalTwoPhaseFlowWithPP/CreateThermalTwoPhaseFlowWithPPMaterialProperties.cpp b/ProcessLib/ThermalTwoPhaseFlowWithPP/CreateThermalTwoPhaseFlowWithPPMaterialProperties.cpp
@@ -38,13 +38,14 @@ namespace ThermalTwoPhaseFlowWithPP
 std::unique_ptr<ThermalTwoPhaseFlowWithPPMaterialProperties>
 createThermalTwoPhaseFlowWithPPMaterialProperties(
     BaseLib::ConfigTree const& config,
-    MeshLib::PropertyVector<int> const& material_ids)
+    MeshLib::PropertyVector<int> const& material_ids,
+    std::vector<std::unique_ptr<ProcessLib::ParameterBase>> const& parameters)
 {
     DBUG(
         "Reading material properties of nonisothermal two-phase flow process.");
     auto two_phase_model_tuple =
         MaterialLib::TwoPhaseFlowWithPP::createTwoPhaseFlowMaterialProperties(
-            config, material_ids);
+            config, material_ids, parameters);
     auto two_phase_material_model =
         std::move(std::get<0>(two_phase_model_tuple));
     auto const& fluid_config = std::get<1>(two_phase_model_tuple);

diff --git a/ProcessLib/ThermalTwoPhaseFlowWithPP/CreateThermalTwoPhaseFlowWithPPMaterialProperties.h b/ProcessLib/ThermalTwoPhaseFlowWithPP/CreateThermalTwoPhaseFlowWithPPMaterialProperties.h
@@ -30,7 +30,8 @@ namespace ThermalTwoPhaseFlowWithPP
 std::unique_ptr<ThermalTwoPhaseFlowWithPPMaterialProperties>
 createThermalTwoPhaseFlowWithPPMaterialProperties(
     BaseLib::ConfigTree const& config,
-    MeshLib::PropertyVector<int> const& material_ids);
+    MeshLib::PropertyVector<int> const& material_ids,
+    std::vector<std::unique_ptr<ProcessLib::ParameterBase>> const& parameters);
 
 }  // end namespace
 }  // end namespace