From 4d90eef265562e11ddd28cc66b492c016380b10d Mon Sep 17 00:00:00 2001
From: Christoph Grueninger <christoph.grueninger@iws.uni-stuttgart.de>
Date: Thu, 4 Oct 2012 11:13:04 +0000
Subject: [PATCH] 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
---
dumux/decoupled/2p2c/fvtransport2p2cadaptive.hh | 4 ++--
dumux/material/components/co2.hh | 7 +++++--
2 files changed, 7 insertions(+), 4 deletions(-)
diff --git a/dumux/decoupled/2p2c/fvtransport2p2cadaptive.hh b/dumux/decoupled/2p2c/fvtransport2p2cadaptive.hh
index 56baba7727..fa9dcd3dc6 100644
--- a/dumux/decoupled/2p2c/fvtransport2p2cadaptive.hh
+++ b/dumux/decoupled/2p2c/fvtransport2p2cadaptive.hh
@@ -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
diff --git a/dumux/material/components/co2.hh b/dumux/material/components/co2.hh
index 05ccf42fda..5123a379d9 100644
--- a/dumux/material/components/co2.hh
+++ b/dumux/material/components/co2.hh
@@ -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;
--
GitLab