Commit 4d90eef2 authored by Christoph Grueninger's avatar Christoph Grueninger
Browse files

Fix make check for Clang 3.1.

(review by bernd)


git-svn-id: svn://svn.iws.uni-stuttgart.de/DUMUX/dumux/trunk@9184 2fb0f335-1f38-0410-981e-8018bf24f1b0
parent 5fe00b0f
......@@ -105,7 +105,7 @@ class FVTransport2P2CAdaptive : public FVTransport2P2C<TypeTag>
{return problem_;};
public:
virtual void update(const Scalar t, Scalar& dt, TransportSolutionType& updateVec, bool impes);
virtual void update(const Scalar t, Scalar& dt, TransportSolutionType& updateVec, bool impes = false);
void getMpfaFlux(Dune::FieldVector<Scalar, 2>&, Dune::FieldVector<Scalar, 2>&,
const IntersectionIterator&, CellData&);
......@@ -153,7 +153,7 @@ protected:
* \param impet Flag that determines if it is a real impet step or an update estimate for volume derivatives
*/
template<class TypeTag>
void FVTransport2P2CAdaptive<TypeTag>::update(const Scalar t, Scalar& dt, TransportSolutionType& updateVec, bool impet = false)
void FVTransport2P2CAdaptive<TypeTag>::update(const Scalar t, Scalar& dt, TransportSolutionType& updateVec, bool impet)
{
this->impet_ = impet;
// initialize dt very large
......
......@@ -48,7 +48,7 @@ namespace Dumux
template <class Scalar, class CO2Tables>
class CO2 : public Component<Scalar, CO2<Scalar, CO2Tables> >
{
static constexpr Scalar R = Constants<Scalar>::R;
static const Scalar R;
typedef typename Dumux::IdealGas<Scalar> IdealGas;
static bool warningThrown;
......@@ -227,7 +227,7 @@ public:
warningThrown=true;
}
return CO2Tables::tabulatedDensity.at(temperature, pressure);
}
}
/*!
* \brief The pressure of steam in \f$\mathrm{[Pa]}\f$ at a given density and temperature.
*
......@@ -325,6 +325,9 @@ public:
};
};
template <class Scalar, class CO2Tables>
const Scalar CO2<Scalar, CO2Tables>::R = Constants<Scalar>::R;
template <class Scalar, class CO2Tables>
bool CO2<Scalar, CO2Tables>::warningThrown = false;
......
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