OilfieldToolsNet/opm-core
4
0
Fork 0
Code Issues Pull Requests 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 7c0998e197
commit cbe5d3015b
5 changed files with 23 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
Makefile.am
View File

@ -9,6 +9,11 @@ lib_LTLIBRARIES = libopmcore.la
libopmcore_la_SOURCES = \
opm/core/eclipse/EclipseGridInspector.cpp \
opm/core/eclipse/EclipseGridParser.cpp \
opm/core/fluid/blackoil/BlackoilPVT.cpp \
opm/core/fluid/blackoil/MiscibilityDead.cpp \
opm/core/fluid/blackoil/MiscibilityLiveGas.cpp \
opm/core/fluid/blackoil/MiscibilityLiveOil.cpp \
opm/core/fluid/blackoil/MiscibilityProps.cpp \
opm/core/utility/MonotCubicInterpolator.cpp \
opm/core/utility/parameters/Parameter.cpp \
opm/core/utility/parameters/ParameterGroup.cpp \

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

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

6
opm/core/fluid/blackoil/BlackoilPVT.hpp
View File

@ -21,9 +21,9 @@
#define OPM_BLACKOILPVT_HEADER_INCLUDED
#include "MiscibilityProps.hpp"
#include "BlackoilDefs.hpp"
#include <dune/common/EclipseGridParser.hpp>
#include <opm/core/fluid/blackoil/MiscibilityProps.hpp>
#include <opm/core/fluid/blackoil/BlackoilDefs.hpp>
#include <opm/core/eclipse/EclipseGridParser.hpp>
#include <boost/scoped_ptr.hpp>
#include <string>

8
opm/core/fluid/blackoil/MiscibilityDead.cpp
View File

@ -28,11 +28,11 @@
along with OPM. If not, see <http://www.gnu.org/licenses/>.
*/
#include <opm/core/fluid/blackoil/MiscibilityDead.hpp>
#include <algorithm>
#include "MiscibilityDead.hpp"
#include <dune/common/ErrorMacros.hpp>
#include <dune/common/linInt.hpp>
#include <dune/porsol/common/buildUniformMonotoneTable.hpp>
#include <opm/core/utility/ErrorMacros.hpp>
#include <opm/core/utility/linInt.hpp>
#include <opm/core/utility/buildUniformMonotoneTable.hpp>
#include <boost/lexical_cast.hpp>
#include <string>
#include <fstream>

4
opm/core/fluid/blackoil/MiscibilityDead.hpp
View File

@ -35,8 +35,8 @@
* Detailed description.
*/
#include "MiscibilityProps.hpp"
#include <dune/porsol/common/UniformTableLinear.hpp>
#include <opm/core/fluid/blackoil/MiscibilityProps.hpp>
#include <opm/core/utility/UniformTableLinear.hpp>
namespace Opm
{