Changed code to use new include path: <opm/core/...>

2011-12-12 11:28:09 +01:00 · 2011-12-12 11:28:09 +01:00 · 23a61cb167
commit 23a61cb167
parent 4655108f98
36 changed files with 121 additions and 121 deletions
--- a/examples/spu_2p.cpp
+++ b/examples/spu_2p.cpp
@ -44,26 +44,26 @@
 #include <iterator>
 #include <vector>

-#include <opmcore/linalg/sparse_sys.h>
+#include <opm/core/linalg/sparse_sys.h>

-#include <opmcore/pressure/tpfa/ifs_tpfa.h>
-#include <opmcore/pressure/tpfa/trans_tpfa.h>
+#include <opm/core/pressure/tpfa/ifs_tpfa.h>
+#include <opm/core/pressure/tpfa/trans_tpfa.h>

-#include <opmcore/utility/cart_grid.h>
+#include <opm/core/utility/cart_grid.h>

-#include <opmcore/fluid/SimpleFluid2p.hpp>
+#include <opm/core/fluid/SimpleFluid2p.hpp>

-#include <opmcore/transport/transport_source.h>
-#include <opmcore/transport/CSRMatrixUmfpackSolver.hpp>
+#include <opm/core/transport/transport_source.h>
+#include <opm/core/transport/CSRMatrixUmfpackSolver.hpp>

-#include <opmcore/transport/NormSupport.hpp>
-#include <opmcore/transport/ImplicitAssembly.hpp>
-#include <opmcore/transport/ImplicitTransport.hpp>
-#include <opmcore/transport/JacobianSystem.hpp>
+#include <opm/core/transport/NormSupport.hpp>
+#include <opm/core/transport/ImplicitAssembly.hpp>
+#include <opm/core/transport/ImplicitTransport.hpp>
+#include <opm/core/transport/JacobianSystem.hpp>

-#include <opmcore/transport/CSRMatrixBlockAssembler.hpp>
+#include <opm/core/transport/CSRMatrixBlockAssembler.hpp>

-#include <opmcore/transport/SinglePointUpwindTwoPhase.hpp>
+#include <opm/core/transport/SinglePointUpwindTwoPhase.hpp>

 template <class Ostream, class Collection>
 Ostream&
--- a/opm/core/linalg/call_umfpack.c
+++ b/opm/core/linalg/call_umfpack.c
@ -38,8 +38,8 @@

 #include <suitesparse/umfpack.h>

