OilfieldToolsNet/opm-simulators
4
0
Fork 0
mirror of https://github.com/OPM/opm-simulators.git synced 2025-02-25 18:55:30 -06:00
Code Issues Packages Projects Releases Wiki Activity

Work in progress on adapting to opm-core.

Browse Source
This commit is contained in:
Atgeirr Flø Rasmussen
2011-12-21 13:22:26 +01:00
parent fcfbd0e2a2
commit ca48cbe6a4
1 changed files with 9 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
opm/core/fluid/blackoil/BlackoilDefs.hpp
View File

@@ -21,8 +21,7 @@
#define OPM_BLACKOILDEFS_HEADER_INCLUDED #define OPM_BLACKOILDEFS_HEADER_INCLUDED
#include <dune/common/fvector.hh> #include <tr1/array>
#include <dune/common/fmatrix.hh>
#include <boost/static_assert.hpp> #include <boost/static_assert.hpp>
namespace Opm namespace Opm
@@ -38,11 +37,15 @@ namespace Opm
enum PhaseIndex { Aqua = 0, Liquid = 1, Vapour = 2 }; enum PhaseIndex { Aqua = 0, Liquid = 1, Vapour = 2 };
typedef double Scalar; typedef double Scalar;
typedef Dune::FieldVector<Scalar, numComponents> CompVec; // typedef Dune::FieldVector<Scalar, numComponents> CompVec;
typedef Dune::FieldVector<Scalar, numPhases> PhaseVec; // typedef Dune::FieldVector<Scalar, numPhases> PhaseVec;
typedef std::tr1::array<Scalar, numComponents> CompVec;
typedef std::tr1::array<Scalar, numPhases> PhaseVec;
BOOST_STATIC_ASSERT(int(numComponents) == int(numPhases)); BOOST_STATIC_ASSERT(int(numComponents) == int(numPhases));
typedef Dune::FieldMatrix<Scalar, numComponents, numPhases> PhaseToCompMatrix; // typedef Dune::FieldMatrix<Scalar, numComponents, numPhases> PhaseToCompMatrix;
typedef Dune::FieldMatrix<Scalar, numPhases, numPhases> PhaseJacobian; // typedef Dune::FieldMatrix<Scalar, numPhases, numPhases> PhaseJacobian;
typedef std::tr1::array<PhaseVec, numComponents> PhaseToCompMatrix;
typedef std::tr1::array<PhaseVec, numPhases> PhaseJacobian;
}; };
} // namespace Opm } // namespace Opm