From df8c0a79b6ea57835ddaacd0f0218f396cbe5b33 Mon Sep 17 00:00:00 2001 From: Markus Wolff <markus.wolff@twt-gmbh.de> Date: Thu, 4 Nov 2010 17:33:54 +0000 Subject: [PATCH] Changed back the call of neumann b.c.'s to use neumannSat() git-svn-id: svn://svn.iws.uni-stuttgart.de/DUMUX/dumux/trunk@4597 2fb0f335-1f38-0410-981e-8018bf24f1b0 --- .../2p/transport/fv/fvsaturation2p.hh | 31 +++++++++---------- 1 file changed, 15 insertions(+), 16 deletions(-) diff --git a/dumux/decoupled/2p/transport/fv/fvsaturation2p.hh b/dumux/decoupled/2p/transport/fv/fvsaturation2p.hh index 226c8c4e75..8312a9ebc2 100644 --- a/dumux/decoupled/2p/transport/fv/fvsaturation2p.hh +++ b/dumux/decoupled/2p/transport/fv/fvsaturation2p.hh @@ -884,24 +884,23 @@ int FVSaturation2P<TypeTag>::update(const Scalar t, Scalar& dt, RepresentationTy break; } } + Scalar boundaryFactor = problem_.neumannSat(globalPosFace, *isIt, factor); - - switch (saturationType_) - { - case Sw: - { - Scalar boundaryFactor = problem_.neumannPress(globalPosFace, *isIt)[wPhaseIdx]; - - factor = boundaryFactor / densityWI * faceArea / (volume * porosity); - break; - } - case Sn: + if (factor != boundaryFactor) { - Scalar boundaryFactor = problem_.neumannPress(globalPosFace, *isIt)[nPhaseIdx]; - - factor = boundaryFactor / densityNWI * faceArea / (volume * porosity); - break; - } + switch (saturationType_) + { + case Sw: + { + factor = boundaryFactor / densityWI * faceArea / (volume * porosity); + break; + } + case Sn: + { + factor = boundaryFactor / densityNWI * faceArea / (volume * porosity); + break; + } + } } -- GitLab