From aa3eb4366f942d3773fbe784056aff39e4999a7a Mon Sep 17 00:00:00 2001
From: Bernd Flemisch <bernd@iws.uni-stuttgart.de>
Date: Tue, 21 May 2013 14:41:51 +0000
Subject: [PATCH] implicit 3p3cni: fix matrixHeatFlux routines such that they
also work on boundary faces
git-svn-id: svn://svn.iws.uni-stuttgart.de/DUMUX/dumux/trunk@10725 2fb0f335-1f38-0410-981e-8018bf24f1b0
---
test/implicit/3p3c/infiltrationspatialparameters.hh | 4 ++--
test/implicit/3p3cni/columnxylolspatialparams.hh | 4 ++--
test/implicit/3p3cni/kuevettespatialparams.hh | 4 ++--
test/implicit/mpnc/obstaclespatialparams.hh | 4 ++--
4 files changed, 8 insertions(+), 8 deletions(-)
diff --git a/test/implicit/3p3c/infiltrationspatialparameters.hh b/test/implicit/3p3c/infiltrationspatialparameters.hh
index 26e707a2d4..8d9cf61bc4 100644
--- a/test/implicit/3p3c/infiltrationspatialparameters.hh
+++ b/test/implicit/3p3c/infiltrationspatialparameters.hh
@@ -249,8 +249,8 @@ public:
static const Scalar lSn1 = 0.65;
// arithmetic mean of the liquid saturation and the porosity
- const int i = fvGeometry.subContVolFace[scvfIdx].i;
- const int j = fvGeometry.subContVolFace[scvfIdx].j;
+ const int i = fluxDat.face().i;
+ const int j = fluxDat.face().j;
Scalar Sw = std::max(0.0, (elemVolVars[i].saturation(wPhaseIdx) +
elemVolVars[j].saturation(wPhaseIdx)) / 2);
Scalar Sn = std::max(0.0, (elemVolVars[i].saturation(nPhaseIdx) +
diff --git a/test/implicit/3p3cni/columnxylolspatialparams.hh b/test/implicit/3p3cni/columnxylolspatialparams.hh
index 326f142f46..ffa6439576 100644
--- a/test/implicit/3p3cni/columnxylolspatialparams.hh
+++ b/test/implicit/3p3cni/columnxylolspatialparams.hh
@@ -263,8 +263,8 @@ public:
static const Scalar lSn1 = 0.65;
// arithmetic mean of the liquid saturation and the porosity
- const int i = fvGeometry.subContVolFace[faceIdx].i;
- const int j = fvGeometry.subContVolFace[faceIdx].j;
+ const int i = fluxDat.face().i;
+ const int j = fluxDat.face().j;
Scalar Sw = std::max(0.0, (elemVolVars[i].saturation(wPhaseIdx) +
elemVolVars[j].saturation(wPhaseIdx)) / 2);
Scalar Sn = std::max(0.0, (elemVolVars[i].saturation(nPhaseIdx) +
diff --git a/test/implicit/3p3cni/kuevettespatialparams.hh b/test/implicit/3p3cni/kuevettespatialparams.hh
index d3487b383c..fe3166dbf9 100644
--- a/test/implicit/3p3cni/kuevettespatialparams.hh
+++ b/test/implicit/3p3cni/kuevettespatialparams.hh
@@ -258,8 +258,8 @@ public:
static const Scalar lSn1 = 0.65;
// arithmetic mean of the liquid saturation and the porosity
- const int i = fvGeometry.subContVolFace[faceIdx].i;
- const int j = fvGeometry.subContVolFace[faceIdx].j;
+ const int i = fluxDat.face().i;
+ const int j = fluxDat.face().j;
Scalar Sw = std::max(0.0, (elemVolVars[i].saturation(wPhaseIdx) +
elemVolVars[j].saturation(wPhaseIdx)) / 2);
Scalar Sn = std::max(0.0, (elemVolVars[i].saturation(nPhaseIdx) +
diff --git a/test/implicit/mpnc/obstaclespatialparams.hh b/test/implicit/mpnc/obstaclespatialparams.hh
index ed9bf34771..ab3be7bc9a 100644
--- a/test/implicit/mpnc/obstaclespatialparams.hh
+++ b/test/implicit/mpnc/obstaclespatialparams.hh
@@ -216,8 +216,8 @@ public:
// static const Scalar lGranite = 2.8; // [W / (m K ) ]
//
// // arithmetic mean of the liquid saturation and the porosity
-// const int i = fvElemGeom.subContVolFace[faceIdx].i;
-// const int j = fvElemGeom.subContVolFace[faceIdx].j;
+// const int i = fluxDat.face().i;
+// const int j = fluxDat.face().j;
// Scalar Sl = std::max(0.0, (vDat[i].saturation(wPhaseIdx) +
// vDat[j].saturation(wPhaseIdx)) / 2);
// Scalar poro = (porosity(element, fvElemGeom, i) +
--
GitLab