[MatLib/MPL] Extend linear property #2649
Conversation
| std::get<double>(iv.reference_condition)); | ||
| }; | ||
|
|
||
| double linearized_ratio_to_reference_value = |
There was a problem hiding this comment.
| double linearized_ratio_to_reference_value = | |
| double const linearized_ratio_to_reference_value = |
| _independent_variable.type)]) - | ||
| std::get<double>(_independent_variable.reference_condition))); | ||
| auto calculate_linearized_ratio = | ||
| [&variable_array](double initial_linearized_ratio, auto const& iv) { |
There was a problem hiding this comment.
| [&variable_array](double initial_linearized_ratio, auto const& iv) { | |
| [&variable_array](double const initial_linearized_ratio, auto const& iv) { |
| } | ||
|
|
||
|
|
||
| PropertyDataType LinearProperty::dValue(VariableArray const& /*variable_array*/, | ||
| Variable const primary_variable) const | ||
| { | ||
| return _independent_variable.type == primary_variable | ||
| auto independent_variable = |
There was a problem hiding this comment.
| auto independent_variable = | |
| auto const independent_variable = |
MaterialLib/MPL/VariableType.h
Outdated
| @@ -42,6 +42,7 @@ using Tensor = std::array<double, 9>; | |||
| /// is missing, simply add it somewhere at the list, but above the last entry. | |||
| enum class Variable : int | |||
| { | |||
| concentration, | |||
There was a problem hiding this comment.
| concentration, |
Does not belong into this PR, I guess...
There was a problem hiding this comment.
Moved this commit into PR #2646
| } | ||
|
|
||
|
|
||
| PropertyDataType LinearProperty::dValue(VariableArray const& /*variable_array*/, | ||
| Variable const primary_variable) const | ||
| { | ||
| return _independent_variable.type == primary_variable | ||
| auto independent_variable = | ||
| std::find_if(_independent_variables.begin(), |
There was a problem hiding this comment.
Maybe you can use an array like
using IndependentVariableArray =
std::array<IndependentVariable, static_cast<int>(Variable::number_of_variables)>;
IndependentVariableArray const _independent_variables; /// With initial value for specified entries
``
Then you can get the value by the entry index of `static_cast<int>( primary_variable).
There was a problem hiding this comment.
@wenqing If I understood you correctly, instead of a vector an array should be used with maximum possible variables.
Then we would need to store another list of integeres indicating in which variables the LinearProperty is multi-linear.
There was a problem hiding this comment.
The additional list of integers wouldn't make the code better readable. And I don't think we would gain much speedup.
Another possibility would be to set the slope of the independent variables in which the property is not linear to zero - but this implies more computations. I would keep @renchao-lu implementation as it is.
There was a problem hiding this comment.
By far I keep the implementation as it is.
Co-Authored-By: Tom Fischer <thomas.fischer@ufz.de>
renchao-lu
force-pushed
the
EnrichLinearProperty
branch
from
55314c7
to
b285c5a
Compare
renchao-lu
force-pushed
the
EnrichLinearProperty
branch
from
b285c5a
to
8a7b238
Compare
|
@renchao-lu Please add the description to the changelog. Also in other PR's. |
@endJunction Description of this pull request added half an hour ago. ^-^ |
|
OpenGeoSys development has been moved to GitLab. |
Following from Tom's suggestion, PR #2646 is split into two parts. As titled, this pull request extends for linear dependency on multiple variables.