Skip to content
Snippets Groups Projects
Commit 24a9477e authored by Kilian Weishaupt's avatar Kilian Weishaupt
Browse files

[fluidsystem][2pimmiscible] Allow two napls

parent abfb6605
No related branches found
No related tags found
1 merge request!1597[fluidsystem][2pimmiscible] Allow two napls
...@@ -89,10 +89,13 @@ public: ...@@ -89,10 +89,13 @@ public:
if (!Fluid0::isGas() && !Fluid1::isGas()) if (!Fluid0::isGas() && !Fluid1::isGas())
{ {
if (phaseIdx == phase0Idx) static const auto name0 = Components::IsAqueous<typename Fluid0::Component>::value ? IOName::aqueousPhase() : IOName::naplPhase();
return Components::IsAqueous<typename Fluid0::Component>::value ? IOName::aqueousPhase() : IOName::naplPhase(); static const auto name1 = Components::IsAqueous<typename Fluid1::Component>::value ? IOName::aqueousPhase() : IOName::naplPhase();
if (name0 != name1)
return (phaseIdx == phase0Idx) ? name0 : name1;
else else
return Components::IsAqueous<typename Fluid1::Component>::value ? IOName::aqueousPhase() : IOName::naplPhase(); return (phaseIdx == phase0Idx) ? name0 + "_0" : name1 + "_1";
} }
else else
{ {
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment