[MPL] Add Property based on Parameter. #2616

TomFischer · 2019-08-19T11:16:58Z

PR implements a new Property based on Parameter. With this implementation spatial heterogeneous properties are available now.

Feature description was added to the changelog
Tests covering your feature were added?
The disabled HT decovalex test was re-enable.
Any new feature or behavior change was documented?

renchao-lu · 2019-08-19T11:31:51Z

So great！

wenqing

👍

endJunction · 2019-08-19T14:55:02Z

MaterialLib/MPL/Components/GetThermalExpansivity.cpp

-                             const double density)
+double getThermalExpansivity(Phase const& phase, VariableArray const& vars,
+                             const double density,
+                             ParameterLib::SpatialPosition const& pos, double t)


Suggested change

ParameterLib::SpatialPosition const& pos, double t)

ParameterLib::SpatialPosition const& pos, double const t)

endJunction · 2019-08-19T14:57:49Z

MaterialLib/MPL/CreateProperty.cpp

@@ -170,6 +173,17 @@ std::unique_ptr<MaterialPropertyLib::Property> createProperty(
            reference_value, exp_data);
    }

+    if (property_type == "parameter")


parameter or Parameter? If the former, then in line 179 it should be

//! \ogs_file_param{properties__property__parameter__parameter_name}

endJunction · 2019-08-19T14:58:30Z

MaterialLib/MPL/Properties/LinearProperty.h

-    PropertyDataType value(VariableArray const& variable_array) const override;
+    PropertyDataType value(VariableArray const& variable_array,
+                           ParameterLib::SpatialPosition const& pos,
+                           double t) const override;


Suggested change

double t) const override;

double const t) const override;

endJunction · 2019-08-19T14:58:58Z

MaterialLib/MPL/Properties/ParameterProperty.cpp

+PropertyDataType ParameterProperty::value(
+    VariableArray const& /*variable_array*/,
+    ParameterLib::SpatialPosition const& pos,
+    double t) const


Suggested change

double t) const

double const t) const

endJunction · 2019-08-19T14:59:57Z

MaterialLib/MPL/Property.h

-    T value(VariableArray const& variable_array) const
+    T value(VariableArray const& variable_array,
+            ParameterLib::SpatialPosition const& pos,
+            double t) const


Suggested change

double t) const

double const t) const

endJunction · 2019-08-19T15:00:30Z

ProcessLib/HT/HTFEM.h

-        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 t)


Suggested change

ParameterLib::SpatialPosition const& pos, double t)

ParameterLib::SpatialPosition const& pos, double const t)

endJunction · 2019-08-19T15:03:31Z

Tests/Data/Parabolic/HT/StaggeredCoupling/ADecovalexTHMCBasedHTExample/th_decovalex.prj

+                        <property>
+                            <name>density</name>
+                            <type>parameter</type>
+                            <parameter_name>rho_solid</parameter_name>


For discussion:
Could be also

<property> <name>density</name> <parameter>rho_solid</parameter> </property>

What do you think?
@TomFischer I know, the parsing is slightly more difficult.

The advantage of your variant is a non-redundant, short description of a ParameterProperty object. The advantage of the implementation of the PR is that it is consistent with the specification of other parameter types.

@wenqing, @renchao-lu, @ErikNixdorf , @WaltherM Opinions?

I think that it is better to have the consistency with other types of input. Therefore I prefer to take the present one in this PR.

In my mind, there are three types of property offered by far as follows: constant, linear dependency, and exponential dependency. I guess the initial design of the tag <type> intends to establish property dependency linking to primary process variables which will change over time. If a material property is not time-dependent, we assign the tag to constant. Otherwise, we assign to linear/exponential dependency. As to ParameterLib, I think the major business of ParameterLib is to tackle spatial heterogeneity, although it offers some time-associated functionalities. For this main reason, ParameterLib has its own tag for property type: function, group, meshnode, and meshelement (for spatial heterogeneity), curvescaled, and timedependentheterogeneousparameter (for time-dependency).

