From 74a50a76c1bfd7525d4a03b83c8cc1cdb754cc37 Mon Sep 17 00:00:00 2001
From: Tianyuan Zheng <ichbinzty@gmail.com>
Date: Mon, 2 Sep 2013 13:14:18 +0000
Subject: [PATCH] [namingConventions] changed "problem", "referenceElement",
"element", "vertex" and "intersection"
reviewed by fetzer
git-svn-id: svn://svn.iws.uni-stuttgart.de/DUMUX/dumux/trunk@11338 2fb0f335-1f38-0410-981e-8018bf24f1b0
---
dumux/decoupled/common/impet.hh | 6 ++--
dumux/freeflow/stokes/stokesproblem.hh | 2 +-
dumux/geomechanics/el2p/el2passembler.hh | 4 +--
dumux/implicit/box/boxassembler.hh | 36 +++++++++----------
dumux/implicit/cellcentered/ccassembler.hh | 34 +++++++++---------
.../implicit/common/implicitlocaljacobian.hh | 6 ++--
dumux/implicit/common/implicitmodel.hh | 6 ++--
dumux/implicit/common/implicitproblem.hh | 14 ++++----
.../mpnc/mass/mpncvtkwritermasskinetic.hh | 8 ++---
dumux/implicit/mpnc/mpncvtkwritermodule.hh | 2 +-
.../navierstokes/navierstokestestproblem.hh | 2 +-
test/freeflow/stokes/stokestestproblem.hh | 4 +--
test/freeflow/stokes2c/stokes2ctestproblem.hh | 2 +-
.../stokes2cni/stokes2cnitestproblem.hh | 2 +-
test/geomechanics/el2p/el2pproblem.hh | 4 +--
test/implicit/1p/1ptestproblem.hh | 2 +-
test/implicit/1p2c/1p2coutflowproblem.hh | 2 +-
test/implicit/2p2c/injectionproblem.hh | 6 ++--
test/implicit/2p2cni/waterairproblem.hh | 6 ++--
test/implicit/2pni/injectionproblem2pni.hh | 6 ++--
test/implicit/3p/infiltration3pproblem.hh | 6 ++--
test/implicit/3p3c/infiltrationproblem.hh | 6 ++--
test/implicit/3p3cni/columnxylolproblem.hh | 4 +--
test/implicit/3p3cni/kuevetteproblem.hh | 6 ++--
test/implicit/co2/heterogeneousproblem.hh | 12 +++----
test/implicit/co2ni/heterogeneousproblemni.hh | 12 +++----
test/implicit/mpnc/forchheimer1pproblem.hh | 2 +-
test/implicit/mpnc/forchheimer2pproblem.hh | 2 +-
test/implicit/mpnc/obstacleproblem.hh | 2 +-
29 files changed, 103 insertions(+), 103 deletions(-)
diff --git a/dumux/decoupled/common/impet.hh b/dumux/decoupled/common/impet.hh
index 33cebda351..a78cf4e9a0 100644
--- a/dumux/decoupled/common/impet.hh
+++ b/dumux/decoupled/common/impet.hh
@@ -195,10 +195,10 @@ public:
//! Constructs an IMPET object
/**
- * \param prob Problem
+ * \param problem Problem
*/
- IMPET(Problem& prob) :
- problem_(prob)
+ IMPET(Problem& problem) :
+ problem_(problem)
{
cFLFactor_ = GET_PARAM_FROM_GROUP(TypeTag, Scalar, Impet, CFLFactor);
iterFlag_ = GET_PARAM_FROM_GROUP(TypeTag, int, Impet, IterationFlag);
diff --git a/dumux/freeflow/stokes/stokesproblem.hh b/dumux/freeflow/stokes/stokesproblem.hh
index 760a4b8a9f..6954197a5e 100644
--- a/dumux/freeflow/stokes/stokesproblem.hh
+++ b/dumux/freeflow/stokes/stokesproblem.hh
@@ -109,7 +109,7 @@ public:
*/
Scalar permeability(const Element &element,
const FVElementGeometry &fvGeometry,
- const Intersection &is,
+ const Intersection &intersection,
const int scvIdx,
const int boundaryFaceIdx) const
{ DUNE_THROW(Dune::NotImplemented, "permeability()"); }
diff --git a/dumux/geomechanics/el2p/el2passembler.hh b/dumux/geomechanics/el2p/el2passembler.hh
index 75d2bccd29..e41aec8769 100644
--- a/dumux/geomechanics/el2p/el2passembler.hh
+++ b/dumux/geomechanics/el2p/el2passembler.hh
@@ -567,10 +567,10 @@ private:
ElementIterator eIt = gridView_().template begin<0>();
const ElementIterator eEndIt = gridView_().template end<0>();
for (; eIt != eEndIt; ++eIt) {
- const Element &elem = *eIt;
+ const Element &element = *eIt;
// loop over all element vertices
- int n = elem.template count<dim>();
+ int n = element.template count<dim>();
for (int i = 0; i < n - 1; ++i) {
int globalI = vertexMapper_().map(*eIt, i, dim);
for (int j = i + 1; j < n; ++j) {
diff --git a/dumux/implicit/box/boxassembler.hh b/dumux/implicit/box/boxassembler.hh
index 8fbce95754..db73bc6599 100644
--- a/dumux/implicit/box/boxassembler.hh
+++ b/dumux/implicit/box/boxassembler.hh
@@ -229,13 +229,13 @@ private:
ElementIterator eIt = this->gridView_().template begin<0>();
const ElementIterator eEndIt = this->gridView_().template end<0>();
for (; eIt != eEndIt; ++eIt) {
- const Element &elem = *eIt;
- int numVerticesLocal = elem.template count<dim>();
+ const Element &element = *eIt;
+ int numVerticesLocal = element.template count<dim>();
// if the element is not in the interior or the process
// border, all dofs just contain main-diagonal entries
- if (elem.partitionType() != Dune::InteriorEntity &&
- elem.partitionType() != Dune::BorderEntity)
+ if (element.partitionType() != Dune::InteriorEntity &&
+ element.partitionType() != Dune::BorderEntity)
{
for (int i = 0; i < numVerticesLocal; ++i) {
int globalI = this->vertexMapper_().map(*eIt, i, dim);
@@ -283,23 +283,23 @@ private:
}
// assemble a non-ghost element
- void assembleElement_(const Element &elem)
+ void assembleElement_(const Element &element)
{
if (this->enablePartialReassemble_()) {
- int globalElemIdx = this->model_().elementMapper().map(elem);
+ int globalElemIdx = this->model_().elementMapper().map(element);
if (this->elementColor_[globalElemIdx] == ParentType::Green) {
++this->greenElems_;
- assembleGreenElement_(elem);
+ assembleGreenElement_(element);
return;
}
}
- this->model_().localJacobian().assemble(elem);
+ this->model_().localJacobian().assemble(element);
- int numVerticesLocal = elem.template count<dim>();
+ int numVerticesLocal = element.template count<dim>();
for (int i=0; i < numVerticesLocal; ++ i) {
- int globI = this->vertexMapper_().map(elem, i, dim);
+ int globI = this->vertexMapper_().map(element, i, dim);
// update the right hand side
this->residual_[globI] += this->model_().localJacobian().residual(i);
@@ -322,7 +322,7 @@ private:
// update the jacobian matrix
for (int j = 0; j < numVerticesLocal; ++ j) {
- int globJ = this->vertexMapper_().map(elem, j, dim);
+ int globJ = this->vertexMapper_().map(element, j, dim);
(*this->matrix_)[globI][globJ] +=
this->model_().localJacobian().mat(i,j);
}
@@ -332,13 +332,13 @@ private:
// "assemble" a green element. green elements only get the
// residual updated, but the jacobian is left alone...
- void assembleGreenElement_(const Element &elem)
+ void assembleGreenElement_(const Element &element)
{
- this->model_().localResidual().eval(elem);
+ this->model_().localResidual().eval(element);
- int numVerticesLocal = elem.template count<dim>();
+ int numVerticesLocal = element.template count<dim>();
for (int i = 0; i < numVerticesLocal; ++ i) {
- int globI = this->vertexMapper_().map(elem, i, dim);
+ int globI = this->vertexMapper_().map(element, i, dim);
// update the right hand side
this->residual_[globI] += this->model_().localResidual().residual(i);
@@ -348,11 +348,11 @@ private:
}
// "assemble" a ghost element
- void assembleGhostElement_(const Element &elem)
+ void assembleGhostElement_(const Element &element)
{
- int numVerticesLocal = elem.template count<dim>();
+ int numVerticesLocal = element.template count<dim>();
for (int i=0; i < numVerticesLocal; ++i) {
- const VertexPointer vp = elem.template subEntity<dim>(i);
+ const VertexPointer vp = element.template subEntity<dim>(i);
if (vp->partitionType() == Dune::InteriorEntity ||
vp->partitionType() == Dune::BorderEntity)
diff --git a/dumux/implicit/cellcentered/ccassembler.hh b/dumux/implicit/cellcentered/ccassembler.hh
index 8e4551be2d..120d135d4e 100644
--- a/dumux/implicit/cellcentered/ccassembler.hh
+++ b/dumux/implicit/cellcentered/ccassembler.hh
@@ -137,19 +137,19 @@ private:
ElementIterator eIt = this->gridView_().template begin<0>();
const ElementIterator eEndIt = this->gridView_().template end<0>();
for (; eIt != eEndIt; ++eIt) {
- const Element &elem = *eIt;
+ const Element &element = *eIt;
- int globalI = this->elementMapper_().map(elem);
+ int globalI = this->elementMapper_().map(element);
neighbors[globalI].insert(globalI);
// if the element is ghost,
// all dofs just contain main-diagonal entries
- //if (elem.partitionType() == Dune::GhostEntity)
+ //if (element.partitionType() == Dune::GhostEntity)
// continue;
// loop over all neighbors
- IntersectionIterator isIt = this->gridView_().ibegin(elem);
- const IntersectionIterator &isEndIt = this->gridView_().iend(elem);
+ IntersectionIterator isIt = this->gridView_().ibegin(element);
+ const IntersectionIterator &isEndIt = this->gridView_().iend(element);
for (; isIt != isEndIt; ++isIt)
{
if (isIt->neighbor())
@@ -179,21 +179,21 @@ private:
}
// assemble a non-ghost element
- void assembleElement_(const Element &elem)
+ void assembleElement_(const Element &element)
{
if (this->enablePartialReassemble_()) {
- int globalElemIdx = this->model_().elementMapper().map(elem);
+ int globalElemIdx = this->model_().elementMapper().map(element);
if (this->elementColor_[globalElemIdx] == ParentType::Green) {
++this->greenElems_;
- assembleGreenElement_(elem);
+ assembleGreenElement_(element);
return;
}
}
- this->model_().localJacobian().assemble(elem);
+ this->model_().localJacobian().assemble(element);
- int globalI = this->elementMapper_().map(elem);
+ int globalI = this->elementMapper_().map(element);
// update the right hand side
this->residual_[globalI] = this->model_().localJacobian().residual(0);
@@ -211,8 +211,8 @@ private:
// update the diagonal entry
(*this->matrix_)[globalI][globalI] = this->model_().localJacobian().mat(0,0);
- IntersectionIterator isIt = this->gridView_().ibegin(elem);
- const IntersectionIterator &isEndIt = this->gridView_().iend(elem);
+ IntersectionIterator isIt = this->gridView_().ibegin(element);
+ const IntersectionIterator &isEndIt = this->gridView_().iend(element);
for (int j = 0; isIt != isEndIt; ++isIt)
{
if (isIt->neighbor())
@@ -225,11 +225,11 @@ private:
// "assemble" a green element. green elements only get the
// residual updated, but the jacobian is left alone...
- void assembleGreenElement_(const Element &elem)
+ void assembleGreenElement_(const Element &element)
{
- this->model_().localResidual().eval(elem);
+ this->model_().localResidual().eval(element);
- int globalI = this->elementMapper_().map(elem);
+ int globalI = this->elementMapper_().map(element);
// update the right hand side
this->residual_[globalI] += this->model_().localResidual().residual(0);
@@ -238,9 +238,9 @@ private:
}
// "assemble" a ghost element
- void assembleGhostElement_(const Element &elem)
+ void assembleGhostElement_(const Element &element)
{
- int globalI = this->elementMapper_().map(elem);
+ int globalI = this->elementMapper_().map(element);
// update the right hand side
this->residual_[globalI] = 0.0;
diff --git a/dumux/implicit/common/implicitlocaljacobian.hh b/dumux/implicit/common/implicitlocaljacobian.hh
index 7b31c09abd..fdc76e3d32 100644
--- a/dumux/implicit/common/implicitlocaljacobian.hh
+++ b/dumux/implicit/common/implicitlocaljacobian.hh
@@ -116,10 +116,10 @@ public:
*
* \param prob The problem which we want to simulate.
*/
- void init(Problem &prob)
+ void init(Problem &problem)
{
- problemPtr_ = &prob;
- localResidual_.init(prob);
+ problemPtr_ = &problem;
+ localResidual_.init(problem);
// assume quadrilinears as elements with most vertices
if (isBox)
diff --git a/dumux/implicit/common/implicitmodel.hh b/dumux/implicit/common/implicitmodel.hh
index ddcae4c359..e27f72e3cb 100644
--- a/dumux/implicit/common/implicitmodel.hh
+++ b/dumux/implicit/common/implicitmodel.hh
@@ -789,13 +789,13 @@ public:
* \brief Returns true if the control volume touches
* the grid's boundary.
*
- * \param elem A DUNE Codim<0> entity coinciding with the control
+ * \param element A DUNE Codim<0> entity coinciding with the control
* volume.
*/
- bool onBoundary(const Element &elem) const
+ bool onBoundary(const Element &element) const
{
if (!isBox)
- return onBoundary(elementMapper().map(elem));
+ return onBoundary(elementMapper().map(element));
else
DUNE_THROW(Dune::InvalidStateException,
"requested for box model");
diff --git a/dumux/implicit/common/implicitproblem.hh b/dumux/implicit/common/implicitproblem.hh
index 708b4746b5..cf1d891650 100644
--- a/dumux/implicit/common/implicitproblem.hh
+++ b/dumux/implicit/common/implicitproblem.hh
@@ -259,7 +259,7 @@ public:
* \param values The neumann values for the conservation equations in units of \f$ [ \textnormal{unit of conserved quantity} / (m^2 \cdot s )] \f$
* \param element The finite element
* \param fvGeometry The finite-volume geometry
- * \param is The intersection between element and boundary
+ * \param intersection The intersection between element and boundary
* \param scvIdx The local subcontrolvolume index
* \param boundaryFaceIdx The index of the boundary face
* \param elemVolVars All volume variables for the element
@@ -270,7 +270,7 @@ public:
void solDependentNeumann(PrimaryVariables &values,
const Element &element,
const FVElementGeometry &fvGeometry,
- const Intersection &is,
+ const Intersection &intersection,
const int scvIdx,
const int boundaryFaceIdx,
const ElementVolumeVariables &elemVolVars) const
@@ -279,7 +279,7 @@ public:
asImp_().neumann(values,
element,
fvGeometry,
- is,
+ intersection,
scvIdx,
boundaryFaceIdx);
}
@@ -289,7 +289,7 @@ public:
void boxSDNeumann(PrimaryVariables &values,
const Element &element,
const FVElementGeometry &fvGeometry,
- const Intersection &is,
+ const Intersection &intersection,
const int scvIdx,
const int boundaryFaceIdx,
const ElementVolumeVariables &elemVolVars) const
@@ -297,7 +297,7 @@ public:
asImp_().solDependentNeumann(values,
element,
fvGeometry,
- is,
+ intersection,
scvIdx,
boundaryFaceIdx,
elemVolVars);
@@ -310,7 +310,7 @@ public:
* \param values The neumann values for the conservation equations in units of \f$ [ \textnormal{unit of conserved quantity} / (m^2 \cdot s )] \f$
* \param element The finite element
* \param fvGeometry The finite-volume geometry
- * \param is The intersection between element and boundary
+ * \param intersection The intersection between element and boundary
* \param scvIdx The local subcontrolvolume index
* \param boundaryFaceIdx The index of the boundary face
*
@@ -320,7 +320,7 @@ public:
void neumann(PrimaryVariables &values,
const Element &element,
const FVElementGeometry &fvGeometry,
- const Intersection &is,
+ const Intersection &intersection,
const int scvIdx,
const int boundaryFaceIdx) const
{
diff --git a/dumux/implicit/mpnc/mass/mpncvtkwritermasskinetic.hh b/dumux/implicit/mpnc/mass/mpncvtkwritermasskinetic.hh
index 782d21727e..50121e2f7a 100644
--- a/dumux/implicit/mpnc/mass/mpncvtkwritermasskinetic.hh
+++ b/dumux/implicit/mpnc/mass/mpncvtkwritermasskinetic.hh
@@ -94,15 +94,15 @@ public:
* \brief Modify the internal buffers according to the volume
* variables seen on an element
*/
- void processElement(const Element &elem,
+ void processElement(const Element &element,
const FVElementGeometry &fvGeometry,
const ElementVolumeVariables &elemVolVars,
const ElementBoundaryTypes &elemBcTypes)
{
- int numLocalVertices = elem.geometry().corners();
+ int numLocalVertices = element.geometry().corners();
for (int localVertexIdx = 0; localVertexIdx< numLocalVertices; ++localVertexIdx) {
- const unsigned int globalIdx = this->problem_.vertexMapper().map(elem, localVertexIdx, dim);
- const VolumeVariables &volVars = elemVolVars[localVertexIdx];
+ const unsigned int globalIdx = this->problem_.vertexMapper().map(element, localVertexIdx, dim);
+ const VolumeVariables &volVars = elementVolVars[localVertexIdx];
for (unsigned int phaseIdx = 0; phaseIdx < numPhases; ++ phaseIdx) {
for (unsigned int compIdx = 0; compIdx < numComponents; ++ compIdx) {
diff --git a/dumux/implicit/mpnc/mpncvtkwritermodule.hh b/dumux/implicit/mpnc/mpncvtkwritermodule.hh
index 848a725b64..8559272162 100644
--- a/dumux/implicit/mpnc/mpncvtkwritermodule.hh
+++ b/dumux/implicit/mpnc/mpncvtkwritermodule.hh
@@ -85,7 +85,7 @@ public:
* \brief Modify the internal buffers according to the volume
* variables seen on an element
*/
- void processElement(const Element &elem,
+ void processElement(const Element &element,
const FVElementGeometry &fvGeometry,
const ElementVolumeVariables &elemCurVolVars,
const ElementBoundaryTypes &elemBcTypes)
diff --git a/test/freeflow/navierstokes/navierstokestestproblem.hh b/test/freeflow/navierstokes/navierstokestestproblem.hh
index 9516b102f6..e16eb1f76e 100644
--- a/test/freeflow/navierstokes/navierstokestestproblem.hh
+++ b/test/freeflow/navierstokes/navierstokestestproblem.hh
@@ -232,7 +232,7 @@ namespace Dumux
void neumann(PrimaryVariables &values,
const Element &element,
const FVElementGeometry &fvGeometry,
- const Intersection &is,
+ const Intersection &intersection,
const int scvIdx,
const int boundaryFaceIdx) const
{
diff --git a/test/freeflow/stokes/stokestestproblem.hh b/test/freeflow/stokes/stokestestproblem.hh
index 70a87a381f..6e34d90ad5 100644
--- a/test/freeflow/stokes/stokestestproblem.hh
+++ b/test/freeflow/stokes/stokestestproblem.hh
@@ -209,7 +209,7 @@ public:
* \param values The neumann values for the conservation equations
* \param element The finite element
* \param fvGeometry The finite-volume geometry in the box scheme
- * \param is The intersection between element and boundary
+ * \param intersection The intersection between element and boundary
* \param scvIdx The local vertex index
* \param boundaryFaceIdx The index of the boundary face
*
@@ -224,7 +224,7 @@ public:
void neumann(PrimaryVariables &values,
const Element &element,
const FVElementGeometry &fvGeometry,
- const Intersection &is,
+ const Intersection &intersection,
int scvIdx,
int boundaryFaceIdx) const
{
diff --git a/test/freeflow/stokes2c/stokes2ctestproblem.hh b/test/freeflow/stokes2c/stokes2ctestproblem.hh
index dc9eb22f10..f4ed2b7046 100644
--- a/test/freeflow/stokes2c/stokes2ctestproblem.hh
+++ b/test/freeflow/stokes2c/stokes2ctestproblem.hh
@@ -201,7 +201,7 @@ public:
void neumann(PrimaryVariables &values,
const Element &element,
const FVElementGeometry &fvGeometry,
- const Intersection &is,
+ const Intersection &intersection,
int scvIdx,
int boundaryFaceIdx) const
{
diff --git a/test/freeflow/stokes2cni/stokes2cnitestproblem.hh b/test/freeflow/stokes2cni/stokes2cnitestproblem.hh
index e0c80aeaea..7ccbb8b8e8 100644
--- a/test/freeflow/stokes2cni/stokes2cnitestproblem.hh
+++ b/test/freeflow/stokes2cni/stokes2cnitestproblem.hh
@@ -187,7 +187,7 @@ public:
void neumann(PrimaryVariables &values,
const Element &element,
const FVElementGeometry &fvGeometry,
- const Intersection &is,
+ const Intersection &intersection,
int scvIdx,
int boundaryFaceIdx) const
{
diff --git a/test/geomechanics/el2p/el2pproblem.hh b/test/geomechanics/el2p/el2pproblem.hh
index d95ffcc14f..6209b0efc8 100644
--- a/test/geomechanics/el2p/el2pproblem.hh
+++ b/test/geomechanics/el2p/el2pproblem.hh
@@ -550,7 +550,7 @@ public:
* \param values The neumann values for the conservation equations in units of \f$ [ \textnormal{unit of conserved quantity} / (m^2 \cdot s )] \f$
* \param element The finite element
* \param fvGeometry The finite-volume geometry in the box scheme
- * \param is The intersection between element and boundary
+ * \param intersection The intersection between element and boundary
* \param scvIdx The local vertex index
* \param boundaryFaceIdx The index of the boundary face
*
@@ -560,7 +560,7 @@ public:
void neumann(PrimaryVariables &values,
const Element &element,
const FVElementGeometry &fvGeometry,
- const Intersection &is,
+ const Intersection &intersection,
int scvIdx,
int boundaryFaceIdx) const
{
diff --git a/test/implicit/1p/1ptestproblem.hh b/test/implicit/1p/1ptestproblem.hh
index c7747163a8..81e35ec08e 100644
--- a/test/implicit/1p/1ptestproblem.hh
+++ b/test/implicit/1p/1ptestproblem.hh
@@ -253,7 +253,7 @@ public:
void neumann(PrimaryVariables &priVars,
const Element &element,
const FVElementGeometry &fvGeometry,
- const Intersection &is,
+ const Intersection &intersection,
const int scvIdx,
const int boundaryFaceIdx) const
{
diff --git a/test/implicit/1p2c/1p2coutflowproblem.hh b/test/implicit/1p2c/1p2coutflowproblem.hh
index c17cf08762..cf7b25ac1a 100644
--- a/test/implicit/1p2c/1p2coutflowproblem.hh
+++ b/test/implicit/1p2c/1p2coutflowproblem.hh
@@ -246,7 +246,7 @@ public:
void neumann(PrimaryVariables &priVars,
const Element &element,
const FVElementGeometry &fvGeometry,
- const Intersection &is,
+ const Intersection &intersection,
const int scvIdx,
const int boundaryFaceIdx) const
{
diff --git a/test/implicit/2p2c/injectionproblem.hh b/test/implicit/2p2c/injectionproblem.hh
index 7edacbfea1..c12bc1934a 100644
--- a/test/implicit/2p2c/injectionproblem.hh
+++ b/test/implicit/2p2c/injectionproblem.hh
@@ -281,7 +281,7 @@ public:
* \param values The neumann values for the conservation equations
* \param element The finite element
* \param fvGeometry The finite-volume geometry in the box scheme
- * \param is The intersection between element and boundary
+ * \param intersection The intersection between element and boundary
* \param scvIdx The local vertex index
* \param boundaryFaceIdx The index of the boundary face
*
@@ -291,7 +291,7 @@ public:
void neumann(PrimaryVariables &values,
const Element &element,
const FVElementGeometry &fvGeometry,
- const Intersection &is,
+ const Intersection &intersection,
int scvIdx,
int boundaryFaceIdx) const
{
@@ -301,7 +301,7 @@ public:
if (isBox)
globalPos = element.geometry().corner(scvIdx);
else
- globalPos = is.geometry().center();
+ globalPos = intersection.geometry().center();
if (globalPos[1] < 15 && globalPos[1] > 7) {
values[contiN2EqIdx] = -1e-3; // kg/(s*m^2)
diff --git a/test/implicit/2p2cni/waterairproblem.hh b/test/implicit/2p2cni/waterairproblem.hh
index 04efc1b9a3..ff4fe4ccd6 100644
--- a/test/implicit/2p2cni/waterairproblem.hh
+++ b/test/implicit/2p2cni/waterairproblem.hh
@@ -260,7 +260,7 @@ public:
* \param values The neumann values for the conservation equations
* \param element The finite element
* \param fvGeometry The finite-volume geometry in the box scheme
- * \param is The intersection between element and boundary
+ * \param intersection The intersection between element and boundary
* \param scvIdx The local vertex index
* \param boundaryFaceIdx The index of the boundary face
*
@@ -270,7 +270,7 @@ public:
void neumann(PrimaryVariables &values,
const Element &element,
const FVElementGeometry &fvGeometry,
- const Intersection &is,
+ const Intersection &intersection,
const int scvIdx,
const int boundaryFaceIdx) const
{
@@ -280,7 +280,7 @@ public:
if (isBox)
globalPos = element.geometry().corner(scvIdx);
else
- globalPos = is.geometry().center();
+ globalPos = intersection.geometry().center();
// negative values for injection
if (globalPos[0] > 15 && globalPos[0] < 25 &&
diff --git a/test/implicit/2pni/injectionproblem2pni.hh b/test/implicit/2pni/injectionproblem2pni.hh
index f0579087c7..664429851c 100644
--- a/test/implicit/2pni/injectionproblem2pni.hh
+++ b/test/implicit/2pni/injectionproblem2pni.hh
@@ -305,7 +305,7 @@ public:
* \param values The neumann values for the conservation equations
* \param element The finite element
* \param fvGeometry The finite-volume geometry in the box scheme
- * \param is The intersection between element and boundary
+ * \param intersection The intersection between element and boundary
* \param scvIdx The local vertex index
* \param boundaryFaceIdx The index of the boundary face
*
@@ -315,7 +315,7 @@ public:
void neumann(PrimaryVariables &values,
const Element &element,
const FVElementGeometry &fvGeometry,
- const Intersection &is,
+ const Intersection &intersection,
int scvIdx,
int boundaryFaceIdx) const
{
@@ -325,7 +325,7 @@ public:
if (isBox)
globalPos = element.geometry().corner(scvIdx);
else
- globalPos = is.geometry().center();
+ globalPos = intersection.geometry().center();
if (globalPos[1] < 15 && globalPos[1] > 7) {
// inject air. negative values mean injection
diff --git a/test/implicit/3p/infiltration3pproblem.hh b/test/implicit/3p/infiltration3pproblem.hh
index 54a614e83c..3f708b41b0 100644
--- a/test/implicit/3p/infiltration3pproblem.hh
+++ b/test/implicit/3p/infiltration3pproblem.hh
@@ -261,7 +261,7 @@ public:
* \param values The neumann values for the conservation equations
* \param element The finite element
* \param fvElemGeom The finite-volume geometry in the box scheme
- * \param is The intersection between element and boundary
+ * \param intersection The intersection between element and boundary
* \param scvIdx The local vertex index
* \param boundaryFaceIdx The index of the boundary face
*
@@ -271,7 +271,7 @@ public:
void neumann(PrimaryVariables &values,
const Element &element,
const FVElementGeometry &fvGeometry,
- const Intersection &is,
+ const Intersection &intersection,
int scvIdx,
const int boundaryFaceIdx) const
{
@@ -281,7 +281,7 @@ public:
if (isBox)
globalPos = element.geometry().corner(scvIdx);
else
- globalPos = is.geometry().center();
+ globalPos = intersection.geometry().center();
// negative values for injection
if (this->timeManager().time()<2592000.)
diff --git a/test/implicit/3p3c/infiltrationproblem.hh b/test/implicit/3p3c/infiltrationproblem.hh
index d0d48272c1..5fee678bb6 100644
--- a/test/implicit/3p3c/infiltrationproblem.hh
+++ b/test/implicit/3p3c/infiltrationproblem.hh
@@ -273,7 +273,7 @@ public:
* \param values The neumann values for the conservation equations
* \param element The finite element
* \param fvGeometry The finite-volume geometry in the box scheme
- * \param is The intersection between element and boundary
+ * \param intersection The intersection between element and boundary
* \param scvIdx The local vertex index
* \param boundaryFaceIdx The index of the boundary face
*
@@ -283,7 +283,7 @@ public:
void neumann(PrimaryVariables &values,
const Element &element,
const FVElementGeometry &fvGeometry,
- const Intersection &is,
+ const Intersection &intersection,
int scvIdx,
const int boundaryFaceIdx) const
{
@@ -293,7 +293,7 @@ public:
if (isBox)
globalPos = element.geometry().corner(scvIdx);
else
- globalPos = is.geometry().center();
+ globalPos = intersection.geometry().center();
// negative values for injection
if ((globalPos[0] <= 75.+eps_) && (globalPos[0] >= 50.+eps_) && (globalPos[1] >= 10.-eps_))
diff --git a/test/implicit/3p3cni/columnxylolproblem.hh b/test/implicit/3p3cni/columnxylolproblem.hh
index 849bc82d28..c8c6df44c3 100644
--- a/test/implicit/3p3cni/columnxylolproblem.hh
+++ b/test/implicit/3p3cni/columnxylolproblem.hh
@@ -239,7 +239,7 @@ public:
void neumann(PrimaryVariables &values,
const Element &element,
const FVElementGeometry &fvGeomtry,
- const Intersection &is,
+ const Intersection &intersection,
const int scvIdx,
int boundaryFaceIdx) const
{
@@ -249,7 +249,7 @@ public:
if (isBox)
globalPos = element.geometry().corner(scvIdx);
else
- globalPos = is.geometry().center();
+ globalPos = intersection.geometry().center();
// negative values for injection
if (globalPos[1] > 1.2 - eps_)
diff --git a/test/implicit/3p3cni/kuevetteproblem.hh b/test/implicit/3p3cni/kuevetteproblem.hh
index 5f0b4d17ff..cb65901f22 100644
--- a/test/implicit/3p3cni/kuevetteproblem.hh
+++ b/test/implicit/3p3cni/kuevetteproblem.hh
@@ -242,7 +242,7 @@ public:
* \param values The neumann values for the conservation equations
* \param element The finite element
* \param fvGeomtry The finite-volume geometry in the box scheme
- * \param is The intersection between element and boundary
+ * \param intersection The intersection between element and boundary
* \param scvIdx The local vertex index
* \param boundaryFaceIdx The index of the boundary face
*
@@ -252,7 +252,7 @@ public:
void neumann(PrimaryVariables &values,
const Element &element,
const FVElementGeometry &fvGeomtry,
- const Intersection &is,
+ const Intersection &intersection,
const int scvIdx,
int boundaryFaceIdx) const
{
@@ -262,7 +262,7 @@ public:
if (isBox)
globalPos = element.geometry().corner(scvIdx);
else
- globalPos = is.geometry().center();
+ globalPos = intersection.geometry().center();
// negative values for injection
if (globalPos[0] < eps_)
diff --git a/test/implicit/co2/heterogeneousproblem.hh b/test/implicit/co2/heterogeneousproblem.hh
index 97398c1daf..cac5b84920 100644
--- a/test/implicit/co2/heterogeneousproblem.hh
+++ b/test/implicit/co2/heterogeneousproblem.hh
@@ -366,12 +366,12 @@ public:
* used for which equation on a given boundary segment.
*
* \param values The boundary types for the conservation equations
- * \param is specifies the intersection at which boundary
+ * \param intersection specifies the intersection at which boundary
* condition is to set
*/
- void boundaryTypes(BoundaryTypes &values, const Intersection &is) const
+ void boundaryTypes(BoundaryTypes &values, const Intersection &intersection) const
{
- int boundaryId = is.boundaryId();
+ int boundaryId = intersection.boundaryId();
if (boundaryId < 1 || boundaryId > 4)
{
std::cout<<"invalid boundaryId: "<<boundaryId<<std::endl;
@@ -404,7 +404,7 @@ public:
* \param values The neumann values for the conservation equations
* \param element The finite element
* \param fvGeometry The finite-volume geometry in the box scheme
- * \param is The intersection between element and boundary
+ * \param intersection The intersection between element and boundary
* \param scvIdx The local vertex index
* \param boundaryFaceIdx The index of the boundary face
*
@@ -414,11 +414,11 @@ public:
void neumann(PrimaryVariables &values,
const Element &element,
const FVElementGeometry &fvGeometry,
- const Intersection &is,
+ const Intersection &intersection,
int scvIdx,
int boundaryFaceIdx) const
{
- int boundaryId = is.boundaryId();
+ int boundaryId = intersection.boundaryId();
values = 0;
if (boundaryId == injectionBottom_)
diff --git a/test/implicit/co2ni/heterogeneousproblemni.hh b/test/implicit/co2ni/heterogeneousproblemni.hh
index 50f2f79492..f884ae0513 100644
--- a/test/implicit/co2ni/heterogeneousproblemni.hh
+++ b/test/implicit/co2ni/heterogeneousproblemni.hh
@@ -369,12 +369,12 @@ public:
* used for which equation on a given boundary segment.
*
* \param values The boundary types for the conservation equations
- * \param is specifies the intersection at which boundary
+ * \param intersection specifies the intersection at which boundary
* condition is to set
*/
- void boundaryTypes(BoundaryTypes &values, const Intersection &is) const
+ void boundaryTypes(BoundaryTypes &values, const Intersection &intersection) const
{
- int boundaryId = is.boundaryId();
+ int boundaryId = intersection.boundaryId();
if (boundaryId < 1 || boundaryId > 4)
{
std::cout<<"invalid boundaryId: "<<boundaryId<<std::endl;
@@ -407,7 +407,7 @@ public:
* \param values The neumann values for the conservation equations
* \param element The finite element
* \param fvGeometry The finite-volume geometry in the box scheme
- * \param is The intersection between element and boundary
+ * \param intersection The intersection between element and boundary
* \param scvIdx The local vertex index
* \param boundaryFaceIdx The index of the boundary face
*
@@ -417,11 +417,11 @@ public:
void neumann(PrimaryVariables &values,
const Element &element,
const FVElementGeometry &fvGeometry,
- const Intersection &is,
+ const Intersection &intersection,
int scvIdx,
int boundaryFaceIdx) const
{
- int boundaryId = is.boundaryId();
+ int boundaryId = intersection.boundaryId();
values = 0;
if (boundaryId == injectionBottom_)
diff --git a/test/implicit/mpnc/forchheimer1pproblem.hh b/test/implicit/mpnc/forchheimer1pproblem.hh
index ff69997f6d..f86a58fbe5 100644
--- a/test/implicit/mpnc/forchheimer1pproblem.hh
+++ b/test/implicit/mpnc/forchheimer1pproblem.hh
@@ -305,7 +305,7 @@ public:
void neumann(PrimaryVariables &values,
const Element &element,
const FVElementGeometry &fvGeometry,
- const Intersection &is,
+ const Intersection &intersection,
const unsigned int scvIdx,
const unsigned int boundaryFaceIdx) const
{ values = 0.; }
diff --git a/test/implicit/mpnc/forchheimer2pproblem.hh b/test/implicit/mpnc/forchheimer2pproblem.hh
index 8533d656dc..00e663e326 100644
--- a/test/implicit/mpnc/forchheimer2pproblem.hh
+++ b/test/implicit/mpnc/forchheimer2pproblem.hh
@@ -299,7 +299,7 @@ public:
void neumann(PrimaryVariables &values,
const Element &element,
const FVElementGeometry &fvGeometry,
- const Intersection &is,
+ const Intersection &intersection,
const unsigned int scvIdx,
const unsigned int boundaryFaceIdx) const
{ values = 0.; }
diff --git a/test/implicit/mpnc/obstacleproblem.hh b/test/implicit/mpnc/obstacleproblem.hh
index 0aeb878b67..cb328c67eb 100644
--- a/test/implicit/mpnc/obstacleproblem.hh
+++ b/test/implicit/mpnc/obstacleproblem.hh
@@ -284,7 +284,7 @@ public:
void neumann(PrimaryVariables &values,
const Element &element,
const FVElementGeometry &fvGeometry,
- const Intersection &is,
+ const Intersection &intersection,
const unsigned int scvIdx,
const unsigned int boundaryFaceIdx) const
{ values = 0.; }
--
GitLab