diff --git a/dumux/decoupled/2p/diffusion/fvmpfa/lmethod/fvmpfal3dinteractionvolumecontainer.hh b/dumux/decoupled/2p/diffusion/fvmpfa/lmethod/fvmpfal3dinteractionvolumecontainer.hh
index 5a499c16b29d1172c4914aaa0eccd65389de53ff..2489055c9ff699a1f3d859be2d82e6d1ccefca05 100644
--- a/dumux/decoupled/2p/diffusion/fvmpfa/lmethod/fvmpfal3dinteractionvolumecontainer.hh
+++ b/dumux/decoupled/2p/diffusion/fvmpfa/lmethod/fvmpfal3dinteractionvolumecontainer.hh
@@ -1896,7 +1896,7 @@ void FvMpfaL3dInteractionVolumeContainer<TypeTag>::storeInteractionVolumeInfo()
storeSubVolumeElements(*ePtr, elemVertMap);
}
- for (int i = 0; i < interactionVolumes_.size(); i++)
+ for (unsigned int i = 0; i < interactionVolumes_.size(); i++)
if (interactionVolumes_[i].getElementNumber() == 0)
interactionVolumes_[i].printInteractionVolumeInfo();
diff --git a/dumux/decoupled/2p/diffusion/fvmpfa/lmethod/fvmpfal3dinteractionvolumecontaineradaptive.hh b/dumux/decoupled/2p/diffusion/fvmpfa/lmethod/fvmpfal3dinteractionvolumecontaineradaptive.hh
index 3ae9911121a40c9f857a946ce1004225082ec0e3..fec1551d7123bd0906414705ca7b8ffb106553ae 100644
--- a/dumux/decoupled/2p/diffusion/fvmpfa/lmethod/fvmpfal3dinteractionvolumecontaineradaptive.hh
+++ b/dumux/decoupled/2p/diffusion/fvmpfa/lmethod/fvmpfal3dinteractionvolumecontaineradaptive.hh
@@ -76,7 +76,7 @@ class FvMpfaL3dInteractionVolumeContainerAdaptive: public FvMpfaL3dInteractionVo
enum
{
- pressEqIdx = Indices::pressureEqIdx,
+ pressureEqIdx = Indices::pressureEqIdx,
};
typedef IndexTranslatorAdaptive IndexTranslator;
@@ -1533,7 +1533,7 @@ void FvMpfaL3dInteractionVolumeContainerAdaptive<TypeTag>::storeInteractionVolum
this->storeSubVolumeElements(*ePtr, elemVertMap);
}
- for (int i = 0; i < this->interactionVolumes_.size(); i++)
+ for (unsigned int i = 0; i < this->interactionVolumes_.size(); i++)
if (this->interactionVolumes_[i].getElementNumber() == 0)
this->interactionVolumes_[i].printInteractionVolumeInfo();
diff --git a/dumux/decoupled/2p/diffusion/fvmpfa/lmethod/fvmpfal3dpressure2padaptive.hh b/dumux/decoupled/2p/diffusion/fvmpfa/lmethod/fvmpfal3dpressure2padaptive.hh
index 73917e647f809e26c27a6715da46ea1d602822d3..45c1cf5516f04e25562023a7650c4ce4c9a8c045 100644
--- a/dumux/decoupled/2p/diffusion/fvmpfa/lmethod/fvmpfal3dpressure2padaptive.hh
+++ b/dumux/decoupled/2p/diffusion/fvmpfa/lmethod/fvmpfal3dpressure2padaptive.hh
@@ -103,7 +103,7 @@ class FvMpfaL3dPressure2pAdaptive: public FvMpfaL3dPressure2p<TypeTag>
nPhaseIdx = Indices::nPhaseIdx,
pressureIdx = Indices::pressureIdx,
saturationIdx = Indices::saturationIdx,
- pressEqIdx = Indices::pressureEqIdx,
+ pressureEqIdx = Indices::pressureEqIdx,
satEqIdx = Indices::satEqIdx,
numPhases = GET_PROP_VALUE(TypeTag, NumPhases)
};
diff --git a/dumux/decoupled/2p/diffusion/fvmpfa/lmethod/fvmpfal3dtransmissibilitycalculator.hh b/dumux/decoupled/2p/diffusion/fvmpfa/lmethod/fvmpfal3dtransmissibilitycalculator.hh
index d563843316fd0d2f64745d7f5663a77d1577099e..8d57d10604ad3695b9d8f895c4aa82343618a9eb 100644
--- a/dumux/decoupled/2p/diffusion/fvmpfa/lmethod/fvmpfal3dtransmissibilitycalculator.hh
+++ b/dumux/decoupled/2p/diffusion/fvmpfa/lmethod/fvmpfal3dtransmissibilitycalculator.hh
@@ -894,7 +894,7 @@ int FvMpfaL3dTransmissibilityCalculator<TypeTag>::transmissibilityCaseOne(
std::cout<<"perm3 = "<<K3<<"\n";
std::cout<<"perm5 = "<<K5<<"\n";
std::cout<<"lambda = ";
- for (int i = 0; i < lambda.size(); i++)
+ for (unsigned int i = 0; i < lambda.size(); i++)
{
std::cout<<lambda[i]<<" ";
}
@@ -905,6 +905,7 @@ int FvMpfaL3dTransmissibilityCalculator<TypeTag>::transmissibilityCaseOne(
return 1;
}
+
template<class TypeTag>
int FvMpfaL3dTransmissibilityCalculator<TypeTag>::transmissibilityCaseTwo(
Dune::FieldMatrix<Scalar,dim,2*dim-dim+1>& transmissibility,
@@ -1270,7 +1271,7 @@ int FvMpfaL3dTransmissibilityCalculator<TypeTag>::transmissibilityCaseTwo(
std::cout<<"perm4 = "<<K4<<"\n";
std::cout<<"perm6 = "<<K6<<"\n";
std::cout<<"lambda = ";
- for (int i = 0; i < lambda.size(); i++)
+ for (unsigned int i = 0; i < lambda.size(); i++)
{
std::cout<<lambda[i]<<" ";
}
@@ -1648,7 +1649,7 @@ int FvMpfaL3dTransmissibilityCalculator<TypeTag>::transmissibilityCaseThree(
std::cout<<"perm4 = "<<K4<<"\n";
std::cout<<"perm5 = "<<K5<<"\n";
std::cout<<"lambda = ";
- for (int i = 0; i < lambda.size(); i++)
+ for (unsigned int i = 0; i < lambda.size(); i++)
{
std::cout<<lambda[i]<<" ";
}
@@ -1657,7 +1658,6 @@ int FvMpfaL3dTransmissibilityCalculator<TypeTag>::transmissibilityCaseThree(
DUNE_THROW(Dune::MathError,"T is nan");
}
-
return 3;
}
@@ -2033,7 +2033,7 @@ int FvMpfaL3dTransmissibilityCalculator<TypeTag>::transmissibilityCaseFour(
std::cout<<"perm3 = "<<K3<<"\n";
std::cout<<"perm6 = "<<K6<<"\n";
std::cout<<"lambda = ";
- for (int i = 0; i < lambda.size(); i++)
+ for (unsigned int i = 0; i < lambda.size(); i++)
{
std::cout<<lambda[i]<<" ";
}
diff --git a/dumux/decoupled/2p/diffusion/fvmpfa/lmethod/fvmpfal3dvelocity2padaptive.hh b/dumux/decoupled/2p/diffusion/fvmpfa/lmethod/fvmpfal3dvelocity2padaptive.hh
index dfea523223ba721246f30357293c19f5c024ffe9..369f7286ef837e49b14489ccab83a67f447f1d18 100644
--- a/dumux/decoupled/2p/diffusion/fvmpfa/lmethod/fvmpfal3dvelocity2padaptive.hh
+++ b/dumux/decoupled/2p/diffusion/fvmpfa/lmethod/fvmpfal3dvelocity2padaptive.hh
@@ -100,7 +100,7 @@ template<class TypeTag> class FvMpfaL3dVelocity2pAdaptive: public FvMpfaL3dVeloc
nPhaseIdx = Indices::nPhaseIdx,
pressureIdx = Indices::pressureIdx,
saturationIdx = Indices::saturationIdx,
- pressEqIdx = Indices::pressureEqIdx,
+ pressureEqIdx = Indices::pressureEqIdx,
satEqIdx = Indices::satEqIdx,
numPhases = GET_PROP_VALUE(TypeTag, NumPhases)
};
diff --git a/dumux/decoupled/2p/diffusion/mimetic/croperator2p.hh b/dumux/decoupled/2p/diffusion/mimetic/croperator2p.hh
index 0c5aebb913940032f86dbaa36d8ad5776aee6647..913a7bdc52769979dcfe8368113d124905c71f1f 100644
--- a/dumux/decoupled/2p/diffusion/mimetic/croperator2p.hh
+++ b/dumux/decoupled/2p/diffusion/mimetic/croperator2p.hh
@@ -290,7 +290,7 @@ public:
unsigned int numFaces = eIt->template count<1>();
// get local to global id map
- for (int k = 0; k < numFaces; k++)
+ for (unsigned int k = 0; k < numFaces; k++)
{
int alpha = faceMapper_.map(*eIt, k, 1);
local2Global[k] = alpha;
diff --git a/dumux/decoupled/2p/diffusion/mimetic/croperator2padaptive.hh b/dumux/decoupled/2p/diffusion/mimetic/croperator2padaptive.hh
index f1e5489547f72e74fe650f149cc92862dd22a5dc..c8b01979558555a3b78f8c77073451a83fb4c3fd 100644
--- a/dumux/decoupled/2p/diffusion/mimetic/croperator2padaptive.hh
+++ b/dumux/decoupled/2p/diffusion/mimetic/croperator2padaptive.hh
@@ -100,7 +100,7 @@ class CROperatorAssemblerTwoPAdaptive
enum
{
- pressEqIdx = Indices::pressureEqIdx,
+ pressureEqIdx = Indices::pressureEqIdx,
};
// return number of rows/columns
@@ -188,7 +188,7 @@ template<class TypeTag>
void CROperatorAssemblerTwoPAdaptive<TypeTag>::updateMatrix()
{
// set size of all rows to zero
- for (unsigned int i = 0; i < size(); i++)
+ for (int i = 0; i < size(); i++)
A_.setrowsize(i, 0);
// build needs a flag for all entities of all codims
@@ -278,24 +278,24 @@ void CROperatorAssemblerTwoPAdaptive<TypeTag>::assemble(LocalStiffness& loc, Vec
unsigned int numFaces = intersectionMapper_.size(globalIdx);
local2Global.resize(numFaces);
- for (int i = 0; i < numFaces; i++)
+ for (unsigned int i = 0; i < numFaces; i++)
{
int idx = intersectionMapper_.map(*eIt, i);
local2Global[i] = idx;
}
// accumulate local matrix into global matrix for non-hanging nodes
- for (int i=0; i<numFaces; i++) // loop over rows, i.e. test functions
+ for (unsigned int i=0; i<numFaces; i++) // loop over rows, i.e. test functions
{
// accumulate matrix
- for (int j=0; j<numFaces; j++)
+ for (unsigned int j=0; j<numFaces; j++)
{
// the standard entry
A_[local2Global[i]][local2Global[j]] += loc.mat(i,j);
}
// essential boundary condition and rhs
- if (loc.bc(i).isDirichlet(pressEqIdx))
+ if (loc.bc(i).isDirichlet(pressureEqIdx))
{
essential[local2Global[i]][0] = BoundaryConditions::dirichlet;
f[local2Global[i]][0] = loc.rhs(i)[0];
@@ -313,7 +313,7 @@ void CROperatorAssemblerTwoPAdaptive<TypeTag>::assemble(LocalStiffness& loc, Vec
unsigned int numFaces = intersectionMapper_.size(globalIdx);
local2Global.resize(numFaces);
- for (int i = 0; i < numFaces; i++)
+ for (unsigned int i = 0; i < numFaces; i++)
{
int idx = intersectionMapper_.map(*eIt, i);
local2Global[i] = idx;
diff --git a/dumux/decoupled/2p/diffusion/mimetic/mimetic2p.hh b/dumux/decoupled/2p/diffusion/mimetic/mimetic2p.hh
index 1418783f57f286f25eaf1c9b1434cb9ac1a8f6c6..13760c922c24ed59fc81feb34ab971e92e05b748 100644
--- a/dumux/decoupled/2p/diffusion/mimetic/mimetic2p.hh
+++ b/dumux/decoupled/2p/diffusion/mimetic/mimetic2p.hh
@@ -183,11 +183,11 @@ public:
this->setcurrentsize(numFaces);
// clear assemble data
- for (int i = 0; i < numFaces; i++)
+ for (unsigned int i = 0; i < numFaces; i++)
{
this->b[i] = 0;
this->bctype[i].reset();
- for (int j = 0; j < numFaces; j++)
+ for (unsigned int j = 0; j < numFaces; j++)
this->A[i][j] = 0;
}
@@ -219,7 +219,7 @@ public:
this->setcurrentsize(numFaces);
// clear assemble data
- for (int i = 0; i < numFaces; i++)
+ for (unsigned int i = 0; i < numFaces; i++)
{
this->b[i] = 0;
this->bctype[i].reset();
@@ -238,7 +238,7 @@ public:
Scalar dInv = 0.;
computeReconstructionMatrices(element, W_[globalIdx], F, dInv);
- for (int i = 0; i < numFaces; i++)
+ for (unsigned int i = 0; i < numFaces; i++)
{
if (!this->bc(i).isDirichlet(pressureEqIdx))
f[local2Global[i]][0] += (dInv * F[i] * rhs_[globalIdx]);
@@ -417,19 +417,19 @@ void MimeticTwoPLocalStiffness<TypeTag>::assembleV(const Element& element, int)
// Calculate the element part of the matrix F D^{-1} F^T.
Dune::FieldMatrix<Scalar, 2 * dim, 2 * dim> FDinvFT(0);
- for (int i = 0; i < numFaces; i++)
- for (int j = 0; j < numFaces; j++)
+ for (unsigned int i = 0; i < numFaces; i++)
+ for (unsigned int j = 0; j < numFaces; j++)
FDinvFT[i][j] = dInv * F[i] * F[j];
// Calculate the element part of the matrix S = Pi W Pi^T - F D^{-1} F^T.
- for (int i = 0; i < numFaces; i++)
- for (int j = 0; j < numFaces; j++)
+ for (unsigned int i = 0; i < numFaces; i++)
+ for (unsigned int j = 0; j < numFaces; j++)
this->A[i][j] = PiWPiT[i][j] - FDinvFT[i][j];
// Calculate the source term F D^{-1} f
// NOT WORKING AT THE MOMENT
Scalar factor = dInv * qmean;
- for (int i = 0; i < numFaces; i++)
+ for (unsigned int i = 0; i < numFaces; i++)
this->b[i] = F[i] * factor;
// std::cout << "faceVol = " << faceVol << std::endl << "W = " << std::endl << W << std::endl
@@ -496,52 +496,52 @@ void MimeticTwoPLocalStiffness<TypeTag>::assembleElementMatrices(const Element&
// Brezzi/Lipnikov/Simonicini M3AS 2005
// (1) orthonormalize columns of the matrix R
Scalar norm = R[0][0] * R[0][0];
- for (int i = 1; i < numFaces; i++)
+ for (unsigned int i = 1; i < numFaces; i++)
norm += R[i][0] * R[i][0];
norm = sqrt(norm);
- for (int i = 0; i < numFaces; i++)
+ for (unsigned int i = 0; i < numFaces; i++)
R[i][0] /= norm;
Scalar weight = R[0][1] * R[0][0];
- for (int i = 1; i < numFaces; i++)
+ for (unsigned int i = 1; i < numFaces; i++)
weight += R[i][1] * R[i][0];
- for (int i = 0; i < numFaces; i++)
+ for (unsigned int i = 0; i < numFaces; i++)
R[i][1] -= weight * R[i][0];
norm = R[0][1] * R[0][1];
- for (int i = 1; i < numFaces; i++)
+ for (unsigned int i = 1; i < numFaces; i++)
norm += R[i][1] * R[i][1];
norm = sqrt(norm);
- for (int i = 0; i < numFaces; i++)
+ for (unsigned int i = 0; i < numFaces; i++)
R[i][1] /= norm;
if (dim == 3)
{
Scalar weight1 = R[0][2] * R[0][0];
Scalar weight2 = R[0][2] * R[0][1];
- for (int i = 1; i < numFaces; i++)
+ for (unsigned int i = 1; i < numFaces; i++)
{
weight1 += R[i][2] * R[i][0];
weight2 += R[i][2] * R[i][1];
}
- for (int i = 0; i < numFaces; i++)
+ for (unsigned int i = 0; i < numFaces; i++)
R[i][2] -= weight1 * R[i][0] + weight2 * R[i][1];
norm = R[0][2] * R[0][2];
- for (int i = 1; i < numFaces; i++)
+ for (unsigned int i = 1; i < numFaces; i++)
norm += R[i][2] * R[i][2];
norm = sqrt(norm);
- for (int i = 0; i < numFaces; i++)
+ for (unsigned int i = 0; i < numFaces; i++)
R[i][2] /= norm;
}
// std::cout << "~R =\dim" << R;
// (2) Build the matrix ~D
Dune::FieldMatrix<Scalar, 2 * dim, 2 * dim> D(0);
- for (int s = 0; s < numFaces; s++)
+ for (unsigned int s = 0; s < numFaces; s++)
{
Dune::FieldVector<Scalar, 2 * dim> es(0);
es[s] = 1;
- for (int k = 0; k < numFaces; k++)
+ for (unsigned int k = 0; k < numFaces; k++)
{
D[k][s] = es[k];
- for (int i = 0; i < dim; i++)
+ for (unsigned int i = 0; i < dim; i++)
{
D[k][s] -= R[s][i] * R[k][i];
}
@@ -564,12 +564,12 @@ void MimeticTwoPLocalStiffness<TypeTag>::assembleElementMatrices(const Element&
Dune::FieldMatrix<Scalar, 2 * dim, dim> NK(N);
NK.rightmultiply(mobility);
- for (int i = 0; i < numFaces; i++)
+ for (unsigned int i = 0; i < numFaces; i++)
{
- for (int j = 0; j < numFaces; j++)
+ for (unsigned int j = 0; j < numFaces; j++)
{
W_[globalIdx][i][j] = NK[i][0] * N[j][0];
- for (int k = 1; k < dim; k++)
+ for (unsigned int k = 1; k < dim; k++)
W_[globalIdx][i][j] += NK[i][k] * N[j][k];
}
}
@@ -588,12 +588,12 @@ void MimeticTwoPLocalStiffness<TypeTag>::assembleElementMatrices(const Element&
// This is just a row vector of size numFaces.
// scale with volume
Dune::FieldVector<Scalar, 2 * dim> c(0);
- for (int i = 0; i < numFaces; i++)
+ for (unsigned int i = 0; i < numFaces; i++)
c[i] = faceVol[i];
// Set up the element part of the matrix \Pi coupling velocities
// and pressure-traces. This is a diagonal matrix with entries given by faceVol.
- for (int i = 0; i < numFaces; i++)
+ for (unsigned int i = 0; i < numFaces; i++)
Pi[i][i] = faceVol[i];
// Calculate the element part of the matrix D^{-1} = (c W c^T)^{-1} which is just a scalar value.
diff --git a/dumux/decoupled/2p/diffusion/mimetic/mimetic2padaptive.hh b/dumux/decoupled/2p/diffusion/mimetic/mimetic2padaptive.hh
index 6dd511d94a58570ad42fa8ed07b435acb0282d85..664a832f56710df2a5607ac2df2db2078015ccc9 100644
--- a/dumux/decoupled/2p/diffusion/mimetic/mimetic2padaptive.hh
+++ b/dumux/decoupled/2p/diffusion/mimetic/mimetic2padaptive.hh
@@ -79,7 +79,7 @@ class MimeticTwoPLocalStiffnessAdaptive: public LocalStiffness<TypeTag, 1>
nPhaseIdx = Indices::nPhaseIdx,
pressureIdx = Indices::pressureIdx,
saturationIdx = Indices::saturationIdx,
- pressEqIdx = Indices::pressureEqIdx,
+ pressureEqIdx = Indices::pressureEqIdx,
satEqIdx = Indices::satEqIdx,
numPhases = GET_PROP_VALUE(TypeTag, NumPhases)
};
@@ -673,7 +673,7 @@ void MimeticTwoPLocalStiffnessAdaptive<TypeTag>::assembleElementMatrices(const E
BoundaryTypes bctype;
problem_.boundaryTypes(bctype, *isIt);
- if (bctype.isDirichlet(pressEqIdx))
+ if (bctype.isDirichlet(pressureEqIdx))
{
if (flux > 0. || !bctype.isDirichlet(satEqIdx))
{
@@ -750,13 +750,13 @@ void MimeticTwoPLocalStiffnessAdaptive<TypeTag>::assembleBC(const Element& eleme
problem_.boundaryTypes(this->bctype[faceIndex], *isIt);
PrimaryVariables boundValues(0.0);
- if (this->bctype[faceIndex].isNeumann(pressEqIdx))
+ if (this->bctype[faceIndex].isNeumann(pressureEqIdx))
{
problem_.neumann(boundValues, *isIt);
Scalar J = (boundValues[wPhaseIdx]/density_[wPhaseIdx] + boundValues[nPhaseIdx]/density_[nPhaseIdx]);
this->b[faceIndex] -= J * isIt->geometry().volume();
}
- else if (this->bctype[faceIndex].isDirichlet(pressEqIdx))
+ else if (this->bctype[faceIndex].isDirichlet(pressureEqIdx))
{
problem_.dirichlet(boundValues, *isIt);
if (pressureType == pw)
diff --git a/dumux/decoupled/common/fv/mpfa/mpfalinteractionvolume3d.hh b/dumux/decoupled/common/fv/mpfa/mpfalinteractionvolume3d.hh
index 2652dda9a170c74a3a93f2f71c3d35ce1d344afa..a75296bdc6a9c4efe55be13bdfddfc22f629b85c 100644
--- a/dumux/decoupled/common/fv/mpfa/mpfalinteractionvolume3d.hh
+++ b/dumux/decoupled/common/fv/mpfa/mpfalinteractionvolume3d.hh
@@ -312,7 +312,7 @@ public:
bool isInnerVolume()
{
- for (int i = 0; i < faceType_.size(); i++)
+ for (unsigned int i = 0; i < faceType_.size(); i++)
{
if (isOutsideFace(i) || isBoundaryFace(i))
return false;
diff --git a/dumux/decoupled/common/fv/mpfa/mpfaointeractionvolume.hh b/dumux/decoupled/common/fv/mpfa/mpfaointeractionvolume.hh
index ffa327db211d026aa6903cf7e1d493c275a0a13a..00842f8ecc50c784262079bf8d9848872cdc2848 100644
--- a/dumux/decoupled/common/fv/mpfa/mpfaointeractionvolume.hh
+++ b/dumux/decoupled/common/fv/mpfa/mpfaointeractionvolume.hh
@@ -287,7 +287,7 @@ public:
//! Returns true if the interaction volume is completely inside the model domain.
bool isInnerVolume()
{
- for (int i = 0; i < faceType_.size(); i++)
+ for (unsigned int i = 0; i < faceType_.size(); i++)
{
if (isOutsideFace(i) || isBoundaryFace(i))
return false;
diff --git a/dumux/implicit/common/implicitdarcyfluxvariables.hh b/dumux/implicit/common/implicitdarcyfluxvariables.hh
index c748595c530ba912782b8db17c9b2212015f504c..7daf29d731ab2ad5c0a7384128cb666aec8f379d 100644
--- a/dumux/implicit/common/implicitdarcyfluxvariables.hh
+++ b/dumux/implicit/common/implicitdarcyfluxvariables.hh
@@ -179,7 +179,7 @@ protected:
for (int phaseIdx = 0; phaseIdx < numPhases; phaseIdx++)
{
gradPotential_[phaseIdx]= 0.0 ;
- for (int idx = 0;
+ for (unsigned int idx = 0;
idx < face().numFap;
idx++) // loop over adjacent vertices
{
diff --git a/test/decoupled/2p/test_3d2pproblem.hh b/test/decoupled/2p/test_3d2pproblem.hh
index 96b7f55638f699f77e4d88abd7caea2aa83dfaa1..b041716bd24a7e5f8720638d870ecd2c1d8e52e2 100644
--- a/test/decoupled/2p/test_3d2pproblem.hh
+++ b/test/decoupled/2p/test_3d2pproblem.hh
@@ -171,8 +171,8 @@ enum
#else
pWIdx = Indices::pwIdx,
#endif
- SwIdx = Indices::swIdx,
- pressEqIdx = Indices::pressureEqIdx,
+ swIdx = Indices::swIdx,
+ pressureEqIdx = Indices::pressureEqIdx,
satEqIdx = Indices::satEqIdx
};
@@ -332,7 +332,7 @@ void boundaryTypesAtPos(BoundaryTypes &bcTypes, const GlobalPosition& globalPos)
}
else if (globalPos[0] > this->bBoxMax()[0] - eps_)
{
- bcTypes.setNeumann(pressEqIdx);
+ bcTypes.setNeumann(pressureEqIdx);
bcTypes.setOutflow(satEqIdx);
}
// all other boundaries
@@ -374,19 +374,19 @@ void dirichletAtPos(PrimaryVariables &values, const GlobalPosition& globalPos) c
values = 0;
#if PROBLEM == 2 //Nine-Spot
- values[SwIdx] = 0.8;
+ values[swIdx] = 0.8;
values[pWIdx] = 1;
#elif PROBLEM == 0
if (globalPos[0] < eps_)
{
- values[SwIdx] = 0.8;
+ values[swIdx] = 0.8;
typedef typename GET_PROP_TYPE(TypeTag, NonwettingPhase) NonwettingPhase;
values[pWIdx] = 1;
}
#elif PROBLEM == 1
if (globalPos[0] < eps_)
{
- values[SwIdx] = 1.0;
+ values[swIdx] = 1.0;
values[pNIdx] = 1e5;
}
#endif
@@ -409,10 +409,10 @@ void initialAtPos(PrimaryVariables &values,
{
#if PROBLEM == 1
values[pNIdx] = 0;
- values[SwIdx] = 0.0;
+ values[swIdx] = 0.0;
#else
values[pWIdx] = 0;
- values[SwIdx] = 0.2;
+ values[swIdx] = 0.2;
#endif
}