OilfieldToolsNet/opm-core
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge from upstream.

Browse Source
This commit is contained in:
Bård Skaflestad 2011-12-19 14:59:28 +01:00
commit 940ec1a996
6 changed files with 20 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Makefile.am
View File

@ -59,6 +59,7 @@ opm/core/linalg/sparse_sys.h \
opm/core/linalg/blas_lapack.h \
opm/core/fluid/SimpleFluid2p.hpp \
opm/core/grid.h \
opm/core/GridAdapter.hpp \
opm/core/pressure/fsh.h \
opm/core/pressure/HybridPressureSolver.hpp \
opm/core/pressure/TPFAPressureSolver.hpp \
@ -71,7 +72,6 @@ opm/core/pressure/tpfa/trans_tpfa.h \
opm/core/pressure/tpfa/cfs_tpfa_residual.h \
opm/core/pressure/tpfa/ifs_tpfa.h \
opm/core/pressure/TPFACompressiblePressureSolver.hpp \
opm/core/pressure/GridAdapter.hpp \
opm/core/pressure/msmfem/coarse_sys.h \
opm/core/pressure/msmfem/hash_set.h \
opm/core/pressure/msmfem/ifsh_ms.h \

2
opm/core/pressure/GridAdapter.hpp → opm/core/GridAdapter.hpp
View File

@ -21,7 +21,7 @@
#define OPM_GRIDADAPTER_HEADER_INCLUDED
#include "grid.h"
#include <opm/core/grid.h>
#include <stdexcept>
class GridAdapter

8
opm/core/pressure/HybridPressureSolver.hpp
View File

@ -21,10 +21,10 @@
#ifndef OPM_HYBRIDPRESSURESOLVER_HEADER_INCLUDED
#define OPM_HYBRIDPRESSURESOLVER_HEADER_INCLUDED
#include "fsh.h"
#include "sparse_sys.h"
#include "mimetic.h"
#include "GridAdapter.hpp"
#include <opm/core/pressure/fsh.h>
#include <opm/core/linalg/sparse_sys.h>
#include <opm/core/pressure/mimetic/mimetic.h>
#include <opm/core/GridAdapter.hpp>
#include <stdexcept>

14
opm/core/pressure/TPFACompressiblePressureSolver.hpp
View File

@ -21,13 +21,13 @@
#define OPM_TPFACOMPRESSIBLEPRESSURESOLVER_HEADER_INCLUDED
#include "cfs_tpfa.h"
#include "trans_tpfa.h"
#include "sparse_sys.h"
#include "flow_bc.h"
#include "well.h"
#include "compr_quant.h"
#include "GridAdapter.hpp"
#include <opm/core/pressure/tpfa/cfs_tpfa.h>
#include <opm/core/pressure/tpfa/trans_tpfa.h>
#include <opm/core/linalg/sparse_sys.h>
#include <opm/core/pressure/flow_bc.h>
#include <opm/core/well.h>
#include <opm/core/pressure/tpfa/compr_quant.h>
#include <opm/core/GridAdapter.hpp>
#include <stdexcept>

12
opm/core/pressure/TPFAPressureSolver.hpp
View File

@ -21,12 +21,12 @@
#define OPM_TPFAPRESSURESOLVER_HEADER_INCLUDED
#include "ifs_tpfa.h"
#include "trans_tpfa.h"
#include "sparse_sys.h"
#include "flow_bc.h"
#include "mimetic.h" // for updating gpress
#include "GridAdapter.hpp"
#include <opm/core/pressure/tpfa/ifs_tpfa.h>
#include <opm/core/pressure/tpfa/trans_tpfa.h>
#include <opm/core/linalg/sparse_sys.h>
#include <opm/core/pressure/flow_bc.h>
#include <opm/core/pressure/mimetic/mimetic.h> // for updating gpress
#include <opm/core/GridAdapter.hpp>
#include <stdexcept>

2
opm/core/transport/ImplicitTransport.hpp
View File

@ -36,7 +36,7 @@
#ifndef OPM_IMPLICITTRANSPORT_HPP_HEADER
#define OPM_IMPLICITTRANSPORT_HPP_HEADER
#include "ImplicitAssembly.hpp"
#include <opm/core/transport/ImplicitAssembly.hpp>
namespace Opm {
namespace ImplicitTransportDetails {