Merge pull request #269 from akva2/optional_petsc

add option to enable PETSc

.travis.yml

@@ -8,6 +8,7 @@ addons:
     sources:
       - boost-latest
       - ubuntu-toolchain-r-test
+      - george-edison55-precise-backports
     packages:
       - libboost1.55-all-dev
       - gcc-4.8
@@ -18,6 +19,13 @@ addons:
       - libsuitesparse-dev
       - libeigen3-dev
       - bc
+      - cmake
+      - cmake-data
+
+env:
+  global:
+  - TRAVIS_CI=1
+
 
 before_script:
     - export CXX="g++-4.8" CC="gcc-4.8" FC="gfortran-4.8"

cmake/Modules/FindClangCheck.cmake

@@ -0,0 +1,11 @@
+# Find clang-check.
+#
+# This module defines:
+#  CLANGCHECK_PROGRAM, the clang-check executable.
+#  CLANGHCECK_FOUND, If false, do not try to use cppcheck.
+#
+find_program(CLANGCHECK_PROGRAM NAMES clang-check clang-check-3.8)
+
+find_package_handle_standard_args(ClangCheck DEFAULT_MSG CLANGCHECK_PROGRAM)
+
+mark_as_advanced(CLANGCHECK_PROGRAM)

cmake/Modules/FindCppCheck.cmake

@@ -0,0 +1,11 @@
+# Find CppCheck.
+#
+# This module defines:
+#  CPPCHECK_PROGRAM, the cppcheck executable.
+#  CPPCHECK_FOUND, If false, do not try to use cppcheck.
+#
+find_program(CPPCHECK_PROGRAM NAMES cppcheck)
+
+find_package_handle_standard_args(CppCheck DEFAULT_MSG CPPCHECK_PROGRAM)
+
+mark_as_advanced(CPPCHECK_PROGRAM)

cmake/Modules/FindERT.cmake

@@ -33,7 +33,7 @@ endif (ERT_ROOT)
 find_path (ERT_ECL_INCLUDE_DIR
   NAMES "ert/ecl/ecl_util.h"
   HINTS "${ERT_ROOT}"
-  PATHS "${PROJECT_SOURCE_DIR}/../ert"
+  PATHS "${PROJECT_SOURCE_DIR}/../libecl" "${PROJECT_SOURCE_DIR}/../ert"
   PATH_SUFFIXES "libecl/include/" "include"
   DOC "Path to ERT Eclipse library header files"
   ${_no_default_path}
@@ -41,7 +41,7 @@ find_path (ERT_ECL_INCLUDE_DIR
 find_path (ERT_ECL_WELL_INCLUDE_DIR
   NAMES "ert/ecl_well/well_const.h"
   HINTS "${ERT_ROOT}"
-  PATHS "${PROJECT_SOURCE_DIR}/../ert"
+  PATHS "${PROJECT_SOURCE_DIR}/../libecl" "${PROJECT_SOURCE_DIR}/../ert"
   PATH_SUFFIXES "libecl_well/include/" "include"
   DOC "Path to ERT Eclipse library header files"
   ${_no_default_path}
@@ -49,7 +49,7 @@ find_path (ERT_ECL_WELL_INCLUDE_DIR
 find_path (ERT_ECLXX_INCLUDE_DIR
   NAMES "ert/ecl/EclKW.hpp"
   HINTS "${ERT_ROOT}"
-  PATHS "${PROJECT_SOURCE_DIR}/../ert"
+  PATHS "${PROJECT_SOURCE_DIR}/../libecl" "${PROJECT_SOURCE_DIR}/../ert"
   PATH_SUFFIXES "libeclxx/include/" "include"
   DOC "Path to ERT Eclipse C++ library header files"
   ${_no_default_path}
@@ -57,7 +57,7 @@ find_path (ERT_ECLXX_INCLUDE_DIR
 find_path (ERT_UTIL_INCLUDE_DIR
   NAMES "ert/util/stringlist.h"
   HINTS "${ERT_ROOT}"
-  PATHS "${PROJECT_SOURCE_DIR}/../ert"
+  PATHS "${PROJECT_SOURCE_DIR}/../libecl" "${PROJECT_SOURCE_DIR}/../ert"
   PATH_SUFFIXES "libert_util/include/" "include"
   DOC "Path to ERT Eclipse library header files"
   ${_no_default_path}
@@ -65,7 +65,7 @@ find_path (ERT_UTIL_INCLUDE_DIR
 find_path (ERT_UTILXX_INCLUDE_DIR
   NAMES "ert/util/ert_unique_ptr.hpp"
   HINTS "${ERT_ROOT}"
-  PATHS "${PROJECT_SOURCE_DIR}/../ert"
+  PATHS "${PROJECT_SOURCE_DIR}/../libecl" "${PROJECT_SOURCE_DIR}/../ert"
   PATH_SUFFIXES "libert_utilxx/include/" "include"
   DOC "Path to ERT Eclipse C++ library header files"
   ${_no_default_path}
@@ -73,7 +73,7 @@ find_path (ERT_UTILXX_INCLUDE_DIR
 find_path (ERT_GEN_INCLUDE_DIR
   NAMES "ert/util/int_vector.h"
   HINTS "${ERT_ROOT}"
-  PATHS "${PROJECT_SOURCE_DIR}/../ert"
+  PATHS "${PROJECT_SOURCE_DIR}/../libecl" "${PROJECT_SOURCE_DIR}/../ert"
   PATH_SUFFIXES "libert_util/include"
                 "include" "build/libert_util/include" "build/libert_util/include"
   DOC "Path to ERT generated library header files"
@@ -88,7 +88,10 @@ endif (CMAKE_SIZEOF_VOID_P)
 find_library (ERT_LIBRARY_ECL
   NAMES "ecl"
   HINTS "${ERT_ROOT}"
-  PATHS "${PROJECT_BINARY_DIR}/../ert"
+  PATHS "${PROJECT_BINARY_DIR}/../libecl"
+        "${PROJECT_SOURCE_DIR}/../libecl/build"
+        "${PROJECT_BINARY_DIR}/../libecl-build"
+        "${PROJECT_BINARY_DIR}/../ert"
         "${PROJECT_SOURCE_DIR}/../ert/build"
         "${PROJECT_BINARY_DIR}/../ert-build"
   PATH_SUFFIXES "lib" "lib/Release" "lib/Debug" "lib${_BITS}" "lib/${CMAKE_LIBRARY_ARCHITECTURE}"
@@ -98,7 +101,10 @@ find_library (ERT_LIBRARY_ECL
 find_library (ERT_LIBRARY_ECLXX
   NAMES "eclxx"
   HINTS "${ERT_ROOT}"
-  PATHS "${PROJECT_BINARY_DIR}/../ert"
+  PATHS "${PROJECT_BINARY_DIR}/../libecl"
+        "${PROJECT_SOURCE_DIR}/../libecl/build"
+        "${PROJECT_BINARY_DIR}/../libecl-build"
+        "${PROJECT_BINARY_DIR}/../ert"
         "${PROJECT_SOURCE_DIR}/../ert/build"
         "${PROJECT_BINARY_DIR}/../ert-build"
   PATH_SUFFIXES "lib" "lib/Release" "lib/Debug" "lib${_BITS}" "lib/${CMAKE_LIBRARY_ARCHITECTURE}"
@@ -108,7 +114,10 @@ find_library (ERT_LIBRARY_ECLXX
 find_library (ERT_LIBRARY_ECL_WELL
   NAMES "ecl_well"
   HINTS "${ERT_ROOT}"
-  PATHS "${PROJECT_BINARY_DIR}/../ert"
+  PATHS "${PROJECT_BINARY_DIR}/../libecl"
+        "${PROJECT_SOURCE_DIR}/../libecl/build"
+        "${PROJECT_BINARY_DIR}/../libecl-build"
+        "${PROJECT_BINARY_DIR}/../ert"
         "${PROJECT_SOURCE_DIR}/../ert/build"
         "${PROJECT_BINARY_DIR}/../ert-build"
   PATH_SUFFIXES "lib" "lib/Release" "lib/Debug" "lib${_BITS}" "lib/${CMAKE_LIBRARY_ARCHITECTURE}"
@@ -118,7 +127,10 @@ find_library (ERT_LIBRARY_ECL_WELL
 find_library (ERT_LIBRARY_GEOMETRY
   NAMES "ert_geometry"
   HINTS "${ERT_ROOT}"
-  PATHS "${PROJECT_BINARY_DIR}/../ert"
+  PATHS "${PROJECT_BINARY_DIR}/../libecl"
+        "${PROJECT_SOURCE_DIR}/../libecl/build"
+        "${PROJECT_BINARY_DIR}/../libecl-build"
+        "${PROJECT_BINARY_DIR}/../ert"
         "${PROJECT_SOURCE_DIR}/../ert/build"
         "${PROJECT_BINARY_DIR}/../ert-build"
   PATH_SUFFIXES "lib" "lib/Release" "lib/Debug" "lib${_BITS}" "lib/${CMAKE_LIBRARY_ARCHITECTURE}"
@@ -128,7 +140,10 @@ find_library (ERT_LIBRARY_GEOMETRY
 find_library (ERT_LIBRARY_UTIL
   NAMES "ert_util"
   HINTS "${ERT_ROOT}"
-  PATHS "${PROJECT_BINARY_DIR}/../ert"
+  PATHS "${PROJECT_BINARY_DIR}/../libecl"
+        "${PROJECT_SOURCE_DIR}/../libecl/build"
+        "${PROJECT_BINARY_DIR}/../libecl-build"
+        "${PROJECT_BINARY_DIR}/../ert"
         "${PROJECT_SOURCE_DIR}/../ert/build"
         "${PROJECT_BINARY_DIR}/../ert-build"
   PATH_SUFFIXES "lib" "lib/Release" "lib/Debug" "lib${_BITS}" "lib/${CMAKE_LIBRARY_ARCHITECTURE}"
@@ -138,7 +153,10 @@ find_library (ERT_LIBRARY_UTIL
 find_library (ERT_LIBRARY_UTILXX
   NAMES "ert_utilxx"
   HINTS "${ERT_ROOT}"
-  PATHS "${PROJECT_BINARY_DIR}/../ert"
+  PATHS "${PROJECT_BINARY_DIR}/../libecl"
+        "${PROJECT_SOURCE_DIR}/../libecl/build"
+        "${PROJECT_BINARY_DIR}/../libecl-build"
+        "${PROJECT_BINARY_DIR}/../ert"
         "${PROJECT_SOURCE_DIR}/../ert/build"
         "${PROJECT_BINARY_DIR}/../ert-build"
   PATH_SUFFIXES "lib" "lib/Release" "lib/Debug" "lib${_BITS}" "lib/${CMAKE_LIBRARY_ARCHITECTURE}"

cmake/Modules/FindPETSc.cmake

@@ -16,6 +16,11 @@
 
 # find out the size of a pointer. this is required to only search for
 # libraries in the directories relevant for the architecture
+
+if(NOT USE_PETSC)
+  return()
+endif()
+
 if (CMAKE_SIZEOF_VOID_P)
   math (EXPR _BITS "8 * ${CMAKE_SIZEOF_VOID_P}")
 endif (CMAKE_SIZEOF_VOID_P)

cmake/Modules/FindSuperLU.cmake

@@ -15,6 +15,10 @@
 # SUPERLU_LIBRARIES           Name to the SuperLU library.
 #
 
+if(NOT USE_SUPERLU)
+  return()
+endif()
+
 include(CheckIncludeFiles)
 include(CMakePushCheckState)
 include(CheckCSourceCompiles)
@@ -118,6 +122,19 @@ int main(void)
   return 0;
 }"
 SUPERLU_POST_2005_VERSION)
+
+# check whether version is at least 5.0
+CHECK_C_SOURCE_COMPILES("
+typedef int int_t;
+#include <supermatrix.h>
+#include <slu_util.h>
+int main(void)
+{
+  GlobalLU_t glu;
+  return 0;
+}"
+SUPERLU_MIN_VERSION_5)
+
 cmake_pop_check_state()
 
 if(SUPERLU_MIN_VERSION_4_3)
@@ -128,6 +145,17 @@ else()
     "Human readable string containing SuperLU version information.")
 endif()
 
+if(SUPERLU_MIN_VERSION_5)
+  include(UseDuneVer)
+  find_dune_version("dune" "istl")
+  set(DUNE_ISTL_VERSION ${DUNE_ISTL_VERSION_MAJOR}.${DUNE_ISTL_VERSION_MINOR}.${DUNE_ISTL_VERSION_REVISION})
+  if(DUNE_ISTL_VERSION VERSION_LESS 2.5)
+    message(STATUS "SuperLU requested, but version found not compatible with dune-istl ${DUNE_ISTL_VERSION}")
+    set(SUPERLU_LIBRARY "")
+    set(SUPERLU_INCLUDE_DIR "")
+  endif()
+endif()
+
 # behave like a CMake module is supposed to behave
 include(FindPackageHandleStandardArgs)
 find_package_handle_standard_args(

cmake/Modules/FindTinyXML.cmake

@@ -1,37 +0,0 @@
-# - Find TinyXML library
-#
-# Defines the following variables:
-#   TinyXML_INCLUDE_DIRS    Directory of header files
-#   TinyXML_LIBRARIES       Directory of shared object files
-#   TinyXML_DEFINITIONS     Defines that must be set to compile
-
-# Copyright (C) 2012 Uni Research AS
-# This code is licensed under The GNU General Public License v3.0
-
-# use the generic find routine
-include (OpmPackage)
-find_opm_package (
-  # module name
-  "TinyXML"
-
-  # dependencies
-  ""
-  
-  # header to search for
-  "tinyxml.h"
-
-  # library to search for
-  "tinyxml"
-
-  # defines to be added to compilations
-  ""
-
-  # test program
-"#include <tinyxml.h>
-int main (void) {
-  TiXmlDocument doc;
-  return 0;  
-}
-"
-  # config variables
-  "")

cmake/Modules/Findopm-core.cmake

@@ -34,7 +34,7 @@ find_opm_package (
 #include <opm/core/utility/parameters/ParameterGroup.hpp>
 int main()
 {
-    Opm::parameter::ParameterGroup parameters;
+    Opm::ParameterGroup parameters;
     parameters.insertParameter(\"number\", \"7\");
     return 0;
 }

cmake/Modules/Findopm-parser.cmake

@@ -18,13 +18,6 @@ else ()
   set (OPM_PARSER_QUIET "")
 endif ()
 
-# use lowercase versions of the variables if those are set
-if (opm-parser_ROOT)
-  set (OPM_PARSER_ROOT ${opm-parser_ROOT})
-endif ()
-if (opm_ROOT)
-  set (OPM_ROOT ${opm_ROOT})
-endif ()
 
 # inherit "suite" root if not specifically set for this library
 if ((NOT OPM_PARSER_ROOT) AND OPM_ROOT)
@@ -50,135 +43,24 @@ else ()
     "${PROJECT_BINARY_DIR}/../../opm-parser/${BUILD_DIR_SUFFIX}")
 endif ()
 
-# use this header as signature
-find_path (OPM_PARSER_INCLUDE_DIR
-  NAMES "opm/parser/eclipse/Parser/Parser.hpp"
-  HINTS "${OPM_PARSER_ROOT}"
-  PATHS ${_opm_parser_source}
-  PATH_SUFFIXES "include"
-  DOC "Path to OPM parser header files"
-  ${_no_default_path} )
 
-find_path (OPM_PARSER_GEN_INCLUDE_DIR
-  NAMES "opm/parser/eclipse/Parser/ParserKeywords.hpp"
-  HINTS "${OPM_PARSER_ROOT}"
-  PATHS ${_opm_parser_build}
-  PATH_SUFFIXES "generated-source/include" "include"
-  DOC "Path to OPM parser generated header files"
-  ${_no_default_path} )
+find_package(opm-parser CONFIG HINTS ${_opm_parser_build})
+if (opm-parser_FOUND)
+    find_package(ecl REQUIRED)
+    find_package(Boost 1.44.0
+                 COMPONENTS regex filesystem system date_time
+                 REQUIRED)
+    set(HAVE_OPM_PARSER 1)
+    # setting HAVE_ERT is a mega hack here, but some downstreams require it.
+    # Eventually projets should move on to properly handle dependencies and
+    # configurations, and Findopm-parser be deprecated
+    set(HAVE_ERT 1)
+    set(opm-parser_CONFIG_VARS HAVE_OPM_PARSER HAVE_REGEX HAVE_ERT)
+    set(opm-parser_LIBRARIES opmparser)
 
-
-# backup: if we didn't find any headers there, but a CMakeCache.txt,
-# then it is probably a build directory; read the CMake cache of
-# opm-parser to figure out where the source directory is
-if ((NOT OPM_PARSER_INCLUDE_DIR) AND
-        (OPM_PARSER_ROOT AND (EXISTS "${OPM_PARSER_ROOT}/CMakeCache.txt")))
-  set (_regex "^OPMParser_SOURCE_DIR:STATIC=\(.*\)$")
-  file (STRINGS
-        "${OPM_PARSER_ROOT}/CMakeCache.txt"
-        _cache_entry
-        REGEX "${_regex}")
-  string(REGEX REPLACE "${_regex}" "\\1"
-        OPM_PARSER_INCLUDE_DIR
-        "${_cache_entry}")
-  if (OPM_PARSER_INCLUDE_DIR)
-        set (OPM_PARSER_INCLUDE_DIR "${OPM_PARSER_INCLUDE_DIR}"
-          CACHE PATH "Path to OPM parser header files" FORCE)
-  endif ()
-endif ()
-
-# find out the size of a pointer. this is required to only search for
-# libraries in the directories relevant for the architecture
-if (CMAKE_SIZEOF_VOID_P)
-  math (EXPR _BITS "8 * ${CMAKE_SIZEOF_VOID_P}")
-endif ()
-
-# these libraries constitute the parser core
-find_library (OPM_PARSER_LIBRARY
-  NAMES "opmparser"
-  HINTS "${OPM_PARSER_ROOT}"
-  PATHS ${_opm_parser_build}
-  PATH_SUFFIXES "lib" "lib${_BITS}" "lib/${CMAKE_LIBRARY_ARCHITECTURE}"
-                "opm/parser/eclipse"
-  DOC "Path to OPM parser library archive/shared object files"
-  ${_no_default_path} )
-
-# find the OPM-parser wrapper library around cJSON
-find_library (OPM_JSON_LIBRARY
-  NAMES "opmjson"
-  HINTS "${OPM_PARSER_ROOT}"
-  PATHS ${_opm_parser_build}
-  PATH_SUFFIXES "lib" "lib${_BITS}" "lib/${CMAKE_LIBRARY_ARCHITECTURE}"
-                "opm/json"
-  DOC "Path to OPM JSON library archive/shared object files"
-  ${_no_default_path} )
-
-# get the prerequisite ERT libraries
-if (NOT ERT_FOUND)
-  find_package(ERT ${OPM_PARSER_QUIET})
-endif ()
-
-# get the prerequisite Boost libraries
-find_package(Boost 1.44.0 COMPONENTS filesystem date_time system unit_test_framework regex ${OPM_PARSER_QUIET})
-
-if (ERT_FOUND AND Boost_FOUND AND
-    OPM_PARSER_LIBRARY AND OPM_JSON_LIBRARY AND OPM_PARSER_INCLUDE_DIR)
-  # setup list of all required libraries to link with opm-parser. notice that
-  # we use the plural form to get *all* the libraries needed by cjson
-  set (opm-parser_INCLUDE_DIRS
-    ${OPM_PARSER_INCLUDE_DIR}
-    ${OPM_PARSER_GEN_INCLUDE_DIR}
-    ${Boost_INCLUDE_DIRS}
-    ${ERT_INCLUDE_DIRS})
-
-  set (opm-parser_LIBRARIES
-    ${OPM_PARSER_LIBRARY}
-    ${OPM_JSON_LIBRARY}
-    ${Boost_LIBRARIES}
-    ${ERT_LIBRARIES})
-
-  # We might be using an external cJSON library
-  # but we have to unset the OPM_PARSER_ROOT stuff to find it
-  # (other NO_DEFAULT_PATH will be set).
-  set(_OPM_PARSER_ROOT_bak ${OPM_PARSER_ROOT})
-  set(OPM_PARSER_ROOT "")
-  find_package(cjson)
-  set(OPM_PARSER_ROOT ${OPM_PARSER_ROOT_bak})
-
-  if (CJSON_FOUND)
-    # If we do we need to add it to the libs.
-    set (opm-parser_LIBRARIES
-      ${opm-parser_LIBRARIES}
-      ${CJSON_LIBRARY})
-  endif (CJSON_FOUND)
-
-  # see if we can compile a minimum example
-  # CMake logical test doesn't handle lists (sic)
-  include (CMakePushCheckState)
-  include (CheckCSourceCompiles)
-  cmake_push_check_state ()
-  set (CMAKE_REQUIRED_INCLUDES ${opm-parser_INCLUDE_DIRS})
-  set (CMAKE_REQUIRED_LIBRARIES ${opm-parser_LIBRARIES})
-
-  check_cxx_source_compiles (
-      "#include <cstdlib>
-#include <opm/parser/eclipse/Deck/Deck.hpp>
-
-int main (void) {
-   return EXIT_SUCCESS;
-}" HAVE_OPM_PARSER)
-  cmake_pop_check_state ()
-endif()
-
-# if the test program didn't compile, but was required to do so, bail
-# out now and display an error; otherwise limp on
-set (OPM_PARSER_FIND_REQUIRED ${opm-parser_FIND_REQUIRED})
-find_package_handle_standard_args (opm-parser
-  DEFAULT_MSG
-  opm-parser_INCLUDE_DIRS opm-parser_LIBRARIES HAVE_OPM_PARSER
+    find_package_handle_standard_args(opm-parser
+        DEFAULT_MSG
+        opm-parser_LIBRARIES HAVE_OPM_PARSER HAVE_ERT
     )
+endif ()
 
-set (opm-parser_CONFIG_VARS "HAVE_OPM_PARSER;HAVE_REGEX")
-set (opm-parser_FOUND ${OPM-PARSER_FOUND})
-
-mark_as_advanced(opm-parser_LIBRARIES opm-parser_INCLUDE_DIRS OPM-PARSER_FOUND)

cmake/Modules/OpmCompile.cmake

@@ -30,19 +30,34 @@ macro (opm_compile opm)
   add_definitions (${${opm}_DEFINITIONS})
   set (${opm}_VERSION "${${opm}_VERSION_MAJOR}.${${opm}_VERSION_MINOR}")
   if (${opm}_SOURCES)
-	add_library (${${opm}_TARGET} ${${opm}_LIBRARY_TYPE} ${${opm}_SOURCES})
-	set_target_properties (${${opm}_TARGET} PROPERTIES
-	  SOVERSION ${${opm}_VERSION_MAJOR}
-	  VERSION ${${opm}_VERSION}
-	  LINK_FLAGS "${${opm}_LINKER_FLAGS_STR}"
+        add_library (${${opm}_TARGET} ${${opm}_LIBRARY_TYPE} ${${opm}_SOURCES})
+        set_target_properties (${${opm}_TARGET} PROPERTIES
+          SOVERSION ${${opm}_VERSION_MAJOR}
+          VERSION ${${opm}_VERSION}
+          LINK_FLAGS "${${opm}_LINKER_FLAGS_STR}"
           POSITION_INDEPENDENT_CODE TRUE 
           )
-	target_link_libraries (${${opm}_TARGET} ${${opm}_LIBRARIES})
+        if (${${opm}_LIBRARY_TYPE} STREQUAL "SHARED")
+          # libs that will be linked with the main lib
+          string(REGEX REPLACE "([;^])[^;]+\\.a[;$]" "\\1" _public_libs
+            "${${opm}_LIBRARIES}")
+          # libs that will not actually linked to the library but
+          # transitively linked to binaries that link to the main library
+          string(REGEX REPLACE "([^;]+\\.[^a][a-zA-Z0-9]*|-[a-z]*)[;$]" "" _interface_libs
+            "${${opm}_LIBRARIES}")
+        else()
+          # Use all libs for real and transitive linking
+          set(_public_libs ${${opm}_LIBRARIES})
+          unset(_interface)
+        endif()
+        target_link_libraries (${${opm}_TARGET} PUBLIC ${_public_libs}
+          INTERFACE ${_interface_libs})
 
         if (STRIP_DEBUGGING_SYMBOLS)
 	  # queue this executable to be stripped
 	  strip_debug_symbols (${${opm}_TARGET} ${opm}_DEBUG)
         endif()
+	  add_static_analysis_tests(${opm}_SOURCES ${opm}_INCLUDE_DIRS)
   else (${opm}_SOURCES)
 	# unset this variable to signal that no library is generated
 	set (${opm}_TARGET)

cmake/Modules/OpmLibMain.cmake

@@ -102,6 +102,16 @@ find_openmp (${project})
 include (UseThreads)
 find_threads (${project})
 
+# SuperLU is optional
+option (USE_SUPERLU "Use SuperLU direct solvers" OFF)
+
+# PETSc is optional
+option (USE_PETSC "Use PETSc iterative solvers" OFF)
+
+# static code analysis
+include(UseStaticAnalysis)
+setup_static_analysis_tools()
+
 # callback hook to setup additional dependencies
 if (COMMAND prereqs_hook)
 	prereqs_hook ()

cmake/Modules/OpmSatellites.cmake

@@ -72,6 +72,7 @@ macro (opm_compile_satellites opm satellite excl_all test_regexp)
 	  set (_test_lib "${Boost_UNIT_TEST_FRAMEWORK_LIBRARY}")
 	else (NOT "${test_regexp}" STREQUAL "")
 	  set (_test_lib "")
+	  add_static_analysis_tests(_sat_FILE ${opm}_INCLUDE_DIRS)
 	endif (NOT "${test_regexp}" STREQUAL "")
 	target_link_libraries (${_sat_NAME} ${${opm}_TARGET} ${${opm}_LIBRARIES} ${_test_lib})
         if (STRIP_DEBUGGING_SYMBOLS)

cmake/Modules/UseDynamicBoost.cmake

@@ -1,6 +1,4 @@
-if (NOT Boost_UNIT_TEST_FRAMEWORK_FOUND)
-  find_package (Boost 1.44.0 COMPONENTS unit_test_framework QUIET)
-endif ()
+find_package (Boost 1.44.0 COMPONENTS unit_test_framework QUIET)
 
 if (Boost_UNIT_TEST_FRAMEWORK_FOUND)
   # setup to do a test compile

cmake/Modules/UseOptimization.cmake

@@ -38,7 +38,7 @@ if (CXX_COMPAT_GCC)
 
   # default optimization flags, if not set by user
   set_default_option (CXX _opt_dbg "-O0" "(^|\ )-O")
-  set_default_option (CXX _opt_rel "-O2" "(^|\ )-O")
+  set_default_option (CXX _opt_rel "-O3" "(^|\ )-O")
 
   # use these options for debug builds - no optimizations
   add_options (ALL_LANGUAGES "${_prof_DEBUG}" ${_opt_dbg} "-DDEBUG")

cmake/Modules/UseStaticAnalysis.cmake

@@ -0,0 +1,50 @@
+# Add static analysis tests for a given source file
+
+macro(setup_static_analysis_tools)
+  find_package(CppCheck)
+  if(CMAKE_EXPORT_COMPILE_COMMANDS)
+    find_package(ClangCheck)
+  else()
+    message(STATUS "Disabling clang-check as CMAKE_EXPORT_COMPILE_COMMANDS is not enabled")
+  endif()
+  if(OPM_COMMON_ROOT)
+    set(DIR ${OPM_COMMON_ROOT})
+  elseif(OPM_MACROS_ROOT)
+    set(DIR ${OPM_MACROS_ROOT})
+  else()
+    set(DIR ${CMAKE_CURRENT_SOURCE_DIR})
+  endif()
+  if(CPPCHECK_FOUND)
+    file(COPY        ${DIR}/cmake/Scripts/cppcheck-test.sh
+         DESTINATION bin
+         FILE_PERMISSIONS OWNER_READ OWNER_WRITE OWNER_EXECUTE GROUP_READ GROUP_EXECUTE WORLD_READ WORLD_EXECUTE)
+    endif()
+  if(CLANGCHECK_FOUND AND CMAKE_EXPORT_COMPILE_COMMANDS)
+    configure_file(${DIR}/cmake/Scripts/clang-check-test.sh.in
+                   ${CMAKE_BINARY_DIR}/CMakeFiles/clang-check-test.sh)
+    file(COPY ${CMAKE_BINARY_DIR}/CMakeFiles/clang-check-test.sh
+         DESTINATION bin
+         FILE_PERMISSIONS OWNER_READ OWNER_WRITE OWNER_EXECUTE GROUP_READ GROUP_EXECUTE WORLD_READ WORLD_EXECUTE)
+   endif()
+endmacro()
+
+function(add_static_analysis_tests sources includes)
+  if(CPPCHECK_FOUND OR (CLANGCHECK_FOUND AND CMAKE_EXPORT_COMPILE_COMMANDS))
+    foreach(dep ${${includes}})
+      list(APPEND IPATHS -I ${dep})
+    endforeach()
+    foreach(src ${${sources}})
+      file(RELATIVE_PATH name ${PROJECT_SOURCE_DIR} ${src})
+      if(CPPCHECK_FOUND)
+        add_test(NAME cppcheck+${name}
+                 COMMAND bin/cppcheck-test.sh ${CPPCHECK_PROGRAM} ${src} ${IPATHS}
+                 CONFIGURATIONS analyze cppcheck)
+      endif()
+      if(CLANGCHECK_FOUND AND CMAKE_EXPORT_COMPILE_COMMANDS)
+        add_test(NAME clang-check+${name}
+                 COMMAND bin/clang-check-test.sh ${CLANGCHECK_PROGRAM} ${src}
+                 CONFIGURATIONS analyze clang-check)
+      endif()
+    endforeach()
+  endif()
+endfunction()

cmake/Modules/opm-core-prereqs.cmake

@@ -29,10 +29,8 @@ set (opm-core_DEPS
 	"SuiteSparse COMPONENTS umfpack"
 	# solver
 	"SuperLU"
-	# xml processing (for config parsing)
-	"TinyXML"
 	# Ensembles-based Reservoir Tools (ERT)
-	"ERT REQUIRED"
+	"ecl REQUIRED"
 	# Look for MPI support
 	"MPI"
 	# PETSc numerical backend

cmake/Modules/opm-output-prereqs.cmake

@@ -16,7 +16,7 @@ set (opm-output_DEPS
 	"Boost 1.44.0
 		COMPONENTS unit_test_framework REQUIRED"
 	# Ensembles-based Reservoir Tools (ERT)
-	"ERT REQUIRED"
+	"ecl REQUIRED"
 	# Look for MPI support
 	"opm-common REQUIRED"
 	# Parser library for ECL-type simulation models

cmake/Scripts/clang-check-test.sh.in

@@ -0,0 +1,23 @@
+#!/bin/bash
+
+# This script performs a single analysis using clang-check
+# It is used by the 'make test' target in the buildsystems
+# Usually you should use 'ctest -C clang-check' rather than calling this script directly
+#
+# Parameters: $1 = Application binary
+#             $2 = Source file to process
+
+clangcheck_cmd=$1
+source_file=$2
+
+tmpfil=`mktemp`
+$clangcheck_cmd -p @CMAKE_BINARY_DIR@ -analyze $source_file &> $tmpfil
+cat $tmpfil
+if test -s $tmpfil
+then
+  rm $tmpfil
+  exit 1
+fi
+
+rm $tmpfil
+exit 0

cmake/Scripts/cppcheck-test.sh

@@ -0,0 +1,30 @@
+#!/bin/bash
+
+# This script performs a single analysis using cppcheck
+# It is used by the 'make test' target in the buildsystems
+# Usually you should use 'ctest -C cppcheck' rather than calling this script directly
+#
+# Parameters: $1 = Application binary
+#             $2 = Source file to process
+#             $3..$N = include path parameters (-I dir1 -I dir2 ...)
+
+cppcheck_cmd=$1
+source_file=$2
+shift 2
+
+tmpfil=`mktemp`
+$cppcheck_cmd $@ --enable=all --suppress=unusedFunction $source_file &> $tmpfil
+nmatch=`cat $tmpfil | grep "\[.*\]" | wc -l`
+nsys=`cat $tmpfil | grep "\[/usr.*\]" | wc -l`
+nnone=`cat $tmpfil | grep "\[\\*]" | wc -l`
+ndef=`cat $tmpfil | grep "\[.*Too many #ifdef" | wc -l`
+let "nval=$nmatch-$nsys-$nnone-$ndef"
+if test $nval -gt 0
+then
+  cat $tmpfil
+  rm $tmpfil
+  exit 1
+fi
+
+rm $tmpfil
+exit 0

debian/rules

@@ -20,7 +20,7 @@ override_dh_auto_build:
 
 # consider using -DUSE_VERSIONED_DIR=ON if backporting
 override_dh_auto_configure:
-	dh_auto_configure --buildsystem=cmake -- -DCMAKE_BUILD_TYPE=RelWithDebInfo -DSTRIP_DEBUGGING_SYMBOLS=ON -DBUILD_SHARED_LIBS=1 -DCMAKE_INSTALL_DOCDIR=share/doc/libopm-common1 -DWHOLE_PROG_OPTIM=ON -DUSE_RUNPATH=OFF
+	dh_auto_configure --buildsystem=cmake -- -DCMAKE_BUILD_TYPE=RelWithDebInfo -DSTRIP_DEBUGGING_SYMBOLS=ON -DBUILD_SHARED_LIBS=1 -DCMAKE_INSTALL_DOCDIR=share/doc/libopm-common1 -DWHOLE_PROG_OPTIM=ON -DUSE_RUNPATH=OFF -DWITH_NATIVE=OFF
 
 override_dh_auto_install:
 	dh_auto_install -- install-html

dune.module

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

jenkins/build-opm-module.sh

@@ -90,7 +90,12 @@ function build_module {
       cmake --build .
     fi
     test $? -eq 0 || exit 2
-    ctest -T Test --no-compress-output
+    if test -z "$CTEST_CONFIGURATION"
+    then
+      ctest -T Test --no-compress-output
+    else
+      ctest -C $CTEST_CONFIGURATION --timeout 5000 -T Test --no-compress-output
+    fi
 
     # Convert to junit format
     $WORKSPACE/deps/opm-common/jenkins/convert.py -x $WORKSPACE/deps/opm-common/jenkins/conv.xsl -t . > testoutput.xml
@@ -119,9 +124,9 @@ function clone_module {
   mkdir -p $WORKSPACE/deps/$1
   cd $WORKSPACE/deps/$1
   git init .
-  if [ "$1" == "ert" ]
+  if [ "$1" == "libecl" ]
   then
-    git remote add origin https://github.com/Ensembles/$1
+    git remote add origin https://github.com/Statoil/$1
   else
     git remote add origin https://github.com/OPM/$1
   fi

jenkins/build.sh

@@ -8,7 +8,7 @@ ln -sf $WORKSPACE deps/opm-common
 
 # Downstreams and revisions
 declare -a downstreams
-downstreams=(ert
+downstreams=(libecl
              opm-parser
              opm-output
              opm-material
@@ -20,7 +20,7 @@ downstreams=(ert
              )
 
 declare -A downstreamRev
-downstreamRev[ert]=master
+downstreamRev[libecl]=master
 downstreamRev[opm-parser]=master
 downstreamRev[opm-material]=master
 downstreamRev[opm-core]=master

jenkins/update-opm-data.sh

@@ -5,7 +5,7 @@ MAIN_REPO=$1 # The repo the update was triggered from
 source $WORKSPACE/deps/opm-common/jenkins/build-opm-module.sh
 
 declare -a upstreams # Everything is considered an upstream to aid code reuse
-upstreams=(ert
+upstreams=(libecl
            opm-common
            opm-parser
            opm-output
@@ -18,7 +18,7 @@ upstreams=(ert
           )
 
 declare -A upstreamRev
-upstreamRev[ert]=master
+upstreamRev[libecl]=master
 upstreamRev[opm-common]=master
 upstreamRev[opm-parser]=master
 upstreamRev[opm-material]=master

opm/common/Exceptions.hpp

@@ -58,6 +58,13 @@ public:
         : NumericalProblem(message)
     {}
 };
+class TooManyIterations : public NumericalProblem
+{
+public:
+    explicit TooManyIterations(const std::string &message)
+        : NumericalProblem(message)
+    {}
+};
 }
 
 #endif // OPM_EXCEPTIONS_HPP

opm/common/OpmLog/CounterLog.hpp

@@ -33,7 +33,7 @@ namespace Opm {
     class CounterLog : public LogBackend
     {
     public:
-        CounterLog(int64_t messageMask);
+        explicit CounterLog(int64_t messageMask);
         CounterLog();
 
         size_t numMessages(int64_t messageType) const;

opm/common/OpmLog/LogUtil.cpp

@@ -58,16 +58,16 @@ namespace Log {
             prefix = "Info";
             break;
         case MessageType::Warning:
-            prefix = "Warning";
+            prefix = "\nWarning";
             break;
         case MessageType::Error:
-            prefix = "Error";
+            prefix = "\nError";
             break;
         case MessageType::Problem:
-            prefix = "Problem";
+            prefix = "\nProblem";
             break;
         case MessageType::Bug:
-            prefix = "Bug";
+            prefix = "\nBug";
             break;
         default:
             throw std::invalid_argument("Unhandled messagetype");

opm/common/OpmLog/MessageFormatter.hpp

@@ -64,7 +64,7 @@ namespace Opm
         }
 
 
-        SimpleMessageFormatter(const bool use_color_coding)
+        explicit SimpleMessageFormatter(const bool use_color_coding)
             : use_color_coding_(use_color_coding)
         {
             prefix_flag_ = Log::MessageType::Warning + Log::MessageType::Error 

opm/common/OpmLog/MessageLimiter.hpp

@@ -62,7 +62,7 @@ namespace Opm
         {
         }
 
-        MessageLimiter(const int tag_limit, const std::map<int64_t, int> category_limits)
+        MessageLimiter(const int tag_limit, const std::map<int64_t, int>& category_limits)
             : tag_limit_(tag_limit < 0 ? NoLimit : tag_limit),
               category_limits_(category_limits)
         {

opm/common/OpmLog/OpmLog.hpp

@@ -77,13 +77,13 @@ public:
 
     template <class BackendType>
     static std::shared_ptr<BackendType> getBackend(const std::string& name) {
-        auto logger = OpmLog::getLogger();
+        auto logger = getLogger();
         return logger->getBackend<BackendType>(name);
     }
 
     template <class BackendType>
     static std::shared_ptr<BackendType> popBackend(const std::string& name) {
-        auto logger = OpmLog::getLogger();
+        auto logger = getLogger();
         return logger->popBackend<BackendType>(name);
     }
 

opm/common/OpmLog/TimerLog.cpp

@@ -32,11 +32,13 @@ namespace Opm {
 TimerLog::TimerLog(const std::string& logFile) : StreamLog( logFile , StopTimer | StartTimer )
 {
     m_work.precision(8);
+    m_start = 0;
 }
 
 TimerLog::TimerLog(std::ostream& os) : StreamLog( os , StopTimer | StartTimer )
 {
     m_work.precision(8);
+    m_start = 0;
 }
 
 

opm/common/OpmLog/TimerLog.hpp

@@ -39,8 +39,8 @@ public:
     static const int64_t StartTimer = 4096;
     static const int64_t StopTimer  = 8192;
 
-    TimerLog(const std::string& logFile);
-    TimerLog(std::ostream& os);
+    explicit TimerLog(const std::string& logFile);
+    explicit TimerLog(std::ostream& os);
 
     void clear();
     ~TimerLog() {};

redhat/opm-common.spec

@@ -49,7 +49,7 @@ 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 %{?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}
+%{?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}
 make
 
 %install

tests/test_OpmLog.cpp

@@ -48,8 +48,8 @@ BOOST_AUTO_TEST_CASE(DoLogging) {
 BOOST_AUTO_TEST_CASE(Test_Format) {
     BOOST_CHECK_EQUAL( "There is an error here?\nIn file /path/to/file, line 100\n" , Log::fileMessage("/path/to/file" , 100 , "There is an error here?"));
 
-    BOOST_CHECK_EQUAL( "Error: This is the error" ,     Log::prefixMessage(Log::MessageType::Error , "This is the error"));
-    BOOST_CHECK_EQUAL( "Warning: This is the warning" , Log::prefixMessage(Log::MessageType::Warning , "This is the warning"));
+    BOOST_CHECK_EQUAL( "\nError: This is the error" ,     Log::prefixMessage(Log::MessageType::Error , "This is the error"));
+    BOOST_CHECK_EQUAL( "\nWarning: This is the warning" , Log::prefixMessage(Log::MessageType::Warning , "This is the warning"));
     BOOST_CHECK_EQUAL( "Info: This is the info" ,       Log::prefixMessage(Log::MessageType::Info , "This is the info"));
 }
 
@@ -250,10 +250,10 @@ BOOST_AUTO_TEST_CASE(TestHelperFunctions)
 
     // fileMessage
     BOOST_CHECK_EQUAL(fileMessage("foo/bar", 1, "message"), "message\nIn file foo/bar, line 1\n");
-    BOOST_CHECK_EQUAL(fileMessage(MessageType::Error, "foo/bar", 1, "message"), "Error: message\nIn file foo/bar, line 1\n");
+    BOOST_CHECK_EQUAL(fileMessage(MessageType::Error, "foo/bar", 1, "message"), "\nError: message\nIn file foo/bar, line 1\n");
 
     // prefixMessage
-    BOOST_CHECK_EQUAL(prefixMessage(MessageType::Error, "message"), "Error: message");
+    BOOST_CHECK_EQUAL(prefixMessage(MessageType::Error, "message"), "\nError: message");
     BOOST_CHECK_EQUAL(prefixMessage(MessageType::Info, "message"), "Info: message");
     BOOST_CHECK_EQUAL(prefixMessage(MessageType::Note, "message"), "Note: message");
 
@@ -356,7 +356,7 @@ BOOST_AUTO_TEST_CASE(TestOpmLogWithLimits)
         + Log::colorCodeMessage(Log::MessageType::Info, "Info") + "\n"
         + Log::colorCodeMessage(Log::MessageType::Bug, "Bug") + "\n"
         + Log::colorCodeMessage(Log::MessageType::Warning, "Warning") + "\n"
-        + Log::colorCodeMessage(Log::MessageType::Warning, "Message limit reached for message category: Warning") + "\n";
+        + Log::colorCodeMessage(Log::MessageType::Warning, "Message limit reached for message category: \nWarning") + "\n";
 
     BOOST_CHECK_EQUAL(log_stream2.str(), expected2);
 

travis/build-and-test.sh

@@ -1,7 +1,7 @@
 #!/bin/bash
 set -e
 
-build_order=(opm-common opm-parser opm-material opm-output opm-grid opm-core ewoms opm-simulators)
+build_order=(opm-common opm-parser opm-output opm-material opm-grid opm-core ewoms opm-simulators)
 
 # This shell script should be started with the name of a module as
 # only only command line argument. It will start by building all

travis/build-prereqs.sh

@@ -25,7 +25,7 @@ function build_dune {
    pushd . > /dev/null
    git clone ${url}
    cd ${project}
-   git checkout tags/v2.3.1
+   git checkout tags/v2.4.1
    mkdir build
    cd build
    cmake ../
@@ -62,11 +62,11 @@ function install_python_deps {
 }
 
 
-function build_ert {
+function build_libecl {
     install_python_deps
-    git clone https://github.com/Ensembles/ert.git
-    mkdir -p ert/build
-    pushd ert/build > /dev/null
+    git clone https://github.com/Statoil/libecl.git
+    mkdir -p libecl/build
+    pushd libecl/build > /dev/null
     cmake .. && make
     popd > /dev/null
 }
@@ -75,7 +75,7 @@ function build_ert {
 #################################################################
 
 build_superlu
-build_ert
+build_libecl
 
 build_dune dune-common
 build_dune dune-istl