Commit 3545fafc authored by Christoph Grueninger's avatar Christoph Grueninger
Browse files

Fix warnings, headercheck, and an issue with the documentation.

Thanks to Aaron for the hint concerning the documentation bug.
(reviewed by nicolas)


git-svn-id: svn://svn.iws.uni-stuttgart.de/DUMUX/dumux/trunk@11323 2fb0f335-1f38-0410-981e-8018bf24f1b0
parent 9dc20c0f
......@@ -223,7 +223,7 @@ public:
return upwindPotential_[indexInInside][phaseIdx];
}
DUNE_DEPRECATED_MSG("use upwindPotential() instead");
DUNE_DEPRECATED_MSG("use upwindPotential() instead")
Scalar potential(int phaseIdx, int indexInInside)
{
return upwindPotential_[indexInInside][phaseIdx];
......@@ -239,7 +239,7 @@ public:
return upwindPotential_[indexInInside][phaseIdx];
}
DUNE_DEPRECATED_MSG("use upwindPotential() instead");
DUNE_DEPRECATED_MSG("use upwindPotential() instead")
Scalar potential(int phaseIdx, int indexInInside) const
{
return upwindPotential_[indexInInside][phaseIdx];
......@@ -256,7 +256,7 @@ public:
upwindPotential_[indexInInside][phaseIdx] = pot;
}
DUNE_DEPRECATED_MSG("use setUpwindPotential() instead");
DUNE_DEPRECATED_MSG("use setUpwindPotential() instead")
void setPotential(int phaseIdx, int indexInInside, Scalar pot)
{
upwindPotential_[indexInInside][phaseIdx] = pot;
......@@ -273,7 +273,7 @@ public:
upwindPotential_[indexInInside][phaseIdx] += pot;
}
DUNE_DEPRECATED_MSG("use addUpwindPotential() instead");
DUNE_DEPRECATED_MSG("use addUpwindPotential() instead")
void addPotential(int phaseIdx, int indexInInside, Scalar pot)
{
upwindPotential_[indexInInside][phaseIdx] += pot;
......
......@@ -265,7 +265,7 @@ public:
* \param problem a problem class object
*/
FVTransport2P2C(Problem& problem) :
totalConcentration_(0.), problem_(problem), switchNormals(GET_PARAM_FROM_GROUP(TypeTag, bool, Impet, SwitchNormals)), subCFLFactor_(1.0), accumulatedDt_(0), dtThreshold_(1e-6)
totalConcentration_(0.), problem_(problem), switchNormals(GET_PARAM_FROM_GROUP(TypeTag, bool, Impet, SwitchNormals)), accumulatedDt_(0), dtThreshold_(1e-6), subCFLFactor_(1.0)
{
restrictFluxInTransport_ = GET_PARAM_FROM_GROUP(TypeTag,int, Impet, RestrictFluxInTransport);
regulateBoundaryPermeability = GET_PROP_VALUE(TypeTag, RegulateBoundaryPermeability);
......
......@@ -277,7 +277,7 @@ void FVTransport<TypeTag>::update(const Scalar t, Scalar& dt, TransportSolutionT
asImp_().updateMaterialLaws();
}
int size = problem_.gridView().size(0);
unsigned int size = problem_.gridView().size(0);
if (localTimeStepping_)
{
if (timeStepData_.size() != size)
......
......@@ -726,7 +726,7 @@ public:
// gradients using a two-point flux approximation
subContVolFace[k].numFap = 2;
for (int idx = 0; idx < subContVolFace[k].numFap; idx++)
for (unsigned int idx = 0; idx < subContVolFace[k].numFap; idx++)
{
subContVolFace[k].grad[idx] = distVec;
subContVolFace[k].shapeValue[idx] = 0.5;
......
......@@ -465,7 +465,7 @@ protected:
if (numericDifferenceMethod_ <= 0) {
// we are not using forward differences, i.e. we don't
// we are using forward differences, i.e. we
// need to calculate f(x - \epsilon)
// deflect the primary variables
......
......@@ -24,6 +24,7 @@
#ifndef TEST_DIFFUSION_SPATIALPARAMS_HH
#define TEST_DIFFUSION_SPATIALPARAMS_HH
#include <dumux/decoupled/common/decoupledproperties.hh>
#include <dumux/material/spatialparams/fvspatialparams.hh>
#include <dumux/material/fluidmatrixinteractions/2p/linearmaterial.hh>
#include <dumux/material/fluidmatrixinteractions/2p/efftoabslaw.hh>
......
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