I would vote for @TomFischer implementation, which seems more consistent with the existing, alternative options.

Thanks for discussion.
⏩

endJunction · 2019-08-20T09:24:26Z

ProcessLib/HT/HTFEM.h

@@ -199,7 +198,8 @@ class HTFEM : public HTLocalAssemblerInterface
    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 t)


Suggested change

ParameterLib::SpatialPosition const& pos, double t)

ParameterLib::SpatialPosition const& pos, double const t)

ogsbot · 2020-06-19T13:04:00Z

OpenGeoSys development has been moved to GitLab.

See this pull request on GitLab.

wenqing approved these changes Aug 19, 2019

View reviewed changes

TomFischer added stop review 🛑 WIP 🏗️ labels Aug 19, 2019

TomFischer force-pushed the AddParameterToMPL branch from db37152 to 4bea79b Compare August 19, 2019 12:45

TomFischer removed WIP 🏗️ stop review 🛑 labels Aug 19, 2019

endJunction reviewed Aug 19, 2019

View reviewed changes

TomFischer force-pushed the AddParameterToMPL branch 3 times, most recently from 0651908 to a84cdce Compare August 20, 2019 05:58

TomFischer added 3 commits August 20, 2019 10:54

[MPL] Add SpatialPosition and time to MPL properties.

5d601c7

[MPL] Impl. of ParameterProperty.

72b380a

[MPL] Pass through the Parameters needed by ParameterProperty.

ce14635

TomFischer force-pushed the AddParameterToMPL branch from a84cdce to c626c06 Compare August 20, 2019 09:08

endJunction reviewed Aug 20, 2019

View reviewed changes

TomFischer added 7 commits August 20, 2019 11:27

[PL/HT] Pass pos and time to property calculations.

761e668

[T] Use parameter type in MPL::Property.

56a858e

[T/HT] Enable DECOVALEX test again.

0f45e2b

[Material/MPL] Remove unused getType() function.

6b78aa8

[PL/THM] Pass pos and time to MPL property calculations.

f5961dd

[T/MPL] Use the new interface in the tests.

010cda9

[docu] Tags to use the MPL::ParameterProperty.

4ea7df2

TomFischer force-pushed the AddParameterToMPL branch from c626c06 to 4ea7df2 Compare August 20, 2019 09:34

bilke merged commit ef0ca26 into ufz:master Aug 20, 2019

TomFischer deleted the AddParameterToMPL branch August 20, 2019 12:19

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

[MPL] Add Property based on Parameter. #2616

[MPL] Add Property based on Parameter. #2616

TomFischer commented Aug 19, 2019 •

edited

Loading

renchao-lu commented Aug 19, 2019

wenqing left a comment

endJunction Aug 19, 2019

endJunction Aug 19, 2019

endJunction Aug 19, 2019

endJunction Aug 19, 2019

endJunction Aug 19, 2019

endJunction Aug 19, 2019

endJunction Aug 19, 2019

TomFischer Aug 20, 2019 •

edited

Loading

wenqing Aug 20, 2019

renchao-lu Aug 20, 2019

hydromarc Aug 20, 2019

endJunction Aug 20, 2019

endJunction Aug 20, 2019

ogsbot commented Jun 19, 2020

	ParameterLib::SpatialPosition const& pos, double t)
	ParameterLib::SpatialPosition const& pos, double const t)

[MPL] Add Property based on Parameter. #2616

[MPL] Add Property based on Parameter. #2616

Conversation

TomFischer commented Aug 19, 2019 • edited Loading

renchao-lu commented Aug 19, 2019

wenqing left a comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

TomFischer Aug 20, 2019 • edited Loading

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

ogsbot commented Jun 19, 2020

TomFischer commented Aug 19, 2019 •

edited

Loading

TomFischer Aug 20, 2019 •

edited

Loading