diff --git a/.hgignore b/.hgignore index 76427b06..53e2d2a8 100644 --- a/.hgignore +++ b/.hgignore @@ -8,6 +8,7 @@ syntax: glob .deps *.pc stamp-* +.dirstamp Makefile Makefile.in @@ -18,9 +19,11 @@ am autom4te.cache config.* configure +compile depcomp dependencies.m4 install-sh +libtool ltmain.sh m4/libtool.m4 m4/lt*.m4 @@ -28,3 +31,9 @@ missing # Ignoring executables *_test +examples/scaneclipsedeck +examples/spu_2p +tests/test_cfs_tpfa +tests/test_jacsys +tests/test_readvector +tests/test_sf2p diff --git a/Makefile.am b/Makefile.am index e516a2a0..14e7dbe0 100644 --- a/Makefile.am +++ b/Makefile.am @@ -7,92 +7,95 @@ SUBDIRS = . tests examples lib_LTLIBRARIES = libopmcore.la libopmcore_la_SOURCES = \ -opmcore/utility/cart_grid.c \ -opmcore/utility/cpgpreprocess/geometry.c \ -opmcore/utility/cpgpreprocess/preprocess.c \ -opmcore/utility/cpgpreprocess/readvector.cpp \ -opmcore/utility/cpgpreprocess/cgridinterface.c \ -opmcore/utility/cpgpreprocess/sparsetable.c \ -opmcore/utility/cpgpreprocess/facetopology.c \ -opmcore/utility/cpgpreprocess/uniquepoints.c \ -opmcore/linalg/sparse_sys.c \ -opmcore/linalg/call_umfpack.c \ -opmcore/pressure/cfsh.c \ -opmcore/pressure/flow_bc.c \ -opmcore/pressure/well.c \ -opmcore/pressure/fsh_common_impl.c \ -opmcore/pressure/fsh.c \ -opmcore/pressure/tpfa/ifs_tpfa.c \ -opmcore/pressure/tpfa/compr_source.c \ -opmcore/pressure/tpfa/cfs_tpfa.c \ -opmcore/pressure/tpfa/compr_bc.c \ -opmcore/pressure/tpfa/compr_quant.c \ -opmcore/pressure/tpfa/compr_quant_general.c \ -opmcore/pressure/tpfa/cfs_tpfa_residual.c \ -opmcore/pressure/tpfa/trans_tpfa.c \ -opmcore/pressure/msmfem/coarse_conn.c \ -opmcore/pressure/msmfem/partition.c \ -opmcore/pressure/msmfem/hash_set.c \ -opmcore/pressure/msmfem/ifsh_ms.c \ -opmcore/pressure/msmfem/dfs.c \ -opmcore/pressure/msmfem/coarse_sys.c \ -opmcore/pressure/ifsh.c \ -opmcore/pressure/mimetic/mimetic.c \ -opmcore/pressure/mimetic/hybsys_global.c \ -opmcore/pressure/mimetic/hybsys.c \ -opmcore/transport/spu_explicit.c \ -opmcore/transport/spu_implicit.c \ -opmcore/transport/transport_source.c +opm/core/utility/cart_grid.c \ +opm/core/utility/cpgpreprocess/geometry.c \ +opm/core/utility/cpgpreprocess/preprocess.c \ +opm/core/utility/cpgpreprocess/readvector.cpp \ +opm/core/utility/cpgpreprocess/cgridinterface.c \ +opm/core/utility/cpgpreprocess/sparsetable.c \ +opm/core/utility/cpgpreprocess/facetopology.c \ +opm/core/utility/cpgpreprocess/uniquepoints.c \ +opm/core/linalg/sparse_sys.c \ +opm/core/pressure/cfsh.c \ +opm/core/pressure/flow_bc.c \ +opm/core/pressure/well.c \ +opm/core/pressure/fsh_common_impl.c \ +opm/core/pressure/fsh.c \ +opm/core/pressure/tpfa/ifs_tpfa.c \ +opm/core/pressure/tpfa/compr_source.c \ +opm/core/pressure/tpfa/cfs_tpfa.c \ +opm/core/pressure/tpfa/compr_bc.c \ +opm/core/pressure/tpfa/compr_quant.c \ +opm/core/pressure/tpfa/compr_quant_general.c \ +opm/core/pressure/tpfa/cfs_tpfa_residual.c \ +opm/core/pressure/tpfa/trans_tpfa.c \ +opm/core/pressure/msmfem/coarse_conn.c \ +opm/core/pressure/msmfem/partition.c \ +opm/core/pressure/msmfem/hash_set.c \ +opm/core/pressure/msmfem/ifsh_ms.c \ +opm/core/pressure/msmfem/dfs.c \ +opm/core/pressure/msmfem/coarse_sys.c \ +opm/core/pressure/ifsh.c \ +opm/core/pressure/mimetic/mimetic.c \ +opm/core/pressure/mimetic/hybsys_global.c \ +opm/core/pressure/mimetic/hybsys.c \ +opm/core/transport/spu_explicit.c \ +opm/core/transport/spu_implicit.c \ +opm/core/transport/transport_source.c -nobase_include_HEADERS = \ -opmcore/utility/cpgpreprocess/readvector.hpp \ -opmcore/utility/cpgpreprocess/uniquepoints.h \ -opmcore/utility/cpgpreprocess/preprocess.h \ -opmcore/utility/cpgpreprocess/sparsetable.h \ -opmcore/utility/cpgpreprocess/cgridinterface.h \ -opmcore/utility/cpgpreprocess/geometry.h \ -opmcore/utility/cpgpreprocess/facetopology.h \ -opmcore/utility/cpgpreprocess/grid.h \ -opmcore/utility/cpgpreprocess/grdecl.h \ -opmcore/utility/cart_grid.h \ -opmcore/well.h \ -opmcore/linalg/sparse_sys.h \ -opmcore/linalg/call_umfpack.h \ -opmcore/linalg/blas_lapack.h \ -opmcore/fluid/SimpleFluid2p.hpp \ -opmcore/grid.h \ -opmcore/pressure/fsh.h \ -opmcore/pressure/HybridPressureSolver.hpp \ -opmcore/pressure/TPFAPressureSolver.hpp \ -opmcore/pressure/tpfa/compr_quant.h \ -opmcore/pressure/tpfa/compr_source.h \ -opmcore/pressure/tpfa/compr_bc.h \ -opmcore/pressure/tpfa/cfs_tpfa.h \ -opmcore/pressure/tpfa/compr_quant_general.h \ -opmcore/pressure/tpfa/trans_tpfa.h \ -opmcore/pressure/tpfa/cfs_tpfa_residual.h \ -opmcore/pressure/tpfa/ifs_tpfa.h \ -opmcore/pressure/TPFACompressiblePressureSolver.hpp \ -opmcore/pressure/GridAdapter.hpp \ -opmcore/pressure/msmfem/coarse_sys.h \ -opmcore/pressure/msmfem/hash_set.h \ -opmcore/pressure/msmfem/ifsh_ms.h \ -opmcore/pressure/msmfem/dfs.h \ -opmcore/pressure/msmfem/partition.h \ -opmcore/pressure/msmfem/coarse_conn.h \ -opmcore/pressure/flow_bc.h \ -opmcore/pressure/fsh_common_impl.h \ -opmcore/pressure/mimetic/hybsys_global.h \ -opmcore/pressure/mimetic/hybsys.h \ -opmcore/pressure/mimetic/mimetic.h \ -opmcore/transport/ImplicitTransport.hpp \ -opmcore/transport/CSRMatrixUmfpackSolver.hpp \ -opmcore/transport/CSRMatrixBlockAssembler.hpp \ -opmcore/transport/SimpleFluid2pWrapper.hpp \ -opmcore/transport/SinglePointUpwindTwoPhase.hpp \ -opmcore/transport/NormSupport.hpp \ -opmcore/transport/spu_explicit.h \ -opmcore/transport/JacobianSystem.hpp \ -opmcore/transport/spu_implicit.h \ -opmcore/transport/ImplicitAssembly.hpp \ -opmcore/transport/transport_source.h +nobase_include_HEADERS = \ +opm/core/utility/cpgpreprocess/readvector.hpp \ +opm/core/utility/cpgpreprocess/uniquepoints.h \ +opm/core/utility/cpgpreprocess/preprocess.h \ +opm/core/utility/cpgpreprocess/sparsetable.h \ +opm/core/utility/cpgpreprocess/cgridinterface.h \ +opm/core/utility/cpgpreprocess/geometry.h \ +opm/core/utility/cpgpreprocess/facetopology.h \ +opm/core/utility/cpgpreprocess/grid.h \ +opm/core/utility/cpgpreprocess/grdecl.h \ +opm/core/utility/cart_grid.h \ +opm/core/well.h \ +opm/core/linalg/sparse_sys.h \ +opm/core/linalg/blas_lapack.h \ +opm/core/fluid/SimpleFluid2p.hpp \ +opm/core/grid.h \ +opm/core/pressure/fsh.h \ +opm/core/pressure/HybridPressureSolver.hpp \ +opm/core/pressure/TPFAPressureSolver.hpp \ +opm/core/pressure/tpfa/compr_quant.h \ +opm/core/pressure/tpfa/compr_source.h \ +opm/core/pressure/tpfa/compr_bc.h \ +opm/core/pressure/tpfa/cfs_tpfa.h \ +opm/core/pressure/tpfa/compr_quant_general.h \ +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 \ +opm/core/pressure/msmfem/dfs.h \ +opm/core/pressure/msmfem/partition.h \ +opm/core/pressure/msmfem/coarse_conn.h \ +opm/core/pressure/flow_bc.h \ +opm/core/pressure/fsh_common_impl.h \ +opm/core/pressure/mimetic/hybsys_global.h \ +opm/core/pressure/mimetic/hybsys.h \ +opm/core/pressure/mimetic/mimetic.h \ +opm/core/transport/ImplicitTransport.hpp \ +opm/core/transport/CSRMatrixUmfpackSolver.hpp \ +opm/core/transport/CSRMatrixBlockAssembler.hpp \ +opm/core/transport/SimpleFluid2pWrapper.hpp \ +opm/core/transport/SinglePointUpwindTwoPhase.hpp \ +opm/core/transport/NormSupport.hpp \ +opm/core/transport/spu_explicit.h \ +opm/core/transport/JacobianSystem.hpp \ +opm/core/transport/spu_implicit.h \ +opm/core/transport/ImplicitAssembly.hpp \ +opm/core/transport/transport_source.h + +if UMFPACK +libopmcore_la_SOURCES += opm/core/linalg/call_umfpack.c +nobase_include_HEADERS += opm/core/linalg/call_umfpack.h +endif diff --git a/configure.ac b/configure.ac index 43c22001..b67a70b4 100644 --- a/configure.ac +++ b/configure.ac @@ -1,7 +1,7 @@ # -*- Autoconf -*- # Process this file with autoconf to produce a configure script. -AC_PREREQ([2.65]) +AC_PREREQ([2.59]) AC_INIT([OPM Core Library], [0.1], [atgeirr@sintef.no],dnl [opmcore], [https://public.ict.sintef.no/opm/hg/opmcore]) AM_INIT_AUTOMAKE([-Wall -Werror foreign subdir-objects]) @@ -11,13 +11,14 @@ m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])]) LT_INIT AC_CONFIG_MACRO_DIR([m4]) -AC_CONFIG_SRCDIR([opmcore/grid.h]) +AC_CONFIG_SRCDIR([opm/core/grid.h]) AC_CONFIG_HEADERS([config.h]) # Checks for programs. AC_PROG_CXX AC_PROG_CC -AC_PROG_CC_C_O +AM_PROG_CC_C_O +AC_PROG_LIBTOOL # AX_LAPACK requires a working F77 compiler or, rather, its runtime # support libraries. @@ -32,10 +33,6 @@ AX_LAPACK # Checks for header files. AC_CHECK_HEADERS([float.h limits.h stddef.h stdlib.h string.h]) -AC_CHECK_HEADERS([suitesparse/umfpack.h], - [umfpack_header=yes], - [umfpack_header=no]) - # Checks for typedefs, structures, and compiler characteristics. AC_HEADER_STDBOOL AC_TYPE_SIZE_T @@ -44,15 +41,21 @@ AC_CHECK_TYPES([ptrdiff_t]) # Checks for library functions. AC_CHECK_FUNCS([floor memmove pow sqrt strchr strtol]) + +# To use UMFPACK, we need the header, and both the AMD and UMFPACK libs. +AC_CHECK_HEADERS([suitesparse/umfpack.h], + [umfpack_header=yes], + [umfpack_header=no]) + +AC_SEARCH_LIBS([amd_free], [amd], + [amd_lib=yes], [amd_lib=no], [-lm]) + AC_SEARCH_LIBS([umfpack_dl_solve], [umfpack], - [umfpack_lib=yes], [umfpack_lib=no]) + [umfpack_lib=yes], [umfpack_lib=no], [-lamd -lm]) AM_CONDITIONAL([UMFPACK], [test "x$umfpack_header" != "xno" -a "x$umfpack_lib" != "xno"]) -AM_COND_IF([UMFPACK], [], -[AC_MSG_NOTICE([Found no working installation of UMFPACK. - UMFPACK support is disabled.])]) AC_CONFIG_FILES([ Makefile diff --git a/examples/Makefile.am b/examples/Makefile.am index 4fcaef96..8440ca65 100644 --- a/examples/Makefile.am +++ b/examples/Makefile.am @@ -6,7 +6,9 @@ $(top_builddir)/libopmcore.la \ $(LAPACK_LIBS) $(BLAS_LIBS) $(LIBS) $(FLIBS) noinst_PROGRAMS = \ -spu_2p \ scaneclipsedeck +if UMFPACK +noinst_PROGRAMS += spu_2p spu_2p_SOURCES = spu_2p.cpp +endif diff --git a/examples/spu_2p.cpp b/examples/spu_2p.cpp index a6c77758..901c2dc6 100644 --- a/examples/spu_2p.cpp +++ b/examples/spu_2p.cpp @@ -38,32 +38,32 @@ #include #include -#include +#include #include #include #include #include -#include +#include -#include -#include +#include +#include -#include +#include -#include +#include -#include -#include +#include +#include -#include -#include -#include -#include +#include +#include +#include +#include -#include +#include -#include +#include template Ostream& @@ -273,8 +273,8 @@ main() using Opm::ImplicitTransportLinAlgSupport::CSRMatrixUmfpackSolver; CSRMatrixUmfpackSolver linsolve; - std::array mu = {{ 1.0, 1.0 }}; - std::array rho = {{ 0.0, 0.0 }}; + std::tr1::array mu = {{ 1.0, 1.0 }}; + std::tr1::array rho = {{ 0.0, 0.0 }}; TwophaseFluid fluid(mu, rho); std::vector porevol; diff --git a/opmcore/fluid/SimpleFluid2p.hpp b/opm/core/fluid/SimpleFluid2p.hpp similarity index 93% rename from opmcore/fluid/SimpleFluid2p.hpp rename to opm/core/fluid/SimpleFluid2p.hpp index 9c4244f4..bb89fc6d 100644 --- a/opmcore/fluid/SimpleFluid2p.hpp +++ b/opm/core/fluid/SimpleFluid2p.hpp @@ -36,15 +36,15 @@ #ifndef OPM_SIMPLEFLUID2P_HPP_HEADER #define OPM_SIMPLEFLUID2P_HPP_HEADER -#include +#include #include namespace Opm { template class SimpleFluid2p { public: - SimpleFluid2p(const std::array& mu, - const std::array& rho) + SimpleFluid2p(const std::tr1::array& mu, + const std::tr1::array& rho) : mu_(mu), rho_(rho) { } @@ -99,8 +99,8 @@ namespace Opm { double s_max(int c) const { (void) c; return 1.0; } private: - std::array mu_ ; - std::array rho_; + std::tr1::array mu_ ; + std::tr1::array rho_; }; } diff --git a/opmcore/grid.h b/opm/core/grid.h similarity index 100% rename from opmcore/grid.h rename to opm/core/grid.h diff --git a/opmcore/linalg/blas_lapack.h b/opm/core/linalg/blas_lapack.h similarity index 100% rename from opmcore/linalg/blas_lapack.h rename to opm/core/linalg/blas_lapack.h diff --git a/opmcore/linalg/call_umfpack.c b/opm/core/linalg/call_umfpack.c similarity index 98% rename from opmcore/linalg/call_umfpack.c rename to opm/core/linalg/call_umfpack.c index 517dd292..d3887378 100644 --- a/opmcore/linalg/call_umfpack.c +++ b/opm/core/linalg/call_umfpack.c @@ -38,8 +38,8 @@ #include -#include -#include +#include +#include struct CSCMatrix { UF_long n; diff --git a/opmcore/linalg/call_umfpack.h b/opm/core/linalg/call_umfpack.h similarity index 100% rename from opmcore/linalg/call_umfpack.h rename to opm/core/linalg/call_umfpack.h diff --git a/opmcore/linalg/sparse_sys.c b/opm/core/linalg/sparse_sys.c similarity index 100% rename from opmcore/linalg/sparse_sys.c rename to opm/core/linalg/sparse_sys.c diff --git a/opmcore/linalg/sparse_sys.h b/opm/core/linalg/sparse_sys.h similarity index 100% rename from opmcore/linalg/sparse_sys.h rename to opm/core/linalg/sparse_sys.h diff --git a/opmcore/pressure/GridAdapter.hpp b/opm/core/pressure/GridAdapter.hpp similarity index 100% rename from opmcore/pressure/GridAdapter.hpp rename to opm/core/pressure/GridAdapter.hpp diff --git a/opmcore/pressure/HybridPressureSolver.hpp b/opm/core/pressure/HybridPressureSolver.hpp similarity index 100% rename from opmcore/pressure/HybridPressureSolver.hpp rename to opm/core/pressure/HybridPressureSolver.hpp diff --git a/opmcore/pressure/TPFACompressiblePressureSolver.hpp b/opm/core/pressure/TPFACompressiblePressureSolver.hpp similarity index 100% rename from opmcore/pressure/TPFACompressiblePressureSolver.hpp rename to opm/core/pressure/TPFACompressiblePressureSolver.hpp diff --git a/opmcore/pressure/TPFAPressureSolver.hpp b/opm/core/pressure/TPFAPressureSolver.hpp similarity index 100% rename from opmcore/pressure/TPFAPressureSolver.hpp rename to opm/core/pressure/TPFAPressureSolver.hpp diff --git a/opmcore/pressure/cfsh.c b/opm/core/pressure/cfsh.c similarity index 97% rename from opmcore/pressure/cfsh.c rename to opm/core/pressure/cfsh.c index 04241f00..ab0ca13e 100644 --- a/opmcore/pressure/cfsh.c +++ b/opm/core/pressure/cfsh.c @@ -24,10 +24,10 @@ #include #include -#include -#include -#include -#include +#include +#include +#include +#include diff --git a/opmcore/pressure/flow_bc.c b/opm/core/pressure/flow_bc.c similarity index 100% rename from opmcore/pressure/flow_bc.c rename to opm/core/pressure/flow_bc.c diff --git a/opmcore/pressure/flow_bc.h b/opm/core/pressure/flow_bc.h similarity index 100% rename from opmcore/pressure/flow_bc.h rename to opm/core/pressure/flow_bc.h diff --git a/opmcore/pressure/fsh.c b/opm/core/pressure/fsh.c similarity index 94% rename from opmcore/pressure/fsh.c rename to opm/core/pressure/fsh.c index 84bb3a0c..51e19b8a 100644 --- a/opmcore/pressure/fsh.c +++ b/opm/core/pressure/fsh.c @@ -24,10 +24,10 @@ #include #include -#include -#include -#include -#include +#include +#include +#include +#include diff --git a/opmcore/pressure/fsh.h b/opm/core/pressure/fsh.h similarity index 98% rename from opmcore/pressure/fsh.h rename to opm/core/pressure/fsh.h index 2a6f5fe1..4240fb37 100644 --- a/opmcore/pressure/fsh.h +++ b/opm/core/pressure/fsh.h @@ -20,9 +20,9 @@ #ifndef OPM_FSH_HEADER_INCLUDED #define OPM_FHS_HEADER_INCLUDED -#include -#include -#include +#include +#include +#include #ifdef __cplusplus extern "C" { diff --git a/opmcore/pressure/fsh_common_impl.c b/opm/core/pressure/fsh_common_impl.c similarity index 96% rename from opmcore/pressure/fsh_common_impl.c rename to opm/core/pressure/fsh_common_impl.c index 02ee3713..3789c72a 100644 --- a/opmcore/pressure/fsh_common_impl.c +++ b/opm/core/pressure/fsh_common_impl.c @@ -24,15 +24,15 @@ #include #include -#include -#include -#include +#include +#include +#include -#include -#include +#include +#include -#include -#include +#include +#include #if defined MAX #undef MAX diff --git a/opmcore/pressure/fsh_common_impl.h b/opm/core/pressure/fsh_common_impl.h similarity index 100% rename from opmcore/pressure/fsh_common_impl.h rename to opm/core/pressure/fsh_common_impl.h diff --git a/opmcore/pressure/ifsh.c b/opm/core/pressure/ifsh.c similarity index 98% rename from opmcore/pressure/ifsh.c rename to opm/core/pressure/ifsh.c index 1248ed2a..c788c0c0 100644 --- a/opmcore/pressure/ifsh.c +++ b/opm/core/pressure/ifsh.c @@ -24,10 +24,10 @@ #include #include -#include -#include -#include -#include +#include +#include +#include +#include /* ---------------------------------------------------------------------- */ diff --git a/opmcore/pressure/mimetic/hybsys.c b/opm/core/pressure/mimetic/hybsys.c similarity index 99% rename from opmcore/pressure/mimetic/hybsys.c rename to opm/core/pressure/mimetic/hybsys.c index cf2d666e..6e900a5b 100644 --- a/opmcore/pressure/mimetic/hybsys.c +++ b/opm/core/pressure/mimetic/hybsys.c @@ -22,8 +22,8 @@ #include #include -#include -#include +#include +#include #if defined(MAX) diff --git a/opmcore/pressure/mimetic/hybsys.h b/opm/core/pressure/mimetic/hybsys.h similarity index 100% rename from opmcore/pressure/mimetic/hybsys.h rename to opm/core/pressure/mimetic/hybsys.h diff --git a/opmcore/pressure/mimetic/hybsys_global.c b/opm/core/pressure/mimetic/hybsys_global.c similarity index 99% rename from opmcore/pressure/mimetic/hybsys_global.c rename to opm/core/pressure/mimetic/hybsys_global.c index 67b3abfb..8a3fe0c1 100644 --- a/opmcore/pressure/mimetic/hybsys_global.c +++ b/opm/core/pressure/mimetic/hybsys_global.c @@ -22,10 +22,10 @@ #include /* ---> Layering violation! */ -#include +#include /* <--- Layering violation! */ -#include +#include #if defined MAX diff --git a/opmcore/pressure/mimetic/hybsys_global.h b/opm/core/pressure/mimetic/hybsys_global.h similarity index 94% rename from opmcore/pressure/mimetic/hybsys_global.h rename to opm/core/pressure/mimetic/hybsys_global.h index 6b023f7a..525477c9 100644 --- a/opmcore/pressure/mimetic/hybsys_global.h +++ b/opm/core/pressure/mimetic/hybsys_global.h @@ -24,9 +24,9 @@ extern "C" { #endif -#include -#include -#include +#include +#include +#include struct CSRMatrix * hybsys_define_globconn(grid_t *G, well_t *W); diff --git a/opmcore/pressure/mimetic/mimetic.c b/opm/core/pressure/mimetic/mimetic.c similarity index 98% rename from opmcore/pressure/mimetic/mimetic.c rename to opm/core/pressure/mimetic/mimetic.c index e7a49cce..4ead1e52 100644 --- a/opmcore/pressure/mimetic/mimetic.c +++ b/opm/core/pressure/mimetic/mimetic.c @@ -21,8 +21,8 @@ #include #include -#include -#include +#include +#include /* ------------------------------------------------------------------ */ void diff --git a/opmcore/pressure/mimetic/mimetic.h b/opm/core/pressure/mimetic/mimetic.h similarity index 100% rename from opmcore/pressure/mimetic/mimetic.h rename to opm/core/pressure/mimetic/mimetic.h diff --git a/opmcore/pressure/msmfem/coarse_conn.c b/opm/core/pressure/msmfem/coarse_conn.c similarity index 99% rename from opmcore/pressure/msmfem/coarse_conn.c rename to opm/core/pressure/msmfem/coarse_conn.c index 33548748..4a9beb34 100644 --- a/opmcore/pressure/msmfem/coarse_conn.c +++ b/opm/core/pressure/msmfem/coarse_conn.c @@ -23,8 +23,8 @@ #include #include -#include -#include +#include +#include #define MAX(a,b) (((a) > (b)) ? (a) : (b)) #define MIN(a,b) (-MAX(-(a), -(b))) diff --git a/opmcore/pressure/msmfem/coarse_conn.h b/opm/core/pressure/msmfem/coarse_conn.h similarity index 100% rename from opmcore/pressure/msmfem/coarse_conn.h rename to opm/core/pressure/msmfem/coarse_conn.h diff --git a/opmcore/pressure/msmfem/coarse_sys.c b/opm/core/pressure/msmfem/coarse_sys.c similarity index 99% rename from opmcore/pressure/msmfem/coarse_sys.c rename to opm/core/pressure/msmfem/coarse_sys.c index 00dbf9d1..557ba913 100644 --- a/opmcore/pressure/msmfem/coarse_sys.c +++ b/opm/core/pressure/msmfem/coarse_sys.c @@ -34,16 +34,16 @@ #endif -#include -#include +#include +#include -#include -#include -#include +#include +#include +#include -#include -#include -#include +#include +#include +#include #if defined(MAX) @@ -508,7 +508,7 @@ compute_fs_ip(grid_t *g, const double *perm, return Binv; } #elif USE_MIM_IP_TPFA -#include +#include /* ---------------------------------------------------------------------- */ static double * compute_fs_ip(grid_t *g, const double *perm, diff --git a/opmcore/pressure/msmfem/coarse_sys.h b/opm/core/pressure/msmfem/coarse_sys.h similarity index 99% rename from opmcore/pressure/msmfem/coarse_sys.h rename to opm/core/pressure/msmfem/coarse_sys.h index 04673239..f49c00ff 100644 --- a/opmcore/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 +#include #ifdef __cplusplus extern "C" { diff --git a/opmcore/pressure/msmfem/dfs.c b/opm/core/pressure/msmfem/dfs.c similarity index 100% rename from opmcore/pressure/msmfem/dfs.c rename to opm/core/pressure/msmfem/dfs.c diff --git a/opmcore/pressure/msmfem/dfs.h b/opm/core/pressure/msmfem/dfs.h similarity index 100% rename from opmcore/pressure/msmfem/dfs.h rename to opm/core/pressure/msmfem/dfs.h diff --git a/opmcore/pressure/msmfem/hash_set.c b/opm/core/pressure/msmfem/hash_set.c similarity index 100% rename from opmcore/pressure/msmfem/hash_set.c rename to opm/core/pressure/msmfem/hash_set.c diff --git a/opmcore/pressure/msmfem/hash_set.h b/opm/core/pressure/msmfem/hash_set.h similarity index 100% rename from opmcore/pressure/msmfem/hash_set.h rename to opm/core/pressure/msmfem/hash_set.h diff --git a/opmcore/pressure/msmfem/ifsh_ms.c b/opm/core/pressure/msmfem/ifsh_ms.c similarity index 97% rename from opmcore/pressure/msmfem/ifsh_ms.c rename to opm/core/pressure/msmfem/ifsh_ms.c index 606b0aab..e29f7f89 100644 --- a/opmcore/pressure/msmfem/ifsh_ms.c +++ b/opm/core/pressure/msmfem/ifsh_ms.c @@ -21,17 +21,17 @@ #include #include -#include -#include +#include +#include -#include -#include -#include +#include +#include +#include -#include -#include -#include -#include +#include +#include +#include +#include #if defined(MAX) diff --git a/opmcore/pressure/msmfem/ifsh_ms.h b/opm/core/pressure/msmfem/ifsh_ms.h similarity index 95% rename from opmcore/pressure/msmfem/ifsh_ms.h rename to opm/core/pressure/msmfem/ifsh_ms.h index d1c940fb..ed276ad1 100644 --- a/opmcore/pressure/msmfem/ifsh_ms.h +++ b/opm/core/pressure/msmfem/ifsh_ms.h @@ -26,8 +26,8 @@ extern "C" { #include -#include -#include +#include +#include struct CSRMatrix; struct ifsh_ms_impl; diff --git a/opmcore/pressure/msmfem/partition.c b/opm/core/pressure/msmfem/partition.c similarity index 100% rename from opmcore/pressure/msmfem/partition.c rename to opm/core/pressure/msmfem/partition.c diff --git a/opmcore/pressure/msmfem/partition.h b/opm/core/pressure/msmfem/partition.h similarity index 100% rename from opmcore/pressure/msmfem/partition.h rename to opm/core/pressure/msmfem/partition.h diff --git a/opmcore/pressure/tpfa/cfs_tpfa.c b/opm/core/pressure/tpfa/cfs_tpfa.c similarity index 99% rename from opmcore/pressure/tpfa/cfs_tpfa.c rename to opm/core/pressure/tpfa/cfs_tpfa.c index 14d3576a..e3ca53f1 100644 --- a/opmcore/pressure/tpfa/cfs_tpfa.c +++ b/opm/core/pressure/tpfa/cfs_tpfa.c @@ -4,14 +4,14 @@ #include #include -#include -#include -#include -#include +#include +#include +#include +#include -#include -#include -#include +#include +#include +#include #if defined(MAX) diff --git a/opmcore/pressure/tpfa/cfs_tpfa.h b/opm/core/pressure/tpfa/cfs_tpfa.h similarity index 97% rename from opmcore/pressure/tpfa/cfs_tpfa.h rename to opm/core/pressure/tpfa/cfs_tpfa.h index 7d1ed80d..6fd49566 100644 --- a/opmcore/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 -#include -#include +#include +#include +#include #ifdef __cplusplus extern "C" { diff --git a/opmcore/pressure/tpfa/cfs_tpfa_residual.c b/opm/core/pressure/tpfa/cfs_tpfa_residual.c similarity index 99% rename from opmcore/pressure/tpfa/cfs_tpfa_residual.c rename to opm/core/pressure/tpfa/cfs_tpfa_residual.c index e7953145..4f83e42b 100644 --- a/opmcore/pressure/tpfa/cfs_tpfa_residual.c +++ b/opm/core/pressure/tpfa/cfs_tpfa_residual.c @@ -4,15 +4,15 @@ #include #include -#include -#include -#include +#include +#include +#include -#include -#include -#include +#include +#include +#include -#include +#include #if defined(MAX) #undef MAX diff --git a/opmcore/pressure/tpfa/cfs_tpfa_residual.h b/opm/core/pressure/tpfa/cfs_tpfa_residual.h similarity index 99% rename from opmcore/pressure/tpfa/cfs_tpfa_residual.h rename to opm/core/pressure/tpfa/cfs_tpfa_residual.h index 1e852639..b2a60de5 100644 --- a/opmcore/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 +#include #ifdef __cplusplus extern "C" { diff --git a/opmcore/pressure/tpfa/compr_bc.c b/opm/core/pressure/tpfa/compr_bc.c similarity index 100% rename from opmcore/pressure/tpfa/compr_bc.c rename to opm/core/pressure/tpfa/compr_bc.c diff --git a/opmcore/pressure/tpfa/compr_bc.h b/opm/core/pressure/tpfa/compr_bc.h similarity index 100% rename from opmcore/pressure/tpfa/compr_bc.h rename to opm/core/pressure/tpfa/compr_bc.h diff --git a/opmcore/pressure/tpfa/compr_quant.c b/opm/core/pressure/tpfa/compr_quant.c similarity index 100% rename from opmcore/pressure/tpfa/compr_quant.c rename to opm/core/pressure/tpfa/compr_quant.c diff --git a/opmcore/pressure/tpfa/compr_quant.h b/opm/core/pressure/tpfa/compr_quant.h similarity index 98% rename from opmcore/pressure/tpfa/compr_quant.h rename to opm/core/pressure/tpfa/compr_quant.h index 6175f4c0..e1b705df 100644 --- a/opmcore/pressure/tpfa/compr_quant.h +++ b/opm/core/pressure/tpfa/compr_quant.h @@ -22,7 +22,7 @@ #include -#include +#include #ifdef __cplusplus extern "C" { diff --git a/opmcore/pressure/tpfa/compr_quant_general.c b/opm/core/pressure/tpfa/compr_quant_general.c similarity index 95% rename from opmcore/pressure/tpfa/compr_quant_general.c rename to opm/core/pressure/tpfa/compr_quant_general.c index 6fc3dd0d..7eed7da5 100644 --- a/opmcore/pressure/tpfa/compr_quant_general.c +++ b/opm/core/pressure/tpfa/compr_quant_general.c @@ -19,8 +19,8 @@ #include -#include -#include +#include +#include void diff --git a/opmcore/pressure/tpfa/compr_quant_general.h b/opm/core/pressure/tpfa/compr_quant_general.h similarity index 100% rename from opmcore/pressure/tpfa/compr_quant_general.h rename to opm/core/pressure/tpfa/compr_quant_general.h diff --git a/opmcore/pressure/tpfa/compr_source.c b/opm/core/pressure/tpfa/compr_source.c similarity index 100% rename from opmcore/pressure/tpfa/compr_source.c rename to opm/core/pressure/tpfa/compr_source.c diff --git a/opmcore/pressure/tpfa/compr_source.h b/opm/core/pressure/tpfa/compr_source.h similarity index 100% rename from opmcore/pressure/tpfa/compr_source.h rename to opm/core/pressure/tpfa/compr_source.h diff --git a/opmcore/pressure/tpfa/ifs_tpfa.c b/opm/core/pressure/tpfa/ifs_tpfa.c similarity index 98% rename from opmcore/pressure/tpfa/ifs_tpfa.c rename to opm/core/pressure/tpfa/ifs_tpfa.c index df059c82..136ab43b 100644 --- a/opmcore/pressure/tpfa/ifs_tpfa.c +++ b/opm/core/pressure/tpfa/ifs_tpfa.c @@ -3,8 +3,8 @@ #include #include -#include -#include +#include +#include struct ifs_tpfa_impl { diff --git a/opmcore/pressure/tpfa/ifs_tpfa.h b/opm/core/pressure/tpfa/ifs_tpfa.h similarity index 98% rename from opmcore/pressure/tpfa/ifs_tpfa.h rename to opm/core/pressure/tpfa/ifs_tpfa.h index 4b9aab62..9b04a8d7 100644 --- a/opmcore/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 +#include #ifdef __cplusplus extern "C" { diff --git a/opmcore/pressure/tpfa/trans_tpfa.c b/opm/core/pressure/tpfa/trans_tpfa.c similarity index 97% rename from opmcore/pressure/tpfa/trans_tpfa.c rename to opm/core/pressure/tpfa/trans_tpfa.c index 863eb53f..e24e823a 100644 --- a/opmcore/pressure/tpfa/trans_tpfa.c +++ b/opm/core/pressure/tpfa/trans_tpfa.c @@ -3,8 +3,8 @@ #include #include -#include -#include +#include +#include /* ---------------------------------------------------------------------- */ /* htrans <- sum(C(:,i) .* K(cellNo,:) .* N(:,j), 2) ./ sum(C.*C, 2) */ diff --git a/opmcore/pressure/tpfa/trans_tpfa.h b/opm/core/pressure/tpfa/trans_tpfa.h similarity index 97% rename from opmcore/pressure/tpfa/trans_tpfa.h rename to opm/core/pressure/tpfa/trans_tpfa.h index dda48f09..ec2d0d3a 100644 --- a/opmcore/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 +#include #ifdef __cplusplus extern "C" { diff --git a/opmcore/pressure/well.c b/opm/core/pressure/well.c similarity index 99% rename from opmcore/pressure/well.c rename to opm/core/pressure/well.c index aab5dbd0..16719426 100644 --- a/opmcore/pressure/well.c +++ b/opm/core/pressure/well.c @@ -19,7 +19,7 @@ #include -#include +#include /* Release memory resources for cell->well mapping. */ diff --git a/opmcore/transport/CSRMatrixBlockAssembler.hpp b/opm/core/transport/CSRMatrixBlockAssembler.hpp similarity index 98% rename from opmcore/transport/CSRMatrixBlockAssembler.hpp rename to opm/core/transport/CSRMatrixBlockAssembler.hpp index 55bed160..342ce455 100644 --- a/opmcore/transport/CSRMatrixBlockAssembler.hpp +++ b/opm/core/transport/CSRMatrixBlockAssembler.hpp @@ -42,7 +42,7 @@ #include #include -#include +#include namespace Opm { namespace ImplicitTransportDefault { @@ -102,12 +102,12 @@ namespace Opm { sa_.insert(sa_.end(), nconn * ndof, double(0.0)); - construct(); - setCSRSize(); + finalizeStructure(); } void finalizeStructure() { + construct(); setCSRSize(); } @@ -121,8 +121,6 @@ namespace Opm { ia_.push_back(0); ndof_ = ndof; - - construct(); } struct CSRMatrix& matrix() { return mat_; } diff --git a/opmcore/transport/CSRMatrixUmfpackSolver.hpp b/opm/core/transport/CSRMatrixUmfpackSolver.hpp similarity index 98% rename from opmcore/transport/CSRMatrixUmfpackSolver.hpp rename to opm/core/transport/CSRMatrixUmfpackSolver.hpp index 8649b2fd..c08f60f5 100644 --- a/opmcore/transport/CSRMatrixUmfpackSolver.hpp +++ b/opm/core/transport/CSRMatrixUmfpackSolver.hpp @@ -36,7 +36,7 @@ #ifndef OPM_CSRMATRIXUMFPACKSOLVER_HPP_HEADER #define OPM_CSRMATRIXUMFPACKSOLVER_HPP_HEADER -#include +#include namespace Opm { namespace ImplicitTransportLinAlgSupport { diff --git a/opmcore/transport/ImplicitAssembly.hpp b/opm/core/transport/ImplicitAssembly.hpp similarity index 100% rename from opmcore/transport/ImplicitAssembly.hpp rename to opm/core/transport/ImplicitAssembly.hpp diff --git a/opmcore/transport/ImplicitTransport.hpp b/opm/core/transport/ImplicitTransport.hpp similarity index 100% rename from opmcore/transport/ImplicitTransport.hpp rename to opm/core/transport/ImplicitTransport.hpp diff --git a/opmcore/transport/JacobianSystem.hpp b/opm/core/transport/JacobianSystem.hpp similarity index 100% rename from opmcore/transport/JacobianSystem.hpp rename to opm/core/transport/JacobianSystem.hpp diff --git a/opmcore/transport/NormSupport.hpp b/opm/core/transport/NormSupport.hpp similarity index 100% rename from opmcore/transport/NormSupport.hpp rename to opm/core/transport/NormSupport.hpp diff --git a/opmcore/transport/SimpleFluid2pWrapper.hpp b/opm/core/transport/SimpleFluid2pWrapper.hpp similarity index 100% rename from opmcore/transport/SimpleFluid2pWrapper.hpp rename to opm/core/transport/SimpleFluid2pWrapper.hpp diff --git a/opmcore/transport/SinglePointUpwindTwoPhase.hpp b/opm/core/transport/SinglePointUpwindTwoPhase.hpp similarity index 100% rename from opmcore/transport/SinglePointUpwindTwoPhase.hpp rename to opm/core/transport/SinglePointUpwindTwoPhase.hpp diff --git a/opmcore/transport/spu_explicit.c b/opm/core/transport/spu_explicit.c similarity index 96% rename from opmcore/transport/spu_explicit.c rename to opm/core/transport/spu_explicit.c index 702d1760..f8f526c4 100644 --- a/opmcore/transport/spu_explicit.c +++ b/opm/core/transport/spu_explicit.c @@ -7,8 +7,8 @@ #include #include -#include -#include +#include +#include /* Twophase mobility-weighted upwind */ diff --git a/opmcore/transport/spu_explicit.h b/opm/core/transport/spu_explicit.h similarity index 100% rename from opmcore/transport/spu_explicit.h rename to opm/core/transport/spu_explicit.h diff --git a/opmcore/transport/spu_implicit.c b/opm/core/transport/spu_implicit.c similarity index 99% rename from opmcore/transport/spu_implicit.c rename to opm/core/transport/spu_implicit.c index 383fba95..e8fa4d96 100644 --- a/opmcore/transport/spu_implicit.c +++ b/opm/core/transport/spu_implicit.c @@ -10,8 +10,8 @@ #include #include -#include -#include +#include +#include diff --git a/opmcore/transport/spu_implicit.h b/opm/core/transport/spu_implicit.h similarity index 100% rename from opmcore/transport/spu_implicit.h rename to opm/core/transport/spu_implicit.h diff --git a/opmcore/transport/transport_source.c b/opm/core/transport/transport_source.c similarity index 100% rename from opmcore/transport/transport_source.c rename to opm/core/transport/transport_source.c diff --git a/opmcore/transport/transport_source.h b/opm/core/transport/transport_source.h similarity index 100% rename from opmcore/transport/transport_source.h rename to opm/core/transport/transport_source.h diff --git a/opmcore/utility/cart_grid.c b/opm/core/utility/cart_grid.c similarity index 100% rename from opmcore/utility/cart_grid.c rename to opm/core/utility/cart_grid.c diff --git a/opmcore/utility/cart_grid.h b/opm/core/utility/cart_grid.h similarity index 97% rename from opmcore/utility/cart_grid.h rename to opm/core/utility/cart_grid.h index 59511b41..5ef7e482 100644 --- a/opmcore/utility/cart_grid.h +++ b/opm/core/utility/cart_grid.h @@ -34,7 +34,7 @@ extern "C" { #endif -#include +#include void destroy_cart_grid(grid_t *G); diff --git a/opmcore/utility/cpgpreprocess/cgridinterface.c b/opm/core/utility/cpgpreprocess/cgridinterface.c similarity index 100% rename from opmcore/utility/cpgpreprocess/cgridinterface.c rename to opm/core/utility/cpgpreprocess/cgridinterface.c diff --git a/opmcore/utility/cpgpreprocess/cgridinterface.h b/opm/core/utility/cpgpreprocess/cgridinterface.h similarity index 100% rename from opmcore/utility/cpgpreprocess/cgridinterface.h rename to opm/core/utility/cpgpreprocess/cgridinterface.h diff --git a/opmcore/utility/cpgpreprocess/facetopology.c b/opm/core/utility/cpgpreprocess/facetopology.c similarity index 100% rename from opmcore/utility/cpgpreprocess/facetopology.c rename to opm/core/utility/cpgpreprocess/facetopology.c diff --git a/opmcore/utility/cpgpreprocess/facetopology.h b/opm/core/utility/cpgpreprocess/facetopology.h similarity index 100% rename from opmcore/utility/cpgpreprocess/facetopology.h rename to opm/core/utility/cpgpreprocess/facetopology.h diff --git a/opmcore/utility/cpgpreprocess/geometry.c b/opm/core/utility/cpgpreprocess/geometry.c similarity index 100% rename from opmcore/utility/cpgpreprocess/geometry.c rename to opm/core/utility/cpgpreprocess/geometry.c diff --git a/opmcore/utility/cpgpreprocess/geometry.h b/opm/core/utility/cpgpreprocess/geometry.h similarity index 100% rename from opmcore/utility/cpgpreprocess/geometry.h rename to opm/core/utility/cpgpreprocess/geometry.h diff --git a/opmcore/utility/cpgpreprocess/grdecl.h b/opm/core/utility/cpgpreprocess/grdecl.h similarity index 100% rename from opmcore/utility/cpgpreprocess/grdecl.h rename to opm/core/utility/cpgpreprocess/grdecl.h diff --git a/opmcore/utility/cpgpreprocess/grid.h b/opm/core/utility/cpgpreprocess/grid.h similarity index 100% rename from opmcore/utility/cpgpreprocess/grid.h rename to opm/core/utility/cpgpreprocess/grid.h diff --git a/opmcore/utility/cpgpreprocess/mxgrdecl.c b/opm/core/utility/cpgpreprocess/mxgrdecl.c similarity index 100% rename from opmcore/utility/cpgpreprocess/mxgrdecl.c rename to opm/core/utility/cpgpreprocess/mxgrdecl.c diff --git a/opmcore/utility/cpgpreprocess/mxgrdecl.h b/opm/core/utility/cpgpreprocess/mxgrdecl.h similarity index 100% rename from opmcore/utility/cpgpreprocess/mxgrdecl.h rename to opm/core/utility/cpgpreprocess/mxgrdecl.h diff --git a/opmcore/utility/cpgpreprocess/preprocess.c b/opm/core/utility/cpgpreprocess/preprocess.c similarity index 100% rename from opmcore/utility/cpgpreprocess/preprocess.c rename to opm/core/utility/cpgpreprocess/preprocess.c diff --git a/opmcore/utility/cpgpreprocess/preprocess.h b/opm/core/utility/cpgpreprocess/preprocess.h similarity index 100% rename from opmcore/utility/cpgpreprocess/preprocess.h rename to opm/core/utility/cpgpreprocess/preprocess.h diff --git a/opmcore/utility/cpgpreprocess/processgrid.c b/opm/core/utility/cpgpreprocess/processgrid.c similarity index 100% rename from opmcore/utility/cpgpreprocess/processgrid.c rename to opm/core/utility/cpgpreprocess/processgrid.c diff --git a/opmcore/utility/cpgpreprocess/processgrid.m b/opm/core/utility/cpgpreprocess/processgrid.m similarity index 100% rename from opmcore/utility/cpgpreprocess/processgrid.m rename to opm/core/utility/cpgpreprocess/processgrid.m diff --git a/opmcore/utility/cpgpreprocess/readvector.cpp b/opm/core/utility/cpgpreprocess/readvector.cpp similarity index 100% rename from opmcore/utility/cpgpreprocess/readvector.cpp rename to opm/core/utility/cpgpreprocess/readvector.cpp diff --git a/opmcore/utility/cpgpreprocess/readvector.hpp b/opm/core/utility/cpgpreprocess/readvector.hpp similarity index 100% rename from opmcore/utility/cpgpreprocess/readvector.hpp rename to opm/core/utility/cpgpreprocess/readvector.hpp diff --git a/opmcore/utility/cpgpreprocess/sparsetable.c b/opm/core/utility/cpgpreprocess/sparsetable.c similarity index 100% rename from opmcore/utility/cpgpreprocess/sparsetable.c rename to opm/core/utility/cpgpreprocess/sparsetable.c diff --git a/opmcore/utility/cpgpreprocess/sparsetable.h b/opm/core/utility/cpgpreprocess/sparsetable.h similarity index 100% rename from opmcore/utility/cpgpreprocess/sparsetable.h rename to opm/core/utility/cpgpreprocess/sparsetable.h diff --git a/opmcore/utility/cpgpreprocess/uniquepoints.c b/opm/core/utility/cpgpreprocess/uniquepoints.c similarity index 100% rename from opmcore/utility/cpgpreprocess/uniquepoints.c rename to opm/core/utility/cpgpreprocess/uniquepoints.c diff --git a/opmcore/utility/cpgpreprocess/uniquepoints.h b/opm/core/utility/cpgpreprocess/uniquepoints.h similarity index 100% rename from opmcore/utility/cpgpreprocess/uniquepoints.h rename to opm/core/utility/cpgpreprocess/uniquepoints.h diff --git a/opmcore/well.h b/opm/core/well.h similarity index 93% rename from opmcore/well.h rename to opm/core/well.h index 279f57aa..bdee861a 100644 --- a/opmcore/well.h +++ b/opm/core/well.h @@ -27,6 +27,7 @@ extern "C" { enum well_type { INJECTOR, PRODUCER }; enum well_control { BHP , RATE }; +enum surface_component { WATER = 0, OIL = 1, GAS = 2 }; struct WellCompletions { int number_of_wells; @@ -38,6 +39,7 @@ struct WellControls { enum well_type *type; enum well_control *ctrl; double *target; + double *zfrac; /* Surface volume fraction (3*nwells) */ }; struct completion_data { diff --git a/tests/Makefile.am b/tests/Makefile.am index d9953b34..f58cb1c8 100644 --- a/tests/Makefile.am +++ b/tests/Makefile.am @@ -7,14 +7,14 @@ $(LAPACK_LIBS) $(BLAS_LIBS) $(LIBS) $(FLIBS) noinst_PROGRAMS = \ -test_jacsys \ test_readvector \ test_sf2p -if UMFPACK -noinst_PROGRAMS += test_cfs_tpfa -endif - -test_jacsys_SOURCES = test_jacsys.cpp test_readvector_SOURCES = test_readvector.cpp test_sf2p_SOURCES = test_sf2p.cpp + +if UMFPACK +noinst_PROGRAMS += test_cfs_tpfa +noinst_PROGRAMS += test_jacsys +test_jacsys_SOURCES = test_jacsys.cpp +endif diff --git a/tests/test_cfs_tpfa.c b/tests/test_cfs_tpfa.c index b65c3e70..9b825de2 100644 --- a/tests/test_cfs_tpfa.c +++ b/tests/test_cfs_tpfa.c @@ -5,16 +5,16 @@ #include -#include -#include +#include +#include -#include +#include -#include +#include -#include -#include -#include +#include +#include +#include diff --git a/tests/test_jacsys.cpp b/tests/test_jacsys.cpp index 8fa4980a..1bcac3e0 100644 --- a/tests/test_jacsys.cpp +++ b/tests/test_jacsys.cpp @@ -78,7 +78,7 @@ main() { #endif #if 0 -#include +#include //using namespace Opm::LinAlgSupport; using namespace Opm::ImplicitTransportDefault; @@ -101,11 +101,11 @@ main() { #endif #if 1 -#include +#include -#include -#include -#include +#include +#include +#include using namespace Opm::ImplicitTransportDefault; diff --git a/tests/test_readvector.cpp b/tests/test_readvector.cpp index 43c26277..d82c898c 100644 --- a/tests/test_readvector.cpp +++ b/tests/test_readvector.cpp @@ -2,11 +2,11 @@ #include #include -#include -#include -#include +#include +#include +#include -#include +#include static struct CornerpointGrid read_grid(const std::string& dir) @@ -26,7 +26,7 @@ read_grid(const std::string& dir) read_vector_from_file(fn, actnum); fn = dir + '/' + "dimens.txt"; - ::std::vector dimens; + ::std::vector dimens; read_vector_from_file(fn, dimens); struct grdecl grdecl; diff --git a/tests/test_sf2p.cpp b/tests/test_sf2p.cpp index 0cc0550e..3e34b6a3 100644 --- a/tests/test_sf2p.cpp +++ b/tests/test_sf2p.cpp @@ -1,13 +1,13 @@ #include -#include +#include #include #include -#include +#include template Ostream& -operator<<(Ostream& os, const std::array& a) +operator<<(Ostream& os, const std::tr1::array& a) { os << "[ "; std::copy(a.begin(), a.end(), std::ostream_iterator(os, " ")); @@ -16,32 +16,33 @@ operator<<(Ostream& os, const std::array& a) return os; } -template +template void test_simplefluid2p() { - std::array mu = { {1.0, 1.0} }; - std::array rho = { {0.0, 0.0} }; + using std::tr1::array; + array mu = { {1.0, 1.0} }; + array rho = { {0.0, 0.0} }; Opm::SimpleFluid2p fluid(mu, rho); std::cerr << "\\rho = [ " << fluid.density(0) << ", " << fluid.density(1) << " ]\n"; - std::array sl = {{ 1.0, 0.0 }}; + array sl = {{ 1.0, 0.0 }}; - std::array mob; - std::array dmob; + array mob; + array dmob; fluid.mobility(0, sl, mob, dmob); std::cerr << "s = " << sl << ", m = " << mob << ", dm = " << dmob << '\n'; - std::array sm = {{ 0.5, 0.5 }}; + array sm = {{ 0.5, 0.5 }}; fluid.mobility(0, sm, mob, dmob); std::cerr << "s = " << sm << ", m = " << mob << ", dm = " << dmob << '\n'; - std::array sr = {{ 0.0, 1.0 }}; + array sr = {{ 0.0, 1.0 }}; fluid.mobility(0, sr, mob, dmob); std::cerr << "s = " << sr << ", m = " << mob << ", dm = " << dmob << '\n'; @@ -53,7 +54,7 @@ int main() test_simplefluid2p<1>(); std::cerr << "n = 2\n"; - test_simplefluid2p<> (); + test_simplefluid2p<2> (); std::cerr << "n = 3\n"; test_simplefluid2p<3>();