From b879a484fd41086754cf2512d6bb5ca0d635494e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Dennis=20Gl=C3=A4ser?= <dennis.glaeser@iws.uni-stuttgart.de>
Date: Thu, 15 Nov 2018 10:58:40 +0100
Subject: [PATCH] [mpfa][localfacedata] rename isoutside function
---
.../discretization/cellcentered/mpfa/darcyslaw.hh | 8 ++++----
dumux/discretization/cellcentered/mpfa/fickslaw.hh | 14 ++++++++------
.../cellcentered/mpfa/fourierslaw.hh | 14 ++++++++------
.../cellcentered/mpfa/localfacedata.hh | 6 +++---
.../cellcentered/mpfa/omethod/localassembler.hh | 6 +++---
5 files changed, 26 insertions(+), 22 deletions(-)
diff --git a/dumux/discretization/cellcentered/mpfa/darcyslaw.hh b/dumux/discretization/cellcentered/mpfa/darcyslaw.hh
index fd18b34195..ad6c150e29 100644
--- a/dumux/discretization/cellcentered/mpfa/darcyslaw.hh
+++ b/dumux/discretization/cellcentered/mpfa/darcyslaw.hh
@@ -134,7 +134,7 @@ class DarcysLawImplementation<TypeTag, DiscretizationMethod::ccmpfa>
const PrimaryIvDataHandle& dataHandle,
const SubControlVolumeFace &scvf)
{
- switchFluxSign_ = localFaceData.isOutside();
+ switchFluxSign_ = localFaceData.isOutsideFace();
stencil_ = &iv.stencil();
for (unsigned int pIdx = 0; pIdx < numPhases; ++pIdx)
@@ -154,7 +154,7 @@ class DarcysLawImplementation<TypeTag, DiscretizationMethod::ccmpfa>
// surface grids
else
{
- if (!localFaceData.isOutside())
+ if (!localFaceData.isOutsideFace())
{
primaryTij_ = &dataHandle.advectionT()[ivLocalIdx];
if (enableGravity)
@@ -189,7 +189,7 @@ class DarcysLawImplementation<TypeTag, DiscretizationMethod::ccmpfa>
const SecondaryIvDataHandle& dataHandle,
const SubControlVolumeFace &scvf)
{
- switchFluxSign_ = localFaceData.isOutside();
+ switchFluxSign_ = localFaceData.isOutsideFace();
stencil_ = &iv.stencil();
for (unsigned int pIdx = 0; pIdx < numPhases; ++pIdx)
@@ -209,7 +209,7 @@ class DarcysLawImplementation<TypeTag, DiscretizationMethod::ccmpfa>
// surface grids
else
{
- if (!localFaceData.isOutside())
+ if (!localFaceData.isOutsideFace())
{
secondaryTij_ = &dataHandle.advectionT()[ivLocalIdx];
if (enableGravity)
diff --git a/dumux/discretization/cellcentered/mpfa/fickslaw.hh b/dumux/discretization/cellcentered/mpfa/fickslaw.hh
index d9afded35c..71dcb70fcc 100644
--- a/dumux/discretization/cellcentered/mpfa/fickslaw.hh
+++ b/dumux/discretization/cellcentered/mpfa/fickslaw.hh
@@ -133,7 +133,7 @@ class FicksLawImplementation<TypeTag, DiscretizationMethod::ccmpfa>
unsigned int phaseIdx, unsigned int compIdx)
{
stencil_[phaseIdx][compIdx] = &iv.stencil();
- switchFluxSign_[phaseIdx][compIdx] = localFaceData.isOutside();
+ switchFluxSign_[phaseIdx][compIdx] = localFaceData.isOutsideFace();
// store pointer to the mole fraction vector of this iv
primaryXj_[phaseIdx][compIdx] = &dataHandle.moleFractions(phaseIdx, compIdx);
@@ -142,8 +142,9 @@ class FicksLawImplementation<TypeTag, DiscretizationMethod::ccmpfa>
if (dim == dimWorld)
primaryTij_[phaseIdx][compIdx] = &dataHandle.diffusionT()[ivLocalIdx];
else
- primaryTij_[phaseIdx][compIdx] = localFaceData.isOutside() ? &dataHandle.diffusionTout()[ivLocalIdx][localFaceData.scvfLocalOutsideScvfIndex()]
- : &dataHandle.diffusionT()[ivLocalIdx];
+ primaryTij_[phaseIdx][compIdx] = localFaceData.isOutsideFace()
+ ? &dataHandle.diffusionTout()[ivLocalIdx][localFaceData.scvfLocalOutsideScvfIndex()]
+ : &dataHandle.diffusionT()[ivLocalIdx];
}
/*!
@@ -163,7 +164,7 @@ class FicksLawImplementation<TypeTag, DiscretizationMethod::ccmpfa>
unsigned int phaseIdx, unsigned int compIdx)
{
stencil_[phaseIdx][compIdx] = &iv.stencil();
- switchFluxSign_[phaseIdx][compIdx] = localFaceData.isOutside();
+ switchFluxSign_[phaseIdx][compIdx] = localFaceData.isOutsideFace();
// store pointer to the mole fraction vector of this iv
secondaryXj_[phaseIdx][compIdx] = &dataHandle.moleFractions(phaseIdx, compIdx);
@@ -172,8 +173,9 @@ class FicksLawImplementation<TypeTag, DiscretizationMethod::ccmpfa>
if (dim == dimWorld)
secondaryTij_[phaseIdx][compIdx] = &dataHandle.diffusionT()[ivLocalIdx];
else
- secondaryTij_[phaseIdx][compIdx] = localFaceData.isOutside() ? &dataHandle.diffusionTout()[ivLocalIdx][localFaceData.scvfLocalOutsideScvfIndex()]
- : &dataHandle.diffusionT()[ivLocalIdx];
+ secondaryTij_[phaseIdx][compIdx] = localFaceData.isOutsideFace()
+ ? &dataHandle.diffusionTout()[ivLocalIdx][localFaceData.scvfLocalOutsideScvfIndex()]
+ : &dataHandle.diffusionT()[ivLocalIdx];
}
//! In the interaction volume-local system of eq we have one unknown per face.
diff --git a/dumux/discretization/cellcentered/mpfa/fourierslaw.hh b/dumux/discretization/cellcentered/mpfa/fourierslaw.hh
index db27fa6202..5a69ad33ff 100644
--- a/dumux/discretization/cellcentered/mpfa/fourierslaw.hh
+++ b/dumux/discretization/cellcentered/mpfa/fourierslaw.hh
@@ -128,7 +128,7 @@ class FouriersLawImplementation<TypeTag, DiscretizationMethod::ccmpfa>
const SubControlVolumeFace &scvf)
{
stencil_ = &iv.stencil();
- switchFluxSign_ = localFaceData.isOutside();
+ switchFluxSign_ = localFaceData.isOutsideFace();
// store pointer to the temperature vector of this iv
primaryTj_ = &dataHandle.temperatures();
@@ -137,8 +137,9 @@ class FouriersLawImplementation<TypeTag, DiscretizationMethod::ccmpfa>
if (dim == dimWorld)
primaryTij_ = &dataHandle.heatConductionT()[ivLocalIdx];
else
- primaryTij_ = localFaceData.isOutside() ? &dataHandle.heatConductionTout()[ivLocalIdx][localFaceData.scvfLocalOutsideScvfIndex()]
- : &dataHandle.heatConductionT()[ivLocalIdx];
+ primaryTij_ = localFaceData.isOutsideFace()
+ ? &dataHandle.heatConductionTout()[ivLocalIdx][localFaceData.scvfLocalOutsideScvfIndex()]
+ : &dataHandle.heatConductionT()[ivLocalIdx];
}
/*!
@@ -157,7 +158,7 @@ class FouriersLawImplementation<TypeTag, DiscretizationMethod::ccmpfa>
const SubControlVolumeFace &scvf)
{
stencil_ = &iv.stencil();
- switchFluxSign_ = localFaceData.isOutside();
+ switchFluxSign_ = localFaceData.isOutsideFace();
// store pointer to the temperature vector of this iv
secondaryTj_ = &dataHandle.temperatures();
@@ -166,8 +167,9 @@ class FouriersLawImplementation<TypeTag, DiscretizationMethod::ccmpfa>
if (dim == dimWorld)
secondaryTij_ = &dataHandle.heatConductionT()[ivLocalIdx];
else
- secondaryTij_ = localFaceData.isOutside() ? &dataHandle.heatConductionTout()[ivLocalIdx][localFaceData.scvfLocalOutsideScvfIndex()]
- : &dataHandle.heatConductionT()[ivLocalIdx];
+ secondaryTij_ = localFaceData.isOutsideFace()
+ ? &dataHandle.heatConductionTout()[ivLocalIdx][localFaceData.scvfLocalOutsideScvfIndex()]
+ : &dataHandle.heatConductionT()[ivLocalIdx];
}
//! Coefficients for the cell (& Dirichlet) unknowns in flux expressions (primary type)
diff --git a/dumux/discretization/cellcentered/mpfa/localfacedata.hh b/dumux/discretization/cellcentered/mpfa/localfacedata.hh
index 1fe6489b2d..4fec383779 100644
--- a/dumux/discretization/cellcentered/mpfa/localfacedata.hh
+++ b/dumux/discretization/cellcentered/mpfa/localfacedata.hh
@@ -32,7 +32,7 @@ namespace Dumux
/*!
* \ingroup CCMpfaDiscretization
* \brief General implementation of a data structure holding interaction
- * volume-local information for a grid subb-control volume face embedded in it.
+ * volume-local information for a grid sub-control volume face embedded in it.
*
* \tparam GridIndexType The type used for indices on the grid
* \tparam LocalIndexType The type used for indices inside interaction volumes
@@ -44,7 +44,7 @@ class InteractionVolumeLocalFaceData
LocalIndexType ivLocalInsideScvIndex_; //!< the iv-local index of the scvfs' inside scv
LocalIndexType scvfLocalOutsideScvfIndex_; //!< the index of this scvf in the scvf-local outside faces
GridIndexType globalScvfIndex_; //!< the index of the corresponding global scvf
- bool isOutside_; //!< indicates if this face maps to the iv-local index from "outside"
+ bool isOutside_; //!< indicates if this face is an "outside" face in the iv-local system
public:
//! Default constructor
@@ -77,7 +77,7 @@ public:
LocalIndexType ivLocalInsideScvIndex() const { return ivLocalInsideScvIndex_; }
LocalIndexType scvfLocalOutsideScvfIndex() const { assert(isOutside_); return scvfLocalOutsideScvfIndex_; }
GridIndexType globalScvfIndex() const { return globalScvfIndex_; }
- bool isOutside() const { return isOutside_; }
+ bool isOutsideFace() const { return isOutside_; }
};
} // end namespace
diff --git a/dumux/discretization/cellcentered/mpfa/omethod/localassembler.hh b/dumux/discretization/cellcentered/mpfa/omethod/localassembler.hh
index c0c35e8d7d..aeb4d2838f 100644
--- a/dumux/discretization/cellcentered/mpfa/omethod/localassembler.hh
+++ b/dumux/discretization/cellcentered/mpfa/omethod/localassembler.hh
@@ -115,7 +115,7 @@ public:
for (const auto& localFaceData : iv.localFaceData())
{
// continue only for "outside" faces
- if (!localFaceData.isOutside())
+ if (!localFaceData.isOutsideFace())
continue;
const auto localScvIdx = localFaceData.ivLocalInsideScvIndex();
@@ -244,7 +244,7 @@ public:
for (const auto& localFaceData : iv.localFaceData())
{
// continue only for "outside" faces
- if (!localFaceData.isOutside())
+ if (!localFaceData.isOutsideFace())
continue;
const auto localScvIdx = localFaceData.ivLocalInsideScvIndex();
@@ -580,7 +580,7 @@ public:
for (const auto& localFaceData : iv.localFaceData())
{
// continue only for "outside" faces
- if (!localFaceData.isOutside())
+ if (!localFaceData.isOutsideFace())
continue;
const auto localScvIdx = localFaceData.ivLocalInsideScvIndex();
--
GitLab