From 56dab5c0c68d8d15a34f10f55eacb79af3e1ff08 Mon Sep 17 00:00:00 2001
From: Markus Wolff <markus.wolff@twt-gmbh.de>
Date: Fri, 20 Jan 2012 08:12:58 +0000
Subject: [PATCH] removed warnings in decoupled 2p models
git-svn-id: svn://svn.iws.uni-stuttgart.de/DUMUX/dumux/trunk@7467 2fb0f335-1f38-0410-981e-8018bf24f1b0
---
.../2p/diffusion/fv/fvpressure2padaptive.hh | 9 -------
.../2p/diffusion/fv/fvvelocity2padaptive.hh | 11 --------
.../2p/diffusion/fvmpfa/fvmpfaopressure2p.hh | 27 -------------------
.../2p/diffusion/fvmpfa/fvmpfaovelocity2p.hh | 15 -----------
.../diffusion/mimetic/mimeticgroundwater.hh | 2 --
.../2p/diffusion/mimetic/mimeticpressure2p.hh | 2 --
6 files changed, 66 deletions(-)
diff --git a/dumux/decoupled/2p/diffusion/fv/fvpressure2padaptive.hh b/dumux/decoupled/2p/diffusion/fv/fvpressure2padaptive.hh
index 36921788ba..9d2ffcf272 100644
--- a/dumux/decoupled/2p/diffusion/fv/fvpressure2padaptive.hh
+++ b/dumux/decoupled/2p/diffusion/fv/fvpressure2padaptive.hh
@@ -224,15 +224,8 @@ void FVPressure2Padaptive<TypeTag>::getFlux(Dune::FieldVector<Scalar, 2>& entrie
// get face area
Scalar faceArea = intersection.geometry().volume();
- // distance vector between barycenters
- GlobalPosition distVecIJ = globalPosJ - globalPosI;
-
- // compute distance between cell centers
- Scalar distIJ = distVecIJ.two_norm();
-
// Count number of hanging nodes
// not really necessary
- int isIndexJ = intersection.indexInOutside();
int globalIdxK = 0;
ElementPointer elementK = intersection.outside();
// We are looking for two things:
@@ -299,8 +292,6 @@ void FVPressure2Padaptive<TypeTag>::getFlux(Dune::FieldVector<Scalar, 2>& entrie
ng = gravity_ * unitOuterNormal;
- Scalar lambdaWK = cellDataK.mobility(wPhaseIdx);
- Scalar lambdaNWK = cellDataK.mobility(nPhaseIdx);
Scalar fractionalWK = cellDataK.fracFlowFunc(wPhaseIdx);
Scalar fractionalNWK = cellDataK.fracFlowFunc(nPhaseIdx);
diff --git a/dumux/decoupled/2p/diffusion/fv/fvvelocity2padaptive.hh b/dumux/decoupled/2p/diffusion/fv/fvvelocity2padaptive.hh
index 9063b2871b..872d4943b4 100644
--- a/dumux/decoupled/2p/diffusion/fv/fvvelocity2padaptive.hh
+++ b/dumux/decoupled/2p/diffusion/fv/fvvelocity2padaptive.hh
@@ -202,15 +202,6 @@ void FVVelocity2Padaptive<TypeTag>::calculateVelocity(const Intersection& inters
//get face normal
const Dune::FieldVector<Scalar, dim>& unitOuterNormal = intersection.centerUnitOuterNormal();
- // get face area
- Scalar faceArea = intersection.geometry().volume();
-
- // distance vector between barycenters
- GlobalPosition distVecIJ = globalPosJ - globalPosI;
-
- // compute distance between cell centers
- Scalar distIJ = distVecIJ.two_norm();
-
// Count number of hanging nodes
// not really necessary
int isIndexJ = intersection.indexInOutside();
@@ -281,8 +272,6 @@ void FVVelocity2Padaptive<TypeTag>::calculateVelocity(const Intersection& inters
ng = gravity_ * unitOuterNormal;
- Scalar lambdaWK = cellDataK.mobility(wPhaseIdx);
- Scalar lambdaNWK = cellDataK.mobility(nPhaseIdx);
Scalar fractionalWK = cellDataK.fracFlowFunc(wPhaseIdx);
Scalar fractionalNWK = cellDataK.fracFlowFunc(nPhaseIdx);
diff --git a/dumux/decoupled/2p/diffusion/fvmpfa/fvmpfaopressure2p.hh b/dumux/decoupled/2p/diffusion/fvmpfa/fvmpfaopressure2p.hh
index 3b9e194d7d..e41e109992 100644
--- a/dumux/decoupled/2p/diffusion/fvmpfa/fvmpfaopressure2p.hh
+++ b/dumux/decoupled/2p/diffusion/fvmpfa/fvmpfaopressure2p.hh
@@ -1102,9 +1102,6 @@ void FVMPFAOPressure2P<TypeTag>::assemble()
}
}
- Scalar temperature = problem_.temperature(*eIt);
- Scalar referencePressure = problem_.referencePressure(*eIt);
-
Scalar lambdaWBound = 0;
Scalar lambdaNWBound = 0;
@@ -1221,10 +1218,6 @@ void FVMPFAOPressure2P<TypeTag>::assemble()
}
}
- Scalar temperature = problem_.temperature(*eIt);
- Scalar referencePressure = problem_.referencePressure(*eIt);
-
-
Scalar lambdaWBound = 0;
Scalar lambdaNWBound = 0;
@@ -1349,9 +1342,6 @@ void FVMPFAOPressure2P<TypeTag>::assemble()
}
}
- Scalar temperature = problem_.temperature(*eIt);
- Scalar referencePressure = problem_.referencePressure(*eIt);
-
Scalar lambdaWBound = 0;
Scalar lambdaNWBound = 0;
@@ -1483,9 +1473,6 @@ void FVMPFAOPressure2P<TypeTag>::assemble()
}
}
- Scalar temperature = problem_.temperature(*eIt);
- Scalar referencePressure = problem_.referencePressure(*eIt);
-
Scalar lambdaWBound = 0;
Scalar lambdaNWBound = 0;
@@ -1728,9 +1715,6 @@ void FVMPFAOPressure2P<TypeTag>::assemble()
}
}
- Scalar temperature = problem_.temperature(*eIt);
- Scalar referencePressure = problem_.referencePressure(*eIt);
-
Scalar lambdaWBound = 0;
Scalar lambdaNWBound = 0;
@@ -1862,9 +1846,6 @@ void FVMPFAOPressure2P<TypeTag>::assemble()
}
}
- Scalar temperature = problem_.temperature(*eIt);
- Scalar referencePressure = problem_.referencePressure(*eIt);
-
Scalar lambdaWBound = 0;
Scalar lambdaNWBound = 0;
@@ -1918,9 +1899,6 @@ void FVMPFAOPressure2P<TypeTag>::assemble()
}
}
- Scalar temperature = problem_.temperature(*eIt);
- Scalar referencePressure = problem_.referencePressure(*eIt);
-
Scalar lambdaWBound = 0;
Scalar lambdaNWBound = 0;
@@ -2105,9 +2083,6 @@ void FVMPFAOPressure2P<TypeTag>::assemble()
}
}
- Scalar temperature = problem_.temperature(*eIt);
- Scalar referencePressure = problem_.referencePressure(*eIt);
-
Scalar lambdaWBound = 0;
Scalar lambdaNWBound = 0;
@@ -2407,8 +2382,6 @@ void FVMPFAOPressure2P<TypeTag>::updateMaterialLaws()
CellData& cellData = problem_.variables().cellData(globalIdx);
- Scalar temperature = problem_.temperature(*eIt);
-
//determine phase saturations from primary saturation variable
Scalar satW = cellData.saturation(wPhaseIdx);
diff --git a/dumux/decoupled/2p/diffusion/fvmpfa/fvmpfaovelocity2p.hh b/dumux/decoupled/2p/diffusion/fvmpfa/fvmpfaovelocity2p.hh
index 5e352a76d5..3f7088ac8e 100644
--- a/dumux/decoupled/2p/diffusion/fvmpfa/fvmpfaovelocity2p.hh
+++ b/dumux/decoupled/2p/diffusion/fvmpfa/fvmpfaovelocity2p.hh
@@ -827,9 +827,6 @@ void FVMPFAOVelocity2P<TypeTag>::calculateVelocity()
}
}
- Scalar temperature = problem_.temperature(*eIt);
- Scalar referencePressure = problem_.referencePressure(*eIt);
-
Scalar lambdaWBound = 0;
Scalar lambdaNWBound = 0;
@@ -950,9 +947,6 @@ void FVMPFAOVelocity2P<TypeTag>::calculateVelocity()
}
}
- Scalar temperature = problem_.temperature(*eIt);
- Scalar referencePressure = problem_.referencePressure(*eIt);
-
Scalar lambdaWBound = 0;
Scalar lambdaNWBound = 0;
@@ -1089,9 +1083,6 @@ void FVMPFAOVelocity2P<TypeTag>::calculateVelocity()
}
}
- Scalar temperature = problem_.temperature(*eIt);
- Scalar referencePressure = problem_.referencePressure(*eIt);
-
Scalar lambdaWBound = 0;
Scalar lambdaNWBound = 0;
@@ -1238,9 +1229,6 @@ void FVMPFAOVelocity2P<TypeTag>::calculateVelocity()
}
}
- Scalar temperature = problem_.temperature(*eIt);
- Scalar referencePressure = problem_.referencePressure(*eIt);
-
Scalar lambdaWBound = 0;
Scalar lambdaNWBound = 0;
@@ -1628,9 +1616,6 @@ void FVMPFAOVelocity2P<TypeTag>::calculateVelocity()
}
}
- Scalar temperature = problem_.temperature(*eIt);
- Scalar referencePressure = problem_.referencePressure(*eIt);
-
Scalar lambdaWBound = 0;
Scalar lambdaNWBound = 0;
diff --git a/dumux/decoupled/2p/diffusion/mimetic/mimeticgroundwater.hh b/dumux/decoupled/2p/diffusion/mimetic/mimeticgroundwater.hh
index 1546c17d3d..8da2600ea8 100644
--- a/dumux/decoupled/2p/diffusion/mimetic/mimeticgroundwater.hh
+++ b/dumux/decoupled/2p/diffusion/mimetic/mimeticgroundwater.hh
@@ -419,8 +419,6 @@ private:
if (this->bctype[faceIndex].isNeumann(pressEqIdx))
{
- int globalIdx = problem_.variables().index(element);
-
problem_.neumann(boundValues, *isIt);
Scalar J = (boundValues[wPhaseIdx]/density_[wPhaseIdx] + boundValues[nPhaseIdx]/density_[nPhaseIdx]);
this->b[faceIndex] -= J * isIt->geometry().volume();
diff --git a/dumux/decoupled/2p/diffusion/mimetic/mimeticpressure2p.hh b/dumux/decoupled/2p/diffusion/mimetic/mimeticpressure2p.hh
index 310abcaf7b..c91e5a4d8a 100644
--- a/dumux/decoupled/2p/diffusion/mimetic/mimeticpressure2p.hh
+++ b/dumux/decoupled/2p/diffusion/mimetic/mimeticpressure2p.hh
@@ -315,8 +315,6 @@ void MimeticPressure2P<TypeTag>::updateMaterialLaws()
CellData& cellData = problem_.variables().cellData(globalIdx);
- Scalar temperature = problem_.temperature(*eIt);
-
//determine phase saturations from primary saturation variable
Scalar satW = cellData.saturation(wPhaseIdx);
--
GitLab