Commit 79eb7d74 authored by Andreas Lauser's avatar Andreas Lauser
Browse files

fix the GCC 4.6 stuff in a more backward compatible way and fix a lot of...

fix the GCC 4.6 stuff in a more backward compatible way and fix a lot of "variable set but not used" warnings on GCC 4.6

if the compiler doesn't know about constexpr

git-svn-id: svn://svn.iws.uni-stuttgart.de/DUMUX/dumux/trunk@5676 2fb0f335-1f38-0410-981e-8018bf24f1b0
parent 5b59c10a
......@@ -377,7 +377,7 @@ private:
&& lambda > (bboxMax_[0] - 0.55*width)/width;
}
static const Scalar eps_ = 3e-6;
static constexpr Scalar eps_ = 3e-6;
GlobalPosition bboxMin_;
GlobalPosition bboxMax_;
......
......@@ -414,7 +414,7 @@ private:
return onUpperBoundary_(globalPos) && (bboxMax_[0]-0.35*width)/width > lambda && lambda > (bboxMax_[0]-0.55*width)/width;
}
static const Scalar eps_ = 3e-6;
static constexpr Scalar eps_ = 3e-6;
GlobalPosition bboxMin_;
GlobalPosition bboxMax_;
......
......@@ -73,7 +73,7 @@ class OnePLocalResidual : public BoxLocalResidual<TypeTag>
pressureIdx = Indices::pressureIdx,
};
static const Scalar upwindWeight = GET_PROP_VALUE(TypeTag, PTAG(UpwindWeight));
static constexpr Scalar upwindWeight = GET_PROP_VALUE(TypeTag, PTAG(UpwindWeight));
typedef typename GET_PROP_TYPE(TypeTag, PTAG(VolumeVariables)) VolumeVariables;
typedef typename GET_PROP_TYPE(TypeTag, PTAG(FluxVariables)) FluxVariables;
......
......@@ -93,7 +93,7 @@ protected:
transEqIdx = Indices::transEqIdx,
};
static const Scalar upwindAlpha = GET_PROP_VALUE(TypeTag, PTAG(UpwindAlpha));
static constexpr Scalar upwindAlpha = GET_PROP_VALUE(TypeTag, PTAG(UpwindAlpha));
typedef typename GridView::template Codim<0>::Entity Element;
typedef typename GridView::template Codim<0>::Iterator ElementIterator;
......
......@@ -106,7 +106,7 @@ class OnePTwoCBoxModel : public BoxModel<TypeTag>
};
typedef Dune::FieldVector<Scalar, dimWorld> GlobalPosition;
typedef typename GridView::template Codim<dim>::Iterator VertexIterator;
static const Scalar upwindAlpha = GET_PROP_VALUE(TypeTag, PTAG(UpwindAlpha));
static constexpr Scalar upwindAlpha = GET_PROP_VALUE(TypeTag, PTAG(UpwindAlpha));
typedef Dune::FieldMatrix<Scalar, dimWorld, dimWorld> Tensor;
public:
......
......@@ -120,7 +120,7 @@ protected:
typedef Dune::FieldVector<Scalar, dimWorld> GlobalPosition;
typedef Dune::FieldMatrix<Scalar, dimWorld, dimWorld> Tensor;
static const Scalar mobilityUpwindAlpha =
static constexpr Scalar mobilityUpwindAlpha =
GET_PROP_VALUE(TypeTag, PTAG(MobilityUpwindAlpha));
public:
......
......@@ -151,7 +151,7 @@ class TwoPTwoCModel: public BoxModel<TypeTag>
typedef Dune::FieldVector<Scalar, dim> LocalPosition;
typedef Dune::FieldVector<Scalar, dimWorld> GlobalPosition;
static const Scalar mobilityUpwindAlpha =
static constexpr Scalar mobilityUpwindAlpha =
GET_PROP_VALUE(TypeTag, PTAG(MobilityUpwindAlpha));
public:
......
......@@ -82,7 +82,7 @@ class TwoPTwoCNILocalResidual : public TwoPTwoCLocalResidual<TypeTag>
typedef Dune::FieldVector<Scalar, dim> LocalPosition;
typedef Dune::FieldVector<Scalar, dimWorld> GlobalPosition;
static const Scalar mobilityUpwindAlpha = GET_PROP_VALUE(TypeTag, PTAG(MobilityUpwindAlpha));
static constexpr Scalar mobilityUpwindAlpha = GET_PROP_VALUE(TypeTag, PTAG(MobilityUpwindAlpha));
public:
/*!
......
......@@ -81,7 +81,7 @@ class TwoPNILocalResidual : public TwoPLocalResidual<TypeTag>
typedef Dune::FieldVector<Scalar, dimWorld> Vector;
static const Scalar mobilityUpwindAlpha = GET_PROP_VALUE(TypeTag, PTAG(MobilityUpwindAlpha));
static constexpr Scalar mobilityUpwindAlpha = GET_PROP_VALUE(TypeTag, PTAG(MobilityUpwindAlpha));
public:
/*!
......
......@@ -64,7 +64,7 @@ class RichardsLocalResidual : public BoxLocalResidual<TypeTag>
};
typedef Dune::FieldVector<Scalar, dimWorld> Vector;
static const Scalar mobilityUpwindAlpha = GET_PROP_VALUE(TypeTag, PTAG(MobilityUpwindAlpha));
static constexpr Scalar mobilityUpwindAlpha = GET_PROP_VALUE(TypeTag, PTAG(MobilityUpwindAlpha));
public:
/*!
......
......@@ -149,11 +149,11 @@ SET_PROP(DecoupledOneP, SolverParameters)
{
public:
//solver parameters
static const double reductionSolver = GET_PROP_VALUE(TypeTag, PTAG(ReductionSolver));
static const int maxIterationNumberSolver = GET_PROP_VALUE(TypeTag, PTAG(MaxIterationNumberSolver));
static const int iterationNumberPreconditioner = GET_PROP_VALUE(TypeTag, PTAG(IterationNumberPreconditioner));
static const int verboseLevelSolver = GET_PROP_VALUE(TypeTag, PTAG(VerboseLevelSolver));
static const double relaxationPreconditioner = GET_PROP_VALUE(TypeTag, PTAG(RelaxationPreconditioner));
static constexpr double reductionSolver = GET_PROP_VALUE(TypeTag, PTAG(ReductionSolver));
static constexpr int maxIterationNumberSolver = GET_PROP_VALUE(TypeTag, PTAG(MaxIterationNumberSolver));
static constexpr int iterationNumberPreconditioner = GET_PROP_VALUE(TypeTag, PTAG(IterationNumberPreconditioner));
static constexpr int verboseLevelSolver = GET_PROP_VALUE(TypeTag, PTAG(VerboseLevelSolver));
static constexpr double relaxationPreconditioner = GET_PROP_VALUE(TypeTag, PTAG(RelaxationPreconditioner));
};
}
}
......
......@@ -215,11 +215,11 @@ SET_PROP(DecoupledTwoP, SolverParameters)
{
public:
//solver parameters
static const double reductionSolver = GET_PROP_VALUE(TypeTag, PTAG(ReductionSolver));
static const int maxIterationNumberSolver = GET_PROP_VALUE(TypeTag, PTAG(MaxIterationNumberSolver));
static const int iterationNumberPreconditioner = GET_PROP_VALUE(TypeTag, PTAG(IterationNumberPreconditioner));
static const int verboseLevelSolver = GET_PROP_VALUE(TypeTag, PTAG(VerboseLevelSolver));
static const double relaxationPreconditioner = GET_PROP_VALUE(TypeTag, PTAG(RelaxationPreconditioner));
static constexpr double reductionSolver = GET_PROP_VALUE(TypeTag, PTAG(ReductionSolver));
static constexpr int maxIterationNumberSolver = GET_PROP_VALUE(TypeTag, PTAG(MaxIterationNumberSolver));
static constexpr int iterationNumberPreconditioner = GET_PROP_VALUE(TypeTag, PTAG(IterationNumberPreconditioner));
static constexpr int verboseLevelSolver = GET_PROP_VALUE(TypeTag, PTAG(VerboseLevelSolver));
static constexpr double relaxationPreconditioner = GET_PROP_VALUE(TypeTag, PTAG(RelaxationPreconditioner));
};
// \}
......
......@@ -588,19 +588,19 @@ void FVPressure2P<TypeTag>::assemble(bool first)
//calculate consitutive relations depending on the kind of saturation used
//determine phase saturations from primary saturation variable
Scalar satW = 0;
Scalar satNW = 0;
//Scalar satNW = 0;
switch (saturationType)
{
case Sw:
{
satW = satBound;
satNW = 1 - satBound;
//satNW = 1 - satBound;
break;
}
case Sn:
{
satW = 1 - satBound;
satNW = satBound;
//satNW = satBound;
}
}
......@@ -851,26 +851,26 @@ void FVPressure2P<TypeTag>::updateMaterialLaws()
//determine phase saturations from primary saturation variable
Scalar satW = 0;
Scalar satNW = 0;
//Scalar satNW = 0;
switch (saturationType)
{
case Sw:
{
satW = problem_.variables().saturation()[globalIdx];
satNW = 1 - problem_.variables().saturation()[globalIdx];
//satNW = 1 - problem_.variables().saturation()[globalIdx];
break;
}
case Sn:
{
satW = 1 - problem_.variables().saturation()[globalIdx];
satNW = problem_.variables().saturation()[globalIdx];
//satNW = problem_.variables().saturation()[globalIdx];
break;
}
}
problem_.variables().capillaryPressure(globalIdx) = MaterialLaw::pC(
problem_.spatialParameters().materialLawParams(globalPos, *eIt), satW);
problem_.spatialParameters().materialLawParams(globalPos, *eIt), satW);
//determine phase pressures from primary pressure variable
Scalar pressW = 0;
Scalar pressNW = 0;
......
......@@ -442,19 +442,19 @@ void FVVelocity2P<TypeTag>::calculateVelocity()
{
//determine phase saturations from primary saturation variable
Scalar satW;
Scalar satNW;
//Scalar satNW;
switch (this->saturationType)
{
case Sw:
{
satW = satBound;
satNW = 1-satBound;
//satNW = 1-satBound;
break;
}
case Sn:
{
satW = 1-satBound;
satNW = satBound;
//satNW = satBound;
break;
}
default:
......
......@@ -462,7 +462,7 @@ void FVMPFAOPressure2P<TypeTag>::assemble()
// get common geometry information for the following computation
// cell 1 geometry type
Dune::GeometryType gt1 = eIt->geometry().type();
//Dune::GeometryType gt1 = eIt->geometry().type();
// get global coordinate of cell 1 center
GlobalPosition globalPos1 = eIt->geometry().center();
......@@ -563,7 +563,7 @@ void FVMPFAOPressure2P<TypeTag>::assemble()
}
// get geometry type of face 'isIt', i.e., the face between cell1 and cell2 (locally numbered)
Dune::GeometryType gtf12 = isIt->geometryInInside().type();
//Dune::GeometryType gtf12 = isIt->geometryInInside().type();
// center of face in global coordinates, i.e., the midpoint of edge 'isIt'
GlobalPosition
......@@ -579,7 +579,7 @@ void FVMPFAOPressure2P<TypeTag>::assemble()
*= face12vol/2.0;
// get geometry type of 'nextisIt', i.e., face between cell1 and cell3 (locally numbered)
Dune::GeometryType gtf13 = nextisIt->geometryInInside().type();
//Dune::GeometryType gtf13 = nextisIt->geometryInInside().type();
// center of face in global coordinates, i.e., the midpoint of edge 'nextisIt'
GlobalPosition globalPosFace13
......@@ -623,7 +623,7 @@ void FVMPFAOPressure2P<TypeTag>::assemble()
int globalIdx2 = problem_.variables().index(*outside);
// neighbor cell 2 geometry type
Dune::GeometryType gt2 = outside->geometry().type();
//Dune::GeometryType gt2 = outside->geometry().type();
// get global coordinate of neighbor cell 2 center
GlobalPosition
......@@ -646,7 +646,7 @@ void FVMPFAOPressure2P<TypeTag>::assemble()
int globalIdx3 = problem_.variables().index(*nextisItoutside);
// neighbor cell 3 geometry type
Dune::GeometryType gt3 = nextisItoutside->geometry().type();
//Dune::GeometryType gt3 = nextisItoutside->geometry().type();
// get global coordinate of neighbor cell 3 center
GlobalPosition
......@@ -684,7 +684,7 @@ void FVMPFAOPressure2P<TypeTag>::assemble()
globalIdx4 = problem_.variables().index(*innerisItoutside);
// neighbor cell 4 geometry type
Dune::GeometryType gt4 = innerisItoutside->geometry().type();
//Dune::GeometryType gt4 = innerisItoutside->geometry().type();
// get global coordinate of neighbor cell 4 center
globalPos4 = innerisItoutside->geometry().center();
......@@ -726,7 +726,7 @@ void FVMPFAOPressure2P<TypeTag>::assemble()
}
// get geometry type of face 'isIt24'
Dune::GeometryType gtf24 = isIt24->geometryInInside().type();
//Dune::GeometryType gtf24 = isIt24->geometryInInside().type();
// center of face in global coordinates, i.e., the midpoint of edge 'isIt24'
GlobalPosition
......@@ -766,7 +766,7 @@ void FVMPFAOPressure2P<TypeTag>::assemble()
}
// get geometry type of face 'isIt34'
Dune::GeometryType gtf34 = isIt34->geometryInInside().type();
//Dune::GeometryType gtf34 = isIt34->geometryInInside().type();
// center of face in global coordinates, i.e., the midpoint of edge 'isIt34'
GlobalPosition
......@@ -939,7 +939,7 @@ void FVMPFAOPressure2P<TypeTag>::assemble()
}
// get geometry type of face 'isIt24'
Dune::GeometryType gtf24 = isIt24->geometryInInside().type();
//Dune::GeometryType gtf24 = isIt24->geometryInInside().type();
// center of face in global coordinates, i.e., the midpoint of edge 'isIt24'
GlobalPosition
......@@ -1535,7 +1535,7 @@ void FVMPFAOPressure2P<TypeTag>::assemble()
int globalIdx3 = problem_.variables().index(*nextisItoutside);
// neighbor cell 3 geometry type
Dune::GeometryType gt3 = nextisItoutside->geometry().type();
//Dune::GeometryType gt3 = nextisItoutside->geometry().type();
// get global coordinate of neighbor cell 3 center
GlobalPosition
......@@ -1570,7 +1570,7 @@ void FVMPFAOPressure2P<TypeTag>::assemble()
}
// get geometry type of face 'isIt34'
Dune::GeometryType gtf34 = isIt34->geometryInInside().type();
//Dune::GeometryType gtf34 = isIt34->geometryInInside().type();
// center of face in global coordinates, i.e., the midpoint of edge 'isIt34'
GlobalPosition
......@@ -2018,7 +2018,7 @@ void FVMPFAOPressure2P<TypeTag>::assemble()
int globalIdx3 = problem_.variables().index(*nextisItoutside);
// neighbor cell 3 geometry type
Dune::GeometryType gt3 = nextisItoutside->geometry().type();
//Dune::GeometryType gt3 = nextisItoutside->geometry().type();
// get global coordinate of neighbor cell 3 center
GlobalPosition
......@@ -2053,7 +2053,7 @@ void FVMPFAOPressure2P<TypeTag>::assemble()
}
// get geometry type of face 'isIt34'
Dune::GeometryType gtf34 = isIt34->geometryInInside().type();
//Dune::GeometryType gtf34 = isIt34->geometryInInside().type();
// center of face in global coordinates, i.e., the midpoint of edge 'isIt34'
GlobalPosition
......@@ -2452,19 +2452,19 @@ void FVMPFAOPressure2P<TypeTag>::updateMaterialLaws()
//determine phase saturations from primary saturation variable
Scalar satW = 0;
Scalar satNW = 0;
//Scalar satNW = 0;
switch (saturationType)
{
case Sw:
{
satW = problem_.variables().saturation()[globalIdx];
satNW = 1 - problem_.variables().saturation()[globalIdx];
//satNW = 1 - problem_.variables().saturation()[globalIdx];
break;
}
case Sn:
{
satW = 1 - problem_.variables().saturation()[globalIdx];
satNW = problem_.variables().saturation()[globalIdx];
//satNW = problem_.variables().saturation()[globalIdx];
break;
}
}
......
......@@ -119,7 +119,7 @@ void FVMPFAOVelocity2P<TypeTag>::calculateVelocity()
// get common geometry information for the following computation
// cell 1 geometry type
Dune::GeometryType gt1 = eIt->geometry().type();
//Dune::GeometryType gt1 = eIt->geometry().type();
// get global coordinate of cell 1 center
GlobalPosition globalPos1 = eIt->geometry().center();
......@@ -225,7 +225,7 @@ void FVMPFAOVelocity2P<TypeTag>::calculateVelocity()
}
// get geometry type of face 'isIt', i.e., the face between cell1 and cell2 (locally numbered)
Dune::GeometryType gtf12 = isIt->geometryInInside().type();
//Dune::GeometryType gtf12 = isIt->geometryInInside().type();
// center of face in global coordinates, i.e., the midpoint of edge 'isIt'
GlobalPosition globalPosFace12 = isIt->geometry().center();
......@@ -250,7 +250,7 @@ void FVMPFAOVelocity2P<TypeTag>::calculateVelocity()
unitOuterNormal[indexInInside] = unitOuterNormaln1;
// get geometry type of 'nextisIt', i.e., face between cell1 and cell3 (locally numbered)
Dune::GeometryType gtf13 = nextisIt->geometryInInside().type();
//Dune::GeometryType gtf13 = nextisIt->geometryInInside().type();
// center of face in global coordinates, i.e., the midpoint of edge 'nextisIt'
GlobalPosition globalPosFace13 = nextisIt->geometry().center();
......@@ -300,7 +300,7 @@ void FVMPFAOVelocity2P<TypeTag>::calculateVelocity()
double press2 = this->problem().variables().pressure()[globalIdx2];
// neighbor cell 2 geometry type
Dune::GeometryType gt2 = outside->geometry().type();
//Dune::GeometryType gt2 = outside->geometry().type();
// get global coordinate of neighbor cell 2 center
GlobalPosition globalPos2 = outside->geometry().center();
......@@ -325,7 +325,7 @@ void FVMPFAOVelocity2P<TypeTag>::calculateVelocity()
double press3 = this->problem().variables().pressure()[globalIdx3];
// neighbor cell 3 geometry type
Dune::GeometryType gt3 = nextisItoutside->geometry().type();
//Dune::GeometryType gt3 = nextisItoutside->geometry().type();
// get global coordinate of neighbor cell 3 center
GlobalPosition globalPos3 = nextisItoutside->geometry().center();
......@@ -363,7 +363,7 @@ void FVMPFAOVelocity2P<TypeTag>::calculateVelocity()
globalIdx4 = this->problem().variables().index(*innerisItoutside);
// neighbor cell 4 geometry type
Dune::GeometryType gt4 = innerisItoutside->geometry().type();
//Dune::GeometryType gt4 = innerisItoutside->geometry().type();
// get global coordinate of neighbor cell 4 center
globalPos4 = innerisItoutside->geometry().center();
......@@ -409,7 +409,7 @@ void FVMPFAOVelocity2P<TypeTag>::calculateVelocity()
}
// get geometry type of face 'isIt24'
Dune::GeometryType gtf24 = isIt24->geometryInInside().type();
//Dune::GeometryType gtf24 = isIt24->geometryInInside().type();
// center of face in global coordinates, i.e., the midpoint of edge 'isIt24'
GlobalPosition globalPosFace24 = isIt24->geometry().center();
......@@ -446,7 +446,7 @@ void FVMPFAOVelocity2P<TypeTag>::calculateVelocity()
}
// get geometry type of face 'isIt34'
Dune::GeometryType gtf34 = isIt34->geometryInInside().type();
//Dune::GeometryType gtf34 = isIt34->geometryInInside().type();
// center of face in global coordinates, i.e., the midpoint of edge 'isIt34'
GlobalPosition globalPosFace34 = isIt34->geometry().center();
......@@ -629,7 +629,7 @@ void FVMPFAOVelocity2P<TypeTag>::calculateVelocity()
}
// get geometry type of face 'isIt24'
Dune::GeometryType gtf24 = isIt24->geometryInInside().type();
//Dune::GeometryType gtf24 = isIt24->geometryInInside().type();
// center of face in global coordinates, i.e., the midpoint of edge 'isIt24'
GlobalPosition globalPosFace24 = isIt24->geometry().center();
......@@ -1253,7 +1253,7 @@ void FVMPFAOVelocity2P<TypeTag>::calculateVelocity()
double press3 = this->problem().variables().pressure()[globalIdx3];
// neighbor cell 3 geometry type
Dune::GeometryType gt3 = nextisItoutside->geometry().type();
//Dune::GeometryType gt3 = nextisItoutside->geometry().type();
// get global coordinate of neighbor cell 3 center
GlobalPosition globalPos3 = nextisItoutside->geometry().center();
......@@ -1289,7 +1289,7 @@ void FVMPFAOVelocity2P<TypeTag>::calculateVelocity()
}
// get geometry type of face 'isIt34'
Dune::GeometryType gtf34 = isIt34->geometryInInside().type();
//Dune::GeometryType gtf34 = isIt34->geometryInInside().type();
// center of face in global coordinates, i.e., the midpoint of edge 'isIt34'
GlobalPosition globalPosFace34 = isIt34->geometry().center();
......@@ -1753,7 +1753,7 @@ void FVMPFAOVelocity2P<TypeTag>::calculateVelocity()
double press3 = this->problem().variables().pressure()[globalIdx3];
// neighbor cell 3 geometry type
Dune::GeometryType gt3 = nextisItoutside->geometry().type();
//Dune::GeometryType gt3 = nextisItoutside->geometry().type();
// get global coordinate of neighbor cell 3 center
GlobalPosition globalPos3 = nextisItoutside->geometry().center();
......@@ -1789,7 +1789,7 @@ void FVMPFAOVelocity2P<TypeTag>::calculateVelocity()
}
// get geometry type of face 'isIt34'
Dune::GeometryType gtf34 = isIt34->geometryInInside().type();
//Dune::GeometryType gtf34 = isIt34->geometryInInside().type();
// center of face in global coordinates, i.e., the midpoint of edge 'isIt34'
GlobalPosition globalPosFace34 = isIt34->geometry().center();
......
......@@ -110,7 +110,7 @@ public:
int globalIdxI = problem_.variables().index(element);
// get geometry type of face
Dune::GeometryType faceGT = isIt->geometryInInside().type();
//Dune::GeometryType faceGT = isIt->geometryInInside().type();
Scalar temperature = problem_.temperature(globalPos, element);
Scalar referencePressure = problem_.referencePressure(globalPos, element);
......
......@@ -291,19 +291,19 @@ public:
//determine phase saturations from primary saturation variable
Scalar satW;
Scalar satNW;
//Scalar satNW;
switch (saturationType_)
{
case Sw:
{
satW = satBound;
satNW = 1 - satBound;
//satNW = 1 - satBound;
break;
}
case Sn:
{
satW = 1 - satBound;
satNW = satBound;
//satNW = satBound;
break;
}
default:
......@@ -474,7 +474,7 @@ private:
static const int pressureType_ = GET_PROP_VALUE(TypeTag, PTAG(PressureFormulation));
static const int velocityType_ = GET_PROP_VALUE(TypeTag, PTAG(VelocityFormulation));
static const int saturationType_ = GET_PROP_VALUE(TypeTag, PTAG(SaturationFormulation));
static const Scalar eps_ = 5e-3;
static constexpr Scalar eps_ = 5e-3;
};
}
......
......@@ -288,7 +288,7 @@ int FVSaturation2P<TypeTag>::update(const Scalar t, Scalar& dt,
updateVec = 0;
// some phase properties
Dune::FieldVector<Scalar, dimWorld> gravity = problem_.gravity();
//Dune::FieldVector<Scalar, dimWorld> gravity = problem_.gravity();
// compute update vector
ElementIterator eItEnd = problem_.gridView().template end<0> ();
......@@ -376,8 +376,8 @@ int FVSaturation2P<TypeTag>::update(const Scalar t, Scalar& dt,
Scalar lambdaW = 0;
Scalar lambdaNW = 0;
Scalar viscosityW = 0;
Scalar viscosityNW = 0;
//Scalar viscosityW = 0;
//Scalar viscosityNW = 0;
//upwinding of lambda dependend on the phase potential gradients
if (potentialW >= 0.)
......@@ -387,7 +387,7 @@ int FVSaturation2P<TypeTag>::update(const Scalar t, Scalar& dt,
{
lambdaW /= densityWI;
}//divide by density because lambda is saved as lambda*density
viscosityW = viscosityWI;
//viscosityW = viscosityWI;
}
else
{
......@@ -396,8 +396,8 @@ int FVSaturation2P<TypeTag>::update(const Scalar t, Scalar& dt,
{
lambdaW /= densityWJ;
}//divide by density because lambda is saved as lambda*density
viscosityW = problem_.variables().viscosityWetting(
globalIdxJ);
//viscosityW = problem_.variables().viscosityWetting(
// globalIdxJ);
}
if (potentialNW >= 0.)
......@@ -407,7 +407,7 @@ int FVSaturation2P<TypeTag>::update(const Scalar t, Scalar& dt,
{
lambdaNW /= densityNWI;
}//divide by density because lambda is saved as lambda*density
viscosityNW = viscosityNWI;
//viscosityNW = viscosityNWI;
}
else
{
......@@ -417,8 +417,8 @@ int FVSaturation2P<TypeTag>::update(const Scalar t, Scalar& dt,
{
lambdaNW /= densityNWJ;
}//divide by density because lambda is saved as lambda*density
viscosityNW = problem_.variables().viscosityNonwetting(
globalIdxJ);
//viscosityNW = problem_.variables().viscosityNonwetting(
// globalIdxJ);
}
switch (velocityType_)
......
......@@ -115,7 +115,7 @@ public:
int globalIdxI = problem_.variables().index(element);
// get geometry type of face
Dune::GeometryType faceGT = isIt->geometryInInside().type();
//Dune::GeometryType faceGT = isIt->geometryInInside().type();
Scalar potentialW = problem_.variables().potentialWetting(globalIdxI, indexInInside);
Scalar potentialNW = problem_.variables().potentialNonwetting(globalIdxI, indexInInside);
......
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