diff --git a/Applications/ApplicationsLib/ProjectData.cpp b/Applications/ApplicationsLib/ProjectData.cpp
index d5349c55aca85d1b4dd98b3c1d8d030d4f1ed6e0..41d9256683735174f50fc91335e6aaeea70e3c57 100644
--- a/Applications/ApplicationsLib/ProjectData.cpp
+++ b/Applications/ApplicationsLib/ProjectData.cpp
@@ -459,7 +459,8 @@ void ProjectData::parseMedia(
material_id);
}
- _media[material_id] = MaterialPropertyLib::createMedium(medium_config);
+ _media[material_id] =
+ MaterialPropertyLib::createMedium(medium_config, _parameters);
}
if (_media.empty())
diff --git a/Documentation/ProjectFile/properties/property/Parameter/c_Parameter.md b/Documentation/ProjectFile/properties/property/Parameter/c_Parameter.md
new file mode 100644
index 0000000000000000000000000000000000000000..a424c343254fcea639ef37c758d372c09b1ab12c
--- /dev/null
+++ b/Documentation/ProjectFile/properties/property/Parameter/c_Parameter.md
@@ -0,0 +1,2 @@
+Definition of a property based on a parameter specified by the parameter_name
+tag.
diff --git a/Documentation/ProjectFile/properties/property/Parameter/t_parameter_name.md b/Documentation/ProjectFile/properties/property/Parameter/t_parameter_name.md
new file mode 100644
index 0000000000000000000000000000000000000000..c433eb427a10c4b0710c3c141eb9a5da25cb4a3b
--- /dev/null
+++ b/Documentation/ProjectFile/properties/property/Parameter/t_parameter_name.md
@@ -0,0 +1 @@
+The name of an existing parameter.
diff --git a/MaterialLib/MPL/Components/GetThermalExpansivity.cpp b/MaterialLib/MPL/Components/GetThermalExpansivity.cpp
index 38aa9ddb5a4a221aac19ec1fe7cf01cedc6c8f82..55a20255a4458bfcfe5b5f06fa5aa6cd7b36d8c8 100644
--- a/MaterialLib/MPL/Components/GetThermalExpansivity.cpp
+++ b/MaterialLib/MPL/Components/GetThermalExpansivity.cpp
@@ -13,15 +13,17 @@
#include "GetThermalExpansivity.h"
+#include "MaterialLib/MPL/Phase.h"
#include "MaterialLib/MPL/Phase.h"
namespace MaterialPropertyLib
{
class Phase;
-double getThermalExpansivity(Phase const& phase,
- VariableArray const& vars,
- const double density)
+double getThermalExpansivity(Phase const& phase, VariableArray const& vars,
+ const double density,
+ ParameterLib::SpatialPosition const& pos,
+ double const t)
{
auto const thermal_expansivity_ptr =
&phase.property(MaterialPropertyLib::PropertyType::thermal_expansivity);
@@ -29,7 +31,7 @@ double getThermalExpansivity(Phase const& phase,
// The thermal expansivity is explicitly given in the project file.
if (thermal_expansivity_ptr)
{
- return (*thermal_expansivity_ptr).template value<double>(vars);
+ return (*thermal_expansivity_ptr).template value<double>(vars, pos, t);
}
// The thermal expansivity calculated by the density model directly.
diff --git a/MaterialLib/MPL/Components/GetThermalExpansivity.h b/MaterialLib/MPL/Components/GetThermalExpansivity.h
index 45ce3c11ae9a1102d803de543968923e4e999857..6f39abb5edea9660f4fa7eb07f8b1239ce18f2c4 100644
--- a/MaterialLib/MPL/Components/GetThermalExpansivity.h
+++ b/MaterialLib/MPL/Components/GetThermalExpansivity.h
@@ -14,6 +14,7 @@
#pragma once
#include "MaterialLib/MPL/VariableType.h" // for VariableArray
+#include "ParameterLib/SpatialPosition.h"
namespace MaterialPropertyLib
{
@@ -38,7 +39,8 @@ class Phase;
* \f]
* where \f$\rho\f$ is the density, \f$T\f$ is the temperature.
*/
-double getThermalExpansivity(Phase const& phase,
- VariableArray const& vars,
- const double density);
+double getThermalExpansivity(Phase const& phase, VariableArray const& vars,
+ const double density,
+ ParameterLib::SpatialPosition const& pos,
+ double const t);
} // namespace MaterialPropertyLib
diff --git a/MaterialLib/MPL/CreateComponent.cpp b/MaterialLib/MPL/CreateComponent.cpp
index d5d3026f2469f51f61b0137a4c01516ac69a444c..9f4b3a80fcc2df016070a60e89e842b03167a603 100644
--- a/MaterialLib/MPL/CreateComponent.cpp
+++ b/MaterialLib/MPL/CreateComponent.cpp
@@ -14,6 +14,7 @@
#include "CreateComponent.h"
#include "BaseLib/ConfigTree.h"
+#include "ParameterLib/Parameter.h"
#include "Components/Components.h"
#include "CreateProperty.h"
@@ -21,7 +22,8 @@
namespace
{
std::unique_ptr<MaterialPropertyLib::Component> createComponent(
- BaseLib::ConfigTree const& config)
+ BaseLib::ConfigTree const& config,
+ std::vector<std::unique_ptr<ParameterLib::ParameterBase>> const& parameters)
{
using namespace MaterialPropertyLib;
// Parsing the component name
@@ -40,7 +42,8 @@ std::unique_ptr<MaterialPropertyLib::Component> createComponent(
// if specified.
std::unique_ptr<PropertyArray> properties =
//! \ogs_file_param{prj__media__medium__phases__phase__components__component__properties}
- createProperties(config.getConfigSubtreeOptional("properties"));
+ createProperties(config.getConfigSubtreeOptional("properties"),
+ parameters);
// If a name is given, it must conform with one of the derived component
// names in the following list:
@@ -64,7 +67,8 @@ std::unique_ptr<MaterialPropertyLib::Component> createComponent(
namespace MaterialPropertyLib
{
std::vector<std::unique_ptr<Component>> createComponents(
- boost::optional<BaseLib::ConfigTree> const& config)
+ boost::optional<BaseLib::ConfigTree> const& config,
+ std::vector<std::unique_ptr<ParameterLib::ParameterBase>> const& parameters)
{
if (!config)
{
@@ -77,7 +81,7 @@ std::vector<std::unique_ptr<Component>> createComponents(
//! \ogs_file_param{prj__media__medium__phases__phase__components__component}
config->getConfigSubtreeList("component"))
{
- auto component = createComponent(component_config);
+ auto component = createComponent(component_config, parameters);
if (std::find_if(components.begin(),
components.end(),
diff --git a/MaterialLib/MPL/CreateComponent.h b/MaterialLib/MPL/CreateComponent.h
index 1109c58e69b786b69cfacb57582a0b7cb31be6f8..ab092b8dc2023ac6abf451c0ffdf86d2921cba4f 100644
--- a/MaterialLib/MPL/CreateComponent.h
+++ b/MaterialLib/MPL/CreateComponent.h
@@ -20,6 +20,11 @@ namespace BaseLib
{
class ConfigTree;
}
+namespace ParameterLib
+{
+struct ParameterBase;
+}
+
namespace MaterialPropertyLib
{
@@ -32,6 +37,8 @@ namespace MaterialPropertyLib
/// Assigning a name is optional; If no name is given, a custom component
/// without predefined properties is created.
std::vector<std::unique_ptr<Component>> createComponents(
- boost::optional<BaseLib::ConfigTree> const& config);
+ boost::optional<BaseLib::ConfigTree> const& config,
+ std::vector<std::unique_ptr<ParameterLib::ParameterBase>> const&
+ parameters);
} // namespace MaterialPropertyLib
diff --git a/MaterialLib/MPL/CreateMedium.cpp b/MaterialLib/MPL/CreateMedium.cpp
index b6c8507b38c7669b69b2771b494b8cf6bd05d0ff..e4da5a500c56813a242ee83851b9653df118ad7e 100644
--- a/MaterialLib/MPL/CreateMedium.cpp
+++ b/MaterialLib/MPL/CreateMedium.cpp
@@ -15,6 +15,7 @@
#include <string>
#include "BaseLib/ConfigTree.h"
+#include "ParameterLib/Parameter.h"
#include "Properties/Properties.h"
@@ -23,17 +24,21 @@
namespace MaterialPropertyLib
{
-std::unique_ptr<Medium> createMedium(BaseLib::ConfigTree const& config)
+std::unique_ptr<Medium> createMedium(
+ BaseLib::ConfigTree const& config,
+ std::vector<std::unique_ptr<ParameterLib::ParameterBase>> const& parameters)
{
// Parsing the phases
// Properties of phases may be not required in all the cases.
//! \ogs_file_param{prj__media__medium__phases}
- auto&& phases = createPhases(config.getConfigSubtreeOptional("phases"));
+ auto&& phases =
+ createPhases(config.getConfigSubtreeOptional("phases"), parameters);
// Parsing medium properties, overwriting the defaults.
auto&& properties =
//! \ogs_file_param{prj__media__medium__properties}
- createProperties(config.getConfigSubtreeOptional("properties"));
+ createProperties(config.getConfigSubtreeOptional("properties"),
+ parameters);
if (phases.empty() && !properties)
{
diff --git a/MaterialLib/MPL/CreateMedium.h b/MaterialLib/MPL/CreateMedium.h
index 6b5c7b94c0c34d80d71cf939146d00f2e296d038..6be67697fb60d4021b990a130a15d2c6e38be652 100644
--- a/MaterialLib/MPL/CreateMedium.h
+++ b/MaterialLib/MPL/CreateMedium.h
@@ -21,6 +21,10 @@ namespace MaterialPropertyLib
{
class Medium;
}
+namespace ParameterLib
+{
+struct ParameterBase;
+}
namespace MaterialPropertyLib
{
@@ -28,5 +32,7 @@ namespace MaterialPropertyLib
/// tree and calls create methods for the phase vector and the properties array.
/// Medium properties are optional. If not defined, default properties are
/// assigned.
-std::unique_ptr<Medium> createMedium(BaseLib::ConfigTree const& config);
+std::unique_ptr<Medium> createMedium(
+ BaseLib::ConfigTree const& config,
+ std::vector<std::unique_ptr<ParameterLib::ParameterBase>> const& parameters);
} // namespace MaterialPropertyLib
diff --git a/MaterialLib/MPL/CreatePhase.cpp b/MaterialLib/MPL/CreatePhase.cpp
index f1c9757de0f622b3e3e59077bf8e633824c87656..5c6d1d2b5b66075b63deb30effbb37b5d1930c49 100644
--- a/MaterialLib/MPL/CreatePhase.cpp
+++ b/MaterialLib/MPL/CreatePhase.cpp
@@ -17,6 +17,7 @@
#include <string>
#include "BaseLib/ConfigTree.h"
+#include "ParameterLib/Parameter.h"
#include "CreateComponent.h"
#include "CreateProperty.h"
@@ -25,7 +26,8 @@
namespace
{
std::unique_ptr<MaterialPropertyLib::Phase> createPhase(
- BaseLib::ConfigTree const& config)
+ BaseLib::ConfigTree const& config,
+ std::vector<std::unique_ptr<ParameterLib::ParameterBase>> const& parameters)
{
using namespace MaterialPropertyLib;
@@ -57,12 +59,14 @@ std::unique_ptr<MaterialPropertyLib::Phase> createPhase(
// Parsing of optional components.
auto components =
//! \ogs_file_param{prj__media__medium__phases__phase__components}
- createComponents(config.getConfigSubtreeOptional("components"));
+ createComponents(config.getConfigSubtreeOptional("components"),
+ parameters);
// Properties of optional properties.
auto properties =
//! \ogs_file_param{prj__media__medium__phases__phase__properties}
- createProperties(config.getConfigSubtreeOptional("properties"));
+ createProperties(config.getConfigSubtreeOptional("properties"),
+ parameters);
if (components.empty() && !properties)
{
@@ -80,7 +84,8 @@ std::unique_ptr<MaterialPropertyLib::Phase> createPhase(
namespace MaterialPropertyLib
{
std::vector<std::unique_ptr<Phase>> createPhases(
- boost::optional<BaseLib::ConfigTree> const& config)
+ boost::optional<BaseLib::ConfigTree> const& config,
+ std::vector<std::unique_ptr<ParameterLib::ParameterBase>> const& parameters)
{
if (!config)
{
@@ -93,7 +98,7 @@ std::vector<std::unique_ptr<Phase>> createPhases(
//! \ogs_file_param{prj__media__medium__phases__phase}
config->getConfigSubtreeList("phase"))
{
- auto phase = createPhase(phase_config);
+ auto phase = createPhase(phase_config, parameters);
if (std::find_if(phases.begin(),
phases.end(),
diff --git a/MaterialLib/MPL/CreatePhase.h b/MaterialLib/MPL/CreatePhase.h
index 4ea426ef6ce64853ff7a305980b5fb4fbe425798..22a519de1e14e6c27780f0c8b64062a588325279 100644
--- a/MaterialLib/MPL/CreatePhase.h
+++ b/MaterialLib/MPL/CreatePhase.h
@@ -19,6 +19,10 @@ namespace BaseLib
{
class ConfigTree;
}
+namespace ParameterLib
+{
+struct ParameterBase;
+}
namespace MaterialPropertyLib
{
class Phase;
@@ -37,5 +41,7 @@ namespace MaterialPropertyLib
/// assigned. These default properties average the component properties,
/// weighted by mole fraction.
std::vector<std::unique_ptr<Phase>> createPhases(
- boost::optional<BaseLib::ConfigTree> const& config);
+ boost::optional<BaseLib::ConfigTree> const& config,
+ std::vector<std::unique_ptr<ParameterLib::ParameterBase>> const&
+ parameters);
} // namespace MaterialPropertyLib
diff --git a/MaterialLib/MPL/CreateProperty.cpp b/MaterialLib/MPL/CreateProperty.cpp
index d2521df40ded967e72e190052675dd644c5c94b7..3def3fe929d919f00bb7d96cb815e6957508e768 100644
--- a/MaterialLib/MPL/CreateProperty.cpp
+++ b/MaterialLib/MPL/CreateProperty.cpp
@@ -16,6 +16,8 @@
#include <string>
#include <vector>
#include "BaseLib/ConfigTree.h"
+#include "ParameterLib/Parameter.h"
+#include "ParameterLib/Utils.h"
#include "Properties/Properties.h"
@@ -26,7 +28,8 @@
namespace
{
std::unique_ptr<MaterialPropertyLib::Property> createProperty(
- BaseLib::ConfigTree const& config)
+ BaseLib::ConfigTree const& config,
+ std::vector<std::unique_ptr<ParameterLib::ParameterBase>> const& parameters)
{
using namespace MaterialPropertyLib;
// Parsing the property type:
@@ -170,6 +173,17 @@ std::unique_ptr<MaterialPropertyLib::Property> createProperty(
reference_value, exp_data);
}
+ if (property_type == "Parameter")
+ {
+ std::string const& parameter_name =
+ //! \ogs_file_param{properties__property__Parameter__parameter_name}
+ config.getConfigParameter<std::string>("parameter_name");
+ auto const& parameter = ParameterLib::findParameter<double>(
+ parameter_name, parameters, 1, nullptr);
+ return std::make_unique<MaterialPropertyLib::ParameterProperty>(
+ parameter);
+ }
+
/* TODO Additional properties go here, for example:
if (boost::iequals(property_type, "BilinearTemperaturePressure"))
{
@@ -186,7 +200,8 @@ std::unique_ptr<MaterialPropertyLib::Property> createProperty(
namespace MaterialPropertyLib
{
std::unique_ptr<PropertyArray> createProperties(
- boost::optional<BaseLib::ConfigTree> const& config)
+ boost::optional<BaseLib::ConfigTree> const& config,
+ std::vector<std::unique_ptr<ParameterLib::ParameterBase>> const& parameters)
{
if (!config)
{
@@ -209,7 +224,7 @@ std::unique_ptr<PropertyArray> createProperties(
//! \ogs_file_param{properties__property__name}
property_config.getConfigParameter<std::string>("name");
// Create a new property based on the configuration subtree:
- auto property = createProperty(property_config);
+ auto property = createProperty(property_config, parameters);
// Insert the new property at the right position into the components
// private PropertyArray:
diff --git a/MaterialLib/MPL/CreateProperty.h b/MaterialLib/MPL/CreateProperty.h
index 777e9181c67149e1f333105d43b2d439e2a71998..8db96040da8f98748c0f248d3394bdc82d370ee6 100644
--- a/MaterialLib/MPL/CreateProperty.h
+++ b/MaterialLib/MPL/CreateProperty.h
@@ -20,6 +20,11 @@ namespace BaseLib
{
class ConfigTree;
}
+namespace ParameterLib
+{
+struct ParameterBase;
+}
+
namespace MaterialPropertyLib
{
@@ -38,6 +43,8 @@ using PropertyArray =
/// Then, the property name is evaluated and the property is copied into the
/// properties array.
std::unique_ptr<PropertyArray> createProperties(
- boost::optional<BaseLib::ConfigTree> const& config);
+ boost::optional<BaseLib::ConfigTree> const& config,
+ std::vector<std::unique_ptr<ParameterLib::ParameterBase>> const&
+ parameters);
} // namespace MaterialPropertyLib
diff --git a/MaterialLib/MPL/Properties/ExponentialProperty.cpp b/MaterialLib/MPL/Properties/ExponentialProperty.cpp
index be4d4d8fbf58f7368b72dc8dd02bebc5decd3e1a..07802b9f2b72f9bb9be9fda2550b058b39a07d37 100644
--- a/MaterialLib/MPL/Properties/ExponentialProperty.cpp
+++ b/MaterialLib/MPL/Properties/ExponentialProperty.cpp
@@ -25,7 +25,9 @@ ExponentialProperty::ExponentialProperty(
}
PropertyDataType ExponentialProperty::value(
- VariableArray const& variable_array) const
+ VariableArray const& variable_array,
+ ParameterLib::SpatialPosition const& /*pos*/,
+ double const /*t*/) const
{
return std::get<double>(_value) *
std::exp(
diff --git a/MaterialLib/MPL/Properties/ExponentialProperty.h b/MaterialLib/MPL/Properties/ExponentialProperty.h
index ae9c4c384a4579d99f14ae5d903fca7f80e6a6d6..4169461db317c53e938a2628afa330baf4f1419f 100644
--- a/MaterialLib/MPL/Properties/ExponentialProperty.h
+++ b/MaterialLib/MPL/Properties/ExponentialProperty.h
@@ -38,9 +38,11 @@ public:
ExponentData const& v);
/// This method computes the value of a property \f$\alpha\f$ depending
/// exponentialy on the value of the given primary variable \f$\beta\f$.
- PropertyDataType value(VariableArray const& variable_array) const override;
- /// This method will compute the derivative of a property with respect to
- /// the given primary variable.
+ PropertyDataType value(VariableArray const& variable_array,
+ ParameterLib::SpatialPosition const& pos,
+ double const t) const override;
+ /// This method will compute the derivative of a property with respect
+ /// to the given primary variable.
PropertyDataType dValue(VariableArray const& variable_array,
Variable const primary_variable) const override;
/// This method will compute the second derivative of a
diff --git a/MaterialLib/MPL/Properties/LinearProperty.cpp b/MaterialLib/MPL/Properties/LinearProperty.cpp
index 585653b7d00c2e6b6a35433573470e7e2c92b294..bb09815239d4c5e0e44bea6631745168e7acd932 100644
--- a/MaterialLib/MPL/Properties/LinearProperty.cpp
+++ b/MaterialLib/MPL/Properties/LinearProperty.cpp
@@ -21,7 +21,9 @@ LinearProperty::LinearProperty(PropertyDataType const& property_reference_value,
}
PropertyDataType LinearProperty::value(
- VariableArray const& variable_array) const
+ VariableArray const& variable_array,
+ ParameterLib::SpatialPosition const& /*pos*/,
+ double const /*t*/) const
{
return std::get<double>(_value) *
(1 +
@@ -31,6 +33,7 @@ PropertyDataType LinearProperty::value(
std::get<double>(_independent_variable.reference_condition)));
}
+
PropertyDataType LinearProperty::dValue(VariableArray const& /*variable_array*/,
Variable const primary_variable) const
{
diff --git a/MaterialLib/MPL/Properties/LinearProperty.h b/MaterialLib/MPL/Properties/LinearProperty.h
index 61727a702d8af81c84dde3b6771edbfa7090d693..f7543c56efe0dfc410afbee1590871514bd0fe39 100644
--- a/MaterialLib/MPL/Properties/LinearProperty.h
+++ b/MaterialLib/MPL/Properties/LinearProperty.h
@@ -34,9 +34,13 @@ public:
/// of the base class Property to that value.
LinearProperty(PropertyDataType const& property_reference_value,
IndependentVariable const& v);
+
/// This method computes the value of a property depending linearly on
/// the value of the given primary variable.
- PropertyDataType value(VariableArray const& variable_array) const override;
+ PropertyDataType value(VariableArray const& variable_array,
+ ParameterLib::SpatialPosition const& pos,
+ double const t) const override;
+
/// This method will compute the derivative of a property with respect to
/// the given primary variable.
PropertyDataType dValue(VariableArray const& variable_array,
diff --git a/MaterialLib/MPL/Properties/ParameterProperty.cpp b/MaterialLib/MPL/Properties/ParameterProperty.cpp
new file mode 100644
index 0000000000000000000000000000000000000000..5406b62396c579db5116e7a1d8768048f9da8bcd
--- /dev/null
+++ b/MaterialLib/MPL/Properties/ParameterProperty.cpp
@@ -0,0 +1,45 @@
+/**
+ * \file
+ *
+ * \copyright
+ * Copyright (c) 2012-2019, OpenGeoSys Community (http://www.opengeosys.org)
+ * Distributed under a Modified BSD License.
+ * See accompanying file LICENSE.txt or
+ * http://www.opengeosys.org/project/license
+ *
+ */
+
+#include "MaterialLib/MPL/Properties/ParameterProperty.h"
+
+namespace MaterialPropertyLib
+{
+ParameterProperty::ParameterProperty(
+ ParameterLib::Parameter<double> const& parameter)
+ : _parameter(parameter)
+{
+}
+
+PropertyDataType ParameterProperty::value(
+ VariableArray const& /*variable_array*/,
+ ParameterLib::SpatialPosition const& pos,
+ double const t) const
+{
+ return _parameter(t, pos)[0];
+}
+
+PropertyDataType ParameterProperty::dValue(
+ VariableArray const& /*variable_array*/,
+ Variable const /*primary_variable*/) const
+{
+ return double{};
+}
+
+PropertyDataType ParameterProperty::d2Value(
+ VariableArray const& /*variable_array*/,
+ Variable const /*pv1*/,
+ Variable const /*pv2*/) const
+{
+ return double{};
+}
+
+} // namespace MaterialPropertyLib
diff --git a/MaterialLib/MPL/Properties/ParameterProperty.h b/MaterialLib/MPL/Properties/ParameterProperty.h
new file mode 100644
index 0000000000000000000000000000000000000000..923e8d52683ebad9d95bcb84f75e2c35d996c004
--- /dev/null
+++ b/MaterialLib/MPL/Properties/ParameterProperty.h
@@ -0,0 +1,49 @@
+/**
+ * \file
+ *
+ * \copyright
+ * Copyright (c) 2012-2019, OpenGeoSys Community (http://www.opengeosys.org)
+ * Distributed under a Modified BSD License.
+ * See accompanying file LICENSE.txt or
+ * http://www.opengeosys.org/project/license
+ *
+ */
+#pragma once
+
+#include "MaterialLib/MPL/Property.h"
+#include "MaterialLib/MPL/VariableType.h"
+
+#include "ParameterLib/Parameter.h"
+
+namespace MaterialPropertyLib
+{
+
+/// The parameter property class. The property reads the value from a parameter.
+/// The current implementation accepts only the double datatype defined in
+/// PropertyDataType.
+class ParameterProperty final : public Property
+{
+public:
+ /// This constructor accepts a Parameter.
+ ParameterProperty(ParameterLib::Parameter<double> const& parameter);
+
+ /// This method computes the value of a property depending linearly on
+ /// the value of the given primary variable.
+ PropertyDataType value(VariableArray const& variable_array,
+ ParameterLib::SpatialPosition const& pos,
+ double const t) const override;
+
+ /// This method will compute the derivative of a property with respect to
+ /// the given primary variable.
+ PropertyDataType dValue(VariableArray const& variable_array,
+ Variable const primary_variable) const override;
+ /// This method will compute the second derivative of a
+ /// property with respect to the given primary variables pv1 and pv2.
+ PropertyDataType d2Value(VariableArray const& variable_array,
+ Variable const pv1,
+ Variable const pv2) const override;
+
+private:
+ ParameterLib::Parameter<double> const& _parameter;
+};
+} // namespace MaterialPropertyLib
diff --git a/MaterialLib/MPL/Properties/Properties.h b/MaterialLib/MPL/Properties/Properties.h
index 0d4ca2876b3c533747615218208419a0508fb8af..0928c34841540950ec8aa081c39a3afe880c9a9c 100644
--- a/MaterialLib/MPL/Properties/Properties.h
+++ b/MaterialLib/MPL/Properties/Properties.h
@@ -15,3 +15,4 @@
#include "Constant.h"
#include "LinearProperty.h"
#include "ExponentialProperty.h"
+#include "ParameterProperty.h"
diff --git a/MaterialLib/MPL/Property.cpp b/MaterialLib/MPL/Property.cpp
index 10fca184d674b4f0309c5a6dbc3deb3e5d9fd79f..2572850b43ec8a65c406e81251e852731bb6b0ae 100644
--- a/MaterialLib/MPL/Property.cpp
+++ b/MaterialLib/MPL/Property.cpp
@@ -22,9 +22,12 @@ PropertyDataType Property::value() const
{
return _value;
}
+
/// The default implementation of this method only returns the property value
/// without altering it.
-PropertyDataType Property::value(VariableArray const& /*variable_array*/) const
+PropertyDataType Property::value(VariableArray const& /*variable_array*/,
+ ParameterLib::SpatialPosition const& /*pos*/,
+ double const /*t*/) const
{
return _value;
}
diff --git a/MaterialLib/MPL/Property.h b/MaterialLib/MPL/Property.h
index 889bbb1777c30e5c295ecb0699896d16ff976e7b..32d16694a89c87c197fa161f50af3ea15d582ea1 100644
--- a/MaterialLib/MPL/Property.h
+++ b/MaterialLib/MPL/Property.h
@@ -19,6 +19,8 @@
#include "PropertyType.h"
#include "VariableType.h"
+#include "ParameterLib/SpatialPosition.h"
+
namespace MaterialPropertyLib
{
/// This is a custom data type for arbitrary properties, based on the
@@ -53,7 +55,9 @@ public:
virtual PropertyDataType value() const;
/// This virtual method will compute the property value based on the primary
/// variables that are passed as arguments.
- virtual PropertyDataType value(VariableArray const& variable_array) const;
+ virtual PropertyDataType value(VariableArray const& variable_array,
+ ParameterLib::SpatialPosition const& pos,
+ double const t) const;
/// This virtual method will compute the derivative of a property
/// with respect to the given variable pv.
virtual PropertyDataType dValue(VariableArray const& variable_array,
@@ -69,11 +73,15 @@ public:
{
return std::get<T>(value());
}
+
template <typename T>
- T value(VariableArray const& variable_array) const
+ T value(VariableArray const& variable_array,
+ ParameterLib::SpatialPosition const& pos,
+ double const t) const
{
- return std::get<T>(value(variable_array));
+ return std::get<T>(value(variable_array, pos, t));
}
+
template <typename T>
T dValue(VariableArray const& variable_array,
Variable const variable) const
@@ -94,13 +102,6 @@ protected:
PropertyDataType _dvalue;
};
-/// This method returns the 0-based index of the variant data types. Can be
-/// enhanced by using enums.
-inline std::size_t getType(Property const& p)
-{
- return p.value().index();
-}
-
inline void overwriteExistingProperties(PropertyArray& properties,
PropertyArray& new_properties)
{
diff --git a/ProcessLib/HT/HTFEM.h b/ProcessLib/HT/HTFEM.h
index 0e3c1084fd691141eaf45c8e240ddfbdd686cd56..3b3e73a6aabcbd07a23b3ca3873e7b29fe420691 100644
--- a/ProcessLib/HT/HTFEM.h
+++ b/ProcessLib/HT/HTFEM.h
@@ -94,7 +94,7 @@ public:
/// Computes the flux in the point \c pnt_local_coords that is given in
/// local coordinates using the values from \c local_x.
Eigen::Vector3d getFlux(MathLib::Point3d const& pnt_local_coords,
- double const /*t*/,
+ double const t,
std::vector<double> const& local_x) const override
{
// eval dNdx and invJ at given point
@@ -134,11 +134,11 @@ public:
auto const K = MaterialPropertyLib::formEigenTensor<GlobalDim>(
solid_phase
.property(MaterialPropertyLib::PropertyType::permeability)
- .value(vars));
+ .value(vars, pos, t));
auto const mu =
liquid_phase.property(MaterialPropertyLib::PropertyType::viscosity)
- .template value<double>(vars);
+ .template value<double>(vars, pos, t);
GlobalDimMatrixType const K_over_mu = K / mu;
auto const p_nodal_values = Eigen::Map<const NodalVectorType>(
@@ -151,7 +151,7 @@ public:
auto const rho_w =
liquid_phase
.property(MaterialPropertyLib::PropertyType::density)
- .template value<double>(vars);
+ .template value<double>(vars, pos, t);
auto const b = this->_process_data.specific_body_force;
q += K_over_mu * rho_w * b;
}
@@ -173,10 +173,9 @@ protected:
_ip_data;
double getHeatEnergyCoefficient(
- MaterialPropertyLib::VariableArray const& vars,
- const double porosity,
- const double fluid_density,
- const double specific_heat_capacity_fluid)
+ MaterialPropertyLib::VariableArray const& vars, const double porosity,
+ const double fluid_density, const double specific_heat_capacity_fluid,
+ ParameterLib::SpatialPosition const& pos, double const t)
{
auto const& medium =
*_process_data.media_map->getMedium(this->_element.getID());
@@ -186,11 +185,11 @@ protected:
solid_phase
.property(
MaterialPropertyLib::PropertyType::specific_heat_capacity)
- .template value<double>(vars);
+ .template value<double>(vars, pos, t);
auto const solid_density =
solid_phase.property(MaterialPropertyLib::PropertyType::density)
- .template value<double>(vars);
+ .template value<double>(vars, pos, t);
return solid_density * specific_heat_capacity_solid * (1 - porosity) +
fluid_density * specific_heat_capacity_fluid * porosity;
@@ -199,7 +198,8 @@ protected:
GlobalDimMatrixType getThermalConductivityDispersivity(
MaterialPropertyLib::VariableArray const& vars, const double porosity,
const double fluid_density, const double specific_heat_capacity_fluid,
- const GlobalDimVectorType& velocity, const GlobalDimMatrixType& I)
+ const GlobalDimVectorType& velocity, const GlobalDimMatrixType& I,
+ ParameterLib::SpatialPosition const& pos, double const t)
{
auto const& medium =
*_process_data.media_map->getMedium(_element.getID());
@@ -210,13 +210,13 @@ protected:
solid_phase
.property(
MaterialPropertyLib::PropertyType::thermal_conductivity)
- .template value<double>(vars);
+ .template value<double>(vars, pos, t);
auto const thermal_conductivity_fluid =
liquid_phase
.property(
MaterialPropertyLib::PropertyType::thermal_conductivity)
- .template value<double>(vars);
+ .template value<double>(vars, pos, t);
double const thermal_conductivity =
thermal_conductivity_solid * (1 - porosity) +
@@ -250,7 +250,7 @@ protected:
}
std::vector<double> const& getIntPtDarcyVelocityLocal(
- const double /*t*/, std::vector<double> const& local_p,
+ const double t, std::vector<double> const& local_p,
std::vector<double> const& local_T, std::vector<double>& cache) const
{
auto const n_integration_points =
@@ -295,12 +295,12 @@ protected:
auto const K = MaterialPropertyLib::formEigenTensor<GlobalDim>(
solid_phase
.property(MaterialPropertyLib::PropertyType::permeability)
- .value(vars));
+ .value(vars, pos, t));
auto const mu =
liquid_phase
.property(MaterialPropertyLib::PropertyType::viscosity)
- .template value<double>(vars);
+ .template value<double>(vars, pos, t);
GlobalDimMatrixType const K_over_mu = K / mu;
cache_mat.col(ip).noalias() = -K_over_mu * dNdx * p_nodal_values;
@@ -310,7 +310,7 @@ protected:
auto const rho_w =
liquid_phase
.property(MaterialPropertyLib::PropertyType::density)
- .template value<double>(vars);
+ .template value<double>(vars, pos, t);
auto const b = _process_data.specific_body_force;
// here it is assumed that the vector b is directed 'downwards'
cache_mat.col(ip).noalias() += K_over_mu * rho_w * b;
diff --git a/ProcessLib/HT/MonolithicHTFEM.h b/ProcessLib/HT/MonolithicHTFEM.h
index 6b992aad18af22f66d6dee2a0486029f34da233e..73dfbc0f4a29126b3dd99bec34f26162ac3829f2 100644
--- a/ProcessLib/HT/MonolithicHTFEM.h
+++ b/ProcessLib/HT/MonolithicHTFEM.h
@@ -66,7 +66,7 @@ public:
{
}
- void assemble(double const /*t*/, std::vector<double> const& local_x,
+ void assemble(double const t, std::vector<double> const& local_x,
std::vector<double>& local_M_data,
std::vector<double>& local_K_data,
std::vector<double>& local_b_data) override
@@ -123,7 +123,7 @@ public:
// constant storage model
auto const specific_storage =
solid_phase.property(MaterialPropertyLib::PropertyType::storage)
- .template value<double>(vars);
+ .template value<double>(vars, pos, t);
auto const& ip_data = this->_ip_data[ip];
auto const& N = ip_data.N;
@@ -138,14 +138,14 @@ public:
auto const porosity =
solid_phase
.property(MaterialPropertyLib::PropertyType::porosity)
- .template value<double>(vars);
+ .template value<double>(vars, pos, t);
auto const intrinsic_permeability =
MaterialPropertyLib::formEigenTensor<GlobalDim>(
solid_phase
.property(
MaterialPropertyLib::PropertyType::permeability)
- .value(vars));
+ .value(vars, pos, t));
vars[static_cast<int>(MaterialPropertyLib::Variable::temperature)] =
T_int_pt;
@@ -155,19 +155,19 @@ public:
auto const specific_heat_capacity_fluid =
liquid_phase
.property(MaterialPropertyLib::specific_heat_capacity)
- .template value<double>(vars);
+ .template value<double>(vars, pos, t);
// Use the fluid density model to compute the density
auto const fluid_density =
liquid_phase
.property(MaterialPropertyLib::PropertyType::density)
- .template value<double>(vars);
+ .template value<double>(vars, pos, t);
// Use the viscosity model to compute the viscosity
auto const viscosity =
liquid_phase
.property(MaterialPropertyLib::PropertyType::viscosity)
- .template value<double>(vars);
+ .template value<double>(vars, pos, t);
GlobalDimMatrixType K_over_mu = intrinsic_permeability / viscosity;
GlobalDimVectorType const velocity =
@@ -180,18 +180,18 @@ public:
GlobalDimMatrixType const thermal_conductivity_dispersivity =
this->getThermalConductivityDispersivity(
vars, porosity, fluid_density, specific_heat_capacity_fluid,
- velocity, I);
+ velocity, I, pos, t);
KTT.noalias() +=
(dNdx.transpose() * thermal_conductivity_dispersivity * dNdx +
N.transpose() * velocity.transpose() * dNdx * fluid_density *
specific_heat_capacity_fluid) *
w;
Kpp.noalias() += w * dNdx.transpose() * K_over_mu * dNdx;
- MTT.noalias() +=
- w *
- this->getHeatEnergyCoefficient(vars, porosity, fluid_density,
- specific_heat_capacity_fluid) *
- N.transpose() * N;
+ MTT.noalias() += w *
+ this->getHeatEnergyCoefficient(
+ vars, porosity, fluid_density,
+ specific_heat_capacity_fluid, pos, t) *
+ N.transpose() * N;
Mpp.noalias() += w * N.transpose() * specific_storage * N;
if (process_data.has_gravity)
{
diff --git a/ProcessLib/HT/StaggeredHTFEM-impl.h b/ProcessLib/HT/StaggeredHTFEM-impl.h
index bb937037c7a5b390cf9e607471b06b0e190fab1f..08ef5e2238243c9de821d1e1cd660fc7db4d49a3 100644
--- a/ProcessLib/HT/StaggeredHTFEM-impl.h
+++ b/ProcessLib/HT/StaggeredHTFEM-impl.h
@@ -105,10 +105,10 @@ void StaggeredHTFEM<ShapeFunction, IntegrationMethod, GlobalDim>::
auto const porosity =
solid_phase.property(MaterialPropertyLib::PropertyType::porosity)
- .template value<double>(vars);
+ .template value<double>(vars, pos, t);
auto const fluid_density =
liquid_phase.property(MaterialPropertyLib::PropertyType::density)
- .template value<double>(vars);
+ .template value<double>(vars, pos, t);
const double dfluid_density_dp =
liquid_phase.property(MaterialPropertyLib::PropertyType::density)
@@ -118,19 +118,19 @@ void StaggeredHTFEM<ShapeFunction, IntegrationMethod, GlobalDim>::
// Use the viscosity model to compute the viscosity
auto const viscosity =
liquid_phase.property(MaterialPropertyLib::PropertyType::viscosity)
- .template value<double>(vars);
+ .template value<double>(vars, pos, t);
// \todo the argument to getValue() has to be changed for non
// constant storage model
auto const specific_storage =
solid_phase.property(MaterialPropertyLib::PropertyType::storage)
- .template value<double>(vars);
+ .template value<double>(vars, pos, t);
auto const intrinsic_permeability =
MaterialPropertyLib::formEigenTensor<GlobalDim>(
solid_phase
.property(MaterialPropertyLib::PropertyType::permeability)
- .value(vars));
+ .value(vars, pos, t));
GlobalDimMatrixType const K_over_mu =
intrinsic_permeability / viscosity;
@@ -178,7 +178,7 @@ void StaggeredHTFEM<ShapeFunction, IntegrationMethod, GlobalDim>::
template <typename ShapeFunction, typename IntegrationMethod,
unsigned GlobalDim>
void StaggeredHTFEM<ShapeFunction, IntegrationMethod, GlobalDim>::
- assembleHeatTransportEquation(double const /*t*/,
+ assembleHeatTransportEquation(double const t,
std::vector<double>& local_M_data,
std::vector<double>& local_K_data,
std::vector<double>& /*local_b_data*/,
@@ -241,33 +241,33 @@ void StaggeredHTFEM<ShapeFunction, IntegrationMethod, GlobalDim>::
auto const porosity =
solid_phase.property(MaterialPropertyLib::PropertyType::porosity)
- .template value<double>(vars);
+ .template value<double>(vars, pos, t);
// Use the fluid density model to compute the density
auto const fluid_density =
liquid_phase.property(MaterialPropertyLib::PropertyType::density)
- .template value<double>(vars);
+ .template value<double>(vars, pos, t);
auto const specific_heat_capacity_fluid =
liquid_phase.property(MaterialPropertyLib::specific_heat_capacity)
- .template value<double>(vars);
+ .template value<double>(vars, pos, t);
// Assemble mass matrix
- local_M.noalias() +=
- w *
- this->getHeatEnergyCoefficient(vars, porosity, fluid_density,
- specific_heat_capacity_fluid) *
- N.transpose() * N;
+ local_M.noalias() += w *
+ this->getHeatEnergyCoefficient(
+ vars, porosity, fluid_density,
+ specific_heat_capacity_fluid, pos, t) *
+ N.transpose() * N;
// Assemble Laplace matrix
auto const viscosity =
liquid_phase.property(MaterialPropertyLib::PropertyType::viscosity)
- .template value<double>(vars);
+ .template value<double>(vars, pos, t);
auto const intrinsic_permeability =
MaterialPropertyLib::formEigenTensor<GlobalDim>(
solid_phase
.property(MaterialPropertyLib::PropertyType::permeability)
- .value(vars));
+ .value(vars, pos, t));
GlobalDimMatrixType const K_over_mu =
intrinsic_permeability / viscosity;
@@ -280,7 +280,7 @@ void StaggeredHTFEM<ShapeFunction, IntegrationMethod, GlobalDim>::
GlobalDimMatrixType const thermal_conductivity_dispersivity =
this->getThermalConductivityDispersivity(
vars, porosity, fluid_density, specific_heat_capacity_fluid,
- velocity, I);
+ velocity, I, pos, t);
local_K.noalias() +=
w * (dNdx.transpose() * thermal_conductivity_dispersivity * dNdx +
diff --git a/ProcessLib/HT/Tests.cmake b/ProcessLib/HT/Tests.cmake
index 1b8c23dc0035f55f456efdb961099f6d4c3f3758..f5fcb32269e099efa3ce881cccc45abda8b28f02 100644
--- a/ProcessLib/HT/Tests.cmake
+++ b/ProcessLib/HT/Tests.cmake
@@ -215,20 +215,19 @@ if(APPLE)
PROPERTIES TIMEOUT 1800)
endif()
-# 2019-05-09 TF disable the test until the MPL can deal with parameters as properties
-#AddTest(
-# NAME HT_a_DECOVALEX_THMC_based_Example
-# PATH Parabolic/HT/StaggeredCoupling/ADecovalexTHMCBasedHTExample
-# EXECUTABLE ogs
-# EXECUTABLE_ARGS th_decovalex.prj
-# WRAPPER time
-# TESTER vtkdiff
-# REQUIREMENTS NOT (OGS_USE_LIS OR OGS_USE_MPI)
-# DIFF_DATA
-# th_decovalex.vtu th_decovalex_pcs_1_ts_40_t_18.000000.vtu T_ref T 6e-12 1.e-14
-# th_decovalex.vtu th_decovalex_pcs_1_ts_40_t_18.000000.vtu p_ref p 1e-7 1.e-14
-# VIS th_decovalex_pcs_1_ts_78_t_1000.000000.vtu
-#)
+AddTest(
+ NAME HT_a_DECOVALEX_THMC_based_Example
+ PATH Parabolic/HT/StaggeredCoupling/ADecovalexTHMCBasedHTExample
+ EXECUTABLE ogs
+ EXECUTABLE_ARGS th_decovalex.prj
+ WRAPPER time
+ TESTER vtkdiff
+ REQUIREMENTS NOT (OGS_USE_LIS OR OGS_USE_MPI)
+ DIFF_DATA
+ th_decovalex.vtu th_decovalex_pcs_1_ts_40_t_18.000000.vtu T_ref T 6e-12 1.e-14
+ th_decovalex.vtu th_decovalex_pcs_1_ts_40_t_18.000000.vtu p_ref p 1e-7 1.e-14
+ VIS th_decovalex_pcs_1_ts_78_t_1000.000000.vtu
+)
AddTest(
NAME HT_SimpleSynthetics_IsothermalFluidFlowStaggered
diff --git a/ProcessLib/ThermoHydroMechanics/ThermoHydroMechanicsFEM-impl.h b/ProcessLib/ThermoHydroMechanics/ThermoHydroMechanicsFEM-impl.h
index 0eb510707b7fec1df14b207e9c98718c7656b08c..b2f72afeb2a45c2d8cf57a8fe11299e6d9222c49 100644
--- a/ProcessLib/ThermoHydroMechanics/ThermoHydroMechanicsFEM-impl.h
+++ b/ProcessLib/ThermoHydroMechanics/ThermoHydroMechanicsFEM-impl.h
@@ -234,38 +234,38 @@ void ThermoHydroMechanicsLocalAssembler<ShapeFunctionDisplacement,
auto const solid_density =
solid_phase.property(MaterialPropertyLib::PropertyType::density)
- .template value<double>(vars);
+ .template value<double>(vars, x_position, t);
auto const specific_storage =
solid_phase.property(MaterialPropertyLib::PropertyType::storage)
- .template value<double>(vars);
+ .template value<double>(vars, x_position, t);
auto const solid_linear_thermal_expansion_coefficient =
solid_phase
.property(
MaterialPropertyLib::PropertyType::thermal_expansivity)
- .template value<double>(vars);
+ .template value<double>(vars, x_position, t);
auto const porosity =
solid_phase.property(MaterialPropertyLib::PropertyType::porosity)
- .template value<double>(vars);
+ .template value<double>(vars, x_position, t);
auto const intrinsic_permeability =
MaterialPropertyLib::formEigenTensor<DisplacementDim>(
solid_phase
.property(MaterialPropertyLib::PropertyType::permeability)
- .value(vars));
+ .value(vars, x_position, t));
auto const fluid_density =
liquid_phase.property(MaterialPropertyLib::PropertyType::density)
- .template value<double>(vars);
+ .template value<double>(vars, x_position, t);
double const fluid_volumetric_thermal_expansion_coefficient =
- MaterialPropertyLib::getThermalExpansivity(liquid_phase, vars,
- fluid_density);
+ MaterialPropertyLib::getThermalExpansivity(
+ liquid_phase, vars, fluid_density, x_position, t);
// Use the viscosity model to compute the viscosity
auto const viscosity =
liquid_phase.property(MaterialPropertyLib::PropertyType::viscosity)
- .template value<double>(vars);
+ .template value<double>(vars, x_position, t);
GlobalDimMatrixType K_over_mu = intrinsic_permeability / viscosity;
double const T0 = _process_data.reference_temperature(t, x_position)[0];
@@ -310,7 +310,7 @@ void ThermoHydroMechanicsLocalAssembler<ShapeFunctionDisplacement,
auto const alpha =
solid_phase
.property(MaterialPropertyLib::PropertyType::biot_coefficient)
- .template value<double>(vars);
+ .template value<double>(vars, x_position, t);
Kup.noalias() += B.transpose() * alpha * identity2 * N_p * w;
@@ -345,19 +345,19 @@ void ThermoHydroMechanicsLocalAssembler<ShapeFunctionDisplacement,
liquid_phase
.property(
MaterialPropertyLib::PropertyType::specific_heat_capacity)
- .template value<double>(vars);
+ .template value<double>(vars, x_position, t);
auto const fluid_thermal_conductivity =
liquid_phase
.property(
MaterialPropertyLib::PropertyType::thermal_conductivity)
- .template value<double>(vars);
+ .template value<double>(vars, x_position, t);
GlobalDimMatrixType effective_thermal_condictivity =
MaterialPropertyLib::formEffectiveThermalConductivity<
DisplacementDim>(
solid_phase
.property(
MaterialPropertyLib::PropertyType::thermal_conductivity)
- .value(vars),
+ .value(vars, x_position, t),
fluid_thermal_conductivity, porosity);
KTT.noalias() +=
@@ -371,7 +371,7 @@ void ThermoHydroMechanicsLocalAssembler<ShapeFunctionDisplacement,
solid_phase
.property(MaterialPropertyLib::PropertyType::
specific_heat_capacity)
- .template value<double>(vars);
+ .template value<double>(vars, x_position, t);
MTT.noalias() +=
N_T.transpose() * effective_volumetric_heat_capacity * N_T * w;
@@ -441,7 +441,7 @@ template <typename ShapeFunctionDisplacement, typename ShapeFunctionPressure,
typename IntegrationMethod, int DisplacementDim>
std::vector<double> const& ThermoHydroMechanicsLocalAssembler<
ShapeFunctionDisplacement, ShapeFunctionPressure, IntegrationMethod,
- DisplacementDim>::getIntPtDarcyVelocity(const double /*t*/,
+ DisplacementDim>::getIntPtDarcyVelocity(const double t,
GlobalVector const&
current_solution,
NumLib::LocalToGlobalIndexMap const&
@@ -492,17 +492,17 @@ std::vector<double> const& ThermoHydroMechanicsLocalAssembler<
auto const viscosity =
liquid_phase.property(MaterialPropertyLib::PropertyType::viscosity)
- .template value<double>(vars);
+ .template value<double>(vars, x_position, t);
GlobalDimMatrixType K_over_mu =
MaterialPropertyLib::formEigenTensor<DisplacementDim>(
solid_phase
.property(MaterialPropertyLib::PropertyType::permeability)
- .value(vars)) /
+ .value(vars, x_position, t)) /
viscosity;
auto const fluid_density =
liquid_phase.property(MaterialPropertyLib::PropertyType::density)
- .template value<double>(vars);
+ .template value<double>(vars, x_position, t);
auto const& b = _process_data.specific_body_force;
// Compute the velocity
@@ -574,7 +574,7 @@ void ThermoHydroMechanicsLocalAssembler<ShapeFunctionDisplacement,
solid_phase
.property(
MaterialPropertyLib::PropertyType::thermal_expansivity)
- .template value<double>(vars);
+ .template value<double>(vars, x_position, t);
double const delta_T(T_int_pt - T0);
double const thermal_strain =
diff --git a/Tests/Data/Parabolic/HT/StaggeredCoupling/ADecovalexTHMCBasedHTExample/th_decovalex.prj b/Tests/Data/Parabolic/HT/StaggeredCoupling/ADecovalexTHMCBasedHTExample/th_decovalex.prj
index 459bd6661fc5db0df74908fffcd06bbe7e8892f3..73cf55c63f151b801d6802392f3f9df0fa5cac33 100644
--- a/Tests/Data/Parabolic/HT/StaggeredCoupling/ADecovalexTHMCBasedHTExample/th_decovalex.prj
+++ b/Tests/Data/Parabolic/HT/StaggeredCoupling/ADecovalexTHMCBasedHTExample/th_decovalex.prj
@@ -12,9 +12,6 @@
<temperature>T</temperature>
<pressure>p</pressure>
</process_variables>
- <density_solid>rho_solid</density_solid>
- <specific_heat_capacity_solid>c_p</specific_heat_capacity_solid>
- <thermal_conductivity_solid>lambda</thermal_conductivity_solid>
<specific_body_force>0 -9.81</specific_body_force>
<secondary_variables>
<secondary_variable type="static" internal_name="darcy_velocity" output_name="darcy_velocity"/>
@@ -73,6 +70,21 @@
<type>Constant</type>
<value>0.0</value>
</property>
+ <property>
+ <name>density</name>
+ <type>Parameter</type>
+ <parameter_name>rho_solid</parameter_name>
+ </property>
+ <property>
+ <name>thermal_conductivity</name>
+ <type>Parameter</type>
+ <parameter_name>lambda</parameter_name>
+ </property>
+ <property>
+ <name>specific_heat_capacity</name>
+ <type>Parameter</type>
+ <parameter_name>c_p</parameter_name>
+ </property>
</properties>
</phase>
</phases>
@@ -135,11 +147,26 @@
<type>Constant</type>
<value>0.41</value>
</property>
+ <property>
+ <name>density</name>
+ <type>Parameter</type>
+ <parameter_name>rho_solid</parameter_name>
+ </property>
<property>
<name>storage</name>
<type>Constant</type>
<value>0.0</value>
</property>
+ <property>
+ <name>thermal_conductivity</name>
+ <type>Parameter</type>
+ <parameter_name>lambda</parameter_name>
+ </property>
+ <property>
+ <name>specific_heat_capacity</name>
+ <type>Parameter</type>
+ <parameter_name>c_p</parameter_name>
+ </property>
</properties>
</phase>
</phases>
diff --git a/Tests/MaterialLib/TestMPL.cpp b/Tests/MaterialLib/TestMPL.cpp
index 3885b74a2402d60827495cbd0b3bf1ab82b2a390..5f59b41d8507722c5a818156d2a93de47b88d2e0 100644
--- a/Tests/MaterialLib/TestMPL.cpp
+++ b/Tests/MaterialLib/TestMPL.cpp
@@ -16,6 +16,7 @@
#include "BaseLib/ConfigTree.h"
#include "MaterialLib/MPL/CreateMedium.h"
+#include "ParameterLib/Parameter.h"
std::unique_ptr<MPL::Medium> createTestMaterial(std::string const& xml)
{
@@ -23,6 +24,7 @@ std::unique_ptr<MPL::Medium> createTestMaterial(std::string const& xml)
BaseLib::ConfigTree conf(ptree, "", BaseLib::ConfigTree::onerror,
BaseLib::ConfigTree::onwarning);
auto const& config = conf.getConfigSubtree("medium");
+ std::vector<std::unique_ptr<ParameterLib::ParameterBase>> parameters;
- return MPL::createMedium(config);
+ return MPL::createMedium(config, parameters);
}
diff --git a/Tests/MaterialLib/TestMPLExponentialProperty.cpp b/Tests/MaterialLib/TestMPLExponentialProperty.cpp
index 3a9c56f11441d312ef9642804c34ccb7ac4a9aae..44773d7425cb3146e9fcf5b6de5776b2ae287d8d 100644
--- a/Tests/MaterialLib/TestMPLExponentialProperty.cpp
+++ b/Tests/MaterialLib/TestMPLExponentialProperty.cpp
@@ -26,8 +26,10 @@ TEST(MaterialPropertyLib, ExponentialProperty)
MaterialPropertyLib::VariableArray variable_array;
variable_array[static_cast<int>(
MaterialPropertyLib::Variable::temperature)] = 20;
+ ParameterLib::SpatialPosition const pos;
+ double const time = std::numeric_limits<double>::quiet_NaN();
ASSERT_NEAR(
- std::get<double>(exp_property.value(variable_array)),
+ std::get<double>(exp_property.value(variable_array, pos, time)),
y_ref * (std::exp(-factor *
(std::get<double>(variable_array[static_cast<int>(
MaterialPropertyLib::Variable::temperature)]) -
diff --git a/Tests/MaterialLib/TestMPLLinearProperty.cpp b/Tests/MaterialLib/TestMPLLinearProperty.cpp
index 3cb9672efa2751e1d2184391dbb80dc43e748b42..fc348c4ba11db5ded46abd0612cc6943ece10a75 100644
--- a/Tests/MaterialLib/TestMPLLinearProperty.cpp
+++ b/Tests/MaterialLib/TestMPLLinearProperty.cpp
@@ -24,8 +24,10 @@ TEST(MaterialPropertyLib, LinearProperty)
MaterialPropertyLib::VariableArray variable_array;
variable_array[static_cast<int>(
MaterialPropertyLib::Variable::temperature)] = 303.15;
+ ParameterLib::SpatialPosition const pos;
+ double const time = std::numeric_limits<double>::quiet_NaN();
ASSERT_NEAR(
- std::get<double>(linear_property.value(variable_array)),
+ std::get<double>(linear_property.value(variable_array, pos, time)),
y_ref * (1 + m * (std::get<double>(variable_array[static_cast<int>(
MaterialPropertyLib::Variable::temperature)]) -
x_ref)),