-#include <opmcore/linalg/sparse_sys.h>
-#include <opmcore/linalg/call_umfpack.h>
+#include <opm/core/linalg/sparse_sys.h>
+#include <opm/core/linalg/call_umfpack.h>

 struct CSCMatrix {
    UF_long  n;
--- a/opm/core/pressure/cfsh.c
+++ b/opm/core/pressure/cfsh.c
@ -24,10 +24,10 @@
 #include <stdlib.h>
 #include <string.h>

-#include <opmcore/pressure/fsh.h>
-#include <opmcore/pressure/fsh_common_impl.h>
-#include <opmcore/pressure/mimetic/hybsys.h>
-#include <opmcore/pressure/mimetic/hybsys_global.h>
+#include <opm/core/pressure/fsh.h>
+#include <opm/core/pressure/fsh_common_impl.h>
+#include <opm/core/pressure/mimetic/hybsys.h>
+#include <opm/core/pressure/mimetic/hybsys_global.h>



--- a/opm/core/pressure/fsh.c
+++ b/opm/core/pressure/fsh.c
@ -24,10 +24,10 @@
 #include <stdlib.h>
 #include <string.h>

-#include <opmcore/pressure/fsh.h>
-#include <opmcore/pressure/fsh_common_impl.h>
-#include <opmcore/pressure/mimetic/hybsys.h>
-#include <opmcore/pressure/mimetic/hybsys_global.h>
+#include <opm/core/pressure/fsh.h>
+#include <opm/core/pressure/fsh_common_impl.h>
+#include <opm/core/pressure/mimetic/hybsys.h>
+#include <opm/core/pressure/mimetic/hybsys_global.h>



--- a/opm/core/pressure/fsh.h
+++ b/opm/core/pressure/fsh.h
@ -20,9 +20,9 @@
 #ifndef OPM_FSH_HEADER_INCLUDED
 #define OPM_FHS_HEADER_INCLUDED

-#include <opmcore/grid.h>
-#include <opmcore/well.h>
-#include <opmcore/pressure/flow_bc.h>
+#include <opm/core/grid.h>
+#include <opm/core/well.h>
+#include <opm/core/pressure/flow_bc.h>

 #ifdef __cplusplus
 extern "C" {
--- a/opm/core/pressure/fsh_common_impl.c
+++ b/opm/core/pressure/fsh_common_impl.c
@ -24,15 +24,15 @@
 #include <stdlib.h>
 #include <string.h>

-#include <opmcore/grid.h>
-#include <opmcore/well.h>
-#include <opmcore/pressure/flow_bc.h>
+#include <opm/core/grid.h>
+#include <opm/core/well.h>
+#include <opm/core/pressure/flow_bc.h>

-#include <opmcore/pressure/fsh.h>
-#include <opmcore/pressure/fsh_common_impl.h>
+#include <opm/core/pressure/fsh.h>
+#include <opm/core/pressure/fsh_common_impl.h>

-#include <opmcore/pressure/mimetic/hybsys.h>
-#include <opmcore/pressure/mimetic/hybsys_global.h>
+#include <opm/core/pressure/mimetic/hybsys.h>
+#include <opm/core/pressure/mimetic/hybsys_global.h>

 #if defined MAX
 #undef MAX
--- a/opm/core/pressure/ifsh.c
+++ b/opm/core/pressure/ifsh.c
@ -24,10 +24,10 @@
 #include <stdlib.h>
 #include <string.h>

-#include <opmcore/pressure/fsh.h>
-#include <opmcore/pressure/fsh_common_impl.h>
-#include <opmcore/pressure/mimetic/hybsys.h>
-#include <opmcore/pressure/mimetic/hybsys_global.h>
+#include <opm/core/pressure/fsh.h>
+#include <opm/core/pressure/fsh_common_impl.h>
+#include <opm/core/pressure/mimetic/hybsys.h>
+#include <opm/core/pressure/mimetic/hybsys_global.h>


 /* ---------------------------------------------------------------------- */
--- a/opm/core/pressure/mimetic/hybsys.c
+++ b/opm/core/pressure/mimetic/hybsys.c
@ -22,8 +22,8 @@
 #include <stdlib.h>
 #include <string.h>

-#include <opmcore/linalg/blas_lapack.h>
-#include <opmcore/pressure/mimetic/hybsys.h>
+#include <opm/core/linalg/blas_lapack.h>
+#include <opm/core/pressure/mimetic/hybsys.h>


 #if defined(MAX)
--- a/opm/core/pressure/mimetic/hybsys_global.c
+++ b/opm/core/pressure/mimetic/hybsys_global.c
@ -22,10 +22,10 @@
 #include <stdlib.h>

 /* ---> Layering violation! */
-#include <opmcore/pressure/msmfem/hash_set.h>
+#include <opm/core/pressure/msmfem/hash_set.h>
 /* <--- Layering violation! */

-#include <opmcore/pressure/mimetic/hybsys_global.h>
+#include <opm/core/pressure/mimetic/hybsys_global.h>


 #if defined MAX
--- a/opm/core/pressure/mimetic/hybsys_global.h
+++ b/opm/core/pressure/mimetic/hybsys_global.h
@ -24,9 +24,9 @@
 extern "C" {
 #endif

-#include <opmcore/grid.h>
-#include <opmcore/well.h>
-#include <opmcore/linalg/sparse_sys.h>
+#include <opm/core/grid.h>
+#include <opm/core/well.h>
+#include <opm/core/linalg/sparse_sys.h>

 struct CSRMatrix *
 hybsys_define_globconn(grid_t *G, well_t *W);
--- a/opm/core/pressure/mimetic/mimetic.c
+++ b/opm/core/pressure/mimetic/mimetic.c
@ -21,8 +21,8 @@
 #include <stddef.h>
 #include <stdlib.h>

-#include <opmcore/linalg/blas_lapack.h>
-#include <opmcore/pressure/mimetic/mimetic.h>
+#include <opm/core/linalg/blas_lapack.h>
+#include <opm/core/pressure/mimetic/mimetic.h>

 /* ------------------------------------------------------------------ */
 void
--- a/opm/core/pressure/msmfem/coarse_conn.c
+++ b/opm/core/pressure/msmfem/coarse_conn.c
@ -23,8 +23,8 @@
 #include <stdlib.h>
 #include <string.h>

-#include <opmcore/pressure/msmfem/hash_set.h>
-#include <opmcore/pressure/msmfem/coarse_conn.h>
+#include <opm/core/pressure/msmfem/hash_set.h>
+#include <opm/core/pressure/msmfem/coarse_conn.h>

 #define MAX(a,b)   (((a) > (b)) ? (a) : (b))
 #define MIN(a,b)   (-MAX(-(a), -(b)))
--- a/opm/core/pressure/msmfem/coarse_sys.c
+++ b/opm/core/pressure/msmfem/coarse_sys.c
@ -34,16 +34,16 @@
 #endif


-#include <opmcore/linalg/blas_lapack.h>
-#include <opmcore/linalg/sparse_sys.h>
+#include <opm/core/linalg/blas_lapack.h>
+#include <opm/core/linalg/sparse_sys.h>

-#include <opmcore/pressure/mimetic/hybsys.h>
-#include <opmcore/pressure/mimetic/hybsys_global.h>
-#include <opmcore/pressure/mimetic/mimetic.h>
+#include <opm/core/pressure/mimetic/hybsys.h>
+#include <opm/core/pressure/mimetic/hybsys_global.h>
+#include <opm/core/pressure/mimetic/mimetic.h>

-#include <opmcore/pressure/msmfem/coarse_conn.h>
-#include <opmcore/pressure/msmfem/coarse_sys.h>
-#include <opmcore/pressure/msmfem/partition.h>
+#include <opm/core/pressure/msmfem/coarse_conn.h>
+#include <opm/core/pressure/msmfem/coarse_sys.h>
+#include <opm/core/pressure/msmfem/partition.h>


 #if defined(MAX)
@ -508,7 +508,7 @@ compute_fs_ip(grid_t *g, const double *perm,
    return Binv;
 }
 #elif USE_MIM_IP_TPFA
-#include <opmcore/pressure/tpfa/trans_tpfa.h>
+#include <opm/core/pressure/tpfa/trans_tpfa.h>
 /* ---------------------------------------------------------------------- */
 static double *
 compute_fs_ip(grid_t *g, const double *perm,
--- a/opm/core/pressure/msmfem/coarse_sys.h
+++ b/opm/core/pressure/msmfem/coarse_sys.h
@ -20,7 +20,7 @@
 #ifndef OPM_COARSE_SYS_HEADER_INCLUDED
 #define OPM_COARSE_SYS_HEADER_INCLUDED

-#include <opmcore/grid.h>
+#include <opm/core/grid.h>

 #ifdef __cplusplus
 extern "C" {
--- a/opm/core/pressure/msmfem/ifsh_ms.c
+++ b/opm/core/pressure/msmfem/ifsh_ms.c
@ -21,17 +21,17 @@
 #include <stdlib.h>
 #include <string.h>

-#include <opmcore/linalg/blas_lapack.h>
-#include <opmcore/linalg/sparse_sys.h>
+#include <opm/core/linalg/blas_lapack.h>
+#include <opm/core/linalg/sparse_sys.h>

-#include <opmcore/pressure/mimetic/hybsys.h>
-#include <opmcore/pressure/mimetic/hybsys_global.h>
-#include <opmcore/pressure/mimetic/mimetic.h>
+#include <opm/core/pressure/mimetic/hybsys.h>
+#include <opm/core/pressure/mimetic/hybsys_global.h>
+#include <opm/core/pressure/mimetic/mimetic.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>
+#include <opm/core/pressure/msmfem/coarse_conn.h>
+#include <opm/core/pressure/msmfem/coarse_sys.h>
+#include <opm/core/pressure/msmfem/partition.h>
+#include <opm/core/pressure/msmfem/ifsh_ms.h>


 #if defined(MAX)
--- a/opm/core/pressure/msmfem/ifsh_ms.h
+++ b/opm/core/pressure/msmfem/ifsh_ms.h
@ -26,8 +26,8 @@ extern "C" {

 #include <stddef.h>

-#include <opmcore/grid.h>
-#include <opmcore/pressure/msmfem/coarse_sys.h>
+#include <opm/core/grid.h>
+#include <opm/core/pressure/msmfem/coarse_sys.h>

 struct CSRMatrix;
 struct ifsh_ms_impl;
--- a/opm/core/pressure/tpfa/cfs_tpfa.c
+++ b/opm/core/pressure/tpfa/cfs_tpfa.c
@ -4,14 +4,14 @@
 #include <stdlib.h>
 #include <string.h>

-#include <opmcore/well.h>
-#include <opmcore/linalg/blas_lapack.h>
-#include <opmcore/linalg/sparse_sys.h>
-#include <opmcore/pressure/flow_bc.h>
+#include <opm/core/well.h>
+#include <opm/core/linalg/blas_lapack.h>
+#include <opm/core/linalg/sparse_sys.h>
+#include <opm/core/pressure/flow_bc.h>

-#include <opmcore/pressure/tpfa/compr_quant.h>
-#include <opmcore/pressure/tpfa/trans_tpfa.h>
-#include <opmcore/pressure/tpfa/cfs_tpfa.h>
+#include <opm/core/pressure/tpfa/compr_quant.h>
+#include <opm/core/pressure/tpfa/trans_tpfa.h>
+#include <opm/core/pressure/tpfa/cfs_tpfa.h>


 #if defined(MAX)
--- a/opm/core/pressure/tpfa/cfs_tpfa.h
+++ b/opm/core/pressure/tpfa/cfs_tpfa.h
@ -20,9 +20,9 @@
 #ifndef OPM_CFS_TPFA_HEADER_INCLUDED
 #define OPM_CFS_TPFA_HEADER_INCLUDED

-#include <opmcore/grid.h>
-#include <opmcore/well.h>
-#include <opmcore/pressure/flow_bc.h>
+#include <opm/core/grid.h>
+#include <opm/core/well.h>
+#include <opm/core/pressure/flow_bc.h>

 #ifdef __cplusplus
 extern "C" {
--- a/opm/core/pressure/tpfa/cfs_tpfa_residual.c
+++ b/opm/core/pressure/tpfa/cfs_tpfa_residual.c
@ -4,15 +4,15 @@
 #include <stdlib.h>
 #include <string.h>

-#include <opmcore/well.h>
-#include <opmcore/linalg/blas_lapack.h>
-#include <opmcore/linalg/sparse_sys.h>
+#include <opm/core/well.h>
+#include <opm/core/linalg/blas_lapack.h>
+#include <opm/core/linalg/sparse_sys.h>

-#include <opmcore/pressure/tpfa/compr_quant_general.h>
-#include <opmcore/pressure/tpfa/compr_source.h>
-#include <opmcore/pressure/tpfa/trans_tpfa.h>
+#include <opm/core/pressure/tpfa/compr_quant_general.h>
+#include <opm/core/pressure/tpfa/compr_source.h>
+#include <opm/core/pressure/tpfa/trans_tpfa.h>

-#include <opmcore/pressure/tpfa/cfs_tpfa_residual.h>
+#include <opm/core/pressure/tpfa/cfs_tpfa_residual.h>

 #if defined(MAX)
 #undef MAX
--- a/opm/core/pressure/tpfa/cfs_tpfa_residual.h
+++ b/opm/core/pressure/tpfa/cfs_tpfa_residual.h
@ -20,7 +20,7 @@
 #ifndef OPM_CFS_TPFA_HEADER_INCLUDED
 #define OPM_CFS_TPFA_HEADER_INCLUDED

-#include <opmcore/grid.h>
+#include <opm/core/grid.h>

 #ifdef __cplusplus
 extern "C" {
--- a/opm/core/pressure/tpfa/compr_quant.h
+++ b/opm/core/pressure/tpfa/compr_quant.h
@ -22,7 +22,7 @@

 #include <stddef.h>

-#include <opmcore/grid.h>
+#include <opm/core/grid.h>

 #ifdef __cplusplus
 extern "C" {
--- a/opm/core/pressure/tpfa/compr_quant_general.c
+++ b/opm/core/pressure/tpfa/compr_quant_general.c
@ -19,8 +19,8 @@

 #include <stdlib.h>

-#include <opmcore/linalg/sparse_sys.h>
-#include <opmcore/pressure/tpfa/compr_quant_general.h>
+#include <opm/core/linalg/sparse_sys.h>
+#include <opm/core/pressure/tpfa/compr_quant_general.h>


 void
--- a/opm/core/pressure/tpfa/ifs_tpfa.c
+++ b/opm/core/pressure/tpfa/ifs_tpfa.c
@ -3,8 +3,8 @@
 #include <stdlib.h>
 #include <string.h>

-#include <opmcore/linalg/sparse_sys.h>
-#include <opmcore/pressure/tpfa/ifs_tpfa.h>
+#include <opm/core/linalg/sparse_sys.h>
+#include <opm/core/pressure/tpfa/ifs_tpfa.h>


 struct ifs_tpfa_impl {
--- a/opm/core/pressure/tpfa/ifs_tpfa.h
+++ b/opm/core/pressure/tpfa/ifs_tpfa.h
@ -20,7 +20,7 @@
 #ifndef OPM_IFS_TPFA_HEADER_INCLUDED
 #define OPM_IFS_TPFA_HEADER_INCLUDED

-#include <opmcore/grid.h>
+#include <opm/core/grid.h>

 #ifdef __cplusplus
 extern "C" {
--- a/opm/core/pressure/tpfa/trans_tpfa.c
+++ b/opm/core/pressure/tpfa/trans_tpfa.c
@ -3,8 +3,8 @@
 #include <stdlib.h>
 #include <string.h>

-#include <opmcore/linalg/blas_lapack.h>
-#include <opmcore/pressure/tpfa/trans_tpfa.h>
+#include <opm/core/linalg/blas_lapack.h>
+#include <opm/core/pressure/tpfa/trans_tpfa.h>

 /* ---------------------------------------------------------------------- */
 /* htrans <- sum(C(:,i) .* K(cellNo,:) .* N(:,j), 2) ./ sum(C.*C, 2) */
--- a/opm/core/pressure/tpfa/trans_tpfa.h
+++ b/opm/core/pressure/tpfa/trans_tpfa.h
@ -20,7 +20,7 @@
 #ifndef OPM_TRANS_TPFA_HEADER_INCLUDED
 #define OPM_TRANS_TPFA_HEADER_INCLUDED

-#include <opmcore/grid.h>
+#include <opm/core/grid.h>

 #ifdef __cplusplus
 extern "C" {
--- a/opm/core/pressure/well.c
+++ b/opm/core/pressure/well.c
@ -19,7 +19,7 @@

 #include <stdlib.h>

-#include <opmcore/well.h>
+#include <opm/core/well.h>


 /* Release memory resources for cell->well mapping. */
--- a/opm/core/transport/CSRMatrixBlockAssembler.hpp
+++ b/opm/core/transport/CSRMatrixBlockAssembler.hpp
@ -42,7 +42,7 @@
 #include <algorithm>
 #include <vector>

-#include <opmcore/linalg/sparse_sys.h>
+#include <opm/core/linalg/sparse_sys.h>

 namespace Opm {
    namespace ImplicitTransportDefault {
--- a/opm/core/transport/CSRMatrixUmfpackSolver.hpp
+++ b/opm/core/transport/CSRMatrixUmfpackSolver.hpp
@ -36,7 +36,7 @@
 #ifndef OPM_CSRMATRIXUMFPACKSOLVER_HPP_HEADER
 #define OPM_CSRMATRIXUMFPACKSOLVER_HPP_HEADER

-#include <opmcore/linalg/call_umfpack.h>
+#include <opm/core/linalg/call_umfpack.h>

 namespace Opm {
    namespace ImplicitTransportLinAlgSupport {
--- a/opm/core/transport/spu_explicit.c
+++ b/opm/core/transport/spu_explicit.c
@ -7,8 +7,8 @@
 #include <assert.h>
 #include <stdio.h>

-#include <opmcore/grid.h>
-#include <opmcore/transport/spu_explicit.h>
+#include <opm/core/grid.h>
+#include <opm/core/transport/spu_explicit.h>


 /* Twophase mobility-weighted upwind */
--- a/opm/core/transport/spu_implicit.c
+++ b/opm/core/transport/spu_implicit.c
@ -10,8 +10,8 @@
 #include <limits.h>
 #include <math.h>

-#include <opmcore/grid.h>
-#include <opmcore/transport/spu_implicit.h>
+#include <opm/core/grid.h>
+#include <opm/core/transport/spu_implicit.h>



--- a/opm/core/utility/cart_grid.h
+++ b/opm/core/utility/cart_grid.h
@ -34,7 +34,7 @@
 extern "C" {
 #endif

-#include <opmcore/grid.h>
+#include <opm/core/grid.h>

 void
 destroy_cart_grid(grid_t *G);
--- a/tests/test_cfs_tpfa.c
+++ b/tests/test_cfs_tpfa.c
@ -5,16 +5,16 @@

 #include <suitesparse/umfpack.h>

-#include <opmcore/grid.h>
-#include <opmcore/well.h>
+#include <opm/core/grid.h>
+#include <opm/core/well.h>

-#include <opmcore/linalg/sparse_sys.h>
+#include <opm/core/linalg/sparse_sys.h>

-#include <opmcore/pressure/flow_bc.h>
+#include <opm/core/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 <opm/core/pressure/tpfa/cfs_tpfa.h>
+#include <opm/core/pressure/tpfa/compr_quant.h>
+#include <opm/core/pressure/tpfa/trans_tpfa.h>



--- a/tests/test_jacsys.cpp
+++ b/tests/test_jacsys.cpp
@ -78,7 +78,7 @@ main() {
 #endif

 #if 0
-#include <opmcore/transport/JacobianSystem.hpp>
+#include <opm/core/transport/JacobianSystem.hpp>

 //using namespace Opm::LinAlgSupport;
 using namespace Opm::ImplicitTransportDefault;
@ -101,11 +101,11 @@ main() {
 #endif

 #if 1
-#include <opmcore/linalg/sparse_sys.h>
+#include <opm/core/linalg/sparse_sys.h>

-#include <opmcore/transport/JacobianSystem.hpp>
-#include <opmcore/transport/CSRMatrixBlockAssembler.hpp>
-#include <opmcore/transport/CSRMatrixUmfpackSolver.hpp>
+#include <opm/core/transport/JacobianSystem.hpp>
+#include <opm/core/transport/CSRMatrixBlockAssembler.hpp>
+#include <opm/core/transport/CSRMatrixUmfpackSolver.hpp>

 using namespace Opm::ImplicitTransportDefault;

--- a/tests/test_readvector.cpp
+++ b/tests/test_readvector.cpp
@ -2,11 +2,11 @@
 #include <string>
 #include <vector>

-#include <opmcore/grid.h>
-#include <opmcore/utility/cpgpreprocess/preprocess.h>
-#include <opmcore/utility/cpgpreprocess/cgridinterface.h>
+#include <opm/core/grid.h>
+#include <opm/core/utility/cpgpreprocess/preprocess.h>
+#include <opm/core/utility/cpgpreprocess/cgridinterface.h>

-#include <opmcore/utility/cpgpreprocess/readvector.hpp>
+#include <opm/core/utility/cpgpreprocess/readvector.hpp>

 static struct CornerpointGrid
 read_grid(const std::string& dir)
--- a/tests/test_sf2p.cpp
+++ b/tests/test_sf2p.cpp
@ -3,7 +3,7 @@
 #include <iostream>
 #include <iterator>

-#include <opmcore/fluid/SimpleFluid2p.hpp>
+#include <opm/core/fluid/SimpleFluid2p.hpp>

 template <class Ostream, typename T, size_t n>
 Ostream&