bump versions to 2017.10 final

before OPM/opm-simulators#1309 it was required, but this was not
enforced by the build system because the SuiteSparse tests are run by
the opm-core build system first and UMFpack is optional there.

thanks to [at]akva2 and [at]blattms for the heads-up.

cmake/Modules/Findopm-grid.cmake

@@ -20,7 +20,7 @@ find_opm_package (
   "${opm-grid_DEPS}"
   
   # header to search for
-  "dune/grid/CpGrid.hpp"
+  "dune/grid/cpgrid/GlobalIdMapping.hpp"
 
   # library to search for
   "opmgrid"
@@ -29,9 +29,9 @@ find_opm_package (
   "HAVE_OPM_GRID"
 
   # test program
-"#include <dune/grid/CpGrid.hpp>
+"#include <dune/grid/cpgrid/GlobalIdMapping.hpp>
 int main (void) {
-  Dune::CpGrid g;
+  Dune::cpgrid::GlobalIdMapping g;
   return 0;
 }
 "

cmake/Modules/Findopm-output.cmake

@@ -42,14 +42,3 @@ include (UseDynamicBoost)
 #debug_find_vars ("opm-output")
 
 
-if(OPM_OUTPUT_FOUND)
-  get_filename_component(opm-output_PREFIX_DIR ${opm-output_LIBRARY} PATH)
-  find_program(COMPARE_SUMMARY_COMMAND compareSummary
-               PATHS ${opm-output_PREFIX_DIR}/../bin
-                     ${opm-output_PREFIX_DIR}/../../bin)
-  find_program(COMPARE_ECL_COMMAND compareECL
-               PATHS ${opm-output_PREFIX_DIR}/../bin
-                     ${opm-output_PREFIX_DIR}/../../bin)
-
-endif()
-

cmake/Modules/OpmAliases.cmake

@@ -9,6 +9,7 @@ function (set_aliases)
   # are separated by space
   set (aliases
 	"HAVE_UMFPACK             HAVE_SUITESPARSE_UMFPACK_H"
+	"HAVE_SUITESPARSE_UMFPACK  HAVE_SUITESPARSE_UMFPACK_H"
 	"HAVE_DUNE_BOOST          HAVE_BOOST"
 	)
   foreach (alias IN LISTS aliases)

cmake/Modules/OpmCompile.cmake

@@ -18,6 +18,8 @@ macro (opm_compile opm)
   if (SILENCE_CROSSMODULE_WARNINGS)
      include_directories("${PROJECT_SOURCE_DIR}")
      include_directories (SYSTEM ${${opm}_INCLUDE_DIRS})
+     set (${opm}_INCLUDE_DIR "${PROJECT_SOURCE_DIR}")
+     set (${opm}_INCLUDE_DIRS ${${opm}_INCLUDE_DIR} ${${opm}_INCLUDE_DIRS})
   else()
      set (${opm}_INCLUDE_DIR "${PROJECT_SOURCE_DIR}")
      set (${opm}_INCLUDE_DIRS ${${opm}_INCLUDE_DIR} ${${opm}_INCLUDE_DIRS})

cmake/Modules/OpmFind.cmake

@@ -33,6 +33,7 @@
 #	)
 
 include (Duplicates)
+include (OpmSiblingSearch)
 
 # list of suffixes for all the project variables
 set (_opm_proj_vars
@@ -135,15 +136,34 @@ macro (find_and_append_package_to prefix name)
 	set (${name}_FOUND FALSE)
 	set (${NAME}_FOUND FALSE)
   else ()
-	# using config mode is better than using module (aka. find) mode
-	# because then the package has already done all its probes and
-	# stored them in the config file for us
-	if (NOT DEFINED ${name}_FOUND AND NOT DEFINED ${NAME}_FOUND)
-	  if (${name}_DIR)
-		message (STATUS "Finding package ${name} using config mode")
-		find_package (${name} ${ARGN} NO_MODULE PATHS ${${name}_DIR} NO_DEFAULT_PATH)
-	  else ()
-		message (STATUS "Finding package ${name} using module mode")
+    # using config mode is better than using module (aka. find) mode
+    # because then the package has already done all its probes and
+    # stored them in the config file for us
+    # For dune and opm modules and exempted packages we force module mode.
+    # For dune and opm it will use config mode underneath.
+    # We even need to repeat the search for opm-common once as this is done
+    # in the top most CMakeLists.txt without querying defines, setting dependencies
+    # and the likes which is only done via opm_find_package
+    if (NOT DEFINED ${name}_FOUND AND NOT DEFINED ${NAME}_FOUND
+        OR ("${name}" STREQUAL "opm-common" AND NOT _opm_common_deps_processed))
+      string(REGEX MATCH "(dune|opm)-.*" _is_opm ${name})
+      if (${name}_DIR AND NOT (_${name}_exempted OR _is_opm))
+        message (STATUS "Finding package ${name} using config mode ${_${name}_exempted}")
+        find_package (${name} ${ARGN} NO_MODULE PATHS ${${name}_DIR} NO_DEFAULT_PATH)
+      else ()
+        # print message if this neither an opm module nor ecl
+        if (NOT (${name}_exempted EQUAL -1 OR _is_opm_) )
+          message (STATUS "Finding package ${name} using module mode")
+        endif()
+		if(${name} STREQUAL "ecl")
+			# Give us a chance to find ecl installed to CMAKE_INSTALL_PREFIX.
+			# We need to deactivate the package registry for this.
+			create_module_dir_var(ecl)
+			set(ARGN_NO_REQUIRED ${ARGN})
+			list(REMOVE_ITEM ARGN_NO_REQUIRED "REQUIRED")
+ 			find_package (${name} ${ARGN_NO_REQUIRED} NO_CMAKE_SYSTEM_PACKAGE_REGISTRY NO_CMAKE_PACKAGE_REGISTRY)
+			# If everything else failed fall back to the registry
+		endif()	
 		find_package (${name} ${ARGN})
 	  endif ()
 	endif ()
@@ -153,6 +173,10 @@ macro (find_and_append_package_to prefix name)
 	if (NOT DEFINED ${NAME}_FOUND)
 	  set (${NAME}_FOUND "${${name}_FOUND}")
 	endif ()
+
+       if(name STREQUAL "opm-common")
+         set(_opm_common_deps_processed ON)
+       endif()
   endif ()
 
   # the variable "NAME" may be replaced during find_package (as this is

cmake/Modules/OpmPackage.cmake

@@ -37,9 +37,7 @@
 # <http://www.vtk.org/Wiki/CMake:How_To_Find_Libraries>
 
 include (OpmFind)
-
-option (SIBLING_SEARCH "Search sibling directories before system paths" ON)
-mark_as_advanced (SIBLING_SEARCH)
+include (OpmSiblingSearch)
 
 # append all items from src into dst; both must be *names* of lists
 macro (append_found src dst)
@@ -57,8 +55,15 @@ macro (find_opm_package module deps header lib defs prog conf)
   string (REPLACE "-" "_" MODULE "${MODULE_UPPER}")
 
   # if someone else has included this test, don't do it again
+  # one exception is opm-common which is already found in the
+  # top most CMakeLists.txt but we still need to search for its
+  # dependencies
   if (${MODULE}_FOUND OR ${module}_FOUND)
-	return ()
+    if (${module} STREQUAL "opm-common" AND NOT _opm_common_deps_processed)
+      set(_opm_common_deps_processed ON)
+    else()
+      return ()
+    endif()
   endif ()
 
   # variables to pass on to other packages
@@ -73,198 +78,13 @@ macro (find_opm_package module deps header lib defs prog conf)
 	set (_${module}_required "")
   endif (${module}_FIND_REQUIRED)
 
-  # see if there is a pkg-config entry for this package, and use those
-  # settings as a starting point
-  find_package (PkgConfig)
-  pkg_check_modules (PkgConf_${module} QUIET ${module})
+  create_module_dir_var(${module})
 
-  # these variables have non-standard names in FindPkgConfig (sic)
-  set (${module}_DEFINITIONS ${PkgConf_${module}_CFLAGS_OTHER})
-  set (${module}_LINKER_FLAG ${PkgConf_${module}_LDFLAGS_OTHER})
+  # This will also set all the needed variables with the exception of
+  # ${module}_CONFIG_VARS for dune modules.
+  find_package(${module} ${_${module}_quiet} ${_${module}_required} CONFIG)
 
-  # try to figure out whether we are in a subdir build tree, and attempt
-  # to put the same name as the appropriate build tree for the module
-  get_filename_component (_build_dir "${CMAKE_CURRENT_BINARY_DIR}" NAME)
 
-  # don't bother if we are in a project specific directory already
-  # (assuming no-one wants to name the build dir after another module!)
-  if ("${_build_dir}" STREQUAL "${PROJECT_NAME}")
-	set (_build_dir "")
-  endif ("${_build_dir}" STREQUAL "${PROJECT_NAME}")
-
-  # if the user hasn't specified any location, and it isn't found
-  # in standard system locations either, then start to wander
-  # about and look for it in proximity to ourself. Qt Creator likes
-  # to put the build-directories as siblings to the source trees,
-  # but with a -build suffix, DUNE likes to have the the build tree
-  # in a "build-cmake" sub-directory of each module
-  set(workaround_cmake_bug 0)
-  if(${module}_DIR})
-    set(workaround_cmake_bug 1)
-  endif()
-  if(${module}_ROOT})
-    set(workaround_cmake_bug 1)
-  endif()
-  if(${MODULE}_ROOT})
-    set(workaround_cmake_bug 1)
-  endif()
-  if (NOT workaround_cmake_bug)
-	string (TOLOWER "${module}" _module_lower)
-	set (_guess
-	  "../${module}"
-	  "../${_module_lower}"
-	  )
-	set (_guess_bin_only
-	  "../${module}-build"
-	  "../${_module_lower}-build"
-	  )
-
-	# look in similar dirs for the other module
-	if (_build_dir)
-	  list (APPEND _guess_bin_only
-		"../../${module}/${_build_dir}"
-		"../../${_module_lower}/${_build_dir}"
-		)
-	endif (_build_dir)
-
-	# generate items that are in the build, not source dir
-	set (_guess_bin)
-	foreach (_item IN ITEMS ${_guess} ${_guess_bin_only})
-	  list (APPEND _guess_bin "${PROJECT_BINARY_DIR}/${_item}")
-	endforeach (_item)
-	set (_no_system "")
-  else ()
-	# start looking at the paths in this order
-	set (_guess_bin
-	  ${${module}_DIR}
-	  ${${module}_ROOT}
-	  ${${MODULE}_ROOT}
-	  )
-	# if every package is installed directly in the "suite" directory
-	# (e.g. /usr) then allow us to back-track one directory from the
-	# module sub-dir that was added by OpmFind (this happens incidently
-	# already for the source do to the out-of-source support)
-	if ("${${MODULE}_ROOT}" MATCHES "/${module}$")
-	  get_filename_component (_suite_parent ${${MODULE}_ROOT} PATH)
-	  list (APPEND _guess_bin
-		${_suite_parent}
-		${_suite_parent}/${module}
-		${_suite_parent}/${module}/${_build_dir}
-		)
-	endif ("${${MODULE}_ROOT}" MATCHES "/${module}$")
-	# when we look for the source, it may be that we have been specified
-	# a build directory which is a sub-dir of the source, so we look in
-	# the parent also
-	set (_guess
-	  ${${module}_DIR}
-	  ${${module}_ROOT}
-	  ${${MODULE}_ROOT}
-	  )
-	# only add parent directories for those variants that are actually set
-	# (otherwise, we'll inadvertedly add the root directory (=all))
-	if (${module}_DIR)
-	  list (APPEND _guess ${${module}_DIR}/..)
-	endif (${module}_DIR)
-	if (${module}_ROOT)
-	  list (APPEND _guess ${${module}_ROOT}/..)
-	endif (${module}_ROOT)
-	if (${MODULE}_ROOT)
-	  list (APPEND _guess ${${MODULE}_ROOT}/..)
-	endif (${MODULE}_ROOT)
-	# don't search the system paths! that would be dangerous; if there
-	# is a problem in our own specified directory, we don't necessarily
-	# want an old version that is left in one of the system paths!
-	set (_no_system "NO_DEFAULT_PATH")
-  endif ()
-
-  # by specifying _guess in the HINTS section, it gets searched before
-  # the system locations as well. the CMake documentation has a cloudy
-  # recommendation, but it ends up like this: if NO_DEFAULT_PATH is
-  # specified, then PATHS is used. Otherwise, it looks in HINTS, then in
-  # system paths, and the finally in PATHS (!)
-  if (SIBLING_SEARCH)
-	set (_guess_hints ${_guess})
-	set (_guess_hints_bin ${_guess_bin})
-  else (SIBLING_SEARCH)
-	set (_guess_hints)
-	set (_guess_hints_bin)
-  endif (SIBLING_SEARCH)
-
-  # if an include directory is specified directly (e.g. OPM_CORE_INCLUDE_DIR=
-  # /usr/include/opm-2013.03) then this overrides everything else. Notice that
-  # this variable uses the fully capitalized version of the name.
-  if (${MODULE}_INCLUDE_DIR)
-	set (_guess "${${MODULE}_INCLUDE_DIR}")
-	set (_no_system_incl "NO_DEFAULT_PATH")
-  else ()
-	set (_no_system_incl "${_no_system}")
-  endif ()
-
-  # search for this include and library file to get the installation
-  # directory of the package; hints are searched before the system locations,
-  # paths are searched afterwards
-  find_path (${module}_INCLUDE_DIR
-	NAMES "${header}"
-	PATHS ${_guess}
-	HINTS ${PkgConf_${module}_INCLUDE_DIRS} ${_guess_hints}
-	PATH_SUFFIXES "include"
-	${_no_system_incl}
-	)
-
-  # some modules are all in headers
-  if (NOT "${lib}" STREQUAL "")
-	if (CMAKE_SIZEOF_VOID_P)
-	  math (EXPR _BITS "8 * ${CMAKE_SIZEOF_VOID_P}")
-	endif (CMAKE_SIZEOF_VOID_P)
-
-	# again, we may directly override the location of the library alone by
-	# specifying e.g. OPM_CORE_LIB_DIR. notice that this is a *directory*
-	# and not the name of the library
-	if (${MODULE}_LIB_DIR)
-	  set (_guess_bin "${${MODULE}_LIB_DIR}")
-	  set (_no_system_lib "NO_DEFAULT_PATH")
-	else ()
-	  set (_no_system_lib "${_no_system}")
-	endif ()
-
-	# if there is more than one library, then look for all of them, putting
-	# them in variables with the name of the library appended. however, the
-	# first entry is assumed to be the "primary" library and will be named
-	# like the module. thus, with a lib entry of "foo;bar", the first library
-	# is called ${module}_LIBRARY and the second ${module}_LIBRARY_bar
-	foreach (_lib IN ITEMS ${lib})
-	  # don't include any suffix if it is the first one
-	  if ("${lib}" MATCHES "^${_lib}")
-		set (_which)
-	  else ()
-		set (_which "_${_lib}")
-	  endif ()
-	  find_library (${module}_LIBRARY${_which}
-		NAMES "${_lib}"
-		PATHS ${_guess_bin}
-		HINTS ${PkgConf_${module}_LIBRARY_DIRS} ${_guess_hints_bin}
-		PATH_SUFFIXES "lib" "lib/Debug" "lib/Release" "lib/.libs" ".libs" "lib${_BITS}" "lib/${CMAKE_LIBRARY_ARCHITECTURE}" "build-cmake/lib"
-		${_no_system_lib}		
-		)
-	  # debug info if we didn't find the desired library
-	  if (NOT ${module}_LIBRARY${_which})
-		message (STATUS "Failed to find library \"${_lib}\" for module ${module}")
-	  endif ()
-	endforeach (_lib)
-  else (NOT "${lib}" STREQUAL "")
-	set (${module}_LIBRARY "")
-  endif (NOT "${lib}" STREQUAL "")
-
-  # add dependencies so that our result variables are complete
-  # list of necessities to build with the software
-  set (${module}_INCLUDE_DIRS "${${module}_INCLUDE_DIR}")
-  foreach (_lib IN ITEMS ${lib})
-	if ("${lib}" MATCHES "^${_lib}")
-	  set (${module}_LIBRARIES "${${module}_LIBRARY}")
-	else ()
-	  list (APPEND ${module}_LIBRARIES "${${module}_LIBRARY_${_lib}}")
-	endif ()
-  endforeach (_lib)
   # period because it should be something that evaluates to true
   # in find_package_handle_standard_args
   set (${module}_ALL_PREREQS ".")
