Commit bf3df30c authored by Markus Wolff's avatar Markus Wolff
Browse files

removed some warning in decoupled models



git-svn-id: svn://svn.iws.uni-stuttgart.de/DUMUX/dumux/trunk@7415 2fb0f335-1f38-0410-981e-8018bf24f1b0
parent f48068c1
......@@ -350,10 +350,7 @@ public:
private:
Problem& problem_;
static const bool compressibility_ = GET_PROP_VALUE(TypeTag, EnableCompressibility);
static const int pressureType_ = GET_PROP_VALUE(TypeTag, PressureFormulation); //!< gives kind of pressure used (\f$p_w\f$, \f$p_n\f$, \f$p_{global}\f$)
static const int saturationType_ = GET_PROP_VALUE(TypeTag, SaturationFormulation); //!< gives kind of saturation used (\f$S_w\f$, \f$S_n\f$)
const GlobalPosition& gravity_; //!< vector including the gravity constant
Scalar maxError_;
Scalar timeStep_;
......@@ -363,7 +360,10 @@ private:
Scalar density_[numPhases];
Scalar viscosity_[numPhases];
const GlobalPosition& gravity_; //!< vector including the gravity constant
static const bool compressibility_ = GET_PROP_VALUE(TypeTag, EnableCompressibility);
static const int pressureType_ = GET_PROP_VALUE(TypeTag, PressureFormulation); //!< gives kind of pressure used (\f$p_w\f$, \f$p_n\f$, \f$p_{global}\f$)
static const int saturationType_ = GET_PROP_VALUE(TypeTag, SaturationFormulation); //!< gives kind of saturation used (\f$S_w\f$, \f$S_n\f$)
};
//!function which calculates the source entry
......
......@@ -459,12 +459,6 @@ void FVSaturation2P<TypeTag>::getFlux(Scalar& update, const Intersection& inters
const GlobalPosition& globalPosI = elementI->geometry().center();
const GlobalPosition& globalPosJ = elementJ->geometry().center();
// get mobilities and fractional flow factors
Scalar lambdaWI = cellDataI.mobility(wPhaseIdx);
Scalar lambdaNWI = cellDataI.mobility(nPhaseIdx);
Scalar lambdaWJ = cellDataJ.mobility(wPhaseIdx);
Scalar lambdaNWJ = cellDataJ.mobility(nPhaseIdx);
// cell volume, assume linear map here
Scalar volume = elementI->geometry().volume();
Scalar porosity = problem_.spatialParameters().porosity(*elementI);
......@@ -512,7 +506,7 @@ void FVSaturation2P<TypeTag>::getFlux(Scalar& update, const Intersection& inters
//upwinding of lambda dependend on the phase potential gradients
if (upwindWI)
{
lambdaW = lambdaWI;
lambdaW = cellDataI.mobility(wPhaseIdx);
if (compressibility_)
{
lambdaW /= cellDataI.density(wPhaseIdx);
......@@ -529,7 +523,7 @@ void FVSaturation2P<TypeTag>::getFlux(Scalar& update, const Intersection& inters
if (upwindNWI)
{
lambdaNW = lambdaNWI;
lambdaNW = cellDataI.mobility(nPhaseIdx);
if (compressibility_)
{
lambdaNW /= cellDataI.density(nPhaseIdx);
......@@ -643,10 +637,6 @@ void FVSaturation2P<TypeTag>::getFluxOnBoundary(Scalar& update, const Intersecti
// center of face in global coordinates
const GlobalPosition& globalPosJ = intersection.geometry().center();
// get mobilities and fractional flow factors
Scalar lambdaWI = cellDataI.mobility(wPhaseIdx);
Scalar lambdaNWI = cellDataI.mobility(nPhaseIdx);
// cell volume, assume linear map here
Scalar volume = elementI->geometry().volume();
Scalar porosity = problem_.spatialParameters().porosity(*elementI);
......@@ -716,7 +706,7 @@ void FVSaturation2P<TypeTag>::getFluxOnBoundary(Scalar& update, const Intersecti
//upwinding of lambda dependend on the phase potential gradients
if (cellDataI.fluxData().isUpwindCell(wPhaseIdx, isIndex))
{
lambdaW = lambdaWI;
lambdaW = cellDataI.mobility(wPhaseIdx);
if (compressibility_)
{
lambdaW /= cellDataI.density(wPhaseIdx);
......@@ -738,7 +728,7 @@ void FVSaturation2P<TypeTag>::getFluxOnBoundary(Scalar& update, const Intersecti
if (cellDataI.fluxData().isUpwindCell(nPhaseIdx, isIndex))
{
lambdaNW = lambdaNWI;
lambdaNW = cellDataI.mobility(nPhaseIdx);
if (compressibility_)
{
lambdaNW /= cellDataI.density(nPhaseIdx);
......@@ -836,8 +826,8 @@ void FVSaturation2P<TypeTag>::getFluxOnBoundary(Scalar& update, const Intersecti
//get mobilities
Scalar lambdaW, lambdaNW;
lambdaW = lambdaWI;
lambdaNW = lambdaNWI;
lambdaW = cellDataI.mobility(wPhaseIdx);
lambdaNW = cellDataI.mobility(nPhaseIdx);
if (compressibility_)
{
lambdaW /= cellDataI.density(wPhaseIdx);
......@@ -872,8 +862,8 @@ void FVSaturation2P<TypeTag>::getFluxOnBoundary(Scalar& update, const Intersecti
if (bcType.isOutflow(satEqIdx))
{
//get mobilities
Scalar lambdaW = lambdaWI;
Scalar lambdaNW = lambdaNWI;
Scalar lambdaW = cellDataI.mobility(wPhaseIdx);
Scalar lambdaNW = cellDataI.mobility(nPhaseIdx);
if (compressibility_)
{
lambdaW /= cellDataI.density(wPhaseIdx);
......@@ -933,9 +923,6 @@ void FVSaturation2P<TypeTag>::getSource(Scalar& update, const Element& element,
Scalar porosity = problem_.spatialParameters().porosity(element);
Scalar lambdaWI = cellDataI.mobility(wPhaseIdx);
Scalar lambdaNWI = cellDataI.mobility(nPhaseIdx);
if (compressibility_)
{
viscosity_[wPhaseIdx] = cellDataI.viscosity(wPhaseIdx);
......@@ -957,8 +944,8 @@ void FVSaturation2P<TypeTag>::getSource(Scalar& update, const Element& element,
}
//get mobilities
Scalar lambdaW = lambdaWI;
Scalar lambdaNW = lambdaNWI;
Scalar lambdaW = cellDataI.mobility(wPhaseIdx);
Scalar lambdaNW = cellDataI.mobility(nPhaseIdx);
if (compressibility_)
{
lambdaW /= cellDataI.density(wPhaseIdx);
......
......@@ -200,9 +200,6 @@ void FVTransport<TypeTag>::update(const Scalar t, Scalar& dt, TransportSolutionT
IntersectionIterator isItEnd = problem_.gridView().iend(*eIt);
for (IntersectionIterator isIt = problem_.gridView().ibegin(*eIt); isIt != isItEnd; ++isIt)
{
// local number of faces
int isIndex = isIt->indexInInside();
FieldVector unitOuterNormal = isIt->centerUnitOuterNormal();
if (switchNormals_)
unitOuterNormal *= -1.0;
......
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