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

Reference headers using canonical (installed) paths.

Browse Source
This commit is contained in:
Bård Skaflestad
2011-12-08 16:18:33 +01:00
parent 953507907e
commit 74b8fe759a
37 changed files with 136 additions and 122 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
examples/spu_2p.cpp
View File

@@ -44,25 +44,26 @@
#include <iterator> #include <iterator>
#include <vector> #include <vector>
#include <ifs_tpfa.h> #include <opmcore/linalg/sparse_sys.h>
#include <trans_tpfa.h>
#include <sparse_sys.h>
#include <transport_source.h> #include <opmcore/pressure/tpfa/ifs_tpfa.h>
#include <opmcore/pressure/tpfa/trans_tpfa.h>
#include <cart_grid.h> #include <opmcore/utility/cart_grid.h>
#include <CSRMatrixUmfpackSolver.hpp> #include <opmcore/fluid/SimpleFluid2p.hpp>
#include <NormSupport.hpp> #include <opmcore/transport/transport_source.h>
#include <ImplicitAssembly.hpp> #include <opmcore/transport/CSRMatrixUmfpackSolver.hpp>
#include <ImplicitTransport.hpp>
#include <JacobianSystem.hpp>
#include <CSRMatrixBlockAssembler.hpp> #include <opmcore/transport/NormSupport.hpp>
#include <opmcore/transport/ImplicitAssembly.hpp>
#include <opmcore/transport/ImplicitTransport.hpp>
#include <opmcore/transport/JacobianSystem.hpp>
#include <SimpleFluid2p.hpp> #include <opmcore/transport/CSRMatrixBlockAssembler.hpp>
#include <SinglePointUpwindTwoPhase.hpp>
#include <opmcore/transport/SinglePointUpwindTwoPhase.hpp>
template <class Ostream, class Collection> template <class Ostream, class Collection>
Ostream& Ostream&

4
opmcore/linalg/call_umfpack.c
View File