@@ -309,10 +129,10 @@ macro (find_opm_package module deps header lib defs prog conf)
   # these defines are used in dune/${module} headers, and should be put
   # in config.h when we include those
   foreach (_var IN ITEMS ${conf})
-	# massage the name to remove source code formatting
-	string (REGEX REPLACE "^[\n\t\ ]+" "" _var "${_var}")
-	string (REGEX REPLACE "[\n\t\ ]+$" "" _var "${_var}")
-	list (APPEND ${module}_CONFIG_VARS ${_var})
+    # massage the name to remove source code formatting
+    string (REGEX REPLACE "^[\n\t\ ]+" "" _var "${_var}")
+    string (REGEX REPLACE "[\n\t\ ]+$" "" _var "${_var}")
+    list (APPEND ${module}_CONFIG_VARS ${_var})
   endforeach (_var)
 
   # these are the defines that should be set when compiling
@@ -335,51 +155,19 @@ macro (find_opm_package module deps header lib defs prog conf)
 
   # write status message in the same manner as everyone else
   include (FindPackageHandleStandardArgs)
-  if ("${lib}" STREQUAL "")
-	set (_lib_var "")
-	set (_and_lib_var)
-  else ("${lib}" STREQUAL "")
-	foreach (_lib IN ITEMS ${lib})
-	  if ("${lib}" MATCHES "^${_lib}")
-		set (_lib_var "${module}_LIBRARY")
-		set (_and_lib_var AND ${_lib_var})
-	  else ()
-		list (APPEND _lib_var "${module}_LIBRARY_${_lib}")
-		set (_and_lib_var ${_and_lib_var} AND "${module}_LIBRARY_${_lib}")
-	  endif ()
-	endforeach (_lib)
-  endif ("${lib}" STREQUAL "")
-  # if the search is going to fail, then write these variables to
-  # the console as well as a diagnostics
-  if ((NOT (${module}_INCLUDE_DIR ${_and_lib_var} AND HAVE_${MODULE}))
-	  AND (_${module}_required OR NOT _${module}_quiet))
-	if (DEFINED ${module}_DIR)
-	  message (STATUS "${module}_DIR = ${${module}_DIR}")
-	elseif (DEFINED ${module}_ROOT)
-	  message (STATUS "${module}_ROOT = ${${module}_ROOT}")
-	elseif (DEFINED ${MODULE}_ROOT)
-	  message (STATUS "${MODULE}_ROOT = ${${MODULE}_ROOT}")
-	endif (DEFINED ${module}_DIR)
-  endif ((NOT (${module}_INCLUDE_DIR ${_and_lib_var} AND HAVE_${MODULE}))
-	AND (_${module}_required OR NOT _${module}_quiet))
-  if ("${${module}_ALL_PREREQS}" MATCHES "-NOTFOUND")
-	message (STATUS "${module} prereqs: ${${module}_ALL_PREREQS}")
-  endif ()
   find_package_handle_standard_args (
-	${module}
-	DEFAULT_MSG
-	${module}_INCLUDE_DIR ${_lib_var} HAVE_${MODULE} ${module}_ALL_PREREQS
-	)
-
-  # allow the user to override these from user interface
-  mark_as_advanced (${module}_INCLUDE_DIR)
-  mark_as_advanced (${module}_LIBRARY)
+        ${module}
+        DEFAULT_MSG
+        ${module}_INCLUDE_DIRS ${module}_LIBRARIES ${module}_FOUND ${module}_ALL_PREREQS
+        )
 
   # some genius that coded the FindPackageHandleStandardArgs figured out
   # that the module name should be in uppercase (?!)
   set (${module}_FOUND "${${MODULE_UPPER}_FOUND}")
   set (${MODULE}_FOUND "${${MODULE_UPPER}_FOUND}")
 
+  # This variable is used by UseDuneVer
+  list(GET ${module}_INCLUDE_DIRS 0 ${module}_INCLUDE_DIR)
   # print everything out if we're asked to
   if (${module}_DEBUG)
 	debug_find_vars (${module})

cmake/Modules/OpmSatellites.cmake

@@ -303,11 +303,6 @@ macro(opm_add_test TestName)
         if(CURTEST_DEPENDS)
           add_dependencies("${CURTEST_EXE_NAME}" ${CURTEST_DEPENDS})
         endif()
-
-        if(NOT TARGET test-suite)
-          add_custom_target(test-suite)
-        endif()
-        add_dependencies(test-suite "${CURTEST_EXE_NAME}")
       endif()
 
       # figure out how the test should be run. if a test driver script
@@ -337,6 +332,13 @@ macro(opm_add_test TestName)
       endif()
     endif()
 
+    if (NOT CURTEST_NO_COMPILE)
+      if(NOT TARGET test-suite)
+        add_custom_target(test-suite)
+      endif()
+      add_dependencies(test-suite "${CURTEST_EXE_NAME}")
+    endif()
+
   else() # test is skipped
 
     # the following causes the test to appear as 'skipped' in the

cmake/Modules/OpmSiblingSearch.cmake

@@ -0,0 +1,36 @@
+option (SIBLING_SEARCH "Search sibling directories before system paths" ON)
+mark_as_advanced (SIBLING_SEARCH)
+
+macro(create_module_dir_var module)
+  if(SIBLING_SEARCH AND NOT ${module}_DIR)
+    # guess the sibling dir
+    get_filename_component(_leaf_dir_name ${PROJECT_BINARY_DIR} NAME)
+    get_filename_component(_parent_full_dir ${PROJECT_BINARY_DIR} DIRECTORY)
+    get_filename_component(_parent_dir_name ${_parent_full_dir} NAME)
+    #Try if <module-name>/<build-dir> is used
+    get_filename_component(_modules_dir ${_parent_full_dir} DIRECTORY)
+    if (module STREQUAL "ecl")
+      #use clone directory libecl
+      set(_clone_dir "libecl")
+    else()
+      set(_clone_dir "${module}")
+    endif()
+    if(IS_DIRECTORY ${_modules_dir}/${_clone_dir}/${_leaf_dir_name})
+      set(${module}_DIR ${_modules_dir}/${_clone_dir}/${_leaf_dir_name})
+    else()
+      string(REPLACE ${PROJECT_NAME} ${_clone_dir} _module_leaf ${_leaf_dir_name})
+      if(NOT _leaf_dir_name STREQUAL _module_leaf
+          AND IS_DIRECTORY ${_parent_full_dir}/${_module_leaf})
+        # We are using build directories named <prefix><module-name><postfix>
+        set(${module}_DIR ${_parent_full_dir}/${_module_leaf})
+      elseif(IS_DIRECTORY ${_parent_full_dir}/${_clone_dir})
+        # All modules are in a common build dir
+        set(${module}_DIR "${_parent_full_dir}/${_clone_dir}}")
+      endif()
+    endif()
+  endif()
+  if(${module}_DIR AND NOT IS_DIRECTORY ${${module}_DIR})
+    message(WARNING "Value ${${module}_DIR} passed to variable"
+      " ${module}_DIR is not a directory")
+  endif()
+endmacro()

