diff --git a/dumux/decoupled/2p2c/2p2cadaptiveproperties.hh b/dumux/decoupled/2p2c/2p2cadaptiveproperties.hh index a17f427394ae120f83b26ec259f0084488f083e4..c9ef8a0c3359e01963c494bc78f4795635ba61ba 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 bc2398b0f20f7c320b8a0675878e85afbb9679c7..5aa5fe98e2b8b16bc82ed07ff534d7cef8c59916 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 00f0cf19ed0b95a865ba8a86654dcb604fc93459..13eaae3d7acd48bb367af8ea1782609ff624c52a 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 b0c2252bcbe48988ef2961021a4dcdcd897fe1b5..7ecb42b354e53d79ec8cfefed6d359ec98d705b4 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()