From 4c98ea8f925471333c84c3a2abc89955a1e77397 Mon Sep 17 00:00:00 2001
From: Bernd Flemisch <bernd@iws.uni-stuttgart.de>
Date: Thu, 11 Oct 2012 16:01:31 +0000
Subject: [PATCH] decoupled 2p2c: enable compilation with gcc 4.3. Reviewed by
Christoph.
git-svn-id: svn://svn.iws.uni-stuttgart.de/DUMUX/dumux/trunk@9280 2fb0f335-1f38-0410-981e-8018bf24f1b0
---
dumux/decoupled/2p2c/2p2cadaptiveproperties.hh | 2 +-
dumux/decoupled/2p2c/2p2cproperties.hh | 2 +-
dumux/decoupled/2p2c/fvpressure2p2cadaptive.hh | 2 +-
test/decoupled/2p2c/test_adaptive2p2cproblem.hh | 2 +-
4 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/dumux/decoupled/2p2c/2p2cadaptiveproperties.hh b/dumux/decoupled/2p2c/2p2cadaptiveproperties.hh
index a17f427394..c9ef8a0c33 100644
--- a/dumux/decoupled/2p2c/2p2cadaptiveproperties.hh
+++ b/dumux/decoupled/2p2c/2p2cadaptiveproperties.hh
@@ -92,7 +92,7 @@ SET_TYPE_PROP(DecoupledTwoPTwoCAdaptive, PressureModel, FVPressure2P2CAdaptive<T
* errors in case those Indice are really applied somewhere.
*/
template <class TypeTag>
-struct DecoupledTwoPTwoCIndicesAdaptive : DecoupledTwoPTwoCIndices<TypeTag>
+struct DecoupledTwoPTwoCIndicesAdaptive : public DecoupledTwoPTwoCIndices<TypeTag>
{
static const int pressureIdx = 0;
static const int saturationIdx = 0;
diff --git a/dumux/decoupled/2p2c/2p2cproperties.hh b/dumux/decoupled/2p2c/2p2cproperties.hh
index bc2398b0f2..5aa5fe98e2 100644
--- a/dumux/decoupled/2p2c/2p2cproperties.hh
+++ b/dumux/decoupled/2p2c/2p2cproperties.hh
@@ -191,7 +191,7 @@ SET_BOOL_PROP(DecoupledTwoPTwoC, EnableGravity, true);//DEPRECATED
* special equation indices have to be provided for boundary conditions.
*/
template <class TypeTag>
-struct DecoupledTwoPTwoCIndices : DecoupledTwoPCommonIndices
+struct DecoupledTwoPTwoCIndices : public DecoupledTwoPCommonIndices
{
private:
typedef typename GET_PROP_TYPE(TypeTag, FluidSystem) FluidSystem;
diff --git a/dumux/decoupled/2p2c/fvpressure2p2cadaptive.hh b/dumux/decoupled/2p2c/fvpressure2p2cadaptive.hh
index 00f0cf19ed..13eaae3d7a 100644
--- a/dumux/decoupled/2p2c/fvpressure2p2cadaptive.hh
+++ b/dumux/decoupled/2p2c/fvpressure2p2cadaptive.hh
@@ -1274,7 +1274,7 @@ int FVPressure2P2CAdaptive<TypeTag>::transmissibilityAdapter_(const Intersection
// int globalIdx4 = problem().variables().index(*isIt14->outside());
Dune::FieldVector<Scalar, dim> unity(1.);
- std::vector<Dune::FieldVector<Scalar, dim> > lambda = {unity, unity, unity, unity};
+ std::vector<Dune::FieldVector<Scalar, dim> > lambda(4, unity);
Dune::FieldMatrix<Scalar,dim,2*dim-dim+1> T;
int triangleType = pressureModelAdaptive2p_->calculateTransmissibility(
diff --git a/test/decoupled/2p2c/test_adaptive2p2cproblem.hh b/test/decoupled/2p2c/test_adaptive2p2cproblem.hh
index b0c2252bcb..7ecb42b354 100644
--- a/test/decoupled/2p2c/test_adaptive2p2cproblem.hh
+++ b/test/decoupled/2p2c/test_adaptive2p2cproblem.hh
@@ -229,7 +229,7 @@ void boundaryTypesAtPos(BoundaryTypes &bcTypes, const GlobalPosition& globalPos)
*/
const void boundaryFormulation(typename Indices::BoundaryFormulation &bcFormulation, const Intersection& intersection) const
{
- bcFormulation = Indices::BoundaryFormulation::concentration;
+ bcFormulation = Indices::concentration;
}
/*!
* \copydoc Dumux::TestDecTwoPTwoCProblem::dirichletAtPos()
--
GitLab