Commit f2df1417 authored by Dennis Gläser's avatar Dennis Gläser Committed by Timo Koch
Browse files

[mpfa] remove leftovers from interior boundary handling

Treatment of interior boundaries will be specialized in the multidimension
module, where a coupling with a different on the element facets is realized.
parent 8ce6847d
......@@ -396,11 +396,9 @@ private:
{
auto curLocalScvfIdx = posLocalScv.localScvfIndex(localDir);
const auto& curLocalScvf = localScvf_(curLocalScvfIdx);
auto curFaceType = curLocalScvf.faceType();
bool curFaceHasUnknown = curFaceType != MpfaFaceTypes::dirichlet;
// First, add the entries associated with face pressures (unkown or dirichlet)
if (curFaceHasUnknown)
if (curLocalScvf.faceType() != MpfaFaceTypes::dirichlet)
{
// we need the index of the current local scvf in the flux face indices
auto curIdxInFluxFaces = this->findLocalIndex(fluxScvfIndexSet_(), curLocalScvfIdx);
......@@ -444,10 +442,8 @@ private:
{
auto curLocalScvfIdx = negLocalScv.localScvfIndex(localDir);
const auto& curLocalScvf = localScvf_(curLocalScvfIdx);
auto curFaceType = curLocalScvf.faceType();
bool curFaceHasUnknown = curFaceType != MpfaFaceTypes::dirichlet && curFaceType != MpfaFaceTypes::interiorDirichlet;
if (curFaceHasUnknown)
if (curLocalScvf.faceType() != MpfaFaceTypes::dirichlet)
{
// we need the index of the current local scvf in the flux face indices
auto curIdxInFluxFaces = this->findLocalIndex(fluxScvfIndexSet_(), curLocalScvfIdx);
......
......@@ -200,7 +200,7 @@ private:
divEqIpLocal[normalDir] = divEqNormalDir == 1 ? c_ + (1.0-c_)*p_ : c_;
// does the face has an unknown associated with it?
bool isFluxFace = localScvf.faceType() != MpfaFaceTypes::dirichlet && localScvf.faceType() != MpfaFaceTypes::interiorDirichlet;
bool isFluxFace = localScvf.faceType() != MpfaFaceTypes::dirichlet;
// assemble coefficients for the face fluxes
addFaceFluxCoefficients_(localScv, localBasis, D, localScvfIdx, ipLocal, normalDir, mc, isFluxFace);
......@@ -245,7 +245,7 @@ private:
divEqIpLocal[normalDir] = divEqNormalDir == 1 ? c_ + (1.0-c_)*p_ : c_;
// does the face has an unknown associated with it?
bool isFluxFace = localScvf.faceType() != MpfaFaceTypes::dirichlet && localScvf.faceType() != MpfaFaceTypes::interiorDirichlet;
bool isFluxFace = localScvf.faceType() != MpfaFaceTypes::dirichlet;
// assemble coefficients for the face fluxes
addFaceFluxCoefficients_(localScv, localBasis, D, localScvfIdx, ipLocal, normalDir, mc, isFluxFace, true);
......@@ -295,10 +295,8 @@ private:
for (int localDir = 0; localDir < dim; localDir++)
{
auto localScvfIdx = localScv.localScvfIndex(localDir);
auto faceType = this->localScvf_(localScvfIdx).faceType();
bool otherHasUnknown = faceType != MpfaFaceTypes::dirichlet && faceType != MpfaFaceTypes::interiorDirichlet;
if (otherHasUnknown)
if (this->localScvf_(localScvfIdx).faceType() != MpfaFaceTypes::dirichlet)
{
Scalar aij = factor*(localD[normalDir]*shapeJacobian[localDir+1][0]);
auto colIdx = this->findLocalIndex(this->fluxScvfIndexSet_(), localScvfIdx);
......@@ -353,10 +351,8 @@ private:
for (int localDir = 0; localDir < dim; localDir++)
{
auto localScvfIdx = localScv.localScvfIndex(localDir);
auto faceType = this->localScvf_(localScvfIdx).faceType();
bool otherHasUnknown = faceType != MpfaFaceTypes::dirichlet && faceType != MpfaFaceTypes::interiorDirichlet;
if (otherHasUnknown)
if (this->localScvf_(localScvfIdx).faceType() != MpfaFaceTypes::dirichlet)
{
auto colIdx = this->findLocalIndex(this->fluxScvfIndexSet_(), localScvfIdx);
mc.AL[divEqIdx_][colIdx] += factor*(localD[normalDir]*shapeJacobian[localDir+1][0]);
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment