Commit 9f7f695f authored by Dmitry Yu. Naumov's avatar Dmitry Yu. Naumov
Browse files

Merge branch 'FixMplPropertyDescriptionOutput' into 'master'

[MPL] Check if scale is set in description output

Closes #3233

See merge request !3897
parents 48ef5cdb 2f73c438
Pipeline #7391 failed with stages
in 77 minutes and 18 seconds
......@@ -140,8 +140,15 @@ PropertyDataType Property::d2Value(VariableArray const& /*variable_array*/,
std::string Property::description() const
{
return "property '" + name_ + "' defined for " +
std::visit([](auto&& scale) -> std::string
{ return scale->description(); },
scale_);
std::visit(
[](auto&& scale) -> std::string
{
if (scale == nullptr)
{
return "unknown scale";
}
return scale->description();
},
scale_);
}
} // namespace MaterialPropertyLib
......@@ -63,11 +63,6 @@
<type>Constant</type>
<value>4.46e-13</value>
</property>
<property>
<name>reference_temperature</name>
<type>Constant</type>
<value>293.15</value>
</property>
<property>
<name>saturation</name>
<type>SaturationVanGenuchten</type>
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment