diff --git a/opm/core/fluid/blackoil/BlackoilDefs.hpp b/opm/core/fluid/blackoil/BlackoilDefs.hpp index e6e4afcbb..7615c5e6d 100644 --- a/opm/core/fluid/blackoil/BlackoilDefs.hpp +++ b/opm/core/fluid/blackoil/BlackoilDefs.hpp @@ -21,8 +21,7 @@ #define OPM_BLACKOILDEFS_HEADER_INCLUDED -#include -#include +#include #include namespace Opm @@ -38,11 +37,15 @@ namespace Opm enum PhaseIndex { Aqua = 0, Liquid = 1, Vapour = 2 }; typedef double Scalar; - typedef Dune::FieldVector CompVec; - typedef Dune::FieldVector PhaseVec; +// typedef Dune::FieldVector CompVec; +// typedef Dune::FieldVector PhaseVec; + typedef std::tr1::array CompVec; + typedef std::tr1::array PhaseVec; BOOST_STATIC_ASSERT(int(numComponents) == int(numPhases)); - typedef Dune::FieldMatrix PhaseToCompMatrix; - typedef Dune::FieldMatrix PhaseJacobian; +// typedef Dune::FieldMatrix PhaseToCompMatrix; +// typedef Dune::FieldMatrix PhaseJacobian; + typedef std::tr1::array PhaseToCompMatrix; + typedef std::tr1::array PhaseJacobian; }; } // namespace Opm