cmake/Modules/ewoms-prereqs.cmake

@@ -36,8 +36,6 @@ set (ewoms_DEPS
 	"opm-parser"
 	"opm-grid"
 	"opm-core"
-	# librt (on some systems necessary for clock_gettime())
-	"librt REQUIRED"
 	# valgrind client requests
 	"Valgrind"
 	# quadruple precision floating point calculations

cmake/Modules/opm-benchmarks-prereqs.cmake

@@ -1,19 +0,0 @@
-# -*- mode: cmake; tab-width: 2; indent-tabs-mode: t; truncate-lines: t; compile-command: "cmake -Wdev" -*-
-# vim: set filetype=cmake autoindent tabstop=2 shiftwidth=2 noexpandtab softtabstop=2 nowrap:
-
-# defines that must be present in config.h for our headers
-set (opm-benchmarks_CONFIG_VAR
-	)
-
-# dependencies
-set (opm-benchmarks_DEPS
-	# compile with C++0x/11 support if available
-	"CXX11Features REQUIRED"
-	# various runtime library enhancements
-	"Boost 1.44.0
-		COMPONENTS date_time filesystem system unit_test_framework REQUIRED"
-	# OPM dependency
-	"opm-common"
-	"opm-core REQUIRED"
-	"opm-upscaling REQUIRED"
-	)

cmake/Modules/opm-flowdiagnostics-applications-prereqs.cmake

@@ -13,7 +13,7 @@ set (opm-flowdiagnostics-applications_DEPS
 	"CXX11Features REQUIRED"
 	"Boost 1.44.0
 		COMPONENTS filesystem regex system unit_test_framework REQUIRED"
-	"ERT REQUIRED"
+	"ecl REQUIRED"
 	# prerequisite OPM modules
 	"opm-common REQUIRED;
 	opm-flowdiagnostics REQUIRED;

cmake/Modules/opm-grid-prereqs.cmake

@@ -6,6 +6,9 @@ set (opm-grid_CONFIG_VAR
 	DUNE_GRID_VERSION_MAJOR
 	DUNE_GRID_VERSION_MINOR
 	DUNE_GRID_VERSION_REVISION
+	DUNE_GEOMETRY_VERSION_MAJOR
+	DUNE_GEOMETRY_VERSION_MINOR
+	DUNE_GEOMETRY_VERSION_REVISION
 	DUNE_COMMON_VERSION_MAJOR
 	DUNE_COMMON_VERSION_MINOR
 	DUNE_COMMON_VERSION_REVISION

cmake/Modules/opm-simulators-prereqs.cmake

@@ -9,6 +9,7 @@ set (opm-simulators_CONFIG_VAR
         DUNE_ISTL_VERSION_MAJOR
         DUNE_ISTL_VERSION_MINOR
         DUNE_ISTL_VERSION_REVISION
+	HAVE_SUITESPARSE_UMFPACK
 	)
 
 # dependencies
@@ -24,6 +25,8 @@ set (opm-simulators_DEPS
 	"dune-common REQUIRED;
 	dune-istl REQUIRED"
 	"ERTPython"
+	# Tim Davis' SuiteSparse archive
+	"SuiteSparse COMPONENTS umfpack"
   # OPM dependency
 	"opm-common REQUIRED;
    opm-parser REQUIRED;

cmake/Templates/opm-project-config.cmake.in

@@ -19,51 +19,55 @@
 
 # <http://www.vtk.org/Wiki/CMake/Tutorials/How_to_create_a_ProjectConfig.cmake_file>
 
-# propagate these properties from one build system to the other
-set (@opm-project_NAME@_VERSION "@opm-project_VERSION@")
-set (@opm-project_NAME@_DEFINITIONS "@opm-project_DEFINITIONS@")
-set (@opm-project_NAME@_INCLUDE_DIRS "@opm-project_INCLUDE_DIRS@")
-set (@opm-project_NAME@_LIBRARY_DIRS "@CMAKE_LIBRARY_OUTPUT_DIRECTORY@")
-set (@opm-project_NAME@_LINKER_FLAGS "@opm-project_LINKER_FLAGS@")
-set (@opm-project_NAME@_CONFIG_VARS "@opm-project_CONFIG_VARS@")
+# Prevent multiple inclusions
+if(NOT @opm-project_NAME@_FOUND)
 
-# libraries come from the build tree where this file was generated
-set (@opm-project_NAME@_LIBRARY "@opm-project_LIBRARY@")
-set (@opm-project_NAME@_LIBRARIES ${@opm-project_NAME@_LIBRARY} "@opm-project_LIBRARIES@")
-mark_as_advanced (@opm-project_NAME@_LIBRARY)
+  # propagate these properties from one build system to the other
+  set (@opm-project_NAME@_VERSION "@opm-project_VERSION@")
+  set (@opm-project_NAME@_DEFINITIONS "@opm-project_DEFINITIONS@")
+  set (@opm-project_NAME@_INCLUDE_DIRS "@opm-project_INCLUDE_DIRS@")
+  set (@opm-project_NAME@_LIBRARY_DIRS "@CMAKE_LIBRARY_OUTPUT_DIRECTORY@")
+  set (@opm-project_NAME@_LINKER_FLAGS "@opm-project_LINKER_FLAGS@")
+  set (@opm-project_NAME@_CONFIG_VARS "@opm-project_CONFIG_VARS@")
 
-# not all projects have targets; conditionally add this part
-if (NOT "@opm-project_TARGET@" STREQUAL "")
-  # add the library as a target, so that other things in the project including
-  # this file may depend on it and get rebuild if this library changes.
-  add_library (@opm-project_TARGET@ UNKNOWN IMPORTED)
-  set_property (TARGET @opm-project_TARGET@ PROPERTY IMPORTED_LOCATION "${@opm-project_NAME@_LIBRARY}")
-endif (NOT "@opm-project_TARGET@" STREQUAL "")
+  # libraries come from the build tree where this file was generated
+  set (@opm-project_NAME@_LIBRARY "@opm-project_LIBRARY@")
+  set (@opm-project_NAME@_LIBRARIES ${@opm-project_NAME@_LIBRARY} "@opm-project_LIBRARIES@")
+  mark_as_advanced (@opm-project_NAME@_LIBRARY)
 
-# ensure that we build with support for C++11 to preserve ABI
-string (REPLACE "@CXX_STD0X_FLAGS@" "" CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS}")
-string (REPLACE "@CXX_STDLIB_FLAGS@" "" CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS}")
-string (STRIP "${CMAKE_CXX_FLAGS}" CMAKE_CXX_FLAGS)
-set (CMAKE_CXX_FLAGS "@CXX_STD0X_FLAGS@@CXX_SPACE@@CXX_STDLIB_FLAGS@ ${CMAKE_CXX_FLAGS}")
+  # not all projects have targets; conditionally add this part
+  if (NOT "@opm-project_TARGET@" STREQUAL "")
+    # add the library as a target, so that other things in the project including
+    # this file may depend on it and get rebuild if this library changes.
+    add_library (@opm-project_TARGET@ UNKNOWN IMPORTED)
+    set_property (TARGET @opm-project_TARGET@ PROPERTY IMPORTED_LOCATION "${@opm-project_NAME@_LIBRARY}")
+  endif (NOT "@opm-project_TARGET@" STREQUAL "")
 
-# same as above, but for C99
-string (REPLACE "@C_STD99_FLAGS@" "" CMAKE_C_FLAGS "${CMAKE_C_FLAGS}")
-string (STRIP "${CMAKE_C_FLAGS}" CMAKE_C_FLAGS)
-set (CMAKE_C_FLAG "@C_STD99_FLAGS@ ${CMAKE_C_FLAGS}")
-
-# build with OpenMP if that was found
-if (NOT "@OpenMP_C_FLAGS@" STREQUAL "")
-  string (REPLACE "@OpenMP_C_FLAGS@" "" CMAKE_C_FLAGS "${CMAKE_C_FLAGS}")
-  string (STRIP "${CMAKE_C_FLAGS}" CMAKE_C_FLAGS)
-  set (CMAKE_C_FLAG "@OpenMP_C_FLAGS@ ${CMAKE_C_FLAGS}")
-endif (NOT "@OpenMP_C_FLAGS@" STREQUAL "")
-if (NOT "@OpenMP_CXX_FLAGS@" STREQUAL "")
-  string (REPLACE "@OpenMP_CXX_FLAGS@" "" CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS}")
+  # ensure that we build with support for C++11 to preserve ABI
+  string (REPLACE "@CXX_STD0X_FLAGS@" "" CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS}")
+  string (REPLACE "@CXX_STDLIB_FLAGS@" "" CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS}")
   string (STRIP "${CMAKE_CXX_FLAGS}" CMAKE_CXX_FLAGS)
-  set (CMAKE_C_FLAG "@OpenMP_CXX_FLAGS@ ${CMAKE_CXX_FLAGS}")
-endif (NOT "@OpenMP_CXX_FLAGS@" STREQUAL "")
+  set (CMAKE_CXX_FLAGS "@CXX_STD0X_FLAGS@@CXX_SPACE@@CXX_STDLIB_FLAGS@ ${CMAKE_CXX_FLAGS}")
 
-# this is the contents of config.h as far as our probes can tell:
+  # same as above, but for C99
+  string (REPLACE "@C_STD99_FLAGS@" "" CMAKE_C_FLAGS "${CMAKE_C_FLAGS}")
+  string (STRIP "${CMAKE_C_FLAGS}" CMAKE_C_FLAGS)
+  set (CMAKE_C_FLAG "@C_STD99_FLAGS@ ${CMAKE_C_FLAGS}")
 
-# extra code
-@OPM_PROJECT_EXTRA_CODE@
+  # build with OpenMP if that was found
+  if (NOT "@OpenMP_C_FLAGS@" STREQUAL "")
+    string (REPLACE "@OpenMP_C_FLAGS@" "" CMAKE_C_FLAGS "${CMAKE_C_FLAGS}")
+    string (STRIP "${CMAKE_C_FLAGS}" CMAKE_C_FLAGS)
+    set (CMAKE_C_FLAG "@OpenMP_C_FLAGS@ ${CMAKE_C_FLAGS}")
+  endif (NOT "@OpenMP_C_FLAGS@" STREQUAL "")
+  if (NOT "@OpenMP_CXX_FLAGS@" STREQUAL "")
+    string (REPLACE "@OpenMP_CXX_FLAGS@" "" CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS}")
+    string (STRIP "${CMAKE_CXX_FLAGS}" CMAKE_CXX_FLAGS)
+    set (CMAKE_C_FLAG "@OpenMP_CXX_FLAGS@ ${CMAKE_CXX_FLAGS}")
+  endif (NOT "@OpenMP_CXX_FLAGS@" STREQUAL "")
+
+  # this is the contents of config.h as far as our probes can tell:
+
+  # extra code
+  @OPM_PROJECT_EXTRA_CODE@
+endif()

debian/changelog

@@ -1,4 +1,4 @@
-opm-common (2015.10-1~trusty) trusty; urgency=medium
+opm-common (2017.10-rfinal-1~xenial) xenial; urgency=medium
 
   * New release
 

dune.module

@@ -5,8 +5,8 @@
 
 Module: opm-common
 Description: Open Porous Media Initiative shared infrastructure
-Version: 2017.10-pre
-Label: 2017.10-pre
+Version: 2017.10
+Label: 2017.10
 Maintainer: opm@opm-project.org
 MaintainerName: OPM community
 Url: http://opm-project.org

jenkins/update-opm-data.sh

@@ -55,4 +55,39 @@ $WORKSPACE/deps/opm-simulators/tests/update_reference_data.sh $OPM_DATA_ROOT
 # Finally open the pull request
 cd $OPM_DATA_ROOT
 git remote add jenkins4opm git@github.com:jenkins4opm/opm-data
-git-open-pull -u jenkins4opm --base-account OPM --base-repo opm-data -r /tmp/cmsg $BRANCH_NAME
+
+# Do some cleaning of old remote branches
+# Easier code with git 2.7+
+#BRANCHES=`git branch --sort=committerdate -r | grep jenkins4opm`
+#NBRANCHES=`git branch --sort=committerdate -r | grep jenkins4opm | wc -l`
+git fetch jenkins4opm # Sadly necessary with older git
+BRANCHES=`git for-each-ref --sort=committerdate refs/remotes/jenkins4opm/ --format='%(refname:short)'`
+NBRANCHES=`git for-each-ref --sort=committerdate refs/remotes/jenkins4opm/ --format='%(refname:short)' | wc -l`
+if test $NBRANCHES -gt 30
+then
+  for BRANCH in $BRANCHES
+  do
+    BNAME=`echo $BRANCH | cut -f1 -d '/' --complement`
+    if [ "$BNAME" != "HEAD" ]
+    then
+      git push jenkins4opm :$BNAME
+    fi
+    NBRANCHES=$((NBRANCHES-1))
+    if test $NBRANCHES -lt 30
+    then
+      break
+    fi
+  done
+fi
+
+if [ -n "`echo $BRANCHES | tr ' ' '\n' | grep ^jenkins4opm/$BRANCH_NAME$`" ]
+then
+  GH_TOKEN=`git config --get gitOpenPull.Token`
+  REV=${upstreamRev[$MAIN_REPO]}
+  PRNUMBER=${rev//[!0-9]/}
+  DATA_PR=`curl -X GET https://api.github.com/repos/OPM/opm-data/pulls?head=jenkins4opm:$BRANCH_NAME | grep '"number":' | awk -F ':' '{print $2}' | sed -e 's/,//'`
+  git push -u jenkins4opm $BRANCH_NAME -f
+  curl -d "{ \"body\": \"Existing PR https://github.com/OPM/opm-data/pull/$DATA_PR was updated\" }" -X POST https://api.github.com/repos/OPM/$MAIN_REPO/issues/$PRNUMBER/comments?access_token=$GH_TOKEN
+else
+  git-open-pull -u jenkins4opm --base-account OPM --base-repo opm-data -r /tmp/cmsg $BRANCH_NAME
+fi

redhat/opm-common.spec

@@ -2,19 +2,19 @@
 # spec file for package opm-common
 #
 
-%define tag rc4
+%define tag final
 
 Name:           opm-common
-Version:        2015.10
+Version:        2017.10
 Release:        0
 Summary:        Open Porous Media - common helpers and buildsystem
 License:        GPL-3.0
 Group:          Development/Libraries/C and C++
 Url:            http://www.opm-project.org/
 Source0:        https://github.com/OPM/%{name}/archive/release/%{version}/%{tag}.tar.gz#/%{name}-%{version}.tar.gz
-BuildRequires:  git doxygen bc
-%{?el6:BuildRequires: devtoolset-3-toolchain cmake28 boost148-devel}
-%{!?el6:BuildRequires: gcc gcc-c++ cmake boost-devel}
+BuildRequires:  git doxygen bc devtoolset-6-toolchain 
+%{?el6:BuildRequires: cmake3 boost148-devel}
+%{!?el6:BuildRequires: cmake boost-devel}
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 
 %description
@@ -48,8 +48,8 @@ This package contains the documentation files for opm-common
 
 # consider using -DUSE_VERSIONED_DIR=ON if backporting
 %build
-%{?el6:scl enable devtoolset-3 bash}
-%{?el6:cmake28} %{?!el6:cmake} -DBUILD_SHARED_LIBS=1 -DCMAKE_BUILD_TYPE=RelWithDebInfo  -DSTRIP_DEBUGGING_SYMBOLS=ON -DCMAKE_INSTALL_PREFIX=%{_prefix} -DCMAKE_INSTALL_DOCDIR=share/doc/%{name}-%{version} -DUSE_RUNPATH=OFF -DWITH_NATIVE=OFF %{?el6:-DCMAKE_CXX_COMPILER=/opt/rh/devtoolset-3/root/usr/bin/g++ -DCMAKE_C_COMPILER=/opt/rh/devtoolset-3/root/usr/bin/gcc -DCMAKE_Fortran_COMPILER=/opt/rh/devtoolset-3/root/usr/bin/gfortran -DBOOST_LIBRARYDIR=%{_libdir}/boost148 -DBOOST_INCLUDEDIR=%{_includedir}/boost148}
+scl enable devtoolset-6 bash
+%{?el6:cmake28} %{?!el6:cmake} -DBUILD_SHARED_LIBS=1 -DCMAKE_BUILD_TYPE=RelWithDebInfo  -DSTRIP_DEBUGGING_SYMBOLS=ON -DCMAKE_INSTALL_PREFIX=%{_prefix} -DCMAKE_INSTALL_DOCDIR=share/doc/%{name}-%{version} -DUSE_RUNPATH=OFF -DWITH_NATIVE=OFF -DCMAKE_CXX_COMPILER=/opt/rh/devtoolset-6/root/usr/bin/g++ -DCMAKE_C_COMPILER=/opt/rh/devtoolset-6/root/usr/bin/gcc -DCMAKE_Fortran_COMPILER=/opt/rh/devtoolset-6/root/usr/bin/gfortran %{?el6:-DBOOST_LIBRARYDIR=%{_libdir}/boost148 -DBOOST_INCLUDEDIR=%{_includedir}/boost148}
 make
 
 %install