From 34dcc1b5a9885b67d4b1fca01174c2d313f46e32 Mon Sep 17 00:00:00 2001
From: Bernd Flemisch <bernd@iws.uni-stuttgart.de>
Date: Fri, 7 Sep 2018 14:19:24 +0200
Subject: [PATCH] [io] fix 2pnc and mineralization IOFields
---
dumux/porousmediumflow/2pnc/iofields.hh | 4 ++--
dumux/porousmediumflow/mineralization/iofields.hh | 4 ++--
2 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/dumux/porousmediumflow/2pnc/iofields.hh b/dumux/porousmediumflow/2pnc/iofields.hh
index 1f1ef53cd6..c04b981105 100644
--- a/dumux/porousmediumflow/2pnc/iofields.hh
+++ b/dumux/porousmediumflow/2pnc/iofields.hh
@@ -106,10 +106,10 @@ public:
switch (ModelTraits::priVarFormulation())
{
case TwoPFormulation::p0s1:
- return pvIdx == 0 ? IOName::pressure<FluidSystem>(FluidSystem::wPhaseIdx)
+ return pvIdx == 0 ? IOName::pressure<FluidSystem>(FluidSystem::phase0Idx)
: p0s1SwitchedPvNames[state-1];
case TwoPFormulation::p1s0:
- return pvIdx == 0 ? IOName::pressure<FluidSystem>(FluidSystem::nPhaseIdx)
+ return pvIdx == 0 ? IOName::pressure<FluidSystem>(FluidSystem::phase1Idx)
: p1s0SwitchedPvNames[state-1];
default: DUNE_THROW(Dune::InvalidStateException, "Invalid formulation ");
}
diff --git a/dumux/porousmediumflow/mineralization/iofields.hh b/dumux/porousmediumflow/mineralization/iofields.hh
index 0ca489e4d4..62124d295b 100644
--- a/dumux/porousmediumflow/mineralization/iofields.hh
+++ b/dumux/porousmediumflow/mineralization/iofields.hh
@@ -63,10 +63,10 @@ public:
template <class ModelTraits, class FluidSystem, class SolidSystem>
static std::string primaryVariableName(int pvIdx, int state = 0)
{
- static constexpr int nonMinNumEq = ModelTraits::numEq() - ModelTraits::numSolidComp() + ModelTraits::numInertSolidComp();
+ static constexpr int nonMinNumEq = ModelTraits::numEq() - ModelTraits::numSolidComps() + ModelTraits::numInertSolidComps();
if (pvIdx < nonMinNumEq)
- return NonMineralizationIOFields::template primaryVariableName<FluidSystem, SolidSystem>(pvIdx, state);
+ return NonMineralizationIOFields::template primaryVariableName<ModelTraits, FluidSystem, SolidSystem>(pvIdx, state);
else
return IOName::solidVolumeFraction<SolidSystem>(pvIdx - nonMinNumEq);
}
--
GitLab