From 92e9d15b8533e8cbefb25a7150fd01f78d976470 Mon Sep 17 00:00:00 2001
From: Timo Koch <timo.koch@iws.uni-stuttgart.de>
Date: Thu, 22 Nov 2018 16:16:17 +0100
Subject: [PATCH] [test] Get wetting phase index from spatial params
---
test/porousmediumflow/mpnc/implicit/2p2ccomparison/problem.hh | 4 +++-
test/porousmediumflow/mpnc/implicit/kinetic/problem.hh | 4 +++-
test/porousmediumflow/mpnc/implicit/obstacle/problem.hh | 4 +++-
.../mpnc/implicit/thermalnonequilibrium/problem.hh | 4 +++-
4 files changed, 12 insertions(+), 4 deletions(-)
diff --git a/test/porousmediumflow/mpnc/implicit/2p2ccomparison/problem.hh b/test/porousmediumflow/mpnc/implicit/2p2ccomparison/problem.hh
index ce4a7e7960..12436f264e 100644
--- a/test/porousmediumflow/mpnc/implicit/2p2ccomparison/problem.hh
+++ b/test/porousmediumflow/mpnc/implicit/2p2ccomparison/problem.hh
@@ -284,7 +284,9 @@ private:
PhaseVector pc;
using MaterialLaw = typename ParentType::SpatialParams::MaterialLaw;
using MPAdapter = MPAdapter<MaterialLaw, numPhases>;
- MPAdapter::capillaryPressures(pc, matParams, fs, liquidPhaseIdx);
+
+ const int wPhaseIdx = this->spatialParams().template wettingPhaseAtPos<FluidSystem>(globalPos);
+ MPAdapter::capillaryPressures(pc, matParams, fs, wPhaseIdx);
fs.setPressure(liquidPhaseIdx,
fs.pressure(gasPhaseIdx) + pc[liquidPhaseIdx] - pc[gasPhaseIdx]);
diff --git a/test/porousmediumflow/mpnc/implicit/kinetic/problem.hh b/test/porousmediumflow/mpnc/implicit/kinetic/problem.hh
index 6a09aad720..92dd18bd10 100644
--- a/test/porousmediumflow/mpnc/implicit/kinetic/problem.hh
+++ b/test/porousmediumflow/mpnc/implicit/kinetic/problem.hh
@@ -424,7 +424,9 @@ private:
//obtain pc according to saturation
using MaterialLaw = typename ParentType::SpatialParams::MaterialLaw;
using MPAdapter = MPAdapter<MaterialLaw, numPhases>;
- MPAdapter::capillaryPressures(capPress, materialParams, equilibriumFluidState, liquidPhaseIdx);
+
+ const int wPhaseIdx = this->spatialParams().template wettingPhaseAtPos<FluidSystem>(globalPos);
+ MPAdapter::capillaryPressures(capPress, materialParams, equilibriumFluidState, wPhaseIdx);
Scalar p[numPhases];
if (this->spatialParams().inPM_(globalPos)){
diff --git a/test/porousmediumflow/mpnc/implicit/obstacle/problem.hh b/test/porousmediumflow/mpnc/implicit/obstacle/problem.hh
index 999b4930ba..93276cb701 100644
--- a/test/porousmediumflow/mpnc/implicit/obstacle/problem.hh
+++ b/test/porousmediumflow/mpnc/implicit/obstacle/problem.hh
@@ -362,7 +362,9 @@ private:
PhaseVector pc;
using MaterialLaw = typename ParentType::SpatialParams::MaterialLaw;
using MPAdapter = MPAdapter<MaterialLaw, numPhases>;
- MPAdapter::capillaryPressures(pc, matParams, fs, liquidPhaseIdx);
+
+ const int wPhaseIdx = this->spatialParams().template wettingPhaseAtPos<FluidSystem>(globalPos);
+ MPAdapter::capillaryPressures(pc, matParams, fs, wPhaseIdx);
fs.setPressure(otherPhaseIdx,
fs.pressure(refPhaseIdx)
+ (pc[otherPhaseIdx] - pc[refPhaseIdx]));
diff --git a/test/porousmediumflow/mpnc/implicit/thermalnonequilibrium/problem.hh b/test/porousmediumflow/mpnc/implicit/thermalnonequilibrium/problem.hh
index 3216ac319a..dc56fb8f76 100644
--- a/test/porousmediumflow/mpnc/implicit/thermalnonequilibrium/problem.hh
+++ b/test/porousmediumflow/mpnc/implicit/thermalnonequilibrium/problem.hh
@@ -456,7 +456,9 @@ private:
this->spatialParams().materialLawParamsAtPos(globalPos);
using MaterialLaw = typename ParentType::SpatialParams::MaterialLaw;
using MPAdapter = MPAdapter<MaterialLaw, numPhases>;
- MPAdapter::capillaryPressures(capPress, materialParams, fluidState, wPhaseIdx);
+
+ const int wettingPhaseIdx = this->spatialParams().template wettingPhaseAtPos<FluidSystem>(globalPos);
+ MPAdapter::capillaryPressures(capPress, materialParams, fluidState, wettingPhaseIdx);
Scalar p[numPhases];
--
GitLab