diff --git a/dumux/material/fluidsystems/brineair.hh b/dumux/material/fluidsystems/brineair.hh
index ca54b4ba99799ceaff055fb9e6f062a38f5ded47..84f52cf24eb8f9a6d3adb15da58c91f407c4f0be 100644
--- a/dumux/material/fluidsystems/brineair.hh
+++ b/dumux/material/fluidsystems/brineair.hh
@@ -101,8 +101,8 @@ public:
static std::string phaseName(int phaseIdx)
{
switch (phaseIdx) {
- case phase0Idx: return "liquid";
- case phase1Idx: return "gas";
+ case liquidPhaseIdx: return "liquid";
+ case gasPhaseIdx: return "gas";
case solidPhaseIdx: return "NaCl";
}
DUNE_THROW(Dune::InvalidStateException, "Invalid phase index " << phaseIdx);
@@ -123,7 +123,7 @@ public:
{
assert(0 <= phaseIdx && phaseIdx < numPhases);
- return phaseIdx != phase1Idx;
+ return phaseIdx != gasPhaseIdx;
}
/*!
@@ -163,7 +163,7 @@ public:
{
assert(0 <= phaseIdx && phaseIdx < numPhases);
// ideal gases are always compressible
- if (phaseIdx == phase1Idx)
+ if (phaseIdx == gasPhaseIdx)
return true;
// the water component decides for the liquid phase...
return H2O::liquidIsCompressible();
@@ -180,7 +180,7 @@ public:
assert(0 <= phaseIdx && phaseIdx < numPhases);
// let the fluids decide
- if (phaseIdx == phase1Idx)
+ if (phaseIdx == gasPhaseIdx)
return H2O::gasIsIdeal() && Air::gasIsIdeal();
return false; // not a gas
}
@@ -567,16 +567,16 @@ public:
int phaseIdx,
int componentIdx)
{
- Scalar T = fluidState.temperature(phase1Idx);
- Scalar p = fluidState.pressure(phase1Idx);
+ Scalar T = fluidState.temperature(gasPhaseIdx);
+ Scalar p = fluidState.pressure(gasPhaseIdx);
Valgrind::CheckDefined(T);
Valgrind::CheckDefined(p);
- if (phaseIdx == phase0Idx)
+ if (phaseIdx == liquidPhaseIdx)
{
DUNE_THROW(Dune::NotImplemented, "The component enthalpies in the liquid phase are not implemented.");
}
- else if (phaseIdx == phase1Idx)
+ else if (phaseIdx == gasPhaseIdx)
{
if (componentIdx == H2OIdx)
{
@@ -631,14 +631,14 @@ public:
{
const Scalar temperature = fluidState.temperature(phaseIdx);
const Scalar pressure = fluidState.pressure(phaseIdx);
- if (phaseIdx == phase0Idx)
+ if (phaseIdx == liquidPhaseIdx)
{
return H2O::liquidHeatCapacity(temperature, pressure);
}
- else if (phaseIdx == phase1Idx)
+ else if (phaseIdx == gasPhaseIdx)
{
- return Air::gasHeatCapacity(temperature, pressure) * fluidState.moleFraction(phase1Idx, AirIdx)
- + H2O::gasHeatCapacity(temperature, pressure) * fluidState.moleFraction(phase1Idx, H2OIdx);
+ return Air::gasHeatCapacity(temperature, pressure) * fluidState.moleFraction(gasPhaseIdx, AirIdx)
+ + H2O::gasHeatCapacity(temperature, pressure) * fluidState.moleFraction(gasPhaseIdx, H2OIdx);
}
else
DUNE_THROW(Dune::InvalidStateException, "Invalid phase index " << phaseIdx);
diff --git a/dumux/material/fluidsystems/brineco2.hh b/dumux/material/fluidsystems/brineco2.hh
index c63188902bab4ba31a2824efc0e466c1bc534e1b..319615b24d6061a15e742336e1f0456e40e3be06 100644
--- a/dumux/material/fluidsystems/brineco2.hh
+++ b/dumux/material/fluidsystems/brineco2.hh
@@ -69,15 +69,14 @@ public:
static constexpr int numComponents = 2;
static constexpr int numPhases = 2;
- static constexpr int phase0Idx = 0; // index of the first phase
- static constexpr int phase1Idx = 1; // index of the second phase
+ static constexpr int liquidPhaseIdx = 0; //!< index of the liquid phase
+ static constexpr int gasPhaseIdx = 1; //!< index of the gas phase
+ static constexpr int phase0Idx = liquidPhaseIdx; //!< index of the first phase
+ static constexpr int phase1Idx = gasPhaseIdx; //!< index of the second phase
static constexpr int comp0Idx = 0;
static constexpr int comp1Idx = 1;
- static constexpr int liquidPhaseIdx = phase0Idx;
- static constexpr int gasPhaseIdx = phase1Idx;
-
static constexpr int BrineIdx = comp0Idx;
static constexpr int CO2Idx = comp1Idx;
@@ -112,7 +111,7 @@ public:
{
assert(0 <= phaseIdx && phaseIdx < numPhases);
- return phaseIdx != phase1Idx;
+ return phaseIdx != gasPhaseIdx;
}
/*!
@@ -265,14 +264,14 @@ public:
Scalar temperature = fluidState.temperature(phaseIdx);
Scalar pressure = fluidState.pressure(phaseIdx);
- if (phaseIdx == phase0Idx) {
+ if (phaseIdx == liquidPhaseIdx) {
// use normalized composition for to calculate the density
// (the relations don't seem to take non-normalized
// compositions too well...)
using std::min;
using std::max;
- Scalar xlBrine = min(1.0, max(0.0, fluidState.moleFraction(phase0Idx, BrineIdx)));
- Scalar xlCO2 = min(1.0, max(0.0, fluidState.moleFraction(phase0Idx, CO2Idx)));
+ Scalar xlBrine = min(1.0, max(0.0, fluidState.moleFraction(liquidPhaseIdx, BrineIdx)));
+ Scalar xlCO2 = min(1.0, max(0.0, fluidState.moleFraction(liquidPhaseIdx, CO2Idx)));
Scalar sumx = xlBrine + xlCO2;
xlBrine /= sumx;
xlCO2 /= sumx;
@@ -286,15 +285,15 @@ public:
return result;
}
else {
- assert(phaseIdx == phase1Idx);
+ assert(phaseIdx == gasPhaseIdx);
// use normalized composition for to calculate the density
// (the relations don't seem to take non-normalized
// compositions too well...)
using std::min;
using std::max;
- Scalar xgBrine = min(1.0, max(0.0, fluidState.moleFraction(phase1Idx, BrineIdx)));
- Scalar xgCO2 = min(1.0, max(0.0, fluidState.moleFraction(phase1Idx, CO2Idx)));
+ Scalar xgBrine = min(1.0, max(0.0, fluidState.moleFraction(gasPhaseIdx, BrineIdx)));
+ Scalar xgCO2 = min(1.0, max(0.0, fluidState.moleFraction(gasPhaseIdx, CO2Idx)));
Scalar sumx = xgBrine + xgCO2;
xgBrine /= sumx;
xgCO2 /= sumx;
@@ -329,7 +328,7 @@ public:
Scalar pressure = fluidState.pressure(phaseIdx);
Scalar result = 0;
- if (phaseIdx == phase0Idx)
+ if (phaseIdx == liquidPhaseIdx)
result = Brine::liquidViscosity(temperature, pressure);
else
result = CO2::gasViscosity(temperature, pressure);
@@ -373,7 +372,7 @@ public:
assert(0 <= phaseIdx && phaseIdx < numPhases);
assert(0 <= compIdx && compIdx < numComponents);
- if (phaseIdx == phase1Idx)
+ if (phaseIdx == gasPhaseIdx)
// use the fugacity coefficients of an ideal gas. the
// actual value of the fugacity is not relevant, as long
// as the relative fluid compositions are observed,
@@ -391,7 +390,7 @@ public:
Brine_CO2::calculateMoleFractions(temperature,
pressure,
BrineRawComponent::salinity,
- /*knowphase1Idx=*/-1,
+ /*knowgasPhaseIdx=*/-1,
xlCO2,
xgH2O);
@@ -442,11 +441,11 @@ public:
Brine_CO2::calculateMoleFractions(temperature,
pressure,
BrineRawComponent::constantSalinity,
- /*knowphase1Idx=*/-1,
+ /*knowgasPhaseIdx=*/-1,
xlCO2,
xgH2O);
- if(phaseIdx == phase1Idx)
+ if(phaseIdx == gasPhaseIdx)
{
return xgH2O;
}
@@ -518,7 +517,7 @@ public:
Scalar temperature = fluidState.temperature(phaseIdx);
Scalar pressure = fluidState.pressure(phaseIdx);
- if (phaseIdx == phase0Idx) {
+ if (phaseIdx == liquidPhaseIdx) {
assert(compIIdx == BrineIdx);
assert(compJIdx == CO2Idx);
@@ -527,7 +526,7 @@ public:
return result;
}
else {
- assert(phaseIdx == phase1Idx);
+ assert(phaseIdx == gasPhaseIdx);
assert(compIIdx == BrineIdx);
assert(compJIdx == CO2Idx);
@@ -553,7 +552,7 @@ public:
Scalar temperature = fluidState.temperature(phaseIdx);
Scalar pressure = fluidState.pressure(phaseIdx);
- if (phaseIdx == phase0Idx) {
+ if (phaseIdx == liquidPhaseIdx) {
Scalar XlCO2 = fluidState.massFraction(phaseIdx, CO2Idx);
Scalar result = liquidEnthalpyBrineCO2_(temperature,
@@ -567,10 +566,10 @@ public:
Scalar result = 0;
result +=
Brine::gasEnthalpy(temperature, pressure) *
- fluidState.massFraction(phase1Idx, BrineIdx);
+ fluidState.massFraction(gasPhaseIdx, BrineIdx);
result +=
CO2::gasEnthalpy(temperature, pressure) *
- fluidState.massFraction(phase1Idx, CO2Idx);
+ fluidState.massFraction(gasPhaseIdx, CO2Idx);
Valgrind::CheckDefined(result);
return result;
}
@@ -590,7 +589,7 @@ public:
static Scalar thermalConductivity(const FluidState &fluidState,
int phaseIdx)
{
- if (phaseIdx == phase0Idx)
+ if (phaseIdx == liquidPhaseIdx)
{
return H2O::liquidThermalConductivity(fluidState.temperature(phaseIdx),
fluidState.pressure(phaseIdx));
@@ -615,7 +614,7 @@ public:
static Scalar heatCapacity(const FluidState &fluidState,
int phaseIdx)
{
- if(phaseIdx == phase0Idx)
+ if(phaseIdx == liquidPhaseIdx)
return H2O::liquidHeatCapacity(fluidState.temperature(phaseIdx),
fluidState.pressure(phaseIdx));
else
diff --git a/dumux/material/fluidsystems/h2oair.hh b/dumux/material/fluidsystems/h2oair.hh
index 5cffa5a93be83d1de1b7d0cd5faf59d77ffaec9d..609494b7e443577362a6e1781ecffa576961306f 100644
--- a/dumux/material/fluidsystems/h2oair.hh
+++ b/dumux/material/fluidsystems/h2oair.hh
@@ -70,8 +70,8 @@ public:
static constexpr int numPhases = 2; //!< Number of phases in the fluid system
static constexpr int numComponents = 2; //!< Number of components in the fluid system
- static constexpr int liquidPhaseIdx = 0; //!< index of the first phase
- static constexpr int gasPhaseIdx = 1; //!< index of the second phase
+ static constexpr int liquidPhaseIdx = 0; //!< index of the liquid phase
+ static constexpr int gasPhaseIdx = 1; //!< index of the gas phase
static constexpr int phase0Idx = liquidPhaseIdx; //!< index of the first phase
static constexpr int phase1Idx = gasPhaseIdx; //!< index of the second phase
@@ -90,8 +90,8 @@ public:
static std::string phaseName(int phaseIdx)
{
switch (phaseIdx) {
- case phase0Idx: return "liquid";
- case phase1Idx: return "gas";
+ case liquidPhaseIdx: return "liquid";
+ case gasPhaseIdx: return "gas";
}
DUNE_THROW(Dune::InvalidStateException, "Invalid phase index " << phaseIdx);
}
@@ -110,7 +110,7 @@ public:
static constexpr bool isLiquid(int phaseIdx)
{
assert(0 <= phaseIdx && phaseIdx < numPhases);
- return phaseIdx != phase1Idx;
+ return phaseIdx != gasPhaseIdx;
}
/*!
@@ -121,7 +121,7 @@ public:
static constexpr bool isGas(int phaseIdx)
{
assert(0 <= phaseIdx && phaseIdx < numPhases);
- return phaseIdx == phase1Idx;
+ return phaseIdx == gasPhaseIdx;
}
/*!
@@ -160,7 +160,7 @@ public:
{
assert(0 <= phaseIdx && phaseIdx < numPhases);
// ideal gases are always compressible
- if (phaseIdx == phase1Idx)
+ if (phaseIdx == gasPhaseIdx)
return true;
// the water component decides for the liquid phase...
return H2O::liquidIsCompressible();
@@ -177,7 +177,7 @@ public:
assert(0 <= phaseIdx && phaseIdx < numPhases);
// let the fluids decide
- if (phaseIdx == phase1Idx)
+ if (phaseIdx == gasPhaseIdx)
return H2O::gasIsIdeal() && Air::gasIsIdeal();
return false; // not a gas
}
@@ -383,7 +383,7 @@ public:
for (int compIdx = 0; compIdx < numComponents; ++compIdx)
sumMoleFrac += fluidState.moleFraction(phaseIdx, compIdx);
- if (phaseIdx == phase0Idx)
+ if (phaseIdx == liquidPhaseIdx)
{
if (!useComplexRelations)
// assume pure water
@@ -396,25 +396,25 @@ public:
return
clH2O
- * (H2O::molarMass()*fluidState.moleFraction(phase0Idx, H2OIdx)
+ * (H2O::molarMass()*fluidState.moleFraction(liquidPhaseIdx, H2OIdx)
+
- Air::molarMass()*fluidState.moleFraction(phase0Idx, AirIdx))
+ Air::molarMass()*fluidState.moleFraction(liquidPhaseIdx, AirIdx))
/ sumMoleFrac;
}
}
- else if (phaseIdx == phase1Idx)
+ else if (phaseIdx == gasPhaseIdx)
{
using std::max;
if (!useComplexRelations)
// for the gas phase assume an ideal gas
return
IdealGas::molarDensity(T, p)
- * fluidState.averageMolarMass(phase1Idx)
+ * fluidState.averageMolarMass(gasPhaseIdx)
/ max(1e-5, sumMoleFrac);
return
- H2O::gasDensity(T, fluidState.partialPressure(phase1Idx, H2OIdx)) +
- Air::gasDensity(T, fluidState.partialPressure(phase1Idx, AirIdx));
+ H2O::gasDensity(T, fluidState.partialPressure(gasPhaseIdx, H2OIdx)) +
+ Air::gasDensity(T, fluidState.partialPressure(gasPhaseIdx, AirIdx));
}
DUNE_THROW(Dune::InvalidStateException, "Invalid phase index " << phaseIdx);
}
@@ -442,12 +442,12 @@ public:
Scalar T = fluidState.temperature(phaseIdx);
Scalar p = fluidState.pressure(phaseIdx);
- if (phaseIdx == phase0Idx)
+ if (phaseIdx == liquidPhaseIdx)
{
// assume pure water for the liquid phase
return H2O::liquidViscosity(T, p);
}
- else if (phaseIdx == phase1Idx)
+ else if (phaseIdx == gasPhaseIdx)
{
if(!useComplexRelations){
return Air::gasViscosity(T, p);
@@ -517,7 +517,7 @@ public:
Scalar T = fluidState.temperature(phaseIdx);
Scalar p = fluidState.pressure(phaseIdx);
- if (phaseIdx == phase0Idx) {
+ if (phaseIdx == liquidPhaseIdx) {
if (compIdx == H2OIdx)
return vaporPressure(fluidState, compIdx)/p;
return BinaryCoeff::H2O_Air::henry(T)/p;
@@ -537,8 +537,8 @@ public:
template <class FluidState>
static Scalar relativeHumidity(const FluidState &fluidState)
{
- return fluidState.partialPressure(phase1Idx, comp0Idx)
- / H2O::vaporPressure(fluidState.temperature(phase1Idx));
+ return fluidState.partialPressure(gasPhaseIdx, comp0Idx)
+ / H2O::vaporPressure(fluidState.temperature(gasPhaseIdx));
}
using Base::diffusionCoefficient;
@@ -590,7 +590,7 @@ public:
switch (phaseIdx)
{
- case phase0Idx:
+ case liquidPhaseIdx:
switch (compIIdx) {
case H2OIdx:
switch (compJIdx) {
@@ -603,7 +603,7 @@ public:
"Binary diffusion coefficients of trace "
"substances in liquid phase is undefined!\n");
}
- case phase1Idx:
+ case gasPhaseIdx:
switch (compIIdx){
case H2OIdx:
switch (compJIdx){
@@ -647,21 +647,21 @@ public:
Valgrind::CheckDefined(T);
Valgrind::CheckDefined(p);
- if (phaseIdx == phase0Idx)
+ if (phaseIdx == liquidPhaseIdx)
{
return H2O::liquidEnthalpy(T, p);
}
- else if (phaseIdx == phase1Idx)
+ else if (phaseIdx == gasPhaseIdx)
{
Scalar result = 0.0;
result +=
H2O::gasEnthalpy(T, p) *
- fluidState.massFraction(phase1Idx, H2OIdx);
+ fluidState.massFraction(gasPhaseIdx, H2OIdx);
result +=
Air::gasEnthalpy(T, p) *
- fluidState.massFraction(phase1Idx, AirIdx);
+ fluidState.massFraction(gasPhaseIdx, AirIdx);
return result;
}
DUNE_THROW(Dune::InvalidStateException, "Invalid phase index " << phaseIdx);
@@ -684,12 +684,12 @@ public:
Valgrind::CheckDefined(T);
Valgrind::CheckDefined(p);
- if (phaseIdx == phase0Idx)
+ if (phaseIdx == liquidPhaseIdx)
{
// the liquid enthalpy is constant
return H2O::liquidEnthalpy(T, p);
}
- else if (phaseIdx == phase1Idx)
+ else if (phaseIdx == gasPhaseIdx)
{
if (componentIdx == H2OIdx)
{
@@ -722,11 +722,11 @@ public:
const Scalar temperature = fluidState.temperature(phaseIdx) ;
const Scalar pressure = fluidState.pressure(phaseIdx);
- if (phaseIdx == phase0Idx)
+ if (phaseIdx == liquidPhaseIdx)
{
return H2O::liquidThermalConductivity(temperature, pressure);
}
- else if (phaseIdx == phase1Idx)
+ else if (phaseIdx == gasPhaseIdx)
{
return Air::gasThermalConductivity(temperature, pressure);
}
@@ -751,15 +751,15 @@ public:
{
const Scalar temperature = fluidState.temperature(phaseIdx);
const Scalar pressure = fluidState.pressure(phaseIdx);
- if (phaseIdx == phase0Idx)
+ if (phaseIdx == liquidPhaseIdx)
{
// influence of air is neglected
return H2O::liquidHeatCapacity(temperature, pressure);
}
- else if (phaseIdx == phase1Idx)
+ else if (phaseIdx == gasPhaseIdx)
{
- return Air::gasHeatCapacity(temperature, pressure) * fluidState.moleFraction(phase1Idx, AirIdx)
- + H2O::gasHeatCapacity(temperature, pressure) * fluidState.moleFraction(phase1Idx, H2OIdx);
+ return Air::gasHeatCapacity(temperature, pressure) * fluidState.moleFraction(gasPhaseIdx, AirIdx)
+ + H2O::gasHeatCapacity(temperature, pressure) * fluidState.moleFraction(gasPhaseIdx, H2OIdx);
}
else
DUNE_THROW(Dune::InvalidStateException, "Invalid phase index " << phaseIdx);
diff --git a/dumux/material/fluidsystems/h2oheavyoilfluidsystem.hh b/dumux/material/fluidsystems/h2oheavyoil.hh
similarity index 100%
rename from dumux/material/fluidsystems/h2oheavyoilfluidsystem.hh
rename to dumux/material/fluidsystems/h2oheavyoil.hh
diff --git a/dumux/material/fluidsystems/liquidphase2c.hh b/dumux/material/fluidsystems/liquidphase2c.hh
index 4cfd409d0c9ccae811aaf8d7461ca0e09a67f9b5..956fa6acc3ab434d0b8820f5c341dfb624217553 100644
--- a/dumux/material/fluidsystems/liquidphase2c.hh
+++ b/dumux/material/fluidsystems/liquidphase2c.hh
@@ -53,7 +53,8 @@ public:
static constexpr int numPhases = 2; //!< Number of phases in the fluid system
static constexpr int numComponents = 2; //!< Number of components in the fluid system
- static constexpr int phase0Idx = 0; //!< index of the only phase
+ static constexpr int liquidPhaseIdx = 0; //!< index of the liquid phase
+ static constexpr int phase0Idx = liquidPhaseIdx; //!< index of the only phase
static constexpr int comp0Idx = 0; //!< index of the frist component
static constexpr int comp1Idx = 1; //!< index of the second component
diff --git a/test/freeflow/navierstokesnc/channeltestproblem.hh b/test/freeflow/navierstokesnc/channeltestproblem.hh
index 4226f97e68728b28d5d186bd0d174352799a3e3a..7c83e14d310ab0adddc037c8a24c8cf52d2fb8af 100644
--- a/test/freeflow/navierstokesnc/channeltestproblem.hh
+++ b/test/freeflow/navierstokesnc/channeltestproblem.hh
@@ -53,7 +53,7 @@ SET_TYPE_PROP(ChannelNCTestTypeTag, FluidSystem,
FluidSystems::H2OAir<typename GET_PROP_TYPE(TypeTag, Scalar)/*, SimpleH2O<typename GET_PROP_TYPE(TypeTag, Scalar)>, true*/>);
SET_INT_PROP(ChannelNCTestTypeTag, PhaseIdx,
- GET_PROP_TYPE(TypeTag, FluidSystem)::phase0Idx);
+ GET_PROP_TYPE(TypeTag, FluidSystem)::liquidPhaseIdx);
SET_INT_PROP(ChannelNCTestTypeTag, ReplaceCompEqIdx, GET_PROP_VALUE(TypeTag, PhaseIdx));
diff --git a/test/freeflow/navierstokesnc/densityflowproblem.hh b/test/freeflow/navierstokesnc/densityflowproblem.hh
index 15c5211b2ca2903eaa2da1b934a52c9b80789592..0ecb8e10c240b94233490c3fdbf0de3b8c69aee2 100644
--- a/test/freeflow/navierstokesnc/densityflowproblem.hh
+++ b/test/freeflow/navierstokesnc/densityflowproblem.hh
@@ -48,7 +48,7 @@ SET_TYPE_PROP(DensityDrivenFlowTypeTag, FluidSystem,
FluidSystems::H2OAir<typename GET_PROP_TYPE(TypeTag, Scalar)/*, SimpleH2O<typename GET_PROP_TYPE(TypeTag, Scalar)>, false*/>);
SET_INT_PROP(DensityDrivenFlowTypeTag, PhaseIdx,
- GET_PROP_TYPE(TypeTag, FluidSystem)::phase0Idx);
+ GET_PROP_TYPE(TypeTag, FluidSystem)::liquidPhaseIdx);
SET_INT_PROP(DensityDrivenFlowTypeTag, ReplaceCompEqIdx, GET_PROP_VALUE(TypeTag, PhaseIdx));
diff --git a/test/freeflow/ransnc/flatplatetestproblem.hh b/test/freeflow/ransnc/flatplatetestproblem.hh
index 1ec575cf50e60b0887cca07702e62e064d606ab2..f6d19b2b4e57815e915db8ee42159565c1d6ddfe 100644
--- a/test/freeflow/ransnc/flatplatetestproblem.hh
+++ b/test/freeflow/ransnc/flatplatetestproblem.hh
@@ -65,7 +65,7 @@ SET_TYPE_PROP(FlatPlateNCTestTypeTag, FluidSystem,
FluidSystems::H2OAir<typename GET_PROP_TYPE(TypeTag, Scalar)>);
SET_INT_PROP(FlatPlateNCTestTypeTag, PhaseIdx,
- GET_PROP_TYPE(TypeTag, FluidSystem)::phase1Idx);
+ GET_PROP_TYPE(TypeTag, FluidSystem)::gasPhaseIdx);
SET_INT_PROP(FlatPlateNCTestTypeTag, ReplaceCompEqIdx, GET_PROP_VALUE(TypeTag, PhaseIdx));
diff --git a/test/porousmediumflow/3pwateroil/implicit/3pwateroilsagdproblem.hh b/test/porousmediumflow/3pwateroil/implicit/3pwateroilsagdproblem.hh
index d72f170d2df25d3751b7033e7addd01cae64dffa..dbf1ad4c54b0db697d29777bf711e7faf6b275e2 100644
--- a/test/porousmediumflow/3pwateroil/implicit/3pwateroilsagdproblem.hh
+++ b/test/porousmediumflow/3pwateroil/implicit/3pwateroilsagdproblem.hh
@@ -28,7 +28,7 @@
#include <dumux/discretization/box/properties.hh>
#include <dumux/porousmediumflow/3pwateroil/model.hh>
-#include <dumux/material/fluidsystems/h2oheavyoilfluidsystem.hh>
+#include <dumux/material/fluidsystems/h2oheavyoil.hh>
#include "3pwateroilsagdspatialparams.hh"
namespace Dumux
diff --git a/test/porousmediumflow/richardsnc/implicit/richardswelltracerproblem.hh b/test/porousmediumflow/richardsnc/implicit/richardswelltracerproblem.hh
index 405103285152b9b6b62c45fe47021882bf26a845..3827a47e0bdf45af7ceba5739f0e4fa73d91b730 100644
--- a/test/porousmediumflow/richardsnc/implicit/richardswelltracerproblem.hh
+++ b/test/porousmediumflow/richardsnc/implicit/richardswelltracerproblem.hh
@@ -111,8 +111,7 @@ class RichardsWellTracerProblem : public PorousMediumFlowProblem<TypeTag>
enum {
pressureIdx = Indices::pressureIdx,
compIdx = Indices::compMainIdx + 1,
- liquidPhaseIdx = FluidSystem::phase0Idx,
-
+ liquidPhaseIdx = FluidSystem::liquidPhaseIdx,
dimWorld = GridView::dimensionworld
};
using Element = typename GridView::template Codim<0>::Entity;