Merge from upstream.

.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

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

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

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

examples/spu_2p.cpp

@@ -38,32 +38,32 @@
 #include <cstddef>
 
 #include <algorithm>
-#include <array>
+#include <tr1/array>
 #include <functional>
 #include <iostream>
 #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&
@@ -273,8 +273,8 @@ main()
     using Opm::ImplicitTransportLinAlgSupport::CSRMatrixUmfpackSolver;
     CSRMatrixUmfpackSolver linsolve;
 
-    std::array<double, 2> mu  = {{ 1.0, 1.0 }};
-    std::array<double, 2> rho = {{ 0.0, 0.0 }};
+    std::tr1::array<double, 2> mu  = {{ 1.0, 1.0 }};
+    std::tr1::array<double, 2> rho = {{ 0.0, 0.0 }};
     TwophaseFluid fluid(mu, rho);
 
     std::vector<double> porevol;

opm/core/fluid/SimpleFluid2p.hpp

@@ -36,15 +36,15 @@
 #ifndef OPM_SIMPLEFLUID2P_HPP_HEADER
 #define OPM_SIMPLEFLUID2P_HPP_HEADER
 
-#include <array>
+#include <tr1/array>
 #include <cmath>
 
 namespace Opm {
     template <int n = 2>
     class SimpleFluid2p {
     public:
-        SimpleFluid2p(const std::array<double, 2>& mu,
-                      const std::array<double, 2>& rho)
+        SimpleFluid2p(const std::tr1::array<double, 2>& mu,
+                      const std::tr1::array<double, 2>& 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<double, 2> mu_ ;
-        std::array<double, 2> rho_;
+        std::tr1::array<double, 2> mu_ ;
+        std::tr1::array<double, 2> rho_;
     };
 }
 

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;

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>
 
 
 

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>
 
 
 

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" {

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

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>
 
 
 /* ---------------------------------------------------------------------- */

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)

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

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);

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

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)))

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,

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" {

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)

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;

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)

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" {

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

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" {

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" {

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

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 {

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" {

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) */

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" {

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. */

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 {
@@ -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_; }

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 {

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 */

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>
 
 
 

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);

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 {

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

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>
 
 
 

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;
 

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)
@@ -26,7 +26,7 @@ read_grid(const std::string& dir)
     read_vector_from_file(fn, actnum);
 
     fn = dir + '/' + "dimens.txt";
-    ::std::vector<double> dimens;
+    ::std::vector<int> dimens;
     read_vector_from_file(fn, dimens);
 
     struct grdecl grdecl;