diff --git a/dumux/freeflow/stokes/stokeslocaljacobian.hh b/dumux/freeflow/stokes/stokeslocaljacobian.hh
index 7db0bfd2b80d02a2fff6012937fbe15869867831..cbc60a8ab807cc5c97f13a0f0b3ed341026f4aff 100644
--- a/dumux/freeflow/stokes/stokeslocaljacobian.hh
+++ b/dumux/freeflow/stokes/stokeslocaljacobian.hh
@@ -52,7 +52,7 @@ public:
Scalar numericEpsilon(const int scvIdx,
const int pvIdx) const
{
- Scalar pv = this->curVolVars_[scvIdx].primaryVars()[pvIdx];
+ Scalar pv = this->curVolVars_[scvIdx].priVars()[pvIdx];
if (pvIdx < GridView::dimension){
return 1e-7*(std::abs(pv) + 1);
}
diff --git a/dumux/freeflow/stokes/stokeslocalresidual.hh b/dumux/freeflow/stokes/stokeslocalresidual.hh
index 01a0cfed342bbf7777cfa34a7e6b4e5f30ff78f6..a927c6f8551b6aa52bbcdb16f649d78c8e4ea56e 100644
--- a/dumux/freeflow/stokes/stokeslocalresidual.hh
+++ b/dumux/freeflow/stokes/stokeslocalresidual.hh
@@ -327,7 +327,7 @@ protected:
void evalBoundary_()
{
assert(this->residual_.size() == this->fvGeometry_().numVertices);
- const ReferenceElement &refElem = ReferenceElements::general(this->element_().geometry().type());
+ const ReferenceElement &refElement = ReferenceElements::general(this->element_().geometry().type());
// loop over vertices of the element
for (int vertexIdx = 0; vertexIdx < this->fvGeometry_().numVertices; vertexIdx++)
@@ -353,14 +353,14 @@ protected:
// assemble the boundary for all vertices of the current face
const int faceIdx = isIt->indexInInside();
- const int numFaceVertices = refElem.size(faceIdx, 1, dim);
+ const int numFaceVertices = refElement.size(faceIdx, 1, dim);
// loop over the single vertices on the current face
for (int faceVertIdx = 0; faceVertIdx < numFaceVertices; ++faceVertIdx)
{
// only evaluate, if we consider the same face vertex as in the outer
// loop over the element vertices
- if (refElem.subEntity(faceIdx, 1, faceVertIdx, dim)
+ if (refElement.subEntity(faceIdx, 1, faceVertIdx, dim)
!= vertexIdx)
continue;
@@ -591,17 +591,17 @@ protected:
{
if (vertexIdx == 0 || vertexIdx == 3)
this->residual_[vertexIdx][massBalanceIdx] =
- this->curPrimaryVars_(0)[pressureIdx]-this->curPrimaryVars_(3)[pressureIdx];
+ this->curPriVars_(0)[pressureIdx] - this->curPriVars_(3)[pressureIdx];
if (vertexIdx == 1 || vertexIdx == 2)
this->residual_[vertexIdx][massBalanceIdx] =
- this->curPrimaryVars_(1)[pressureIdx]-this->curPrimaryVars_(2)[pressureIdx];
+ this->curPriVars_(1)[pressureIdx] - this->curPriVars_(2)[pressureIdx];
}
else
{
if (!bcTypes.isDirichlet(massBalanceIdx)) // do nothing in case of dirichlet
this->residual_[vertexIdx][massBalanceIdx] =
- this->curPrimaryVars_(0)[pressureIdx]+this->curPrimaryVars_(3)[pressureIdx]-
- this->curPrimaryVars_(1)[pressureIdx]-this->curPrimaryVars_(2)[pressureIdx];
+ this->curPriVars_(0)[pressureIdx] + this->curPriVars_(3)[pressureIdx]-
+ this->curPriVars_(1)[pressureIdx] - this->curPriVars_(2)[pressureIdx];
}
}
diff --git a/dumux/freeflow/stokes2c/stokes2cindices.hh b/dumux/freeflow/stokes2c/stokes2cindices.hh
index 0ee1cbf451e4473efb7ba795c76fb86b427b1f01..a7f61a27a266be2a337ce1cd483f17026aefe7cf 100644
--- a/dumux/freeflow/stokes2c/stokes2cindices.hh
+++ b/dumux/freeflow/stokes2c/stokes2cindices.hh
@@ -62,8 +62,10 @@ public:
// equation and primary variable indices
static const int dim = StokesCommonIndices<TypeTag>::dim;
- static const int transportIdx = PVOffset + dim+1; //! The index for the transport equation.
- static const int massOrMoleFracIndex = transportIdx; //! The index for the mass or mole fraction in primary variable vectors.
+ static const int transportEqIdx = PVOffset + dim+1; //!< The index for the transport equation.
+ static const int transportIdx = transportEqIdx; //!< \deprecated use transportEqIdx instead
+ static const int transportCompIdx = transportEqIdx; //!< The index for the mass or mole fraction in primary variable vectors.
+ static const int massOrMoleFracIndex = transportCompIdx; //!< \deprecated use transportCompIdx instead
static const int phaseIdx = nPhaseIdx; //!< Index of the non-wetting phase (required to use the same fluid system in coupled models)
};
diff --git a/dumux/freeflow/stokes2c/stokes2clocalresidual.hh b/dumux/freeflow/stokes2c/stokes2clocalresidual.hh
index dffb3c66a9a1111e177ece4905170f220d523267..e8ca950514ee53c8126340a449ce8084df62de7d 100644
--- a/dumux/freeflow/stokes2c/stokes2clocalresidual.hh
+++ b/dumux/freeflow/stokes2c/stokes2clocalresidual.hh
@@ -53,7 +53,8 @@ class Stokes2cLocalResidual : public StokesLocalResidual<TypeTag>
typedef typename GET_PROP_TYPE(TypeTag, Stokes2cIndices) Indices;
enum { dim = GridView::dimension };
- enum { transportIdx = Indices::transportIdx }; //!< Index of the transport equation
+ enum { transportEqIdx = Indices::transportEqIdx }; //!< Index of the transport equation
+ enum { transportIdx = transportEqIdx }; DUMUX_DEPRECATED_MSG("use transportEqIdx instead");
enum { comp1Idx = Indices::comp1Idx }; //!< Index of the transported component
enum { lCompIdx = comp1Idx } DUMUX_DEPRECATED_MSG("use comp1Idx instead");
enum { phaseIdx = GET_PROP_VALUE(TypeTag, PhaseIdx)}; //!< Index of the considered phase (only of interest when using two-phase fluidsystems)
@@ -90,7 +91,7 @@ public:
const VolumeVariables &volVars = elemVolVars[scvIdx];
// compute the storage of the component
- storage[transportIdx] =
+ storage[transportEqIdx] =
volVars.density() *
volVars.fluidState().massFraction(phaseIdx, comp1Idx);
@@ -128,8 +129,8 @@ public:
tmp += (1.0 - this->massUpwindWeight_) * // rest
dn.density() * dn.fluidState().massFraction(phaseIdx, comp1Idx);
- flux[transportIdx] += tmp;
- Valgrind::CheckDefined(flux[transportIdx]);
+ flux[transportEqIdx] += tmp;
+ Valgrind::CheckDefined(flux[transportEqIdx]);
}
/*!
@@ -147,14 +148,14 @@ public:
// diffusive component flux
for (int dimIdx = 0; dimIdx < dim; ++dimIdx)
- flux[transportIdx] -=
+ flux[transportEqIdx] -=
fluxVars.moleFractionGrad()[dimIdx] *
fluxVars.face().normal[dimIdx] *
fluxVars.diffusionCoeff() *
fluxVars.molarDensity() *
FluidSystem::molarMass(comp1Idx);
- Valgrind::CheckDefined(flux[transportIdx]);
+ Valgrind::CheckDefined(flux[transportEqIdx]);
}
};
diff --git a/dumux/freeflow/stokes2c/stokes2cvolumevariables.hh b/dumux/freeflow/stokes2c/stokes2cvolumevariables.hh
index 086b9f89cdb6d030553701a78c9f2baafc6ba297..f14330bebea12498ab0c392813647819a4f00ca5 100644
--- a/dumux/freeflow/stokes2c/stokes2cvolumevariables.hh
+++ b/dumux/freeflow/stokes2c/stokes2cvolumevariables.hh
@@ -66,7 +66,8 @@ class Stokes2cVolumeVariables : public StokesVolumeVariables<TypeTag>
} DUMUX_DEPRECATED_MSG("use comp1Idx instead");
enum { numComponents = GET_PROP_VALUE(TypeTag, NumComponents) };
enum { phaseIdx = GET_PROP_VALUE(TypeTag, PhaseIdx) };
- enum { transportIdx = Indices::transportIdx };
+ enum { transportEqIdx = Indices::transportEqIdx };
+ enum { transportIdx = transportEqIdx }; //!< \deprecated use transportEqIdx instead
public:
/*!
@@ -118,7 +119,7 @@ public:
const bool isOldSol = false)
{
Scalar massFraction[numComponents];
- massFraction[comp1Idx] = priVars[transportIdx];
+ massFraction[comp1Idx] = priVars[transportEqIdx];
massFraction[comp0Idx] = 1 - massFraction[comp1Idx];
// calculate average molar mass of the gas phase