From e68beebc1720c63b6ed0956cf5c3b2d721ba57c9 Mon Sep 17 00:00:00 2001
From: Simon Emmert <simon.emmert@iws.uni-stuttgart.de>
Date: Tue, 31 Mar 2020 11:56:32 +0200
Subject: [PATCH] [fluidmatrixinteractions] Rename wettingPhaseIdx() ->
wettingPhase()
---
.../fluidmatrixinteractions/2p/thermalconductivityjohansen.hh | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/dumux/material/fluidmatrixinteractions/2p/thermalconductivityjohansen.hh b/dumux/material/fluidmatrixinteractions/2p/thermalconductivityjohansen.hh
index 2bee93d2ff..aa52a5f322 100644
--- a/dumux/material/fluidmatrixinteractions/2p/thermalconductivityjohansen.hh
+++ b/dumux/material/fluidmatrixinteractions/2p/thermalconductivityjohansen.hh
@@ -81,7 +81,7 @@ public:
static_assert(FluidSystem::numPhases == 2, "ThermalConductivitySomerton only works for two-phase fluid systems!");
// TODO: there should be an assertion that the indices are correct and 0 is actually the wetting phase!
- const Scalar sw = volVars.saturation(volVars.wettingPhaseIdx());
+ const Scalar sw = volVars.saturation(volVars.wettingPhase());
const Scalar lambdaW = volVars.fluidThermalConductivity(volVars.wettingPhase());
const Scalar lambdaN = volVars.fluidThermalConductivity(1-volVars.wettingPhase());
const Scalar lambdaSolid = volVars.solidThermalConductivity();
--
GitLab