@@ -38,8 +38,8 @@
#include <suitesparse/umfpack.h> #include <suitesparse/umfpack.h>
#include <sparse_sys.h> #include <opmcore/linalg/sparse_sys.h>
#include "call_umfpack.h" #include <opmcore/linalg/call_umfpack.h>
struct CSCMatrix { struct CSCMatrix {
UF_long n; UF_long n;

8
opmcore/pressure/cfsh.c
View File

@@ -24,10 +24,10 @@
#include <stdlib.h> #include <stdlib.h>
#include <string.h> #include <string.h>
#include "fsh.h" #include <opmcore/pressure/fsh.h>
#include "fsh_common_impl.h" #include <opmcore/pressure/fsh_common_impl.h>
#include "hybsys.h" #include <opmcore/pressure/mimetic/hybsys.h>
#include "hybsys_global.h" #include <opmcore/pressure/mimetic/hybsys_global.h>

8
opmcore/pressure/fsh.c
View File

@@ -24,10 +24,10 @@
#include <stdlib.h> #include <stdlib.h>
#include <string.h> #include <string.h>
#include "fsh.h" #include <opmcore/pressure/fsh.h>
#include "fsh_common_impl.h" #include <opmcore/pressure/fsh_common_impl.h>
#include "hybsys.h" #include <opmcore/pressure/mimetic/hybsys.h>
#include "hybsys_global.h" #include <opmcore/pressure/mimetic/hybsys_global.h>

6
opmcore/pressure/fsh.h
View File

@@ -20,9 +20,9 @@
#ifndef OPM_FSH_HEADER_INCLUDED #ifndef OPM_FSH_HEADER_INCLUDED
#define OPM_FHS_HEADER_INCLUDED #define OPM_FHS_HEADER_INCLUDED
#include "grid.h" #include <opmcore/grid.h>
#include "well.h" #include <opmcore/well.h>
#include "flow_bc.h" #include <opmcore/pressure/flow_bc.h>
#ifdef __cplusplus #ifdef __cplusplus
extern "C" { extern "C" {

14
opmcore/pressure/fsh_common_impl.c
View File

@@ -24,15 +24,15 @@
#include <stdlib.h> #include <stdlib.h>
#include <string.h> #include <string.h>
#include "grid.h" #include <opmcore/grid.h>
#include "flow_bc.h" #include <opmcore/well.h>
#include "well.h" #include <opmcore/pressure/flow_bc.h>
#include "fsh.h" #include <opmcore/pressure/fsh.h>
#include "fsh_common_impl.h" #include <opmcore/pressure/fsh_common_impl.h>
#include "hybsys.h" #include <opmcore/pressure/mimetic/hybsys.h>
#include "hybsys_global.h" #include <opmcore/pressure/mimetic/hybsys_global.h>
#if defined MAX #if defined MAX
#undef MAX #undef MAX

8
opmcore/pressure/ifsh.c
View File

@@ -24,10 +24,10 @@
#include <stdlib.h> #include <stdlib.h>
#include <string.h> #include <string.h>
#include "fsh.h" #include <opmcore/pressure/fsh.h>
#include "fsh_common_impl.h" #include <opmcore/pressure/fsh_common_impl.h>
#include "hybsys.h" #include <opmcore/pressure/mimetic/hybsys.h>
#include "hybsys_global.h" #include <opmcore/pressure/mimetic/hybsys_global.h>
/* ---------------------------------------------------------------------- */ /* ---------------------------------------------------------------------- */

4
opmcore/pressure/mimetic/hybsys.c
View File

@@ -22,8 +22,8 @@
#include <stdlib.h> #include <stdlib.h>
#include <string.h> #include <string.h>
#include "blas_lapack.h" #include <opmcore/linalg/blas_lapack.h>
#include "hybsys.h" #include <opmcore/pressure/mimetic/hybsys.h>
#if defined(MAX) #if defined(MAX)

7
opmcore/pressure/mimetic/hybsys_global.c
View File

@@ -21,8 +21,11 @@
#include <stddef.h> #include <stddef.h>
#include <stdlib.h> #include <stdlib.h>
#include "hash_set.h" /* ---> Layering violation! */
#include "hybsys_global.h" #include <opmcore/pressure/msmfem/hash_set.h>
/* <--- Layering violation! */
#include <opmcore/pressure/mimetic/hybsys_global.h>
#if defined MAX #if defined MAX

6
opmcore/pressure/mimetic/hybsys_global.h
View File

@@ -24,9 +24,9 @@
extern "C" { extern "C" {
#endif #endif
#include "grid.h" #include <opmcore/grid.h>
#include "well.h" #include <opmcore/well.h>
#include "sparse_sys.h" #include <opmcore/linalg/sparse_sys.h>
struct CSRMatrix * struct CSRMatrix *
hybsys_define_globconn(grid_t *G, well_t *W); hybsys_define_globconn(grid_t *G, well_t *W);

4
opmcore/pressure/mimetic/mimetic.c
View File

@@ -21,8 +21,8 @@
#include <stddef.h> #include <stddef.h>
#include <stdlib.h> #include <stdlib.h>
#include "blas_lapack.h" #include <opmcore/linalg/blas_lapack.h>
#include "mimetic.h" #include <opmcore/pressure/mimetic/mimetic.h>
/* ------------------------------------------------------------------ */ /* ------------------------------------------------------------------ */
void void

4
opmcore/pressure/msmfem/coarse_conn.c
View File

@@ -23,8 +23,8 @@
#include <stdlib.h> #include <stdlib.h>
#include <string.h> #include <string.h>
#include "hash_set.h" #include <opmcore/pressure/msmfem/hash_set.h>
#include "coarse_conn.h" #include <opmcore/pressure/msmfem/coarse_conn.h>
#define MAX(a,b) (((a) > (b)) ? (a) : (b)) #define MAX(a,b) (((a) > (b)) ? (a) : (b))
#define MIN(a,b) (-MAX(-(a), -(b))) #define MIN(a,b) (-MAX(-(a), -(b)))

20
opmcore/pressure/msmfem/coarse_sys.c
View File

@@ -34,14 +34,16 @@
#endif #endif
#include "blas_lapack.h" #include <opmcore/linalg/blas_lapack.h>
#include "coarse_conn.h" #include <opmcore/linalg/sparse_sys.h>
#include "coarse_sys.h"
#include "hybsys.h" #include <opmcore/pressure/mimetic/hybsys.h>
#include "hybsys_global.h" #include <opmcore/pressure/mimetic/hybsys_global.h>
#include "mimetic.h" #include <opmcore/pressure/mimetic/mimetic.h>
#include "partition.h"
#include "sparse_sys.h" #include <opmcore/pressure/msmfem/coarse_conn.h>
#include <opmcore/pressure/msmfem/coarse_sys.h>
#include <opmcore/pressure/msmfem/partition.h>
#if defined(MAX) #if defined(MAX)
@@ -506,7 +508,7 @@ compute_fs_ip(grid_t *g, const double *perm,
return Binv; return Binv;
} }
#elif USE_MIM_IP_TPFA #elif USE_MIM_IP_TPFA
#include "trans_tpfa.h" #include <opmcore/pressure/tpfa/trans_tpfa.h>
/* ---------------------------------------------------------------------- */ /* ---------------------------------------------------------------------- */
static double * static double *
compute_fs_ip(grid_t *g, const double *perm, compute_fs_ip(grid_t *g, const double *perm,

4
opmcore/pressure/msmfem/coarse_sys.h
View File

@@ -20,12 +20,12 @@
#ifndef OPM_COARSE_SYS_HEADER_INCLUDED #ifndef OPM_COARSE_SYS_HEADER_INCLUDED
#define OPM_COARSE_SYS_HEADER_INCLUDED #define OPM_COARSE_SYS_HEADER_INCLUDED
#include <opmcore/grid.h>
#ifdef __cplusplus #ifdef __cplusplus
extern "C" { extern "C" {
#endif #endif
#include "grid.h"
/* ---------------------------------------------------------------------- */ /* ---------------------------------------------------------------------- */
struct coarse_sys { struct coarse_sys {

19
opmcore/pressure/msmfem/ifsh_ms.c
View File

@@ -21,14 +21,17 @@
#include <stdlib.h> #include <stdlib.h>
#include <string.h> #include <string.h>
#include "blas_lapack.h" #include <opmcore/linalg/blas_lapack.h>
#include "coarse_conn.h" #include <opmcore/linalg/sparse_sys.h>
#include "coarse_sys.h"
#include "hybsys.h" #include <opmcore/pressure/mimetic/hybsys.h>
#include "hybsys_global.h" #include <opmcore/pressure/mimetic/hybsys_global.h>
#include "ifsh_ms.h" #include <opmcore/pressure/mimetic/mimetic.h>
#include "partition.h"
#include "sparse_sys.h" #include <opmcore/pressure/msmfem/coarse_conn.h>
#include <opmcore/pressure/msmfem/coarse_sys.h>
#include <opmcore/pressure/msmfem/partition.h>
#include <opmcore/pressure/msmfem/ifsh_ms.h>
#if defined(MAX) #if defined(MAX)

4
opmcore/pressure/msmfem/ifsh_ms.h
View File

@@ -26,8 +26,8 @@ extern "C" {
#include <stddef.h> #include <stddef.h>
#include "grid.h" #include <opmcore/grid.h>
#include "coarse_sys.h" #include <opmcore/pressure/msmfem/coarse_sys.h>
struct CSRMatrix; struct CSRMatrix;
struct ifsh_ms_impl; struct ifsh_ms_impl;

14
opmcore/pressure/tpfa/cfs_tpfa.c
View File

@@ -4,14 +4,14 @@
#include <stdlib.h> #include <stdlib.h>
#include <string.h> #include <string.h>
#include "blas_lapack.h" #include <opmcore/well.h>
#include "flow_bc.h" #include <opmcore/linalg/blas_lapack.h>
#include "well.h" #include <opmcore/linalg/sparse_sys.h>
#include <opmcore/pressure/flow_bc.h>
#include "compr_quant.h" #include <opmcore/pressure/tpfa/compr_quant.h>
#include "trans_tpfa.h" #include <opmcore/pressure/tpfa/trans_tpfa.h>
#include "cfs_tpfa.h" #include <opmcore/pressure/tpfa/cfs_tpfa.h>
#include "sparse_sys.h"
#if defined(MAX) #if defined(MAX)

6
opmcore/pressure/tpfa/cfs_tpfa.h
View File

@@ -20,9 +20,9 @@
#ifndef OPM_CFS_TPFA_HEADER_INCLUDED #ifndef OPM_CFS_TPFA_HEADER_INCLUDED
#define OPM_CFS_TPFA_HEADER_INCLUDED #define OPM_CFS_TPFA_HEADER_INCLUDED
#include "grid.h" #include <opmcore/grid.h>
#include "flow_bc.h" #include <opmcore/well.h>
#include "well.h" #include <opmcore/pressure/flow_bc.h>
#ifdef __cplusplus #ifdef __cplusplus
extern "C" { extern "C" {

14
opmcore/pressure/tpfa/cfs_tpfa_residual.c
View File

@@ -4,15 +4,15 @@
#include <stdlib.h> #include <stdlib.h>
#include <string.h> #include <string.h>
#include "blas_lapack.h" #include <opmcore/well.h>
#include "well.h" #include <opmcore/linalg/blas_lapack.h>
#include <opmcore/linalg/sparse_sys.h>
#include "compr_quant_general.h" #include <opmcore/pressure/tpfa/compr_quant_general.h>
#include "compr_source.h" #include <opmcore/pressure/tpfa/compr_source.h>
#include "sparse_sys.h" #include <opmcore/pressure/tpfa/trans_tpfa.h>
#include "trans_tpfa.h"
#include "cfs_tpfa_residual.h" #include <opmcore/pressure/tpfa/cfs_tpfa_residual.h>
#if defined(MAX) #if defined(MAX)
#undef MAX #undef MAX

2
opmcore/pressure/tpfa/cfs_tpfa_residual.h
View File

@@ -20,7 +20,7 @@
#ifndef OPM_CFS_TPFA_HEADER_INCLUDED #ifndef OPM_CFS_TPFA_HEADER_INCLUDED
#define OPM_CFS_TPFA_HEADER_INCLUDED #define OPM_CFS_TPFA_HEADER_INCLUDED
#include "grid.h" #include <opmcore/grid.h>
#ifdef __cplusplus #ifdef __cplusplus
extern "C" { extern "C" {

2
opmcore/pressure/tpfa/compr_quant.h
View File

@@ -22,7 +22,7 @@
#include <stddef.h> #include <stddef.h>
#include "grid.h" #include <opmcore/grid.h>
#ifdef __cplusplus #ifdef __cplusplus
extern "C" { extern "C" {

4
opmcore/pressure/tpfa/compr_quant_general.c
View File

@@ -19,8 +19,8 @@
#include <stdlib.h> #include <stdlib.h>
#include "sparse_sys.h" #include <opmcore/linalg/sparse_sys.h>
#include "compr_quant_general.h" #include <opmcore/pressure/tpfa/compr_quant_general.h>
void void

4
opmcore/pressure/tpfa/ifs_tpfa.c
View File

@@ -3,8 +3,8 @@
#include <stdlib.h> #include <stdlib.h>
#include <string.h> #include <string.h>
#include "ifs_tpfa.h" #include <opmcore/linalg/sparse_sys.h>
#include "sparse_sys.h" #include <opmcore/pressure/tpfa/ifs_tpfa.h>
struct ifs_tpfa_impl { struct ifs_tpfa_impl {

2
opmcore/pressure/tpfa/ifs_tpfa.h
View File

@@ -20,7 +20,7 @@
#ifndef OPM_IFS_TPFA_HEADER_INCLUDED #ifndef OPM_IFS_TPFA_HEADER_INCLUDED
#define OPM_IFS_TPFA_HEADER_INCLUDED #define OPM_IFS_TPFA_HEADER_INCLUDED
#include "grid.h" #include <opmcore/grid.h>
#ifdef __cplusplus #ifdef __cplusplus
extern "C" { extern "C" {

4
opmcore/pressure/tpfa/trans_tpfa.c
View File

@@ -3,8 +3,8 @@
#include <stdlib.h> #include <stdlib.h>
#include <string.h> #include <string.h>
#include "blas_lapack.h" #include <opmcore/linalg/blas_lapack.h>
#include "trans_tpfa.h" #include <opmcore/pressure/tpfa/trans_tpfa.h>
/* ---------------------------------------------------------------------- */ /* ---------------------------------------------------------------------- */
/* htrans <- sum(C(:,i) .* K(cellNo,:) .* N(:,j), 2) ./ sum(C.*C, 2) */ /* htrans <- sum(C(:,i) .* K(cellNo,:) .* N(:,j), 2) ./ sum(C.*C, 2) */

2
opmcore/pressure/tpfa/trans_tpfa.h
View File

@@ -20,7 +20,7 @@
#ifndef OPM_TRANS_TPFA_HEADER_INCLUDED #ifndef OPM_TRANS_TPFA_HEADER_INCLUDED
#define OPM_TRANS_TPFA_HEADER_INCLUDED #define OPM_TRANS_TPFA_HEADER_INCLUDED
#include "grid.h" #include <opmcore/grid.h>
#ifdef __cplusplus #ifdef __cplusplus
extern "C" { extern "C" {

2
opmcore/pressure/well.c
View File

@@ -19,7 +19,7 @@
#include <stdlib.h> #include <stdlib.h>
#include "well.h" #include <opmcore/well.h>
/* Release memory resources for cell->well mapping. */ /* Release memory resources for cell->well mapping. */

2
opmcore/transport/CSRMatrixBlockAssembler.hpp
View File

@@ -42,7 +42,7 @@
#include <algorithm> #include <algorithm>
#include <vector> #include <vector>
#include <sparse_sys.h> #include <opmcore/linalg/sparse_sys.h>
namespace Opm { namespace Opm {
namespace ImplicitTransportDefault { namespace ImplicitTransportDefault {

2
opmcore/transport/CSRMatrixUmfpackSolver.hpp
View File

@@ -36,7 +36,7 @@
#ifndef OPM_CSRMATRIXUMFPACKSOLVER_HPP_HEADER #ifndef OPM_CSRMATRIXUMFPACKSOLVER_HPP_HEADER
#define OPM_CSRMATRIXUMFPACKSOLVER_HPP_HEADER #define OPM_CSRMATRIXUMFPACKSOLVER_HPP_HEADER
#include <call_umfpack.h> #include <opmcore/linalg/call_umfpack.h>
namespace Opm { namespace Opm {
namespace ImplicitTransportLinAlgSupport { namespace ImplicitTransportLinAlgSupport {

5
opmcore/transport/spu_explicit.c
View File

@@ -6,8 +6,9 @@
#include <assert.h> #include <assert.h>
#include <stdio.h> #include <stdio.h>
#include "grid.h"
#include "spu_explicit.h" #include <opmcore/grid.h>
#include <opmcore/transport/spu_explicit.h>
/* Twophase mobility-weighted upwind */ /* Twophase mobility-weighted upwind */

5
opmcore/transport/spu_implicit.c
View File

@@ -9,8 +9,9 @@
#include <stdlib.h> #include <stdlib.h>
#include <limits.h> #include <limits.h>
#include <math.h> #include <math.h>
#include "grid.h"
#include "spu_implicit.h" #include <opmcore/grid.h>
#include <opmcore/transport/spu_implicit.h>

2
opmcore/utility/cart_grid.h
View File

@@ -34,7 +34,7 @@
extern "C" { extern "C" {
#endif #endif
#include <grid.h> #include <opmcore/grid.h>
void void
destroy_cart_grid(grid_t *G); destroy_cart_grid(grid_t *G);

2
opmcore/utility/cpgpreprocess/mxgrdecl.c
View File

@@ -39,7 +39,7 @@ along with OpenRS. If not, see <http://www.gnu.org/licenses/>.
#include <mex.h> #include <mex.h>
#include "grdecl.h" #include <grdecl.h>

17
tests/test_cfs_tpfa.c
View File

@@ -5,14 +5,17 @@
#include <suitesparse/umfpack.h> #include <suitesparse/umfpack.h>
#include "cfs_tpfa.h" #include <opmcore/grid.h>
#include "sparse_sys.h" #include <opmcore/well.h>
#include "compr_quant.h"
#include "trans_tpfa.h" #include <opmcore/linalg/sparse_sys.h>
#include <opmcore/pressure/flow_bc.h>
#include <opmcore/pressure/tpfa/cfs_tpfa.h>
#include <opmcore/pressure/tpfa/compr_quant.h>
#include <opmcore/pressure/tpfa/trans_tpfa.h>
#include "grid.h"
#include "flow_bc.h"
#include "well.h"
struct CSCMatrix { struct CSCMatrix {

10
tests/test_jacsys.cpp
View File

@@ -78,7 +78,7 @@ main() {
#endif #endif
#if 0 #if 0
#include "JacobianSystem.hpp" #include <opmcore/transport/JacobianSystem.hpp>
//using namespace Opm::LinAlgSupport; //using namespace Opm::LinAlgSupport;
using namespace Opm::ImplicitTransportDefault; using namespace Opm::ImplicitTransportDefault;
@@ -101,11 +101,11 @@ main() {
#endif #endif
#if 1 #if 1
#include <sparse_sys.h> #include <opmcore/linalg/sparse_sys.h>
#include <JacobianSystem.hpp> #include <opmcore/transport/JacobianSystem.hpp>
#include <CSRMatrixBlockAssembler.hpp> #include <opmcore/transport/CSRMatrixBlockAssembler.hpp>
#include <CSRMatrixUmfpackSolver.hpp> #include <opmcore/transport/CSRMatrixUmfpackSolver.hpp>
using namespace Opm::ImplicitTransportDefault; using namespace Opm::ImplicitTransportDefault;

8
tests/test_readvector.cpp
View File

@@ -2,11 +2,11 @@
#include <string> #include <string>
#include <vector> #include <vector>
#include "grid.h" #include <opmcore/grid.h>
#include "preprocess.h" #include <opmcore/utility/cpgpreprocess/preprocess.h>
#include "cgridinterface.h" #include <opmcore/utility/cpgpreprocess/cgridinterface.h>
#include "readvector.hpp" #include <opmcore/utility/cpgpreprocess/readvector.hpp>
static struct CornerpointGrid static struct CornerpointGrid
read_grid(const std::string& dir) read_grid(const std::string& dir)

2
tests/test_sf2p.cpp
View File

@@ -3,7 +3,7 @@
#include <iostream> #include <iostream>
#include <iterator> #include <iterator>
#include <SimpleFluid2p.hpp> #include <opmcore/fluid/SimpleFluid2p.hpp>
template <class Ostream, typename T, size_t n> template <class Ostream, typename T, size_t n>
Ostream& Ostream&