bump version to 2019.04

They will be treated as limits, and cause wrong behaviour.

.clang-format

@@ -1,20 +0,0 @@
-{
-        BasedOnStyle: WebKit,
-        AlignAfterOpenBracket: AlwaysBreak,
-        AlignConsecutiveAssignments: false,
-        AlignConsecutiveDeclarations: false,
-        AlignAfterOpenBracket: Align,
-        AllowShortBlocksOnASingleLine: false,
-        AllowShortFunctionsOnASingleLine: None,
-        AlwaysBreakAfterReturnType: TopLevelDefinitions,
-        AlwaysBreakTemplateDeclarations: Yes,
-        BinPackArguments: false,
-        BinPackParameters: false,
-        BreakBeforeBraces: Linux,
-        BreakConstructorInitializers: BeforeComma,
-        ColumnLimit: 120,
-        Cpp11BracedListStyle: true,
-        FixNamespaceComments: true,
-        MaxEmptyLinesToKeep: 5,
-        NamespaceIndentation: Inner,
-}

.gitignore

@@ -69,7 +69,3 @@ install
 
 # emacs directory setting:
 .dir-locals.el
-
-*.pyc
-*.eggs
-*.egg-info

CMakeLists.txt

@@ -8,9 +8,11 @@ set(OPM_MACROS_ROOT ${PROJECT_SOURCE_DIR})
 option(ENABLE_ECL_INPUT "Enable eclipse input support?" ON)
 option(ENABLE_ECL_OUTPUT "Enable eclipse output support?" ON)
 option(ENABLE_MOCKSIM "Build the mock simulator for io testing" ON)
-option(OPM_ENABLE_PYTHON "Enable python bindings?" OFF)
-option(OPM_INSTALL_PYTHON "Enable python bindings?" OFF)
-option(OPM_ENABLE_EMBEDDED_PYTHON "Enable python bindings?" OFF)
+option(ENABLE_WELL_TEST "Enable testing of well code when building Schedule object" OFF)
+
+if (ENABLE_WELL_TEST)
+  add_definitions(-DWELL_TEST)
+endif()
 
 # Output implies input
 if(ENABLE_ECL_OUTPUT)
@@ -110,13 +112,8 @@ macro (sources_hook)
     include(GenerateKeywords.cmake)
 
     # Append generated sources
-    list(INSERT opm-common_SOURCES 0 ${PROJECT_BINARY_DIR}/ParserInit.cpp)
-    foreach (name A B C D E F G H I J K L M N O P Q R S T U V W X Y Z)
-        list(INSERT opm-common_SOURCES 0 ${PROJECT_BINARY_DIR}/ParserKeywords/${name}.cpp)
-    endforeach()
+    list(APPEND opm-common_SOURCES ${PROJECT_BINARY_DIR}/ParserKeywords.cpp)
   endif()
-  set_source_files_properties(src/opm/parser/eclipse/Python/Python.cpp
-                              PROPERTIES COMPILE_FLAGS -Wno-shadow)
 endmacro (sources_hook)
 
 macro (fortran_hook)
@@ -137,21 +134,6 @@ macro (install_hook)
           PATTERN *.hpp)
 endmacro (install_hook)
 
-# If opm-common is configured to embed the python interpreter we must make sure
-# that all downstream modules link libpython transitively. Due to the required
-# integration with Python+cmake machinery provided by pybind11 this is done by
-# manually adding to the opm-common_LIBRARIES variable here, and not in the
-# OpmnLibMain function. Here only the library dependency is implemented, the
-# bulk of the python configuration is further down in the file.
-if (OPM_ENABLE_PYTHON)
-  find_package(PythonInterp REQUIRED)
-  if (OPM_ENABLE_EMBEDDED_PYTHON)
-    find_package(PythonLibs REQUIRED)
-    list(APPEND opm-common_LIBRARIES ${PYTHON_LIBRARY})
-  endif()
-endif()
-
-
 # all setup common to the OPM library modules is done here
 include (OpmLibMain)
 
@@ -167,68 +149,33 @@ if (ENABLE_MOCKSIM)
     ${Boost_UNIT_TEST_FRAMEWORK_LIBRARY})
 
   foreach( test test_msim test_msim_ACTIONX )
-    opm_add_test(${test} SOURCES tests/msim/${test}.cpp
+    opm_add_test(${test} SOURCES tests/msim/${test}
                          LIBRARIES ${_libs}
-                         WORKING_DIRECTORY ${PROJECT_BINARY_DIR}/tests
-                         CONDITION HAVE_ECL_INPUT AND Boost_UNIT_TEST_FRAMEWORK_FOUND)
+                         WORKING_DIRECTORY ${PROJECT_BINARY_DIR}/tests)
   endforeach()
 endif()
 
 # Build the compare utilities
 if(ENABLE_ECL_INPUT)
-  add_executable(compareECL
-    test_util/EclFilesComparator.cpp
-    test_util/EclRegressionTest.cpp
-    test_util/compareECL.cpp
-    )
-
-  add_executable(convertECL
-    test_util/convertECL.cpp
-    )
-
-  add_executable(summary
-    test_util/summary.cpp
-    )
-
-  foreach(target compareECL convertECL summary)
-    target_link_libraries(${target} opmcommon)
-    install(TARGETS ${target} DESTINATION bin)
-  endforeach()
+  add_library(testutil STATIC
+              examples/test_util/EclFilesComparator.cpp
+              examples/test_util/EclIntegrationTest.cpp
+              examples/test_util/EclRegressionTest.cpp
+              examples/test_util/summaryComparator.cpp
+              examples/test_util/summaryIntegrationTest.cpp
+              examples/test_util/summaryRegressionTest.cpp)
+  target_link_libraries(testutil ecl)
+  add_executable(compareECL examples/test_util/compareECL.cpp)
+  target_link_libraries(compareECL testutil opmcommon)
 
   # Add the tests
-  set(_libs opmcommon
+  set(_libs testutil opmcommon
             ${Boost_UNIT_TEST_FRAMEWORK_LIBRARY})
-
-  opm_add_test(test_EclFilesComparator
-    CONDITION
-      ENABLE_ECL_INPUT AND Boost_UNIT_TEST_FRAMEWORK_FOUND
-    SOURCES
-      tests/test_EclFilesComparator.cpp
-      test_util/EclFilesComparator.cpp
-    LIBRARIES
-      ${_libs}
-    WORKING_DIRECTORY
-      ${PROJECT_BINARY_DIR}/tests
-    )
-
-  opm_add_test(test_EclRegressionTest
-    CONDITION
-      ENABLE_ECL_INPUT AND Boost_UNIT_TEST_FRAMEWORK_FOUND
-    SOURCES
-      tests/test_EclRegressionTest.cpp
-      test_util/EclFilesComparator.cpp
-      test_util/EclRegressionTest.cpp
-    LIBRARIES
-      ${_libs}
-    WORKING_DIRECTORY
-      ${PROJECT_BINARY_DIR}/tests
-    )
-
-  foreach(test test_EclIO test_EGrid test_ERft test_ERst test_ESmry)
-    opm_add_test(${test} CONDITION ENABLE_ECL_INPUT AND Boost_UNIT_TEST_FRAMEWORK_FOUND
-                         LIBRARIES ${_libs}
-                         WORKING_DIRECTORY ${PROJECT_BINARY_DIR}/tests)
+  foreach(test test_compareSummary test_EclFilesComparator)
+    opm_add_test(${test} CONDITION ENABLE_ECL_INPUT
+                         LIBRARIES ${_libs})
   endforeach()
+  install(TARGETS compareECL DESTINATION bin)
 endif()
 
 # Install build system files
@@ -236,122 +183,3 @@ install(DIRECTORY cmake DESTINATION share/opm)
 
 # Install tab completion skeleton
 install(FILES etc/opm_bash_completion.sh.in DESTINATION share/opm/etc)
-
-if (OPM_ENABLE_PYTHON)
-  # -------------------------------------------------------------------------
-  # 1: Wrap C++ functionality in Python
-  set(PYTHON_PACKAGE_PATH "site-packages")
-  set(PYTHON_INSTALL_PREFIX "lib/python${PYTHON_VERSION_MAJOR}.${PYTHON_VERSION_MINOR}/${PYTHON_PACKAGE_PATH}" CACHE STRING "Subdirectory to install Python modules in")
-
-  make_directory(${PROJECT_BINARY_DIR}/python)
-  get_target_property(_opmcommon_include_dirs opmcommon INCLUDE_DIRECTORIES)
-  list(APPEND _opmcommon_include_dirs ${_ecl_include_dirs})
-  string(REPLACE ";" ":" _setup_include_dirs "${_opmcommon_include_dirs}")
-
-  if (CMAKE_PREFIX_PATH)
-    set(_opmcommon_lib_dirs ${PROJECT_BINARY_DIR}/lib ${CMAKE_PREFIX_PATH}/${CMAKE_INSTALL_LIBDIR})
-  else()
-    set(_opmcommon_lib_dirs ${PROJECT_BINARY_DIR}/lib)
-  endif()
-  string(REPLACE ";" ":" _setup_lib_dirs "${_opmcommon_lib_dirs}")
-
-  if (USE_RUNPATH)
-    set (_python_rpath_list)
-    if (CMAKE_PREFIX_PATH)
-      foreach(path ${CMAKE_PREFIX_PATH})
-        list(APPEND _python_rpath_list "${path}/${CMAKE_INSTALL_LIBDIR}")
-      endforeach()
-    endif()
-
-    if (BUILD_SHARED_LIBS)
-      list(APPEND _python_rpath_list "${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_LIBDIR}")
-    endif()
-
-    if (_python_rpath_list)
-      string(REPLACE ";" ":" _rpath "${_python_rpath_list}")
-      set( _rpath_arg "--rpath=${_rpath}")
-    else()
-      set(_rpath_arg "")
-    endif()
-  else()
-    set( _rpath_arg "")
-  endif()
-
-  execute_process(COMMAND ${PYTHON_EXECUTABLE} target_name.py
-                  WORKING_DIRECTORY ${PROJECT_SOURCE_DIR}/python
-                  OUTPUT_VARIABLE python_lib_target)
-
-  add_custom_target(copy_python ALL
-    COMMAND ${PYTHON_EXECUTABLE} ${PROJECT_SOURCE_DIR}/python/install.py ${PROJECT_SOURCE_DIR}/python ${PROJECT_BINARY_DIR} 0)
-
-  add_custom_command(OUTPUT python/python/opm/${python_lib_target}
-                     DEPENDS ${PYTHON_CXX_DEPENDS}
-                     DEPENDS copy_python
-                     COMMAND ${PYTHON_EXECUTABLE} ${PROJECT_BINARY_DIR}/python/setup.py
-                                                      build
-                                                      build_ext
-                                                      --build-lib=${PROJECT_BINARY_DIR}/python/python/opm
-                                                      --library-dirs=${_setup_lib_dirs}
-                                                      ${_rpath_arg}
-                                                      --include-dirs=${_setup_include_dirs}
-                     WORKING_DIRECTORY ${PROJECT_BINARY_DIR}/python
-                     COMMENT "Building python bindings")
-  add_custom_target(opmcommon_python ALL DEPENDS python/python/opm/${python_lib_target})
-  add_dependencies(opmcommon_python opmcommon)
-
-  # The install target is based on manually copying the python file tree to the
-  # installation area with a small installation script 'install.py'. Would have
-  # preferred to use standard setup.py install, but the setup.py based solution
-  # refuses to install to a location which the current python executable can not
-  # load from, and the use of eggs in the setup.py based installation makes
-  # debugging quite difficult.
-  #
-  # Since the installation of Python code is nonstandard it is protected by an
-  # extra cmake switch, OPM_INSTALL_PYTHON. If you prefer you can still invoke
-  # setup.py install manually - optionally with the generated script
-  # setup-install.sh - and completely bypass cmake in the installation phase.
-  if (OPM_INSTALL_PYTHON)
-    install( CODE "execute_process(COMMAND ${PYTHON_EXECUTABLE} ${PROJECT_BINARY_DIR}/python/install.py ${PROJECT_BINARY_DIR}/python/python/opm ${DEST_PREFIX}${CMAKE_INSTALL_PREFIX}/${PYTHON_INSTALL_PREFIX} 1)")
-  endif()
-
-  # Observe that if the opmcommon library has been built as a shared library the
-  # python library opmcommon_python will in general not find it runtime while
-  # testing.
-  add_test(NAME python_tests
-           WORKING_DIRECTORY ${PROJECT_BINARY_DIR}/python
-           COMMAND ${CMAKE_COMMAND} -E env LD_LIBRARY_PATH=${PROJECT_BINARY_DIR}/lib ${PYTHON_EXECUTABLE} setup.py build_ext --dry-run --build-lib ${PROJECT_BINARY_DIR}/python/python/opm test
-           )
-
-  set_target_properties(opmcommon PROPERTIES POSITION_INDEPENDENT_CODE ON)
-  set_directory_properties(PROPERTIES ADDITIONAL_MAKE_CLEAN_FILES ${PROJECT_BINARY_DIR}/python/python)
-
-  # -------------------------------------------------------------------------
-  # Let cmake configure some small shell scripts which can be used to simplify
-  # building, testing and installation of the Python extensions.
-  configure_file(python/setup-build.sh.in tmp/setup-build.sh)
-  file( COPY ${PROJECT_BINARY_DIR}/tmp/setup-build.sh
-        DESTINATION ${PROJECT_BINARY_DIR}
-        FILE_PERMISSIONS OWNER_READ OWNER_WRITE OWNER_EXECUTE )
-
-  configure_file(python/setup-test.sh.in tmp/setup-test.sh)
-  file( COPY ${PROJECT_BINARY_DIR}/tmp/setup-test.sh
-        DESTINATION ${PROJECT_BINARY_DIR}
-        FILE_PERMISSIONS OWNER_READ OWNER_WRITE OWNER_EXECUTE )
-
-  configure_file(python/setup-install.sh.in tmp/setup-install.sh)
-  file( COPY ${PROJECT_BINARY_DIR}/tmp/setup-install.sh
-        DESTINATION ${PROJECT_BINARY_DIR}
-        FILE_PERMISSIONS OWNER_READ OWNER_WRITE OWNER_EXECUTE )
-
-  configure_file(python/enable-python.sh.in enable-python.sh)
-
-  # -------------------------------------------------------------------------
-  # 2: Embed the Python interpreter for keywords like PYACTION and PYINPUT
-  if (OPM_ENABLE_EMBEDDED_PYTHON)
-    add_subdirectory(python/pybind11)
-    target_include_directories(opmcommon PRIVATE "python/pybind11/include;${PYTHON_INCLUDE_DIRS}")
-    target_link_libraries(opmcommon PUBLIC ${PYTHON_LIBRARY})
-
-    add_definitions(-DEMBEDDED_PYTHON)
-  endif()
-endif()

CMakeLists_files.cmake

@@ -1,5 +1,5 @@
 # This file sets up five lists:
-#	MAIN_SOURCE_FILES     List of compilation units  which will be included in
+#	MAIN_SOURCE_FILES     List of compilation units which will be included in
 #	                      the library. If it isn't on this list, it won't be
 #	                      part of the library. Please try to keep it sorted to
 #	                      maintain sanity.
@@ -21,6 +21,7 @@
 #	                      the library needs it.
 
 list (APPEND MAIN_SOURCE_FILES
+      examples/test_util/EclFile.cpp
       src/opm/common/data/SimulationDataContainer.cpp
       src/opm/common/OpmLog/CounterLog.cpp
       src/opm/common/OpmLog/EclipsePRTLog.cpp
@@ -30,38 +31,30 @@ list (APPEND MAIN_SOURCE_FILES
       src/opm/common/OpmLog/OpmLog.cpp
       src/opm/common/OpmLog/StreamLog.cpp
       src/opm/common/OpmLog/TimerLog.cpp
-      src/opm/common/utility/ActiveGridCells.cpp
-      src/opm/common/utility/FileSystem.cpp
       src/opm/common/utility/numeric/MonotCubicInterpolator.cpp
       src/opm/common/utility/parameters/Parameter.cpp
       src/opm/common/utility/parameters/ParameterGroup.cpp
       src/opm/common/utility/parameters/ParameterTools.cpp
       src/opm/common/utility/numeric/calculateCellVol.cpp
-      src/opm/common/utility/TimeService.cpp
 )
 if(ENABLE_ECL_INPUT)
   list(APPEND MAIN_SOURCE_FILES
     src/opm/json/JsonObject.cpp
     src/opm/parser/eclipse/Deck/Deck.cpp
     src/opm/parser/eclipse/Deck/DeckItem.cpp
-    src/opm/parser/eclipse/Deck/DeckValue.cpp
     src/opm/parser/eclipse/Deck/DeckKeyword.cpp
     src/opm/parser/eclipse/Deck/DeckRecord.cpp
     src/opm/parser/eclipse/Deck/DeckOutput.cpp
-    src/opm/parser/eclipse/Deck/DeckSection.cpp
-    src/opm/parser/eclipse/Deck/UDAValue.cpp
-    src/opm/parser/eclipse/Python/Python.cpp
-    src/opm/parser/eclipse/EclipseState/AquiferConfig.cpp
+    src/opm/parser/eclipse/Deck/Section.cpp
     src/opm/parser/eclipse/EclipseState/AquiferCT.cpp
     src/opm/parser/eclipse/EclipseState/Aquifetp.cpp
     src/opm/parser/eclipse/EclipseState/Aquancon.cpp
     src/opm/parser/eclipse/EclipseState/checkDeck.cpp
+    src/opm/parser/eclipse/EclipseState/Eclipse3DProperties.cpp
     src/opm/parser/eclipse/EclipseState/EclipseConfig.cpp
     src/opm/parser/eclipse/EclipseState/EclipseState.cpp
     src/opm/parser/eclipse/EclipseState/EndpointScaling.cpp
     src/opm/parser/eclipse/EclipseState/Edit/EDITNNC.cpp
-    src/opm/parser/eclipse/EclipseState/Grid/FieldProps.cpp
-    src/opm/parser/eclipse/EclipseState/Grid/FieldPropsManager.cpp
     src/opm/parser/eclipse/EclipseState/Grid/Box.cpp
     src/opm/parser/eclipse/EclipseState/Grid/BoxManager.cpp
     src/opm/parser/eclipse/EclipseState/Grid/EclipseGrid.cpp
@@ -70,81 +63,63 @@ if(ENABLE_ECL_INPUT)
     src/opm/parser/eclipse/EclipseState/Grid/Fault.cpp
     src/opm/parser/eclipse/EclipseState/Grid/FaultFace.cpp
     src/opm/parser/eclipse/EclipseState/Grid/GridDims.cpp
+    src/opm/parser/eclipse/EclipseState/Grid/GridProperties.cpp
+    src/opm/parser/eclipse/EclipseState/Grid/GridProperty.cpp
     src/opm/parser/eclipse/EclipseState/Grid/MULTREGTScanner.cpp
     src/opm/parser/eclipse/EclipseState/Grid/NNC.cpp
-    src/opm/parser/eclipse/EclipseState/Grid/Operate.cpp
     src/opm/parser/eclipse/EclipseState/Grid/PinchMode.cpp
     src/opm/parser/eclipse/EclipseState/Grid/SatfuncPropertyInitializers.cpp
     src/opm/parser/eclipse/EclipseState/Grid/setKeywordBox.cpp
     src/opm/parser/eclipse/EclipseState/Grid/TransMult.cpp
     src/opm/parser/eclipse/EclipseState/InitConfig/Equil.cpp
-    src/opm/parser/eclipse/EclipseState/InitConfig/FoamConfig.cpp
     src/opm/parser/eclipse/EclipseState/InitConfig/InitConfig.cpp
     src/opm/parser/eclipse/EclipseState/IOConfig/IOConfig.cpp
     src/opm/parser/eclipse/EclipseState/IOConfig/RestartConfig.cpp
     src/opm/parser/eclipse/EclipseState/Runspec.cpp
     src/opm/parser/eclipse/EclipseState/Schedule/Action/ActionAST.cpp
     src/opm/parser/eclipse/EclipseState/Schedule/Action/ActionContext.cpp
-    src/opm/parser/eclipse/EclipseState/Schedule/Action/ActionResult.cpp
-    src/opm/parser/eclipse/EclipseState/Schedule/Action/Actdims.cpp
     src/opm/parser/eclipse/EclipseState/Schedule/Action/Actions.cpp
     src/opm/parser/eclipse/EclipseState/Schedule/Action/ActionX.cpp
     src/opm/parser/eclipse/EclipseState/Schedule/Action/ActionParser.cpp
     src/opm/parser/eclipse/EclipseState/Schedule/Action/ActionValue.cpp
     src/opm/parser/eclipse/EclipseState/Schedule/Action/ASTNode.cpp
-    src/opm/parser/eclipse/EclipseState/Schedule/Action/Condition.cpp
-    src/opm/parser/eclipse/EclipseState/Schedule/Action/PyAction.cpp
     src/opm/parser/eclipse/EclipseState/Schedule/ArrayDimChecker.cpp
     src/opm/parser/eclipse/EclipseState/Schedule/Events.cpp
-    src/opm/parser/eclipse/EclipseState/Schedule/Group/Group.cpp
-    src/opm/parser/eclipse/EclipseState/Schedule/Group/GuideRate.cpp
-    src/opm/parser/eclipse/EclipseState/Schedule/Group/GuideRateConfig.cpp
-    src/opm/parser/eclipse/EclipseState/Schedule/Group/GuideRateModel.cpp
-    src/opm/parser/eclipse/EclipseState/Schedule/Group/GConSale.cpp
-    src/opm/parser/eclipse/EclipseState/Schedule/Group/GConSump.cpp
-    src/opm/parser/eclipse/EclipseState/Schedule/Group/GTNode.cpp
-    src/opm/parser/eclipse/EclipseState/Schedule/Well/injection.cpp
+    src/opm/parser/eclipse/EclipseState/Schedule/Group.cpp
+    src/opm/parser/eclipse/EclipseState/Schedule/GroupTree.cpp
+    src/opm/parser/eclipse/EclipseState/Schedule/injection.cpp
     src/opm/parser/eclipse/EclipseState/Schedule/MessageLimits.cpp
-    src/opm/parser/eclipse/EclipseState/Schedule/MSW/icd.cpp
     src/opm/parser/eclipse/EclipseState/Schedule/MSW/Compsegs.cpp
     src/opm/parser/eclipse/EclipseState/Schedule/MSW/Segment.cpp
     src/opm/parser/eclipse/EclipseState/Schedule/MSW/WellSegments.cpp
     src/opm/parser/eclipse/EclipseState/Schedule/MSW/updatingConnectionsWithSegments.cpp
-    src/opm/parser/eclipse/EclipseState/Schedule/MSW/SpiralICD.cpp
-    src/opm/parser/eclipse/EclipseState/Schedule/MSW/Valve.cpp
     src/opm/parser/eclipse/EclipseState/Schedule/OilVaporizationProperties.cpp
     src/opm/parser/eclipse/EclipseState/Schedule/RFTConfig.cpp
     src/opm/parser/eclipse/EclipseState/Schedule/Schedule.cpp
-    src/opm/parser/eclipse/EclipseState/Schedule/ScheduleTypes.cpp
+    src/opm/parser/eclipse/EclipseState/Schedule/ScheduleEnums.cpp
     src/opm/parser/eclipse/EclipseState/Schedule/SummaryState.cpp
     src/opm/parser/eclipse/EclipseState/Schedule/TimeMap.cpp
+    src/opm/parser/eclipse/EclipseState/Schedule/Tuning.cpp
     src/opm/parser/eclipse/EclipseState/Schedule/Well/Connection.cpp
-    src/opm/parser/eclipse/EclipseState/Schedule/eval_uda.cpp
     src/opm/parser/eclipse/EclipseState/Schedule/Well/Well.cpp
     src/opm/parser/eclipse/EclipseState/Schedule/Well/WellConnections.cpp
     src/opm/parser/eclipse/EclipseState/Schedule/Well/WList.cpp
     src/opm/parser/eclipse/EclipseState/Schedule/Well/WListManager.cpp
     src/opm/parser/eclipse/EclipseState/Schedule/Well/WellEconProductionLimits.cpp
-    src/opm/parser/eclipse/EclipseState/Schedule/Well/WellFoamProperties.cpp
     src/opm/parser/eclipse/EclipseState/Schedule/Well/WellInjectionProperties.cpp
     src/opm/parser/eclipse/EclipseState/Schedule/Well/WellPolymerProperties.cpp
-    src/opm/parser/eclipse/EclipseState/Schedule/Well/WellBrineProperties.cpp
     src/opm/parser/eclipse/EclipseState/Schedule/Well/WellTracerProperties.cpp
     src/opm/parser/eclipse/EclipseState/Schedule/Well/WellProductionProperties.cpp
     src/opm/parser/eclipse/EclipseState/Schedule/Well/WellTestConfig.cpp
     src/opm/parser/eclipse/EclipseState/Schedule/Well/WellTestState.cpp
-    src/opm/parser/eclipse/EclipseState/SimulationConfig/BCConfig.cpp
-    src/opm/parser/eclipse/EclipseState/SimulationConfig/RockConfig.cpp
     src/opm/parser/eclipse/EclipseState/SimulationConfig/SimulationConfig.cpp
     src/opm/parser/eclipse/EclipseState/SimulationConfig/ThresholdPressure.cpp
     src/opm/parser/eclipse/EclipseState/SummaryConfig/SummaryConfig.cpp
     src/opm/parser/eclipse/EclipseState/Tables/ColumnSchema.cpp
-    src/opm/parser/eclipse/EclipseState/Tables/DenT.cpp
     src/opm/parser/eclipse/EclipseState/Tables/JFunc.cpp
     src/opm/parser/eclipse/EclipseState/Tables/PvtxTable.cpp
     src/opm/parser/eclipse/EclipseState/Tables/SimpleTable.cpp
     src/opm/parser/eclipse/EclipseState/Tables/PolyInjTables.cpp
-    src/opm/parser/eclipse/EclipseState/Tables/StandardCond.cpp
     src/opm/parser/eclipse/EclipseState/Tables/TableColumn.cpp
     src/opm/parser/eclipse/EclipseState/Tables/TableContainer.cpp
     src/opm/parser/eclipse/EclipseState/Tables/TableIndex.cpp
@@ -153,22 +128,18 @@ if(ENABLE_ECL_INPUT)
     src/opm/parser/eclipse/EclipseState/Tables/Tables.cpp
     src/opm/parser/eclipse/EclipseState/Tables/Rock2dTable.cpp
     src/opm/parser/eclipse/EclipseState/Tables/Rock2dtrTable.cpp
-    src/opm/parser/eclipse/EclipseState/Tables/PvtwsaltTable.cpp
-    src/opm/parser/eclipse/EclipseState/Tables/BrineDensityTable.cpp
-    src/opm/parser/eclipse/EclipseState/Tables/SolventDensityTable.cpp
     src/opm/parser/eclipse/EclipseState/Schedule/UDQ/UDQASTNode.cpp
     src/opm/parser/eclipse/EclipseState/Schedule/UDQ/UDQParams.cpp
     src/opm/parser/eclipse/EclipseState/Schedule/UDQ/UDQParser.cpp
     src/opm/parser/eclipse/EclipseState/Schedule/UDQ/UDQSet.cpp
-    src/opm/parser/eclipse/EclipseState/Schedule/UDQ/UDQActive.cpp
+    src/opm/parser/eclipse/EclipseState/Schedule/UDQ/UDQWellSet.cpp
     src/opm/parser/eclipse/EclipseState/Schedule/UDQ/UDQAssign.cpp
     src/opm/parser/eclipse/EclipseState/Schedule/UDQ/UDQDefine.cpp
     src/opm/parser/eclipse/EclipseState/Schedule/UDQ/UDQEnums.cpp
-    src/opm/parser/eclipse/EclipseState/Schedule/UDQ/UDQConfig.cpp
+    src/opm/parser/eclipse/EclipseState/Schedule/UDQ/UDQInput.cpp
     src/opm/parser/eclipse/EclipseState/Schedule/UDQ/UDQContext.cpp
     src/opm/parser/eclipse/EclipseState/Schedule/UDQ/UDQFunction.cpp
     src/opm/parser/eclipse/EclipseState/Schedule/UDQ/UDQFunctionTable.cpp
-    src/opm/parser/eclipse/EclipseState/Schedule/UDQ/UDQInput.cpp
     src/opm/parser/eclipse/EclipseState/Schedule/VFPInjTable.cpp
     src/opm/parser/eclipse/EclipseState/Schedule/VFPProdTable.cpp
     src/opm/parser/eclipse/Parser/ErrorGuard.cpp
@@ -178,88 +149,34 @@ if(ENABLE_ECL_INPUT)
     src/opm/parser/eclipse/Parser/ParserItem.cpp
     src/opm/parser/eclipse/Parser/ParserKeyword.cpp
     src/opm/parser/eclipse/Parser/ParserRecord.cpp
-    src/opm/parser/eclipse/Parser/raw/RawKeyword.cpp
-    src/opm/parser/eclipse/Parser/raw/RawRecord.cpp
-    src/opm/parser/eclipse/Parser/raw/StarToken.cpp
+    src/opm/parser/eclipse/RawDeck/RawKeyword.cpp
+    src/opm/parser/eclipse/RawDeck/RawRecord.cpp
+    src/opm/parser/eclipse/RawDeck/StarToken.cpp
     src/opm/parser/eclipse/Units/Dimension.cpp
     src/opm/parser/eclipse/Units/UnitSystem.cpp
     src/opm/parser/eclipse/Utility/Functional.cpp
     src/opm/parser/eclipse/Utility/Stringview.cpp
   )
 
-
-# This list is only used to register a CMake dependency between the the python
-# extension and the corresponding C++ wrapper files. The cpp files actually
-# listed here are repeated in the actual definition of the extension in the
-# setup.py file.
-  list( APPEND PYTHON_CXX_SOURCE_FILES
-          python/cxx/connection.cpp
-          python/cxx/converters.cpp
-          python/cxx/deck.cpp
-          python/cxx/deck_keyword.cpp
-          python/cxx/eclipse_io.cpp
-          python/cxx/field_props.cpp
-          python/cxx/eclipse_config.cpp
-          python/cxx/eclipse_grid.cpp
-          python/cxx/eclipse_state.cpp
-          python/cxx/export.cpp
-          python/cxx/group.cpp
-          python/cxx/log.cpp
-          python/cxx/parsecontext.cpp
-          python/cxx/parser.cpp
-          python/cxx/schedule.cpp
-          python/cxx/summary_state.cpp
-          python/cxx/table_manager.cpp
-          python/cxx/unit_system.cpp
-          python/cxx/well.cpp
-          )
-
-  if (OPM_ENABLE_EMBEDDED_PYTHON)
-    set_source_files_properties(${PYTHON_CXX_SOURCE_FILES} PROPERTIES COMPILE_FLAGS -Wno-shadow)
-    set_source_files_properties(src/opm/parser/eclipse/Python/PythonInterp.cpp PROPERTIES COMPILE_FLAGS -Wno-shadow)
-    set_source_files_properties(src/opm/parser/eclipse/EclipseState/Schedule/Action/PyAction.cpp PROPERTIES COMPILE_FLAGS -Wno-shadow)
-    list( APPEND MAIN_SOURCE_FILES src/opm/parser/eclipse/Python/PythonInterp.cpp ${PYTHON_CXX_SOURCE_FILES})
-  endif()
-
-  list( APPEND PYTHON_CXX_DEPENDS ${PYTHON_CXX_SOURCE_FILES}
-    python/cxx/converters.hpp
-    python/cxx/export.hpp)
-
   if(NOT cjson_FOUND)
     list(APPEND MAIN_SOURCE_FILES external/cjson/cJSON.c)
   endif()
 endif()
 if(ENABLE_ECL_OUTPUT)
   list( APPEND MAIN_SOURCE_FILES
-          src/opm/io/eclipse/EclFile.cpp
-          src/opm/io/eclipse/EclOutput.cpp
-          src/opm/io/eclipse/EclUtil.cpp
-          src/opm/io/eclipse/EGrid.cpp
-          src/opm/io/eclipse/ERft.cpp
-          src/opm/io/eclipse/ERst.cpp
-          src/opm/io/eclipse/ESmry.cpp
-          src/opm/io/eclipse/OutputStream.cpp
-          src/opm/io/eclipse/rst/connection.cpp
-          src/opm/io/eclipse/rst/group.cpp
-          src/opm/io/eclipse/rst/header.cpp
-          src/opm/io/eclipse/rst/segment.cpp
-          src/opm/io/eclipse/rst/state.cpp
-          src/opm/io/eclipse/rst/well.cpp
-          src/opm/output/eclipse/AggregateActionxData.cpp
           src/opm/output/eclipse/AggregateConnectionData.cpp
           src/opm/output/eclipse/AggregateGroupData.cpp
           src/opm/output/eclipse/AggregateMSWData.cpp
-          src/opm/output/eclipse/AggregateUDQData.cpp
           src/opm/output/eclipse/AggregateWellData.cpp
-          src/opm/output/eclipse/CreateActionxDims.cpp
           src/opm/output/eclipse/CreateDoubHead.cpp
           src/opm/output/eclipse/CreateInteHead.cpp
           src/opm/output/eclipse/CreateLogiHead.cpp
-          src/opm/output/eclipse/CreateUdqDims.cpp
+          src/opm/output/eclipse/WellDataSerializers.cpp
           src/opm/output/eclipse/DoubHEAD.cpp
           src/opm/output/eclipse/EclipseGridInspector.cpp
           src/opm/output/eclipse/EclipseIO.cpp
           src/opm/output/eclipse/InteHEAD.cpp
+          src/opm/output/eclipse/libECLRestart.cpp
           src/opm/output/eclipse/LinearisedOutputTable.cpp
           src/opm/output/eclipse/LoadRestart.cpp
           src/opm/output/eclipse/LogiHEAD.cpp
@@ -268,14 +185,12 @@ if(ENABLE_ECL_OUTPUT)
           src/opm/output/eclipse/Tables.cpp
           src/opm/output/eclipse/RegionCache.cpp
           src/opm/output/eclipse/RestartValue.cpp
-          src/opm/output/eclipse/WriteInit.cpp
-          src/opm/output/eclipse/WriteRFT.cpp
           src/opm/output/data/Solution.cpp
       )
 endif()
 
 list (APPEND TEST_SOURCE_FILES
-      tests/test_ActiveGridCells.cpp
+      tests/test_EclFile.cpp
       tests/test_calculateCellVol.cpp
       tests/test_cmp.cpp
       tests/test_cubic.cpp
@@ -283,7 +198,6 @@ list (APPEND TEST_SOURCE_FILES
       tests/test_nonuniformtablelinear.cpp
       tests/test_OpmLog.cpp
       tests/test_param.cpp
-      tests/test_RootFinders.cpp
       tests/test_SimulationDataContainer.cpp
       tests/test_sparsevector.cpp
       tests/test_uniformtablelinear.cpp
@@ -292,26 +206,27 @@ if(ENABLE_ECL_INPUT)
   list(APPEND TEST_SOURCE_FILES
     tests/parser/ACTIONX.cpp
     tests/parser/ADDREGTests.cpp
-    tests/parser/AquiferTests.cpp
+    tests/parser/AquiferCTTests.cpp
+    tests/parser/AquifetpTests.cpp
+    tests/parser/AqudimsTests.cpp
+    tests/parser/AquanconTests.cpp
     tests/parser/BoxTests.cpp
     tests/parser/ColumnSchemaTests.cpp
     tests/parser/ConnectionTests.cpp
     tests/parser/COMPSEGUnits.cpp
     tests/parser/CopyRegTests.cpp
-    tests/parser/DeckValueTests.cpp
     tests/parser/DeckTests.cpp
     tests/parser/DynamicStateTests.cpp
     tests/parser/DynamicVectorTests.cpp
+    tests/parser/Eclipse3DPropertiesTests.cpp
     tests/parser/EclipseGridTests.cpp
-    tests/parser/EmbeddedPython.cpp
     tests/parser/EqualRegTests.cpp
     tests/parser/EventTests.cpp
     tests/parser/FaceDirTests.cpp
     tests/parser/FaultTests.cpp
-    tests/parser/FieldPropsTests.cpp
-    tests/parser/FoamTests.cpp
     tests/parser/FunctionalTests.cpp
     tests/parser/GeomodifierTests.cpp
+    tests/parser/GridPropertyTests.cpp
     tests/parser/GroupTests.cpp
     tests/parser/InitConfigTest.cpp
     tests/parser/IOConfigTests.cpp
@@ -322,16 +237,12 @@ if(ENABLE_ECL_INPUT)
     tests/parser/OrderedMapTests.cpp
     tests/parser/ParseContextTests.cpp
     tests/parser/ParseContext_EXIT1.cpp
-    tests/parser/ParseDATAWithDefault.cpp
-    tests/parser/PYACTION.cpp
+    tests/parser/PORVTests.cpp
     tests/parser/RawKeywordTests.cpp
-    tests/parser/ResinsightTest.cpp
     tests/parser/RestartConfigTests.cpp
-    tests/parser/RFTConfigTests.cpp
     tests/parser/RockTableTests.cpp
     tests/parser/RunspecTests.cpp
-    tests/parser/SaltTableTests.cpp
-    tests/parser/ScheduleRestartTests.cpp
+    tests/parser/SatfuncPropertyInitializersTests.cpp
     tests/parser/ScheduleTests.cpp
     tests/parser/SectionTests.cpp
     tests/parser/SimpleTableTests.cpp
@@ -359,30 +270,28 @@ if(ENABLE_ECL_INPUT)
 endif()
 if(ENABLE_ECL_OUTPUT)
   list (APPEND TEST_SOURCE_FILES
-          tests/test_AggregateActionxData.cpp
           tests/test_AggregateWellData.cpp
           tests/test_AggregateGroupData.cpp
           tests/test_AggregateMSWData.cpp
           tests/test_AggregateConnectionData.cpp
-          tests/test_AggregateUDQData.cpp
           tests/test_ArrayDimChecker.cpp
+          tests/test_CharArrayNullTerm.cpp
           tests/test_EclipseIO.cpp
           tests/test_DoubHEAD.cpp
           tests/test_InteHEAD.cpp
           tests/test_LinearisedOutputTable.cpp
           tests/test_LogiHEAD.cpp
-          tests/test_OutputStream.cpp
           tests/test_regionCache.cpp
-          tests/test_PaddedOutputString.cpp
           tests/test_Restart.cpp
           tests/test_RFT.cpp
-          tests/test_rst.cpp
           tests/test_Solution.cpp
           tests/test_Summary.cpp
           tests/test_Tables.cpp
           tests/test_Wells.cpp
           tests/test_WindowedArray.cpp
-          tests/test_restartwellinfo.cpp
+          tests/test_writenumwells.cpp
+          tests/test_serialize_ICON.cpp
+          tests/test_serialize_SCON.cpp
       )
 endif()
 
@@ -391,11 +300,9 @@ list (APPEND TEST_DATA_FILES
 )
 if(ENABLE_ECL_OUTPUT)
   list (APPEND TEST_DATA_FILES
-          tests/expect-wdims.chldg.err.out
           tests/expect-wdims.err.out
-          tests/BASE_SIM.DATA
-          tests/BASE_SIM_THPRES.DATA
-          tests/RESTART_SIM.DATA
+          tests/FIRST_SIM.DATA
+          tests/FIRST_SIM_THPRES.DATA
           tests/summary_deck.DATA
           tests/group_group.DATA
           tests/testblackoilstate3.DATA
@@ -405,44 +312,18 @@ if(ENABLE_ECL_OUTPUT)
           tests/SUMMARY_EFF_FAC.DATA
           tests/SPE1CASE1.DATA
           tests/SPE1CASE1.SMSPEC
-          tests/SPE1CASE1A.SMSPEC
           tests/SPE9_CP_PACKED.DATA
           tests/SOFR_TEST.DATA
-          tests/UDQ_TEST_WCONPROD_IUAD-2.DATA
-          tests/UDQ_ACTIONX_TEST1.DATA
-          tests/include_example_pvt.txt
-          tests/include_example_summary.txt
-          tests/include_sgof.txt
-          tests/include_swof.txt
-          tests/include_grid_3x5x4.grdecl
-          tests/SPE1CASE2.DATA
-          tests/SPE1CASE2_RESTART.DATA
-          tests/SPE1CASE2.X0060
       )
 endif()
 
 list (APPEND EXAMPLE_SOURCE_FILES
 )
 if(ENABLE_ECL_INPUT)
-  list (APPEND TEST_DATA_FILES
-    tests/ECLFILE.INIT
-    tests/ECLFILE.FINIT
-    tests/SPE1CASE1.EGRID
-    tests/SPE1CASE1.RFT
-    tests/SPE1_TESTCASE.UNRST
-    tests/SPE1_TESTCASE.FUNRST
-    tests/SPE1_TESTCASE.F0025
-    tests/SPE1_TESTCASE.X0025
-    tests/SPE1CASE1.UNSMRY
-    tests/SPE1CASE1A.UNSMRY
-    tests/SPE1CASE1_RST60.SMSPEC
-    tests/SPE1CASE1_RST60.UNSMRY
-  )
   list (APPEND EXAMPLE_SOURCE_FILES
     examples/opmi.cpp
     examples/opmpack.cpp
     examples/opmhash.cpp
-    tests/rst_load.cpp
   )
 endif()
 
@@ -459,6 +340,8 @@ if(ENABLE_ECL_INPUT)
 endif()
 
 list( APPEND PUBLIC_HEADER_FILES
+      examples/test_util/EclFile.hpp
+      examples/test_util/data/EclIOdata.hpp
       opm/common/ErrorMacros.hpp
       opm/common/Exceptions.hpp
       opm/common/data/SimulationDataContainer.hpp
@@ -469,12 +352,9 @@ list( APPEND PUBLIC_HEADER_FILES
       opm/common/OpmLog/LogUtil.hpp
       opm/common/OpmLog/MessageFormatter.hpp
       opm/common/OpmLog/MessageLimiter.hpp
-      opm/common/OpmLog/Location.hpp
       opm/common/OpmLog/OpmLog.hpp
       opm/common/OpmLog/StreamLog.hpp
       opm/common/OpmLog/TimerLog.hpp
-      opm/common/utility/ActiveGridCells.hpp
-      opm/common/utility/FileSystem.hpp
       opm/common/utility/numeric/cmp.hpp
       opm/common/utility/platform_dependent/disable_warnings.h
       opm/common/utility/platform_dependent/reenable_warnings.h
@@ -494,7 +374,6 @@ list( APPEND PUBLIC_HEADER_FILES
       opm/common/utility/parameters/ParameterStrings.hpp
       opm/common/utility/parameters/ParameterTools.hpp
       opm/common/utility/numeric/calculateCellVol.hpp
-      opm/common/utility/TimeService.hpp
 )
 if(ENABLE_ECL_INPUT)
   list(APPEND PUBLIC_HEADER_FILES
@@ -519,31 +398,29 @@ if(ENABLE_ECL_INPUT)
        opm/parser/eclipse/Parser/ParserConst.hpp
        opm/parser/eclipse/EclipseState/InitConfig/InitConfig.hpp
        opm/parser/eclipse/EclipseState/InitConfig/Equil.hpp
-       opm/parser/eclipse/EclipseState/InitConfig/FoamConfig.hpp
        opm/parser/eclipse/EclipseState/Util/Value.hpp
-       opm/parser/eclipse/EclipseState/Util/IOrderSet.hpp
        opm/parser/eclipse/EclipseState/Util/OrderedMap.hpp
        opm/parser/eclipse/EclipseState/SummaryConfig/SummaryConfig.hpp
        opm/parser/eclipse/EclipseState/Edit/EDITNNC.hpp
        opm/parser/eclipse/EclipseState/Grid/GridDims.hpp
        opm/parser/eclipse/EclipseState/Grid/TransMult.hpp
+       opm/parser/eclipse/EclipseState/Grid/GridProperties.hpp
        opm/parser/eclipse/EclipseState/Grid/PinchMode.hpp
        opm/parser/eclipse/EclipseState/Grid/MULTREGTScanner.hpp
        opm/parser/eclipse/EclipseState/Grid/FaultCollection.hpp
        opm/parser/eclipse/EclipseState/Grid/SatfuncPropertyInitializers.hpp
        opm/parser/eclipse/EclipseState/Grid/Fault.hpp
        opm/parser/eclipse/EclipseState/Grid/Box.hpp
-       opm/parser/eclipse/EclipseState/Grid/FieldPropsManager.hpp
+       opm/parser/eclipse/EclipseState/Grid/GridProperty.hpp
        opm/parser/eclipse/EclipseState/Grid/FaultFace.hpp
        opm/parser/eclipse/EclipseState/Grid/NNC.hpp
        opm/parser/eclipse/EclipseState/Grid/EclipseGrid.hpp
        opm/parser/eclipse/EclipseState/Grid/BoxManager.hpp
        opm/parser/eclipse/EclipseState/Grid/FaceDir.hpp
        opm/parser/eclipse/EclipseState/Grid/MinpvMode.hpp
+       opm/parser/eclipse/EclipseState/Eclipse3DProperties.hpp
        opm/parser/eclipse/EclipseState/EndpointScaling.hpp
-       opm/parser/eclipse/EclipseState/Tables/DenT.hpp
        opm/parser/eclipse/EclipseState/Tables/SimpleTable.hpp
-       opm/parser/eclipse/EclipseState/Tables/StandardCond.hpp
        opm/parser/eclipse/EclipseState/Tables/PolyInjTable.hpp
        opm/parser/eclipse/EclipseState/Tables/PdvdTable.hpp
        opm/parser/eclipse/EclipseState/Tables/TlpmixpaTable.hpp
@@ -553,10 +430,6 @@ if(ENABLE_ECL_INPUT)
        opm/parser/eclipse/EclipseState/Tables/Regdims.hpp
        opm/parser/eclipse/EclipseState/Tables/Eqldims.hpp
        opm/parser/eclipse/EclipseState/Tables/SpecrockTable.hpp
-       opm/parser/eclipse/EclipseState/Tables/PvtwsaltTable.hpp
-       opm/parser/eclipse/EclipseState/Tables/BrineDensityTable.hpp
-       opm/parser/eclipse/EclipseState/Tables/SolventDensityTable.hpp
-       opm/parser/eclipse/EclipseState/Tables/SaltvdTable.hpp
        opm/parser/eclipse/EclipseState/Tables/PlydhflfTable.hpp
        opm/parser/eclipse/EclipseState/Tables/PlymwinjTable.hpp
        opm/parser/eclipse/EclipseState/Tables/PlyshlogTable.hpp
@@ -587,8 +460,6 @@ if(ENABLE_ECL_INPUT)
        opm/parser/eclipse/EclipseState/Tables/TableContainer.hpp
        opm/parser/eclipse/EclipseState/Tables/AqutabTable.hpp
        opm/parser/eclipse/EclipseState/Tables/PlyadsTable.hpp
-       opm/parser/eclipse/EclipseState/Tables/FoamadsTable.hpp
-       opm/parser/eclipse/EclipseState/Tables/FoammobTable.hpp
        opm/parser/eclipse/EclipseState/Tables/PbvdTable.hpp
        opm/parser/eclipse/EclipseState/Tables/SorwmisTable.hpp
        opm/parser/eclipse/EclipseState/Tables/PlymaxTable.hpp
@@ -617,36 +488,25 @@ if(ENABLE_ECL_INPUT)
        opm/parser/eclipse/EclipseState/EclipseState.hpp
        opm/parser/eclipse/EclipseState/EclipseConfig.hpp
        opm/parser/eclipse/EclipseState/Aquancon.hpp
-       opm/parser/eclipse/EclipseState/AquiferConfig.hpp
        opm/parser/eclipse/EclipseState/AquiferCT.hpp
        opm/parser/eclipse/EclipseState/Aquifetp.hpp
        opm/parser/eclipse/EclipseState/Schedule/Action/ActionAST.hpp
        opm/parser/eclipse/EclipseState/Schedule/Action/ActionContext.hpp
-       opm/parser/eclipse/EclipseState/Schedule/Action/ActionResult.hpp
-       opm/parser/eclipse/EclipseState/Schedule/Action/ActionValue.hpp
-       opm/parser/eclipse/EclipseState/Schedule/Action/Actdims.hpp
        opm/parser/eclipse/EclipseState/Schedule/Action/Actions.hpp
        opm/parser/eclipse/EclipseState/Schedule/Action/ActionX.hpp
-       opm/parser/eclipse/EclipseState/Schedule/Action/Condition.hpp
-       opm/parser/eclipse/EclipseState/Schedule/Action/ASTNode.hpp
-       opm/parser/eclipse/EclipseState/Schedule/Action/PyAction.hpp
        opm/parser/eclipse/EclipseState/Schedule/ArrayDimChecker.hpp
        opm/parser/eclipse/EclipseState/Schedule/TimeMap.hpp
        opm/parser/eclipse/EclipseState/Schedule/VFPInjTable.hpp
        opm/parser/eclipse/EclipseState/Schedule/VFPProdTable.hpp
        opm/parser/eclipse/EclipseState/Schedule/Well/Connection.hpp
-       opm/parser/eclipse/EclipseState/Schedule/Well/ProductionControls.hpp
-       opm/parser/eclipse/EclipseState/Schedule/Well/InjectionControls.hpp
        opm/parser/eclipse/EclipseState/Schedule/Well/Well.hpp
+       opm/parser/eclipse/EclipseState/Schedule/Well/WellInjectionProperties.hpp
        opm/parser/eclipse/EclipseState/Schedule/Well/WList.hpp
        opm/parser/eclipse/EclipseState/Schedule/Well/WListManager.hpp
        opm/parser/eclipse/EclipseState/Schedule/Well/WellEconProductionLimits.hpp
-       opm/parser/eclipse/EclipseState/Schedule/Well/WellFoamProperties.hpp
-       opm/parser/eclipse/EclipseState/Schedule/Well/WellBrineProperties.hpp
-       opm/parser/eclipse/EclipseState/Schedule/Well/WellInjectionProperties.hpp
        opm/parser/eclipse/EclipseState/Schedule/Well/WellPolymerProperties.hpp
-       opm/parser/eclipse/EclipseState/Schedule/Well/WellProductionProperties.hpp
        opm/parser/eclipse/EclipseState/Schedule/Well/WellTracerProperties.hpp
+       opm/parser/eclipse/EclipseState/Schedule/Well/WellProductionProperties.hpp
        opm/parser/eclipse/EclipseState/Schedule/Well/WellTestConfig.hpp
        opm/parser/eclipse/EclipseState/Schedule/Well/WellTestState.hpp
        opm/parser/eclipse/EclipseState/Schedule/Well/WellConnections.hpp
@@ -654,98 +514,67 @@ if(ENABLE_ECL_INPUT)
        opm/parser/eclipse/EclipseState/Schedule/SummaryState.hpp
        opm/parser/eclipse/EclipseState/Schedule/RFTConfig.hpp
        opm/parser/eclipse/EclipseState/Schedule/Schedule.hpp
-       opm/parser/eclipse/EclipseState/Schedule/ScheduleTypes.hpp
        opm/parser/eclipse/EclipseState/Schedule/Tuning.hpp
-       opm/parser/eclipse/EclipseState/Schedule/Group/GTNode.hpp
-       opm/parser/eclipse/EclipseState/Schedule/Group/Group.hpp
-       opm/parser/eclipse/EclipseState/Schedule/Group/GuideRate.hpp
-       opm/parser/eclipse/EclipseState/Schedule/Group/GConSale.hpp
-       opm/parser/eclipse/EclipseState/Schedule/Group/GConSump.hpp
-       opm/parser/eclipse/EclipseState/Schedule/Group/GuideRateConfig.hpp
-       opm/parser/eclipse/EclipseState/Schedule/Group/GuideRateModel.hpp
+       opm/parser/eclipse/EclipseState/Schedule/Group.hpp
        opm/parser/eclipse/EclipseState/Schedule/MessageLimits.hpp
        opm/parser/eclipse/EclipseState/Schedule/Events.hpp
+       opm/parser/eclipse/EclipseState/Schedule/ScheduleEnums.hpp
        opm/parser/eclipse/EclipseState/Schedule/OilVaporizationProperties.hpp
+       opm/parser/eclipse/EclipseState/Schedule/GroupTree.hpp
        opm/parser/eclipse/EclipseState/Schedule/DynamicState.hpp
-       opm/parser/eclipse/EclipseState/Schedule/MSW/icd.hpp
-       opm/parser/eclipse/EclipseState/Schedule/MSW/Segment.hpp
        opm/parser/eclipse/EclipseState/Schedule/MSW/Segment.hpp
        opm/parser/eclipse/EclipseState/Schedule/MSW/WellSegments.hpp
        opm/parser/eclipse/EclipseState/Schedule/MSW/updatingConnectionsWithSegments.hpp
-       opm/parser/eclipse/EclipseState/Schedule/MSW/SpiralICD.hpp
        opm/parser/eclipse/EclipseState/SimulationConfig/ThresholdPressure.hpp
-       opm/parser/eclipse/EclipseState/SimulationConfig/BCConfig.hpp
-       opm/parser/eclipse/EclipseState/SimulationConfig/RockConfig.hpp
        opm/parser/eclipse/EclipseState/SimulationConfig/SimulationConfig.hpp
-       opm/parser/eclipse/EclipseState/Schedule/MSW/Valve.hpp
        opm/parser/eclipse/EclipseState/IOConfig/RestartConfig.hpp
        opm/parser/eclipse/EclipseState/IOConfig/IOConfig.hpp
        opm/parser/eclipse/EclipseState/checkDeck.hpp
        opm/parser/eclipse/EclipseState/Runspec.hpp
        opm/parser/eclipse/EclipseState/Schedule/UDQ/UDQAssign.hpp
-       opm/parser/eclipse/EclipseState/Schedule/UDQ/UDQASTNode.hpp
        opm/parser/eclipse/EclipseState/Schedule/UDQ/UDQDefine.hpp
        opm/parser/eclipse/EclipseState/Schedule/UDQ/UDQContext.hpp
-       opm/parser/eclipse/EclipseState/Schedule/UDQ/UDQConfig.hpp
+       opm/parser/eclipse/EclipseState/Schedule/UDQ/UDQInput.hpp
        opm/parser/eclipse/EclipseState/Schedule/UDQ/UDQEnums.hpp
        opm/parser/eclipse/EclipseState/Schedule/UDQ/UDQParams.hpp
        opm/parser/eclipse/EclipseState/Schedule/UDQ/UDQInput.hpp
-       opm/parser/eclipse/EclipseState/Schedule/UDQ/UDQActive.hpp
+       opm/parser/eclipse/EclipseState/Schedule/UDQ/UDQWellSet.hpp
        opm/parser/eclipse/EclipseState/Schedule/UDQ/UDQSet.hpp
        opm/parser/eclipse/EclipseState/Schedule/UDQ/UDQFunction.hpp
        opm/parser/eclipse/EclipseState/Schedule/UDQ/UDQFunctionTable.hpp
        opm/parser/eclipse/Deck/DeckItem.hpp
        opm/parser/eclipse/Deck/Deck.hpp
-       opm/parser/eclipse/Deck/DeckSection.hpp
+       opm/parser/eclipse/Deck/Section.hpp
        opm/parser/eclipse/Deck/DeckOutput.hpp
-       opm/parser/eclipse/Deck/DeckValue.hpp
        opm/parser/eclipse/Deck/DeckKeyword.hpp
        opm/parser/eclipse/Deck/DeckRecord.hpp
-       opm/parser/eclipse/Deck/UDAValue.hpp
-       opm/parser/eclipse/Deck/value_status.hpp
-       opm/parser/eclipse/Python/Python.hpp)
+       opm/parser/eclipse/RawDeck/StarToken.hpp
+       opm/parser/eclipse/RawDeck/RawEnums.hpp
+       opm/parser/eclipse/RawDeck/RawRecord.hpp
+       opm/parser/eclipse/RawDeck/RawKeyword.hpp
+       opm/parser/eclipse/RawDeck/RawConsts.hpp)
 endif()
 if(ENABLE_ECL_OUTPUT)
   list(APPEND PUBLIC_HEADER_FILES
-        opm/io/eclipse/EclFile.hpp
-        opm/io/eclipse/EclIOdata.hpp
-        opm/io/eclipse/EclOutput.hpp
-        opm/io/eclipse/EclUtil.hpp
-        opm/io/eclipse/EGrid.hpp
-        opm/io/eclipse/ERft.hpp
-        opm/io/eclipse/ERst.hpp
-        opm/io/eclipse/ESmry.hpp
-        opm/io/eclipse/PaddedOutputString.hpp
-        opm/io/eclipse/OutputStream.hpp
-        opm/io/eclipse/rst/connection.hpp
-        opm/io/eclipse/rst/group.hpp
-        opm/io/eclipse/rst/header.hpp
-        opm/io/eclipse/rst/segment.hpp
-        opm/io/eclipse/rst/state.hpp
-        opm/io/eclipse/rst/well.hpp
-        opm/output/data/Aquifer.hpp
         opm/output/data/Cells.hpp
         opm/output/data/Solution.hpp
         opm/output/data/Wells.hpp
-        opm/output/eclipse/VectorItems/aquifer.hpp
         opm/output/eclipse/VectorItems/connection.hpp
         opm/output/eclipse/VectorItems/group.hpp
         opm/output/eclipse/VectorItems/intehead.hpp
-        opm/output/eclipse/VectorItems/logihead.hpp
         opm/output/eclipse/VectorItems/msw.hpp
-        opm/output/eclipse/VectorItems/tabdims.hpp
         opm/output/eclipse/VectorItems/well.hpp
-        opm/output/eclipse/AggregateActionxData.hpp
         opm/output/eclipse/AggregateGroupData.hpp
         opm/output/eclipse/AggregateConnectionData.hpp
         opm/output/eclipse/AggregateMSWData.hpp
-        opm/output/eclipse/AggregateUDQData.hpp
         opm/output/eclipse/AggregateWellData.hpp
+        opm/output/eclipse/CharArrayNullTerm.hpp
         opm/output/eclipse/DoubHEAD.hpp
         opm/output/eclipse/EclipseGridInspector.hpp
         opm/output/eclipse/EclipseIO.hpp
         opm/output/eclipse/EclipseIOUtil.hpp
         opm/output/eclipse/InteHEAD.hpp
+        opm/output/eclipse/libECLRestart.hpp
         opm/output/eclipse/LinearisedOutputTable.hpp
         opm/output/eclipse/LogiHEAD.hpp
         opm/output/eclipse/RegionCache.hpp
@@ -754,8 +583,6 @@ if(ENABLE_ECL_OUTPUT)
         opm/output/eclipse/Summary.hpp
         opm/output/eclipse/Tables.hpp
         opm/output/eclipse/WindowedArray.hpp
-        opm/output/eclipse/WriteInit.hpp
-        opm/output/eclipse/WriteRFT.hpp
         opm/output/eclipse/WriteRestartHelpers.hpp
         opm/output/OutputWriter.hpp
         )

CopyHeaders.cmake

@@ -1,10 +1,14 @@
 execute_process(COMMAND ${CMAKE_COMMAND} -E copy_if_different
-                        ${BASE_DIR}/tmp_gen/ParserInit.cpp
-                        ${BASE_DIR}/ParserInit.cpp)
+                        ${BASE_DIR}/tmp_gen/ParserKeywords.cpp
+                        ${BASE_DIR}/ParserKeywords.cpp)
 
 execute_process(COMMAND ${CMAKE_COMMAND} -E copy_if_different
-                        ${BASE_DIR}/tmp_gen/TestKeywords.cpp
-                        ${BASE_DIR}/TestKeywords.cpp)
+                        ${BASE_DIR}/tmp_gen/inlinekw.cpp
+                        ${BASE_DIR}/inlinekw.cpp)
+
+execute_process(COMMAND ${CMAKE_COMMAND} -E copy_if_different
+                        ${BASE_DIR}/tmp_gen/include/opm/parser/eclipse/Parser/ParserKeywords.hpp
+                        ${BASE_DIR}/include/opm/parser/eclipse/Parser/ParserKeywords.hpp)
 
 
 file(GLOB HDRS ${BASE_DIR}/tmp_gen/include/opm/parser/eclipse/Parser/ParserKeywords/*.hpp)
@@ -14,11 +18,4 @@ foreach(HDR ${HDRS})
   execute_process(COMMAND ${CMAKE_COMMAND} -E copy_if_different
                           ${HDR}
                           ${BASE_DIR}/include/opm/parser/eclipse/Parser/ParserKeywords/${hdr})
-
-endforeach()
-
-foreach (name A B C D E F G H I J K L M N O P Q R S T U V W X Y Z)
-    execute_process(COMMAND ${CMAKE_COMMAND} -E copy_if_different
-                            ${BASE_DIR}/tmp_gen/ParserKeywords/${name}.cpp
-                            ${BASE_DIR}/ParserKeywords/${name}.cpp)
 endforeach()

ExtraTests.cmake

@@ -1,20 +1,25 @@
 # Libs to link tests against
-set(TEST_LIBS opmcommon Boost::unit_test_framework)
+set(TEST_LIBS opmcommon ecl Boost::unit_test_framework)
 set(EXTRA_TESTS)
 
-if (Boost_UNIT_TEST_FRAMEWORK_FOUND)
-
 # Generated source, needs to be here
 opm_add_test(InlineKeywordTest
-             EXE_NAME TestKeywords
-             SOURCES ${PROJECT_BINARY_DIR}/TestKeywords.cpp
+             EXE_NAME inlinekw
+             SOURCES ${PROJECT_BINARY_DIR}/inlinekw.cpp
              LIBRARIES ${TEST_LIBS})
-list(APPEND EXTRA_TESTS TestKeywords)
+list(APPEND EXTRA_TESTS inlinekw)
 
 # Extra compile definitions and extra parameters
 include(cmake/Modules/CheckCaseSensitiveFileSystem.cmake)
 set(_testdir ${PROJECT_SOURCE_DIR}/tests/parser/data)
 
+opm_add_test(LoaderTest
+             SOURCES tests/parser/KeywordLoaderTests.cpp
+                     src/opm/parser/eclipse/Generator/KeywordLoader.cpp
+             LIBRARIES ${TEST_LIBS}
+             TEST_ARGS ${_testdir}/parser/keyword-generator/)
+list(APPEND EXTRA_TESTS LoaderTest)
+
 opm_add_test(ParserTests
              SOURCES tests/parser/ParserTests.cpp
              LIBRARIES ${TEST_LIBS}
@@ -44,13 +49,15 @@ list(APPEND EXTRA_TESTS EclipseStateTests)
 foreach (test BoxTest
               CheckDeckValidity
               EclipseGridCreateFromDeck
-              EDITNNCTests
+	      EDITNNCTests
               IncludeTest
               IntegrationTests
               IOConfigIntegrationTest
               NNCTests
               ParseKEYWORD
+              ParseDATAWithDefault
               Polymer
+              ResinsightTest
               ScheduleCreateFromDeck
               TransMultIntegrationTests)
 
@@ -80,33 +87,17 @@ if(HAVE_OPM_TESTS)
                 ${OPM_TESTS_ROOT}/spe3/SPE3CASE2.DATA
                 ${OPM_TESTS_ROOT}/spe9/SPE9_CP.DATA
                 ${OPM_TESTS_ROOT}/spe9/SPE9_CP_GROUP.DATA
-                ${OPM_TESTS_ROOT}/spe9/SPE9_CP_SHORT.DATA
-                ${OPM_TESTS_ROOT}/spe9/SPE9_CP_SHORT_RESTART.DATA
                 ${OPM_TESTS_ROOT}/spe9/SPE9.DATA
                 ${OPM_TESTS_ROOT}/spe10model1/SPE10_MODEL1.DATA
                 ${OPM_TESTS_ROOT}/spe10model2/SPE10_MODEL2.DATA
-                ${OPM_TESTS_ROOT}/msw_2d_h/2D_H__.DATA
-                ${OPM_TESTS_ROOT}/model2/0_BASE_MODEL2.DATA
-                ${OPM_TESTS_ROOT}/model2/1_MULTREGT_MODEL2.DATA
-                ${OPM_TESTS_ROOT}/model2/2_MULTXYZ_MODEL2.DATA
-                ${OPM_TESTS_ROOT}/model2/3_MULTFLT_MODEL2.DATA
-                ${OPM_TESTS_ROOT}/model2/4_MINPVV_MODEL2.DATA
-                ${OPM_TESTS_ROOT}/model2/5_SWATINIT_MODEL2.DATA
-                ${OPM_TESTS_ROOT}/model2/6_ENDSCALE_MODEL2.DATA
-                ${OPM_TESTS_ROOT}/model2/7_HYSTERESIS_MODEL2.DATA
-                ${OPM_TESTS_ROOT}/model2/8_MULTIPLY_TRANXYZ_MODEL2.DATA
-                ${OPM_TESTS_ROOT}/model2/9_EDITNNC_MODEL2.DATA)
-
+                ${OPM_TESTS_ROOT}/msw_2d_h/2D_H__.DATA )
       get_filename_component(test_name ${deck} NAME_WE)
       opm_add_test(${test_name} NO_COMPILE
                    EXE_NAME parse_write
                    TEST_ARGS ${deck})
   endforeach()
-  opm_add_test("SPE9_CP_GROUP2" NO_COMPILE EXE_NAME parse_write TEST_ARGS "${OPM_TESTS_ROOT}/spe9group/SPE9_CP_GROUP.DATA")
   set_property(TEST NORNE_ATW2013
                PROPERTY ENVIRONMENT "OPM_ERRORS_IGNORE=PARSE_RANDOM_SLASH")
-
-  opm_add_test("RST_LOAD_MSW" NO_COMPILE EXE_NAME rst_load TEST_ARGS "${OPM_TESTS_ROOT}/msw_3d_hfa/opm-simulation-reference/flow/3D_MSW.UNRST")
 endif()
 
 # JSON tests
@@ -115,5 +106,3 @@ opm_add_test(jsonTests
              LIBRARIES ${TEST_LIBS}
              TEST_ARGS ${PROJECT_SOURCE_DIR}/tests/json/example1.json)
 list(APPEND EXTRA_TESTS jsonTests)
-
-endif()

GenerateKeywords.cmake

@@ -1,7 +1,5 @@
 set(genkw_SOURCES src/opm/json/JsonObject.cpp
                   src/opm/parser/eclipse/Parser/createDefaultKeywordList.cpp
-                  src/opm/parser/eclipse/Deck/UDAValue.cpp
-                  src/opm/parser/eclipse/Deck/DeckValue.cpp
                   src/opm/parser/eclipse/Deck/Deck.cpp
                   src/opm/parser/eclipse/Deck/DeckItem.cpp
                   src/opm/parser/eclipse/Deck/DeckKeyword.cpp
@@ -15,9 +13,9 @@ set(genkw_SOURCES src/opm/json/JsonObject.cpp
                   src/opm/parser/eclipse/Parser/ParserItem.cpp
                   src/opm/parser/eclipse/Parser/ParserKeyword.cpp
                   src/opm/parser/eclipse/Parser/ParserRecord.cpp
-                  src/opm/parser/eclipse/Parser/raw/RawKeyword.cpp
-                  src/opm/parser/eclipse/Parser/raw/RawRecord.cpp
-                  src/opm/parser/eclipse/Parser/raw/StarToken.cpp
+                  src/opm/parser/eclipse/RawDeck/RawKeyword.cpp
+                  src/opm/parser/eclipse/RawDeck/RawRecord.cpp
+                  src/opm/parser/eclipse/RawDeck/StarToken.cpp
                   src/opm/parser/eclipse/Units/Dimension.cpp
                   src/opm/parser/eclipse/Units/UnitSystem.cpp
                   src/opm/parser/eclipse/Utility/Stringview.cpp
@@ -32,7 +30,7 @@ if(NOT cjson_FOUND)
 endif()
 add_executable(genkw ${genkw_SOURCES})
 
-target_link_libraries(genkw ${opm-common_LIBRARIES})
+target_link_libraries(genkw ecl Boost::regex Boost::filesystem Boost::system)
 
 # Generate keyword list
 include(src/opm/parser/eclipse/share/keywords/keyword_list.cmake)
@@ -40,74 +38,18 @@ string(REGEX REPLACE "([^;]+)" "${PROJECT_SOURCE_DIR}/src/opm/parser/eclipse/sha
 configure_file(src/opm/parser/eclipse/keyword_list.argv.in keyword_list.argv)
 
 # Generate keyword source
-
-add_custom_command( OUTPUT
-  ${PROJECT_BINARY_DIR}/tmp_gen/ParserKeywords/A.cpp
-  ${PROJECT_BINARY_DIR}/tmp_gen/ParserKeywords/B.cpp
-  ${PROJECT_BINARY_DIR}/tmp_gen/ParserKeywords/C.cpp
-  ${PROJECT_BINARY_DIR}/tmp_gen/ParserKeywords/D.cpp
-  ${PROJECT_BINARY_DIR}/tmp_gen/ParserKeywords/E.cpp
-  ${PROJECT_BINARY_DIR}/tmp_gen/ParserKeywords/F.cpp
-  ${PROJECT_BINARY_DIR}/tmp_gen/ParserKeywords/G.cpp
-  ${PROJECT_BINARY_DIR}/tmp_gen/ParserKeywords/H.cpp
-  ${PROJECT_BINARY_DIR}/tmp_gen/ParserKeywords/I.cpp
-  ${PROJECT_BINARY_DIR}/tmp_gen/ParserKeywords/J.cpp
-  ${PROJECT_BINARY_DIR}/tmp_gen/ParserKeywords/K.cpp
-  ${PROJECT_BINARY_DIR}/tmp_gen/ParserKeywords/L.cpp
-  ${PROJECT_BINARY_DIR}/tmp_gen/ParserKeywords/M.cpp
-  ${PROJECT_BINARY_DIR}/tmp_gen/ParserKeywords/N.cpp
-  ${PROJECT_BINARY_DIR}/tmp_gen/ParserKeywords/O.cpp
-  ${PROJECT_BINARY_DIR}/tmp_gen/ParserKeywords/P.cpp
-  ${PROJECT_BINARY_DIR}/tmp_gen/ParserKeywords/Q.cpp
-  ${PROJECT_BINARY_DIR}/tmp_gen/ParserKeywords/R.cpp
-  ${PROJECT_BINARY_DIR}/tmp_gen/ParserKeywords/S.cpp
-  ${PROJECT_BINARY_DIR}/tmp_gen/ParserKeywords/T.cpp
-  ${PROJECT_BINARY_DIR}/tmp_gen/ParserKeywords/U.cpp
-  ${PROJECT_BINARY_DIR}/tmp_gen/ParserKeywords/V.cpp
-  ${PROJECT_BINARY_DIR}/tmp_gen/ParserKeywords/W.cpp
-  ${PROJECT_BINARY_DIR}/tmp_gen/ParserKeywords/X.cpp
-  ${PROJECT_BINARY_DIR}/tmp_gen/ParserKeywords/Y.cpp
-  ${PROJECT_BINARY_DIR}/tmp_gen/ParserKeywords/Z.cpp
-  ${PROJECT_BINARY_DIR}/tmp_gen/TestKeywords.cpp
-  COMMAND genkw keyword_list.argv
-                  ${PROJECT_BINARY_DIR}/tmp_gen/ParserKeywords
-                  ${PROJECT_BINARY_DIR}/tmp_gen/ParserInit.cpp
+add_custom_command(
+    OUTPUT  ${PROJECT_BINARY_DIR}/tmp_gen/ParserKeywords.cpp ${PROJECT_BINARY_DIR}/tmp_gen/inlinekw.cpp
+    COMMAND genkw keyword_list.argv
+                  ${PROJECT_BINARY_DIR}/tmp_gen/ParserKeywords.cpp
                   ${PROJECT_BINARY_DIR}/tmp_gen/include/
                   opm/parser/eclipse/Parser/ParserKeywords
-                  ${PROJECT_BINARY_DIR}/tmp_gen/TestKeywords.cpp
+                  ${PROJECT_BINARY_DIR}/tmp_gen/inlinekw.cpp
     DEPENDS genkw ${keyword_files} src/opm/parser/eclipse/share/keywords/keyword_list.cmake
 )
 
 # To avoid some rebuilds
-add_custom_command(OUTPUT
-  ${PROJECT_BINARY_DIR}/ParserKeywords/A.cpp
-  ${PROJECT_BINARY_DIR}/ParserKeywords/B.cpp
-  ${PROJECT_BINARY_DIR}/ParserKeywords/C.cpp
-  ${PROJECT_BINARY_DIR}/ParserKeywords/D.cpp
-  ${PROJECT_BINARY_DIR}/ParserKeywords/E.cpp
-  ${PROJECT_BINARY_DIR}/ParserKeywords/F.cpp
-  ${PROJECT_BINARY_DIR}/ParserKeywords/G.cpp
-  ${PROJECT_BINARY_DIR}/ParserKeywords/H.cpp
-  ${PROJECT_BINARY_DIR}/ParserKeywords/I.cpp
-  ${PROJECT_BINARY_DIR}/ParserKeywords/J.cpp
-  ${PROJECT_BINARY_DIR}/ParserKeywords/K.cpp
-  ${PROJECT_BINARY_DIR}/ParserKeywords/L.cpp
-  ${PROJECT_BINARY_DIR}/ParserKeywords/M.cpp
-  ${PROJECT_BINARY_DIR}/ParserKeywords/N.cpp
-  ${PROJECT_BINARY_DIR}/ParserKeywords/O.cpp
-  ${PROJECT_BINARY_DIR}/ParserKeywords/P.cpp
-  ${PROJECT_BINARY_DIR}/ParserKeywords/Q.cpp
-  ${PROJECT_BINARY_DIR}/ParserKeywords/R.cpp
-  ${PROJECT_BINARY_DIR}/ParserKeywords/S.cpp
-  ${PROJECT_BINARY_DIR}/ParserKeywords/T.cpp
-  ${PROJECT_BINARY_DIR}/ParserKeywords/U.cpp
-  ${PROJECT_BINARY_DIR}/ParserKeywords/V.cpp
-  ${PROJECT_BINARY_DIR}/ParserKeywords/W.cpp
-  ${PROJECT_BINARY_DIR}/ParserKeywords/X.cpp
-  ${PROJECT_BINARY_DIR}/ParserKeywords/Y.cpp
-  ${PROJECT_BINARY_DIR}/ParserKeywords/Z.cpp
-  ${PROJECT_BINARY_DIR}/TestKeywords.cpp
-  ${PROJECT_BINARY_DIR}/ParserInit.cpp
-                   DEPENDS ${PROJECT_BINARY_DIR}/tmp_gen/ParserKeywords/A.cpp
+add_custom_command(OUTPUT ParserKeywords.cpp inlinekw.cpp
+                   DEPENDS ${PROJECT_BINARY_DIR}/tmp_gen/ParserKeywords.cpp
                    COMMAND ${CMAKE_COMMAND} -DBASE_DIR=${PROJECT_BINARY_DIR}
                                             -P ${PROJECT_SOURCE_DIR}/CopyHeaders.cmake)

changelog.md

@@ -3,24 +3,6 @@
 A short month-by-month synopsis of change highlights. Most bugfixes won't make
 it in here, only the bigger features and interface changes.
 
-# Important changes between release 2019.04 and 2019.10
-
-* opm-common and the rest of OPM does not use libecl anymore and
-  supports reading and writing Eclipse files directly
-* Improved Eclipse compatible restart, support for unified and non unified
-  files, and formatted and unformatted files
-* Support for reading and checking various additional keywords was introduced (those
-  starting with A - M, R, T, V, W, Z).
-* ACTIONX support implemented
-* NUPCOL support implemented
-* UDA, UDQ support implemented
-* Implemented writing saturation function scaled end-point arrays (e.g., SWL, SGU,
-  SOWCR, KRORW, PCG) to INIT file
-* Fixes concerning interaction of WELOPEN and WCON* with WECON and
-  WTEST
-* Added support for FOAM keywords (FOAMMOB, FOAMROCK, WFOAM)
-* Refactored and reimplemented Well representation in deck
-
 # 2016.12
 * ZCORN adjustments improved, considers cell-cell relations
 * Slightly more robust compilation - won't crash if locales are broken

cmake/Modules/FindCXX11Features.cmake

@@ -0,0 +1,468 @@
+#
+# Module that checks for supported C++11 (former C++0x) features.
+#
+# Sets the follwing variable:
+#
+# HAVE_FINAL                       True if the compiler supports the "final" quantifier
+# HAVE_TYPE_TRAITS                 True if the <type_traits> header is available and implements sufficient functionality
+# HAVE_SHARED_PTR                  True if std::shared_ptr is available
+# HAVE_UNIQUE_PTR                  True if std::unique_ptr is available
+# HAVE_NULLPTR                     True if nullptr is available
+# HAVE_ARRAY                       True if header <array> and fill() are available
+# HAVE_ATTRIBUTE_ALWAYS_INLINE     True if attribute always inline is supported
+# HAS_ATTRIBUTE_UNUSED             True if attribute unused is supported
+# HAS_ATTRIBUTE_DEPRECATED         True if attribute deprecated is supported
+# HAS_ATTRIBUTE_DEPRECATED_MSG     True if attribute deprecated("msg") is supported
+# HAVE_CONSTEXPR                   True if constexpr attribute is available
+# HAVE_INTEGRAL_CONSTANT           True if compiler supports integral_constant
+# HAVE_STATIC_ASSERT               True if static_assert is available
+# HAVE_AUTO                        True if the compiler supports the auto keyword
+# HAVE_VARIADIC_TEMPLATES          True if variadic templates are supported
+# HAVE_VARIADIC_CONSTRUCTOR_SFINAE True if variadic constructor sfinae is supported
+# HAVE_RVALUE_REFERENCES           True if rvalue references are supported
+# HAVE_TUPLE                       True if std::tuple is available
+# HAVE_TR1_TUPLE                   True if std::tr1::tuple is available
+
+include(CheckCXXSourceCompiles)
+include(CheckCXXSourceRuns)
+
+# test for C++11 flags
+include(TestCXXAcceptsFlag)
+include(CheckIncludeFileCXX)
+
+# macro to only add option once
+include(AddOptions)
+
+# Force CXX Standard cross platfrom for CMakeVersion >=3.1
+set(CMAKE_CXX_EXTENSIONS OFF)
+
+if(NOT CMAKE_CXX_STANDARD)
+  set(CMAKE_CXX_STANDARD 11)
+
+
+  if(NOT MSVC)
+    foreach(_flag "14" "11")
+      set(_FLAG "CXX_FLAG_CXX${_flag}")
+      string(TOUPPER ${_FLAG} _FLAG)
+      # try to use compiler flag -std=c++${_flag}
+      CHECK_CXX_ACCEPTS_FLAG("-std=c++${_flag}" ${_FLAG})
+
+      if(${_FLAG})
+        if(CMAKE_VERSION VERSION_LESS 3.1)
+          add_options (CXX ALL_BUILDS "-std=c++${_flag}")
+        endif()
+        set(CXX_STD0X_FLAGS "-std=c++${_flag}")
+        #Use vriables for CMake > 3.1 set the standard with no extensions
+        set(CMAKE_CXX_STANDARD ${_flag})
+        break()
+      endif()
+    endforeach()
+  endif(NOT MSVC)
+endif()
+
+if(CMAKE_VERSION VERSION_LESS 3.1)
+  # if we are building with an Apple toolchain in MacOS X,
+  # we cannot use the old GCC 4.2 fork, but must use the
+  # new runtime library
+  set (CXX_STDLIB_FLAGS)
+  string (TOUPPER "${CMAKE_CXX_COMPILER_ID}" _comp_id)
+  if (APPLE AND (_comp_id MATCHES "CLANG"))
+    CHECK_CXX_ACCEPTS_FLAG ("-stdlib=libc++" CXX_FLAG_STDLIB_LIBCXX)
+    if (CXX_FLAG_STDLIB_LIBCXX)
+      add_options (CXX ALL_BUILDS "-stdlib=libc++")
+      set (CXX_STDLIB_FLAGS "-stdlib=libc++")
+    endif (CXX_FLAG_STDLIB_LIBCXX)
+  endif (APPLE AND (_comp_id MATCHES "CLANG"))
+
+  # to format the command-line options pretty, we have an optional space
+  if (CXX_STD0X_FLAGS AND CXX_STDLIB_FLAGS)
+    set (CXX_SPACE " ")
+  else (CXX_STD0X_FLAGS AND CXX_STDLIB_FLAGS)
+    set (CXX_SPACE)
+  endif (CXX_STD0X_FLAGS AND CXX_STDLIB_FLAGS)
+endif()
+
+if(NOT CMAKE_VERSION VERSION_LESS 3.1)
+  # Workaround bug in cmake:
+  # cxx standard flags are not applied in CheckCXXSourceCompiles
+  if (CMAKE_CXX_STANDARD EQUAL 14)
+    add_options(CXX ALL_BUILDS ${CMAKE_CXX14_STANDARD_COMPILE_OPTION})
+  else()
+    add_options(CXX ALL_BUILDS ${CMAKE_CXX11_STANDARD_COMPILE_OPTION})
+  endif()
+endif()
+
+
+# perform tests
+include(CheckCXXSourceCompiles)
+
+# the "final" method specifier
+CHECK_CXX_SOURCE_COMPILES("
+struct Base {
+  virtual void foo() = 0;
+};
+struct Derived : public Base {
+  virtual void foo() final {};
+};
+
+int main()
+{
+    return 0;
+}
+"  HAVE_FINAL
+)
+
+# std::is_convertible, std::is_base_of
+CHECK_CXX_SOURCE_COMPILES("
+#include <type_traits>
+
+class Base {};
+class Derived : public Base {};
+
+int main()
+{
+    bool foo = std::is_convertible<int, double>::value;
+    bool bar = std::is_base_of<Base, Derived>::value;
+    bool foobar = std::is_integral<double>::value;
+    return 0;
+}
+"  HAVE_TYPE_TRAITS
+)
+
+# nullptr
+CHECK_CXX_SOURCE_COMPILES("
+    #include <memory>
+
+    int main(void)
+    {
+      std::shared_ptr<int> foo(new int(123));
+      return 0;
+    }
+"  HAVE_SHARED_PTR
+)
+
+# this is required by dune-common to avoid linker errors. "fun"!
+if (HAVE_SHARED_PTR)
+  set(HAVE_MAKE_SHARED 1)
+  set(SHARED_PTR_HEADER "<memory>")
+  set(SHARED_PTR_NAMESPACE "std")
+endif()
+
+# nullptr
+CHECK_CXX_SOURCE_COMPILES("
+    #include <memory>
+
+    int main(void)
+    {
+      std::unique_ptr<int> foo(new int(123));
+      return 0;
+    }
+"  HAVE_UNIQUE_PTR
+)
+
+# nullptr
+CHECK_CXX_SOURCE_COMPILES("
+    int main(void)
+    {
+      char* ch = nullptr;
+      return 0;
+    }
+"  HAVE_NULLPTR
+)
+
+# constexpr
+CHECK_CXX_SOURCE_COMPILES("
+    template <class T>
+    inline constexpr int foo(T bar) { return bar*2; }
+    int main(void)
+    {
+      constexpr int foobar = foo(100);
+      return 0;
+    }
+"  HAVE_CONSTEXPR
+)
+
+# array and fill
+CHECK_CXX_SOURCE_COMPILES("
+    #include <array>
+
+    int main(void)
+    {
+      std::array<int,2> a;
+      a.fill(9);
+      return 0;
+    }
+" HAVE_ARRAY
+)
+
+# Check whether if std::integral_constant< T, v > is supported and casts into T
+CHECK_CXX_SOURCE_COMPILES("
+    #include <type_traits>
+    void f( int ){}
+
+    int main(void){
+      f( std::integral_constant< int, 42 >() );
+    }
+" HAVE_INTEGRAL_CONSTANT
+)
+
+# Check whether if <tuple> is available
+check_include_file_cxx("tuple" HAVE_TUPLE)
+
+# Check whether if <tr1/tuple> is available
+check_include_file_cxx("tr1/tuple" HAVE_TR1_TUPLE)
+
+# __attribute__((always_inline))
+CHECK_CXX_SOURCE_COMPILES("
+   void __attribute__((always_inline)) foo(void) {}
+   int main(void)
+   {
+     foo();
+     return 0;
+   };
+"  HAVE_ATTRIBUTE_ALWAYS_INLINE
+)
+
+# __attribute__((unused))
+CHECK_CXX_SOURCE_COMPILES("
+   int main(void)
+   {
+     int __attribute__((unused)) foo;
+     return 0;
+   };
+"  HAS_ATTRIBUTE_UNUSED
+)
+
+# __attribute__((deprecated))
+CHECK_CXX_SOURCE_COMPILES("
+#define DEP __attribute__((deprecated))
+   class bar
+   {
+     bar() DEP;
+   };
+
+   class peng { } DEP;
+
+   template <class T>
+   class t_bar
+   {
+     t_bar() DEP;
+   };
+
+   template <class T>
+   class t_peng {
+     t_peng() {};
+   } DEP;
+
+   void foo() DEP;
+
+   void foo() {};
+
+   int main(void)
+   {
+     return 0;
+   };
+"  HAS_ATTRIBUTE_DEPRECATED
+)
+
+# __attribute__((deprecated("msg")))
+CHECK_CXX_SOURCE_COMPILES("
+#define DEP __attribute__((deprecated(\"message\")))
+   class bar {
+     bar() DEP;
+   };
+
+   class peng { } DEP;
+
+   template <class T>
+   class t_bar
+   {
+     t_bar() DEP;
+   };
+
+   template <class T>
+   class t_peng
+   {
+     t_peng() {};
+   } DEP;
+
+   void foo() DEP;
+
+   void foo() {};
+
+   int main(void)
+   {
+     return 0;
+   };
+"  HAS_ATTRIBUTE_DEPRECATED_MSG
+)
+
+# static assert
+CHECK_CXX_SOURCE_COMPILES("
+   int main(void)
+   {
+     static_assert(true,\"MSG\");
+     return 0;
+   }
+"  HAVE_STATIC_ASSERT
+)
+
+# auto keyword
+CHECK_CXX_SOURCE_COMPILES("
+   int main(void)
+   {
+     auto foo = 1.23;
+     return 0;
+   }
+"  HAVE_AUTO
+)
+
+# variadic template support
+CHECK_CXX_SOURCE_COMPILES("
+   #include <cassert>
+
+   template<typename... T>
+   int addints(T... x);
+
+   int add_ints()
+   {
+     return 0;
+   }
+
+   template<typename T1, typename... T>
+   int add_ints(T1 t1, T... t)
+   {
+     return t1 + add_ints(t...);
+   }
+
+   int main(void)
+   {
+     assert( 5 == add_ints(9,3,-5,-2) );
+     return 0;
+   }
+" HAVE_VARIADIC_TEMPLATES
+)
+
+# SFINAE on variadic template constructors within template classes
+CHECK_CXX_SOURCE_COMPILES("
+  #include <functional>
+
+  template<typename... U>
+  struct A
+  {
+    template<typename... T,
+             typename = typename std::enable_if<(sizeof...(T) < 2)>::type
+            >
+    A(T... t)
+    : i(1)
+    {}
+
+    template<typename... T,
+             typename = typename std::enable_if<(sizeof...(T) >= 2)>::type,
+             typename = void
+            >
+    A(T... t)
+    : i(-1)
+    {}
+
+    A()
+    : i(1)
+    {}
+
+    int i;
+  };
+
+  int main(void)
+  {
+    return (A<int>().i + A<int>(2).i + A<int>(\"foo\",3.4).i + A<int>(8,'a',A<int>()).i == 0 ? 0 : 1);
+  }
+" HAVE_VARIADIC_CONSTRUCTOR_SFINAE
+)
+
+# rvalue references
+CHECK_CXX_SOURCE_COMPILES("
+  #include <cassert>
+  #include <utility>
+  int foo(int&& x) { return 1; }
+  int foo(const int& x) { return -1; }
+
+  template<typename T>
+  int forward(T&& x)
+  {
+    return foo(std::forward<T>(x));
+  }
+
+  int main(void)
+  {
+    int i = 0;
+    assert( forward(i) + forward(int(2)) == 0);
+    return 0;
+  }
+" HAVE_RVALUE_REFERENCES
+)
+include(CheckIncludeFile)
+include(CheckIncludeFileCXX)
+# Search for some tr1 headers
+foreach(_HEADER tuple tr1/tuple type_traits tr1/type_traits)
+  string(REPLACE "/" "_" _HEADER_VAR ${_HEADER})
+  string(TOUPPER ${_HEADER_VAR} _HEADER_VAR )
+  check_include_file_cxx(${_HEADER} "HAVE_${_HEADER_VAR}")
+endforeach(_HEADER tuple tr1/tuple tr1/type_traits)
+
+# make sure that the C++-11 features implemented by the compiler are a
+# superset of those provided by GCC 4.4. This makes the test fail on
+# all GCC compilers before 4.4.
+set(CXX_FEATURES_MISSING "")
+if (NOT HAVE_TYPE_TRAITS)
+  set(CXX_FEATURES_MISSING
+      "${CXX_FEATURES_MISSING} - Sufficiently conformant type traits (defined by the 'type_traits' header file)\n")
+endif()
+if (NOT HAVE_SHARED_PTR)
+  set(CXX_FEATURES_MISSING
+      "${CXX_FEATURES_MISSING} - Shared pointers (the std::shared_ptr class)\n")
+endif()
+if (NOT HAVE_UNIQUE_PTR)
+  set(CXX_FEATURES_MISSING
+      "${CXX_FEATURES_MISSING} - Unique pointers (the std::unique_ptr class)\n")
+endif()
+if (NOT HAVE_ARRAY)
+  set(CXX_FEATURES_MISSING
+      "${CXX_FEATURES_MISSING} - Statically sized arrays (the std::array class)\n")
+endif()
+if (NOT HAVE_STATIC_ASSERT)
+  set(CXX_FEATURES_MISSING
+      "${CXX_FEATURES_MISSING} - Static assertations (the static_assert() mechanism)\n")
+endif()
+if (NOT HAVE_AUTO)
+  set(CXX_FEATURES_MISSING
+      "${CXX_FEATURES_MISSING} - Automatically typed variables (the 'auto' keyword)\n")
+endif()
+if (NOT HAVE_VARIADIC_TEMPLATES)
+  set(CXX_FEATURES_MISSING
+      "${CXX_FEATURES_MISSING} - Variable number of template arguments\n")
+endif()
+if (NOT HAVE_VARIADIC_CONSTRUCTOR_SFINAE)
+  set(CXX_FEATURES_MISSING
+      "${CXX_FEATURES_MISSING} - Constructors with variable number of template arguments obeying the SFINAE (specialization failure is not an error) rule\n")
+endif()
+if (NOT HAVE_RVALUE_REFERENCES)
+  set(CXX_FEATURES_MISSING
+      "${CXX_FEATURES_MISSING} - References to rvalue objects\n")
+endif()
+if (NOT HAVE_TUPLE)
+  set(CXX_FEATURES_MISSING
+      "${CXX_FEATURES_MISSING} - Tuples (the std::tuple class)\n")
+endif()
+
+if(CXX_FEATURES_MISSING)
+  set (CXX11FEATURES_FOUND FALSE)
+  if (CXX11Features_FIND_REQUIRED)
+        message(FATAL_ERROR
+      "Your C++ compiler does not support the minimum set of C++-2011 features required. "
+      "Make sure to use a compiler which implements all C++-2011 features provided by GCC 4.4. "
+      "Your compiler does not seem to implement the following features:\n"
+      "${CXX_FEATURES_MISSING}")
+  endif()
+else ()
+  set (CXX11FEATURES_FOUND TRUE)
+endif()

cmake/Modules/FindERT.cmake

@@ -0,0 +1,287 @@
+# - Find the Ensemble-based Reservoir Tool (ERT)
+#
+# Set the cache variable ERT_ROOT to the install location of the ERT
+# libraries and header files.
+#
+# If found, it sets these variables:
+#
+#	ERT_INCLUDE_DIRS      Header file directories
+#	ERT_LIBRARIES         Archives and shared objects
+#	ERT_CONFIG_VARS       Definitions that goes in config.h
+#	ERT_LINKER_FLAGS      Options that must be passed to linker
+#
+# It will also add to CMAKE_C_FLAGS and CMAKE_CXX_FLAGS if necessary to
+# link with the ERT libraries.
+
+# variables to pass on to other packages
+if (FIND_QUIETLY)
+  set (ERT_QUIET "QUIET")
+else (FIND_QUIETLY)
+  set (ERT_QUIET "")
+endif (FIND_QUIETLY)
+
+# if a directory has been specified by the user, then don't go look
+# in the system directories as well
+if (ERT_ROOT)
+  set (_no_default_path "NO_DEFAULT_PATH")
+else (ERT_ROOT)
+  set (_no_default_path "")
+endif (ERT_ROOT)
+
+# ERT doesn't have any config-mode file, so we need to specify the root
+# directory in its own variable
+find_path (ERT_ECL_INCLUDE_DIR
+  NAMES "ert/ecl/ecl_util.h"
+  HINTS "${ERT_ROOT}"
+  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}
+  )
+find_path (ERT_ECL_WELL_INCLUDE_DIR
+  NAMES "ert/ecl_well/well_const.h"
+  HINTS "${ERT_ROOT}"
+  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}
+  )
+find_path (ERT_ECLXX_INCLUDE_DIR
+  NAMES "ert/ecl/EclKW.hpp"
+  HINTS "${ERT_ROOT}"
+  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}
+  )
+find_path (ERT_UTIL_INCLUDE_DIR
+  NAMES "ert/util/stringlist.h"
+  HINTS "${ERT_ROOT}"
+  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}
+  )
+find_path (ERT_UTILXX_INCLUDE_DIR
+  NAMES "ert/util/ert_unique_ptr.hpp"
+  HINTS "${ERT_ROOT}"
+  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}
+  )  
+find_path (ERT_GEN_INCLUDE_DIR
+  NAMES "ert/util/int_vector.h"
+  HINTS "${ERT_ROOT}"
+  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"
+  ${_no_default_path}
+  )
+
+
+# need all of these libraries
+if (CMAKE_SIZEOF_VOID_P)
+  math (EXPR _BITS "8 * ${CMAKE_SIZEOF_VOID_P}")
+endif (CMAKE_SIZEOF_VOID_P)
+find_library (ERT_LIBRARY_ECL
+  NAMES "ecl"
+  HINTS "${ERT_ROOT}"
+  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}"
+  DOC "Path to ERT Eclipse library archive/shared object files"
+  ${_no_default_path}
+  )
+find_library (ERT_LIBRARY_ECLXX
+  NAMES "eclxx"
+  HINTS "${ERT_ROOT}"
+  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}"
+  DOC "Path to ERT Eclipse C++ library archive/shared object files"
+  ${_no_default_path}
+  )
+find_library (ERT_LIBRARY_ECL_WELL
+  NAMES "ecl_well"
+  HINTS "${ERT_ROOT}"
+  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}"
+  DOC "Path to ERT Eclipse library archive/shared object files"
+  ${_no_default_path}
+  )
+find_library (ERT_LIBRARY_GEOMETRY
+  NAMES "ert_geometry"
+  HINTS "${ERT_ROOT}"
+  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}"
+  DOC "Path to ERT Geometry library archive/shared object files"
+  ${_no_default_path}
+  )
+find_library (ERT_LIBRARY_UTIL
+  NAMES "ert_util"
+  HINTS "${ERT_ROOT}"
+  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}"
+  DOC "Path to ERT Utilities library archive/shared object files"
+  ${_no_default_path}
+  )
+find_library (ERT_LIBRARY_UTILXX
+  NAMES "ert_utilxx"
+  HINTS "${ERT_ROOT}"
+  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}"
+  DOC "Path to ERT Utilities library archive/shared object files"
+  ${_no_default_path}
+  )
+# the "library" found here is actually a list of several files
+list (APPEND ERT_INCLUDE_DIR
+  ${ERT_ECL_INCLUDE_DIR}
+  ${ERT_ECL_WELL_INCLUDE_DIR}
+  ${ERT_ECLXX_INCLUDE_DIR}
+  ${ERT_UTIL_INCLUDE_DIR}
+  ${ERT_UTILXX_INCLUDE_DIR}
+  ${ERT_GEN_INCLUDE_DIR}
+  )
+list (APPEND ERT_LIBRARY
+  ${ERT_LIBRARY_ECL}
+  ${ERT_LIBRARY_ECLXX}
+  ${ERT_LIBRARY_ECL_WELL}
+  ${ERT_LIBRARY_GEOMETRY}
+  ${ERT_LIBRARY_UTIL}
+  ${ERT_LIBRARY_UTILXX} 
+  )
+list (APPEND ERT_LIBRARIES ${ERT_LIBRARY})
+list (APPEND ERT_INCLUDE_DIRS ${ERT_INCLUDE_DIR})
+
+# if we didn't find any files, then don't proceed through the entire dependency list
+include (FindPackageHandleStandardArgs)
+if (ERT_INCLUDE_DIR MATCHES "-NOTFOUND" OR ERT_LIBRARIES MATCHES "-NOTFOUND")
+  find_package_handle_standard_args (ERT
+	DEFAULT_MSG
+	ERT_INCLUDE_DIR ERT_LIBRARY
+	)
+  # clear the cache so the find probe is attempted again if files becomes
+  # available (only upon a unsuccessful *compile* should we disable further
+  # probing)
+  set (HAVE_ERT)
+  unset (HAVE_ERT CACHE)
+  return ()
+endif (ERT_INCLUDE_DIR MATCHES "-NOTFOUND" OR ERT_LIBRARIES MATCHES "-NOTFOUND")
+
+
+# dependencies
+
+# parallel programming
+include (UseOpenMP)
+find_openmp (ERT)
+
+# compression library
+find_package (ZLIB ${ERT_QUIET})
+if (ZLIB_FOUND)
+  list (APPEND ERT_INCLUDE_DIRS ${ZLIB_INCLUDE_DIRS})
+  list (APPEND ERT_LIBRARIES ${ZLIB_LIBRARIES})
+endif (ZLIB_FOUND)
+
+# numerics
+find_package (BLAS ${ERT_QUIET})
+if (BLAS_FOUND)
+  list (APPEND ERT_INCLUDE_DIRS ${BLAS_INCLUDE_DIRS})
+  list (APPEND ERT_LIBRARIES ${BLAS_LIBRARIES})
+  list (APPEND ERT_LINKER_FLAGS ${BLAS_LINKER_FLAGS})
+endif (BLAS_FOUND)
+
+find_package (LAPACK ${ERT_QUIET})
+if (LAPACK_FOUND)
+  list (APPEND ERT_INCLUDE_DIRS ${LAPACK_INCLUDE_DIRS})
+  list (APPEND ERT_LIBRARIES ${LAPACK_LIBRARIES})
+  list (APPEND ERT_LINKER_FLAGS ${LAPACK_LINKER_FLAGS})
+endif (LAPACK_FOUND)
+
+# math library (should exist on all unices; automatically linked on Windows)
+if (UNIX)
+  find_library (MATH_LIBRARY
+	NAMES "m"
+	)
+  list (APPEND ERT_LIBRARIES ${MATH_LIBRARY})
+endif (UNIX)
+
+# if shared libraries are disabled on linux, explcitly linking to the
+# pthreads library is required by ERT
+find_package(Threads ${ERT_QUIET})
+if (CMAKE_THREAD_LIBS_INIT)
+  list (APPEND ERT_LIBRARIES ${CMAKE_THREAD_LIBS_INIT})
+endif()
+
+# Platform specific library where dlopen with friends lives
+list (APPEND ERT_LIBRARIES ${CMAKE_DL_LIBS})
+
+# since OpenMP often implies pthreads, we need to tidy up
+# (last instance of library must be left standing, thus reversing that
+# list before removing duplicates)
+include (Duplicates)
+remove_dup_deps (ERT)
+
+# see if we can compile a minimum example
+# CMake logical test doesn't handle lists (sic)
+if (NOT (ERT_INCLUDE_DIR MATCHES "-NOTFOUND" OR ERT_LIBRARIES MATCHES "-NOTFOUND"))
+  include (CMakePushCheckState)
+  include (CheckCSourceCompiles)
+  cmake_push_check_state ()
+  set (CMAKE_REQUIRED_INCLUDES ${ERT_INCLUDE_DIR})
+  set (CMAKE_REQUIRED_LIBRARIES ${ERT_LIBRARIES})
+  check_cxx_source_compiles (
+"#include <ert/ecl/ecl_grid.h>
+int main ( ) {
+    ecl_grid_type * grid = ecl_grid_alloc_rectangular( 10,10,10,1,1,1, NULL);
+    ecl_grid_free( grid );
+    return 0;
+}" HAVE_ERT)
+  cmake_pop_check_state ()
+else (NOT (ERT_INCLUDE_DIR MATCHES "-NOTFOUND" OR ERT_LIBRARIES MATCHES "-NOTFOUND"))
+  # clear the cache so the find probe is attempted again if files becomes
+  # available (only upon a unsuccessful *compile* should we disable further
+  # probing)
+  set (HAVE_ERT)
+  unset (HAVE_ERT CACHE)
+endif (NOT (ERT_INCLUDE_DIR MATCHES "-NOTFOUND" OR ERT_LIBRARIES MATCHES "-NOTFOUND"))
+
+# if the test program didn't compile, but was required to do so, bail
+# out now and display an error; otherwise limp on
+find_package_handle_standard_args (ERT
+  DEFAULT_MSG
+  ERT_INCLUDE_DIR ERT_LIBRARY HAVE_ERT
+  )
+
+
+
+

cmake/Modules/FindERTPython.cmake

@@ -0,0 +1,53 @@
+# - Find the Python wrappers for Ensemble-based Reservoir Tool (ERT)
+#
+# Set the cache variable ERT_PYTHON_PATH to the install location of
+# the root ert package.  
+
+find_package(PythonInterp)
+if(PYTHONINTERP_FOUND)
+
+# We try to find the ert Python distribution. This is done by running
+# Python code which tries to 'import ert' and prints out the path to
+# the module if the import succeeds.
+#
+# The normal Python import machinery is employed, so if you have
+# installed ert python in a default location, or alternatively set the
+# PYTHONPATH variable the ert Python distribution will eventually be
+# found there, independently of the alternatives which are tested with
+# the ${PATH_LIST} variable.
+
+  if (EXISTS "/etc/debian_version")
+     set( PYTHON_PACKAGE_PATH "dist-packages")
+  else()
+     set( PYTHON_PACKAGE_PATH "site-packages")
+  endif()
+  set(PYTHON_INSTALL_PREFIX  "lib/python${PYTHON_VERSION_MAJOR}.${PYTHON_VERSION_MINOR}/${PYTHON_PACKAGE_PATH}"  CACHE STRING "Subdirectory to install Python modules in")
+
+  set(PATH_LIST)
+  if (ERT_ROOT)
+      list(APPEND PATH_LIST ${ERT_ROOT})
+  endif()
+  list(APPEND PATH_LIST ${CMAKE_PREFIX_PATH})
+
+  # Add various popular sibling alternatives.
+  list(APPEND PATH_LIST "${PROJECT_SOURCE_DIR}/../ert/build"
+    			"${PROJECT_BINARY_DIR}/../ert-build")
+
+  foreach( PATH ${PATH_LIST})
+      set( python_code "import sys; sys.path.insert(0 , '${PATH}/${PYTHON_INSTALL_PREFIX}'); import os.path; import inspect; import ert; print os.path.dirname(os.path.dirname(inspect.getfile(ert))); from ert.ecl import EclSum")
+      execute_process( COMMAND ${PYTHON_EXECUTABLE} -c "${python_code}"
+                       RESULT_VARIABLE import_result
+                       OUTPUT_VARIABLE stdout_output
+                       ERROR_VARIABLE stderr_output
+                       OUTPUT_STRIP_TRAILING_WHITESPACE )
+
+      if (${import_result} EQUAL 0)
+         set( ERT_PYTHON_PATH ${stdout_output} CACHE PATH "Python path for ERT Python" )
+         break()
+      endif()
+   endforeach()
+endif()
+find_package_handle_standard_args("ERTPython" DEFAULT_MSG ERT_PYTHON_PATH)
+
+
+

cmake/Modules/Finddune-alugrid.cmake

@@ -20,7 +20,8 @@ find_opm_package (
   # TODO: we should probe for all the HAVE_* values listed below;
   # however, we don't actually use them in our implementation, so
   # we just include them to forward here in case anyone else does
-  "dune-grid REQUIRED;
+  "CXX11Features REQUIRED;
+   dune-grid REQUIRED;
    ZLIB;
    ZOLTAN;
    METIS

cmake/Modules/Finddune-common.cmake

@@ -16,7 +16,8 @@ find_opm_package (
   "dune-common"
 
   # dependencies
-  "BLAS REQUIRED;
+  "CXX11Features REQUIRED;
+  BLAS REQUIRED;
   LAPACK REQUIRED;
   CxaDemangle;
   MPI

cmake/Modules/Finddune-fem.cmake

@@ -19,7 +19,8 @@ find_opm_package (
   # TODO: we should probe for all the HAVE_* values listed below;
   # however, we don't actually use them in our implementation, so
   # we just include them to forward here in case anyone else does
-  "dune-common REQUIRED;
+  "CXX11Features REQUIRED;
+   dune-common REQUIRED;
    dune-grid  REQUIRED;
    dune-alugrid;
    ZLIB;

cmake/Modules/Finddune-geometry.cmake

@@ -19,7 +19,8 @@ find_opm_package (
   # TODO: we should probe for all the HAVE_* values listed below;
   # however, we don't actually use them in our implementation, so
   # we just include them to forward here in case anyone else does
-  "dune-common REQUIRED
+  "CXX11Features REQUIRED;
+  dune-common REQUIRED
   "
   # header to search for
   "dune/geometry/quadraturerules.hh"

cmake/Modules/Finddune-grid.cmake

@@ -22,7 +22,8 @@ find_opm_package (
   # TODO: we should probe for all the HAVE_* values listed below;
   # however, we don't actually use them in our implementation, so
   # we just include them to forward here in case anyone else does
-  "dune-common REQUIRED;
+  "CXX11Features REQUIRED;
+  dune-common REQUIRED;
   dune-geometry REQUIRED;
   dune-uggrid;
   MPI;

cmake/Modules/Finddune-uggrid.cmake

@@ -7,7 +7,8 @@ find_opm_package (
   # dependencies
   # TODO: we should probe for all the HAVE_* values listed below;
   # however, we don't actually use them in our implementation, so
-  "dune-common REQUIRED
+  "CXX11Features REQUIRED;
+  dune-common REQUIRED
   "
   # header to search for
   ""

cmake/Modules/OpmCompilerChecks.cmake

@@ -1,99 +0,0 @@
-# Check for various compiler extensions
-
-# HAVE_ATTRIBUTE_ALWAYS_INLINE     True if attribute always inline is supported
-# HAS_ATTRIBUTE_UNUSED             True if attribute unused is supported
-# HAS_ATTRIBUTE_DEPRECATED         True if attribute deprecated is supported
-# HAS_ATTRIBUTE_DEPRECATED_MSG     True if attribute deprecated("msg") is supported
-
-include(CheckCXXSourceCompiles)
-
-# __attribute__((always_inline))
-CHECK_CXX_SOURCE_COMPILES("
-   void __attribute__((always_inline)) foo(void) {}
-   int main(void)
-   {
-     foo();
-     return 0;
-   };
-"  HAVE_ATTRIBUTE_ALWAYS_INLINE
-)
-
-# __attribute__((unused))
-CHECK_CXX_SOURCE_COMPILES("
-   int main(void)
-   {
-     int __attribute__((unused)) foo;
-     return 0;
-   };
-"  HAS_ATTRIBUTE_UNUSED
-)
-
-# __attribute__((deprecated))
-CHECK_CXX_SOURCE_COMPILES("
-#define DEP __attribute__((deprecated))
-   class bar
-   {
-     bar() DEP;
-   };
-
-   class peng { } DEP;
-
-   template <class T>
-   class t_bar
-   {
-     t_bar() DEP;
-   };
-
-   template <class T>
-   class t_peng {
-     t_peng() {};
-   } DEP;
-
-   void foo() DEP;
-
-   void foo() {};
-
-   int main(void)
-   {
-     return 0;
-   };
-"  HAS_ATTRIBUTE_DEPRECATED
-)
-
-# __attribute__((deprecated("msg")))
-CHECK_CXX_SOURCE_COMPILES("
-#define DEP __attribute__((deprecated(\"message\")))
-   class bar {
-     bar() DEP;
-   };
-
-   class peng { } DEP;
-
-   template <class T>
-   class t_bar
-   {
-     t_bar() DEP;
-   };
-
-   template <class T>
-   class t_peng
-   {
-     t_peng() {};
-   } DEP;
-
-   void foo() DEP;
-
-   void foo() {};
-
-   int main(void)
-   {
-     return 0;
-   };
-"  HAS_ATTRIBUTE_DEPRECATED_MSG
-)
-
-if(CMAKE_CXX_COMPILER_ID STREQUAL "GNU")
-  if (CMAKE_CXX_COMPILER_VERSION VERSION_LESS 9.0)
-    list(APPEND ${project}_LIBRARIES stdc++fs)
-  endif()
-endif()

cmake/Modules/OpmFind.cmake

@@ -66,6 +66,10 @@ set (_opm_proj_exemptions
   dune-fem
   )
 
+# although a DUNE module, it is delivered in the OPM suite
+set (opm-core_SUITE "opm")
+set (ewoms_SUITE "opm")
+
 # insert this boilerplate whenever we are going to find a new package
 macro (find_and_append_package_to prefix name)
   # special handling for Boost to avoid inadvertedly picking up system
@@ -152,7 +156,25 @@ macro (find_and_append_package_to prefix name)
     if ( (NOT DEFINED ${name}_FOUND AND NOT DEFINED ${NAME}_FOUND )
          OR _search_components GREATER -1)
       string(REGEX MATCH "(dune|opm)-.*" _is_opm ${name})
-      if(_${name}_exempted LESS 0 AND NOT _is_opm)
+      if(NOT _is_opm)
+        string(REGEX MATCH "ewoms" _is_opm ${name})
+      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})
+        if(ARGN)
+          list(REMOVE_ITEM ARGN_NO_REQUIRED "REQUIRED")
+        endif()
+        find_package (${name} ${ARGN_NO_REQUIRED} NO_CMAKE_SYSTEM_PACKAGE_REGISTRY NO_CMAKE_PACKAGE_REGISTRY)
+        if(TARGET ecl)
+          # Need to grab from target to enable transitional depends
+          #get_target_property(ecl_INCLUDE_DIRS ecl INTERFACE_INCLUDE_DIRECTORIES)
+          set(ecl_LIBRARIES ecl)
+          set(HAVE_ERT 1)
+        endif()
+      elseif(_${name}_exempted LESS 0 AND NOT _is_opm)
         find_package (${name} ${ARGN})
       elseif(_${name}_exempted GREATER -1)
         find_package (${name} ${ARGN})

cmake/Modules/OpmLibMain.cmake

@@ -20,7 +20,6 @@
 #   - CMP0026 to allow access to the LOCATION target property
 #   - CMP0048 to indicate that we want to deal with the *VERSION*
 #     variables ourselves
-#   - CMP0064 to indicate that we want TEST if conditions to be evaluated
 if (POLICY CMP0026)
 	cmake_policy(SET CMP0026 OLD)
 endif()
@@ -29,10 +28,6 @@ if (POLICY CMP0048)
 	cmake_policy(SET CMP0048 OLD)
 endif()
 
-if(POLICY CMP0064)
-  cmake_policy(SET CMP0064 NEW)
-endif()
-
 # set the behavior of the policy 0054 to NEW. (i.e. do not implicitly
 # expand variables in if statements)
 if (POLICY CMP0054)
@@ -64,19 +59,6 @@ project (${${project}_NAME})
 enable_language (C)
 enable_language (CXX)
 
-# Languages and global compiler settings
-if(CMAKE_VERSION VERSION_LESS 3.8)
-  message(WARNING "CMake version does not support c++17, guessing -std=c++17")
-  set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++17")
-else()
-  set(CMAKE_CXX_STANDARD 17)
-  set(CMAKE_CXX_STANDARD_REQUIRED ON)
-  set(CMAKE_CXX_EXTENSIONS OFF)
-endif()
-
-# Various compiler extension checks
-include(OpmCompilerChecks)
-
 # print system information to better pinpoint issues from log alone
 include (UseSystemInfo)
 system_info ()
@@ -274,13 +256,9 @@ macro (cond_disable_test name)
 	endif ((NOT DEFINED HAVE_${name}) OR (NOT HAVE_${name}))
 endmacro (cond_disable_test name)
 
-# use this target to run all tests, with parallel execution
-cmake_host_system_information(RESULT TESTJOBS QUERY NUMBER_OF_PHYSICAL_CORES)
-if(TESTJOBS EQUAL 0)
-	set(TESTJOBS 1)
-endif()
+# use this target to run all tests
 add_custom_target (check
-	COMMAND ${CMAKE_CTEST_COMMAND} -j${TESTJOBS}
+	COMMAND ${CMAKE_CTEST_COMMAND}
 	DEPENDS test-suite
 	COMMENT "Checking if library is functional"
 	VERBATIM

cmake/Modules/OpmPackage.cmake

@@ -162,7 +162,7 @@ macro (find_package_deps module)
           # (i.e. if an optional package requests a package to be required,
           # the build will fail if it's not found)
 	  string (REPLACE "REQUIRED" "${_${module}_required}" _args_req "${_${module}_args}")
-          if(_dep MATCHES "opm-")
+          if(_dep MATCHES "opm-" OR _dep MATCHES "ewoms")
             set(deplist ${_dep})
             string(STRIP "${_dep}" _dep)
             string(REPLACE " " ";" deplist "${_dep}")

cmake/Modules/OpmSatellites.cmake

@@ -1,5 +1,8 @@
 # - Build satellites that are dependent of main library
 
+option(ADD_DISABLED_CTESTS "Add the tests which are disabled due to failed preconditions to the ctest output (this makes ctest return an error if such a test is present)" ON)
+mark_as_advanced(ADD_DISABLED_CTESTS)
+
 #
 # Enumerate all source code in a "satellite" directory such as tests/,
 # compile each of them and optionally set them as a test for CTest to
@@ -8,139 +11,144 @@
 # The following suffices must be defined for the opm prefix passed as
 # parameter:
 #
-#  _LINKER_FLAGS   Necessary flags to link with this library
-#  _TARGET         CMake target which creates the library
-#  _LIBRARIES      Other dependencies that must also be linked
+#	_LINKER_FLAGS   Necessary flags to link with this library
+#	_TARGET         CMake target which creates the library
+#	_LIBRARIES      Other dependencies that must also be linked
 
 # Synopsis:
-#  opm_compile_satellites (opm satellite excl_all test_regexp)
+#	opm_compile_satellites (opm satellite excl_all test_regexp)
 #
 # Parameters:
-#  opm             Prefix of the variable which contain information
-#                  about the library these satellites depends on, e.g.
-#                  pass "opm-core" if opm-core_TARGET is the name of
-#                  the target the builds this library. Variables with
-#                  suffixes _TARGET and _LIBRARIES must exist.
+#	opm             Prefix of the variable which contain information
+#	                about the library these satellites depends on, e.g.
+#	                pass "opm-core" if opm-core_TARGET is the name of
+#	                the target the builds this library. Variables with
+#	                suffixes _TARGET and _LIBRARIES must exist.
 #
-#  satellite       Prefix of variable which contain the names of the
-#                  files, e.g. pass "tests" if the files are in the
-#                  variable tests_SOURCES. Variables with suffixes
-#                  _DATAFILES, _SOURCES and _DIR should exist. This
-#                  name is also used as name of the target that builds
-#                  all these files.
+#	satellite       Prefix of variable which contain the names of the
+#	                files, e.g. pass "tests" if the files are in the
+#	                variable tests_SOURCES. Variables with suffixes
+#	                _DATAFILES, _SOURCES and _DIR should exist. This
+#	                name is also used as name of the target that builds
+#	                all these files.
 #
-#  excl_all        EXCLUDE_FROM_ALL if these targets should not be built by
-#                  default, otherwise empty string.
+#	excl_all        EXCLUDE_FROM_ALL if these targets should not be built by
+#	                default, otherwise empty string.
 #
-#  test_regexp     Regular expression which picks the name of a test
-#                  out of the filename, or blank if no test should be
-#                  setup.
+#	test_regexp     Regular expression which picks the name of a test
+#	                out of the filename, or blank if no test should be
+#	                setup.
 #
 # Example:
-#  opm_compile_satellites (opm-core test "" "^test_([^/]*)$")
+#	opm_compile_satellites (opm-core test "" "^test_([^/]*)$")
 #
 macro (opm_compile_satellites opm satellite excl_all test_regexp)
   # if we are going to build the tests always, then make sure that
   # the datafiles are present too
   if (NOT (${excl_all} MATCHES "EXCLUDE_FROM_ALL"))
-    set (_incl_all "ALL")
+	set (_incl_all "ALL")
   else (NOT (${excl_all} MATCHES "EXCLUDE_FROM_ALL"))
-    set (_incl_all "")
+	set (_incl_all "")
   endif (NOT (${excl_all} MATCHES "EXCLUDE_FROM_ALL"))
 
   # if a set of datafiles has been setup, pull those in
   add_custom_target (${satellite} ${_incl_all})
   if (${satellite}_DATAFILES)
-    add_dependencies (${satellite} ${${satellite}_DATAFILES})
+	add_dependencies (${satellite} ${${satellite}_DATAFILES})
   endif (${satellite}_DATAFILES)
 
   # compile each of these separately
   foreach (_sat_FILE IN LISTS ${satellite}_SOURCES)
-    if (NOT "${test_regexp}" STREQUAL "" AND NOT Boost_UNIT_TEST_FRAMEWORK_FOUND)
-        continue()
-    endif()
-    get_filename_component (_sat_NAME "${_sat_FILE}" NAME_WE)
-    add_executable (${_sat_NAME} ${excl_all} ${_sat_FILE})
-    add_dependencies (${satellite} ${_sat_NAME})
-    set_target_properties (${_sat_NAME} PROPERTIES
-                                        LINK_FLAGS "${${opm}_LINKER_FLAGS_STR}")
-    if(HAVE_DYNAMIC_BOOST_TEST)
-      set_target_properties (${_sat_NAME} PROPERTIES
-                             COMPILE_DEFINITIONS BOOST_TEST_DYN_LINK)
-    endif()
-    # are we building a test? luckily, the testing framework doesn't
-    # require anything else, so we don't have to figure out where it
-    # should go in the library list
-    if (NOT "${test_regexp}" STREQUAL "")
-      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)
-      strip_debug_symbols (${_sat_NAME} _sat_DEBUG)
-      list (APPEND ${satellite}_DEBUG ${_sat_DEBUG})
-    endif()
-
-    # variable with regular expression doubles as a flag for
-    # whether tests should be setup or not
-    set(_sat_FANCY)
-    if (NOT "${test_regexp}" STREQUAL "")
-      foreach (_regexp IN ITEMS ${test_regexp})
-        if ("${_sat_NAME}" MATCHES "${_regexp}")
-          string (REGEX REPLACE "${_regexp}" "\\1" _sat_FANCY "${_sat_NAME}")
-        elseif(NOT _sat_FANCY)
-          set(_sat_FANCY ${_sat_NAME})
+	get_filename_component (_sat_NAME "${_sat_FILE}" NAME_WE)
+	add_executable (${_sat_NAME} ${excl_all} ${_sat_FILE})
+	add_dependencies (${satellite} ${_sat_NAME})
+	set_target_properties (${_sat_NAME} PROPERTIES
+	  LINK_FLAGS "${${opm}_LINKER_FLAGS_STR}"
+	  )
+        if(HAVE_DYNAMIC_BOOST_TEST)
+	  set_target_properties (${_sat_NAME} PROPERTIES
+		  COMPILE_DEFINITIONS BOOST_TEST_DYN_LINK
+	  )
+	endif()
+	# are we building a test? luckily, the testing framework doesn't
+	# require anything else, so we don't have to figure out where it
+	# should go in the library list
+	if (NOT "${test_regexp}" STREQUAL "")
+	  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)
+	  strip_debug_symbols (${_sat_NAME} _sat_DEBUG)
+	  list (APPEND ${satellite}_DEBUG ${_sat_DEBUG})
         endif()
-      endforeach (_regexp)
-      get_target_property (_sat_LOC ${_sat_NAME} LOCATION)
-      # Run tests through mpi-run. Ubuntu 14.04 provided mpi libs will crash
-      # in the MPI_Finalize() call otherwise.
-      if(MPI_FOUND)
-        set(_sat_LOC ${MPIEXEC} ${MPIEXEC_NUMPROC_FLAG} 1 ${_sat_LOC})
-      endif()
-      if (CMAKE_VERSION VERSION_LESS "2.8.4")
-        add_test (NAME ${_sat_FANCY}
-                  COMMAND ${CMAKE_COMMAND} -E chdir "${PROJECT_BINARY_DIR}/${${satellite}_DIR}" ${_sat_LOC})
-      else (CMAKE_VERSION VERSION_LESS "2.8.4")
-      add_test (${_sat_FANCY} ${_sat_LOC})
-      # run the test in the directory where the data files are
-      set_tests_properties (${_sat_FANCY} PROPERTIES
-                            WORKING_DIRECTORY ${PROJECT_BINARY_DIR}/${${satellite}_DIR})
-      endif (CMAKE_VERSION VERSION_LESS "2.8.4")
-      if(NOT TARGET test-suite)
-        add_custom_target(test-suite)
-      endif()
-      add_dependencies(test-suite "${_sat_NAME}")
-    endif(NOT "${test_regexp}" STREQUAL "")
 
-    # if this program on the list of files that should be distributed?
-    # we check by the name of the source file
-    list (FIND ${satellite}_SOURCES_DIST "${_sat_FILE}" _is_util)
-    if (NOT (_is_util EQUAL -1))
-      install (TARGETS ${_sat_NAME} RUNTIME
-               DESTINATION bin${${opm}_VER_DIR}/)
-    endif (NOT (_is_util EQUAL -1))
+	# variable with regular expression doubles as a flag for
+	# whether tests should be setup or not
+	set(_sat_FANCY)
+	if (NOT "${test_regexp}" STREQUAL "")
+	  foreach (_regexp IN ITEMS ${test_regexp})
+		if ("${_sat_NAME}" MATCHES "${_regexp}")
+		  string (REGEX REPLACE "${_regexp}" "\\1" _sat_FANCY "${_sat_NAME}")
+		elseif(NOT _sat_FANCY)
+		  set(_sat_FANCY ${_sat_NAME})
+		endif()
+	  endforeach (_regexp)
+	  get_target_property (_sat_LOC ${_sat_NAME} LOCATION)
+          # Run tests through mpi-run. Ubuntu 14.04 provided mpi libs will crash
+          # in the MPI_Finalize() call otherwise.
+          if(MPI_FOUND)
+            set(_sat_LOC ${MPIEXEC} ${MPIEXEC_NUMPROC_FLAG} 1 ${_sat_LOC})
+          endif()
+	  if (CMAKE_VERSION VERSION_LESS "2.8.4")
+		add_test (
+		  NAME ${_sat_FANCY}
+		  COMMAND ${CMAKE_COMMAND} -E chdir "${PROJECT_BINARY_DIR}/${${satellite}_DIR}" ${_sat_LOC}
+		  )
+	  else (CMAKE_VERSION VERSION_LESS "2.8.4")
+		add_test (${_sat_FANCY} ${_sat_LOC})
+		# run the test in the directory where the data files are
+		set_tests_properties (${_sat_FANCY} PROPERTIES
+		  WORKING_DIRECTORY ${PROJECT_BINARY_DIR}/${${satellite}_DIR}
+		  )
+	  endif (CMAKE_VERSION VERSION_LESS "2.8.4")
+          if(NOT TARGET test-suite)
+            add_custom_target(test-suite)
+          endif()
+          add_dependencies(test-suite "${_sat_NAME}")
+	endif(NOT "${test_regexp}" STREQUAL "")
+
+	# if this program on the list of files that should be distributed?
+	# we check by the name of the source file
+	list (FIND ${satellite}_SOURCES_DIST "${_sat_FILE}" _is_util)
+	if (NOT (_is_util EQUAL -1))
+	  install (TARGETS ${_sat_NAME} RUNTIME
+		DESTINATION bin${${opm}_VER_DIR}/
+		)
+	endif (NOT (_is_util EQUAL -1))
   endforeach (_sat_FILE)
 endmacro (opm_compile_satellites opm prefix)
 
 # Synopsis:
-#  opm_data (satellite target dirname files)
+#	opm_data (satellite target dirname files)
 #
 # provides these output variables:
 #
-#  ${satellite}_INPUT_FILES   List of all files that are copied
-#  ${satellite}_DATAFILES     Name of target which copies these files
+#	${satellite}_INPUT_FILES   List of all files that are copied
+#	${satellite}_DATAFILES     Name of target which copies these files
 #
 # Example:
 #
-#  opm_data (tests datafiles "tests/")
+#	opm_data (tests datafiles "tests/")
 #
 macro (opm_data satellite target dirname)
   # even if there are no datafiles, create the directory so the
   # satellite programs have a homedir to run in
-  execute_process (COMMAND ${CMAKE_COMMAND} -E make_directory ${PROJECT_BINARY_DIR}/${dirname})
+  execute_process (
+	COMMAND ${CMAKE_COMMAND} -E make_directory ${PROJECT_BINARY_DIR}/${dirname}
+	)
 
   # if ever huge test datafiles are necessary, then change this
   # into "create_symlink" (on UNIX only, apparently)
@@ -150,27 +158,26 @@ macro (opm_data satellite target dirname)
   # to a tests/ directory in the output tree (if different)
   set (${satellite}_INPUT_FILES)
   if (NOT PROJECT_SOURCE_DIR STREQUAL PROJECT_BINARY_DIR)
-    foreach (input_datafile IN LISTS ${satellite}_DATA)
-      if (IS_ABSOLUTE ${input_datafile})
-        file (RELATIVE_PATH rel_datafile "${PROJECT_SOURCE_DIR}" ${input_datafile})
-      else()
-        set(rel_datafile ${input_datafile})
-      endif()
-      set (output_datafile "${PROJECT_BINARY_DIR}/${rel_datafile}")
-      add_custom_command (OUTPUT ${output_datafile}
-                          COMMAND ${CMAKE_COMMAND}
-                          ARGS -E ${make_avail} ${input_datafile} ${output_datafile}
-                          DEPENDS ${input_datafile}
-                          VERBATIM)
-      list (APPEND ${satellite}_INPUT_FILES "${output_datafile}")
-    endforeach (input_datafile)
+	foreach (input_datafile IN LISTS ${satellite}_DATA)
+	  file (RELATIVE_PATH rel_datafile "${PROJECT_SOURCE_DIR}" ${input_datafile})
+	  set (output_datafile "${PROJECT_BINARY_DIR}/${rel_datafile}")
+	  add_custom_command (
+		OUTPUT ${output_datafile}
+		COMMAND ${CMAKE_COMMAND}
+		ARGS -E ${make_avail} ${input_datafile} ${output_datafile}
+		DEPENDS ${input_datafile}
+		VERBATIM
+		)
+	  list (APPEND ${satellite}_INPUT_FILES "${output_datafile}")
+	endforeach (input_datafile)
   endif(NOT PROJECT_SOURCE_DIR STREQUAL PROJECT_BINARY_DIR)
 
   # setup a target which does all the copying
   set (${satellite}_DATAFILES "${target}")
   add_custom_target (${${satellite}_DATAFILES}
-                     DEPENDS ${${satellite}_INPUT_FILES}
-                     COMMENT "Making \"${satellite}\" data available in output tree")
+	DEPENDS ${${satellite}_INPUT_FILES}
+	COMMENT "Making \"${satellite}\" data available in output tree"
+	)
   if(NOT TARGET test-suite)
     add_custom_target(test-suite)
   endif()
@@ -302,8 +309,6 @@ macro(opm_add_test TestName)
       # only compile the binary but do not run it as a test
       add_executable("${CURTEST_EXE_NAME}" ${CURTEST_EXCLUDE_FROM_ALL} ${CURTEST_SOURCES})
       target_link_libraries (${CURTEST_EXE_NAME} ${CURTEST_LIBRARIES})
-      get_property(dirs DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR} PROPERTY INCLUDE_DIRECTORIES)
-      add_static_analysis_tests(CURTEST_SOURCES dirs)
 
       if(TARGET ${project}_prepare)
         add_dependencies("${CURTEST_EXE_NAME}" ${project}_prepare)
@@ -319,11 +324,10 @@ macro(opm_add_test TestName)
         add_executable("${CURTEST_EXE_NAME}" ${CURTEST_EXCLUDE_FROM_ALL} ${CURTEST_SOURCES})
         if(HAVE_DYNAMIC_BOOST_TEST)
           set_target_properties (${CURTEST_EXE_NAME} PROPERTIES
-                                 COMPILE_DEFINITIONS BOOST_TEST_DYN_LINK)
-        endif()
+		  COMPILE_DEFINITIONS BOOST_TEST_DYN_LINK
+	  )
+	endif()
         target_link_libraries (${CURTEST_EXE_NAME} ${CURTEST_LIBRARIES})
-        get_property(dirs DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR} PROPERTY INCLUDE_DIRECTORIES)
-        add_static_analysis_tests(CURTEST_SOURCES dirs)
 
         if(CURTEST_DEPENDS)
           add_dependencies("${CURTEST_EXE_NAME}" ${CURTEST_DEPENDS})
@@ -366,6 +370,15 @@ macro(opm_add_test TestName)
       endif()
       add_dependencies(test-suite "${CURTEST_EXE_NAME}")
     endif()
+
+  else() # test is skipped
+
+    # the following causes the test to appear as 'skipped' in the
+    # CDash dashboard. it this is removed, the test is just silently
+    # ignored.
+    if (NOT CURTEST_ONLY_COMPILE AND ADD_DISABLED_CTESTS)
+      add_test(${_FANCY} skip_test_dummy)
+    endif()
   endif()
 endmacro()
 

cmake/Modules/OpmSiblingSearch.cmake

@@ -9,7 +9,12 @@ macro(create_module_dir_var module)
     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)
-    set(_clone_dir "${module}")
+    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()
@@ -18,8 +23,7 @@ macro(create_module_dir_var module)
           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} AND
-          EXISTS ${_parent_full_dir}/${_clone_dir}/CMakeCache.txt)
+      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()

cmake/Modules/UseStaticAnalysis.cmake

@@ -34,29 +34,16 @@ function(add_static_analysis_tests sources includes)
       list(APPEND IPATHS -I ${dep})
     endforeach()
     foreach(src ${${sources}})
-      if(src MATCHES "TARGET_OBJECTS:")
-        string(REGEX REPLACE "\\$<TARGET_OBJECTS:(.*)>" "\\1" TGT ${src})
-        get_target_property(src ${TGT} SOURCES)
-      endif()
-      if(IS_ABSOLUTE ${src})
-        file(RELATIVE_PATH name ${PROJECT_SOURCE_DIR} ${src})
-      else()
-        set(name ${src})
-        set(src ${PROJECT_SOURCE_DIR}/${src})
-      endif()
+      file(RELATIVE_PATH name ${PROJECT_SOURCE_DIR} ${src})
       if(CPPCHECK_FOUND)
-        if(NOT TEST cppcheck+${name})
-          add_test(NAME cppcheck+${name}
-                   COMMAND bin/cppcheck-test.sh ${CPPCHECK_PROGRAM} ${src} ${IPATHS}
-                   CONFIGURATIONS analyze cppcheck)
-        endif()
+        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)
-        if(NOT TEST clang-check+${name})
-          add_test(NAME clang-check+${name}
-                   COMMAND bin/clang-check-test.sh ${CLANGCHECK_PROGRAM} ${src}
-                   CONFIGURATIONS analyze clang-check)
-        endif()
+        add_test(NAME clang-check+${name}
+                 COMMAND bin/clang-check-test.sh ${CLANGCHECK_PROGRAM} ${src}
+                 CONFIGURATIONS analyze clang-check)
       endif()
     endforeach()
   endif()

cmake/Modules/UseWarnings.cmake

@@ -6,7 +6,7 @@ is_compiler_gcc_compatible ()
 
 if (CXX_COMPAT_GCC)
   # default warnings flags, if not set by user
-  set_default_option (CXX _warn_flag "-Wall -Wextra -Wshadow" "(^|\ )-W")
+  set_default_option (CXX _warn_flag "-Wall" "(^|\ )-W")
   if (_warn_flag)
 	message (STATUS "All warnings enabled: ${_warn_flag}")
 	add_options (ALL_LANGUAGES ALL_BUILDS "${_warn_flag}")

cmake/Scripts/CheckCommits.cmake

@@ -31,15 +31,30 @@ if(NOT check_target)
 endif()
 
 # Build threads
-include(ProcessorCount)
 set(build_threads $ENV{CHECK_THREADS})
 if(NOT build_threads)
-  ProcessorCount(build_threads)
-  if(build_threads EQUAL 0)
-    set(build_threads 1)
+  if(UNIX)
+    if(APPLE)
+      execute_process(COMMAND sysctl hw.ncpu
+                      OUTPUT_VARIABLE build_threads)
+      string(REPLACE " " ";" build_threads_list ${build_threads)
+      list(GET build_threads_list 1 build_threads)
+    else()
+      find_program(NPROC_COMMAND nproc)
+      if(NPROC_COMMAND)
+        execute_process(COMMAND ${NPROC_COMMAND}
+                        OUTPUT_VARIABLE build_threads)
+        string(REGEX REPLACE "(\r?\n)+$" "" build_threads "${build_threads}")
+      endif()
+    endif()
   endif()
 endif()
 
+# If for some reason we could not find the info - e.g. centos5 where nproc is missing
+if(NOT build_threads)
+  set(build_threads 1)
+endif()
+
 # Record current HEAD
 execute_process(COMMAND ${GIT_EXECUTABLE} rev-parse --abbrev-ref HEAD
                 OUTPUT_VARIABLE current_branch

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

@@ -69,6 +69,12 @@ if(NOT @opm-project_NAME@_FOUND)
     endif()
   endif (NOT "@opm-project_TARGET@" STREQUAL "")
 
+  # 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}")
+
   # 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)

debian/changelog

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

debian/control

@@ -2,12 +2,11 @@ Source: opm-common
 Priority: extra
 Maintainer: Arne Morten Kvarving <arne.morten.kvarving@sintef.no>
 Build-Depends: build-essential, debhelper (>= 9),
-               pkg-config, cmake, git, libtool, doxygen, graphviz,
+               pkg-config, cmake, git, libtool, doxygen,
                texlive-latex-extra, texlive-latex-recommended,
                ghostscript, libboost-system-dev, libboost-test-dev,
-               zlib1g-dev, libpython3-dev, python3-numpy, python3-distutils,
-               python3-setuptools, python3-setuptools-scm, python3-pytest-runner,
-               python3-decorator
+               libecl-dev, libboost-regex-dev, libboost-filesystem-dev,
+               zlib1g-dev
 Standards-Version: 3.9.2
 Section: libs
 Homepage: http://opm-project.org
@@ -24,16 +23,6 @@ Provides: libopm-common
 Description: OPM common library
  The OPM common library contains generic code shared across all OPM modules.
 
-Package: libopm-common1-bin
-Section: libs
-Pre-Depends: ${misc:Pre-Depends}
-Architecture: any
-Multi-Arch: same
-Depends: ${shlibs:Depends}, ${misc:Depends}
-Provides: libopm-common-bin
-Description: OPM common binaries
- The OPM common binaries.
-
 Package: libopm-common1-dev
 Section: libdevel
 Architecture: any
@@ -53,12 +42,3 @@ Provides: libopm-common-doc
 Description: OPM common library -- documentation
  The OPM common library contains the shared buildsystem
  and helpers shared across all OPM modules.
-
-Package: python3-opm-common
-Section: libs
-Pre-Depends: ${misc:Pre-Depends}, multiarch-support
-Architecture: any
-Multi-Arch: same
-Depends: ${shlibs:Depends}, ${misc:Depends}, libopm-common1, python3-numpy, python3-decorator
-Description: OPM common python bindings
-  Python package for opm-common

debian/libopm-common1-bin.install

@@ -1 +0,0 @@
-usr/bin/*

debian/python3-opm-common.install

@@ -1 +0,0 @@
-usr/lib/python*/*

debian/rules

@@ -10,7 +10,7 @@
 #export DH_VERBOSE=1
 
 %:
-	dh $@ --parallel
+	dh $@
 
 override_dh_auto_clean:
 	dh_auto_clean --buildsystem=cmake
@@ -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 -DWITH_NATIVE=OFF -DOPM_ENABLE_PYTHON=1 -DOPM_INSTALL_PYTHON=1 -DPYTHON_EXECUTABLE=/usr/bin/python3
+	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

docs/keywords.txt

@@ -184,8 +184,8 @@ the WCONHIST keyword has the the following items specification:
        {"name" : "ORAT"         , "value_type" : "DOUBLE",  "default" : 0.0, "dimension" : "LiquidSurfaceVolume/Time"},
        {"name" : "WRAT"         , "value_type" : "DOUBLE" , "default" : 0.0, "dimension" : "LiquidSurfaceVolume/Time"},
        {"name" : "GRAT"         , "value_type" : "DOUBLE" , "default" : 0.0, "dimension" : "GasSurfaceVolume/Time"},
-       {"name" : "VFP_TABLE"    , "value_type" : "INT"   , "default" : 0.0 , "comment":"The default is a state variable"},
-       {"name" : "LIFT"         , "value_type" : "DOUBLE" , "default" : 0.0 , "comment":"The default is a state variable"},
+       {"name" : "VFPTable"     , "value_type" : "INT"   , "default" : 0.0 , "comment":"The default is a state variable"},
+       {"name" : "Lift"         , "value_type" : "DOUBLE" , "default" : 0.0 , "comment":"The default is a state variable"},
        {"name" : "THP"          , "value_type" : "DOUBLE" , "default" : 0.0 , "dimension" : "Pressure"},
        {"name" : "BHP"          , "value_type" : "DOUBLE" , "default" : 0.0 ,"dimension" : "Pressure"},
        {"name" : "NGLRAT"       , "value_type" : "DOUBLE" , "default" : 0.0 ,"dimension" : "LiquidSurfaceVolume/Time"}]}

dune.module

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

examples/msim.cpp

@@ -37,8 +37,8 @@ int main(int /* argc */, char** argv) {
     Opm::ErrorGuard error_guard;
 
     Opm::Deck deck = parser.parseFile(deck_file, parse_context, error_guard);
-    Opm::EclipseState state(deck);
-    Opm::Schedule schedule(deck, state, parse_context, error_guard);
+    Opm::EclipseState state(deck, parse_context, error_guard);
+    Opm::Schedule schedule(deck, state.getInputGrid(), state.get3DProperties(), state.runspec(), parse_context, error_guard);
     Opm::SummaryConfig summary_config(deck, schedule, state.getTableManager(), parse_context, error_guard);
 
     if (error_guard) {
@@ -48,6 +48,6 @@ int main(int /* argc */, char** argv) {
 
     Opm::msim msim(state);
     Opm::EclipseIO io(state, state.getInputGrid(), schedule, summary_config);
-    msim.run(schedule, io, false);
+    msim.run(schedule, io);
 }
 

examples/opmhash.cpp

@@ -33,12 +33,11 @@
 
 
 struct keyword {
-    keyword(const std::string& name_arg, const std::string& filename_arg,
-            std::size_t line_number_arg, std::size_t content_hash_arg) :
-        name(name_arg),
-        filename(filename_arg),
-        line_number(line_number_arg),
-        content_hash(content_hash_arg)
+    keyword(const std::string& name, const std::string& filename, std::size_t line_number, std::size_t content_hash) :
+        name(name),
+        filename(filename),
+        line_number(line_number),
+        content_hash(content_hash)
     {}
 
 
@@ -64,10 +63,9 @@ std::vector<keyword> load_deck(const char * deck_file) {
     auto deck = parser.parseFile(deck_file, parseContext, errors);
     for (const auto& kw : deck) {
         std::stringstream ss;
-        const auto& location = kw.location();
         ss << kw;
 
-        keywords.emplace_back(kw.name(), location.filename, location.lineno, std::hash<std::string>{}(ss.str()));
+        keywords.emplace_back(kw.name(), kw.getFileName(), kw.getLineNumber(), std::hash<std::string>{}(ss.str()));
     }
     return keywords;
 }

examples/opmi.cpp

@@ -18,8 +18,6 @@
 */
 
 #include <iostream>
-#include <iomanip>
-#include <chrono>
 
 #include <opm/parser/eclipse/Parser/Parser.hpp>
 #include <opm/parser/eclipse/Parser/ParseContext.hpp>
@@ -30,15 +28,6 @@
 #include <opm/parser/eclipse/EclipseState/SummaryConfig/SummaryConfig.hpp>
 #include <opm/parser/eclipse/EclipseState/Schedule/Schedule.hpp>
 
-#include <opm/common/OpmLog/OpmLog.hpp>
-#include <opm/common/OpmLog/StreamLog.hpp>
-#include <opm/common/OpmLog/LogUtil.hpp>
-
-
-void initLogging() {
-    std::shared_ptr<Opm::StreamLog> cout_log = std::make_shared<Opm::StreamLog>(std::cout, Opm::Log::DefaultMessageTypes);
-    Opm::OpmLog::addBackend( "COUT" , cout_log);
-}
 
 inline void loadDeck( const char * deck_file) {
     Opm::ParseContext parseContext;
@@ -46,42 +35,16 @@ inline void loadDeck( const char * deck_file) {
     Opm::Parser parser;
 
     std::cout << "Loading deck: " << deck_file << " ..... "; std::cout.flush();
-
-    std::chrono::system_clock::time_point start;
-
-    start = std::chrono::system_clock::now();
     auto deck = parser.parseFile(deck_file, parseContext, errors);
-    auto deck_time = std::chrono::system_clock::now() - start;
-
     std::cout << "parse complete - creating EclipseState .... ";  std::cout.flush();
-
-    start = std::chrono::system_clock::now();
-    Opm::EclipseState state( deck );
-    auto state_time = std::chrono::system_clock::now() - start;
-
-    std::cout << "creating Schedule .... ";  std::cout.flush();
-
-    start = std::chrono::system_clock::now();
-    Opm::Schedule schedule( deck, state);
-    auto schedule_time = std::chrono::system_clock::now() - start;
-
-    std::cout << "creating SummaryConfig .... ";  std::cout.flush();
-
-    start = std::chrono::system_clock::now();
+    Opm::EclipseState state( deck, parseContext, errors );
+    Opm::Schedule schedule( deck, state.getInputGrid(), state.get3DProperties(), state.runspec(), parseContext, errors);
     Opm::SummaryConfig summary( deck, schedule, state.getTableManager( ), parseContext, errors );
-    auto summary_time = std::chrono::system_clock::now() - start;
-
-    std::cout << "complete." << std::endl << std::endl;
-    std::cout << "Time: " << std::endl;
-    std::cout << "   deck.....: "  << std::chrono::duration<double>(deck_time).count()  << " seconds" << std::endl;
-    std::cout << "   state....: "  << std::chrono::duration<double>(state_time).count()  << " seconds" << std::endl;
-    std::cout << "   schedule.: "  << std::chrono::duration<double>(schedule_time).count()  << " seconds" << std::endl;
-    std::cout << "   summary..: "  << std::chrono::duration<double>(summary_time).count()  << " seconds" << std::endl;
+    std::cout << "complete." << std::endl;
 }
 
 
 int main(int argc, char** argv) {
-    initLogging();
     for (int iarg = 1; iarg < argc; iarg++)
         loadDeck( argv[iarg] );
 }

examples/opmpack.cpp

@@ -17,21 +17,18 @@
   along with OPM.  If not, see <http://www.gnu.org/licenses/>.
 */
 
-#include <fstream>
 #include <iostream>
 #include <getopt.h>
+#include <boost/filesystem.hpp>
 
-#include <opm/common/utility/FileSystem.hpp>
-#include <opm/parser/eclipse/Parser/ParserKeywords/G.hpp>
 #include <opm/parser/eclipse/Parser/Parser.hpp>
 #include <opm/parser/eclipse/Parser/ErrorGuard.hpp>
 #include <opm/parser/eclipse/Parser/ParseContext.hpp>
 #include <opm/parser/eclipse/Parser/InputErrorAction.hpp>
 #include <opm/parser/eclipse/Deck/Deck.hpp>
 
-namespace fs = Opm::filesystem;
 
-Opm::Deck pack_deck( const char * deck_file, std::ostream& os) {
+inline void pack_deck( const char * deck_file, std::ostream& os) {
     Opm::ParseContext parseContext(Opm::InputError::WARN);
     Opm::ErrorGuard errors;
     Opm::Parser parser;
@@ -39,7 +36,6 @@ Opm::Deck pack_deck( const char * deck_file, std::ostream& os) {
     auto deck = parser.parseFile(deck_file, parseContext, errors);
     os << deck;
 
-    return deck;
 }
 
 
@@ -66,44 +62,21 @@ Print NEW_CASE in cwd:
 
     opmpack -o NEW_CASE.DATA path/to/MY_CASE.DATA
 
-As an alternative to the -o option you can use -c; that is equivalent to -o -
-but restart and import files referred to in the deck are also copied. The -o and
--c options are mutually exclusive. )";
+
+)";
     std::cerr << help_text << std::endl;
     exit(1);
 }
 
 
-void copy_file(const fs::path& source_dir, fs::path fname, const fs::path& target_dir) {
-    if (fname.is_absolute()) {
-        // change when moving to gcc8+
-        // fname = fs::relative(fname, source_dir);
-        auto prefix_len = fs::canonical(source_dir).string().size();
-        fname = fs::canonical(fname);
-        fname = fs::path( fname.string().substr(prefix_len + 1) );
-    }
-
-    auto source_file = source_dir / fname;
-    auto target_file = target_dir / fname;
-
-    if (!fs::is_directory(target_file.parent_path()))
-        fs::create_directories(target_file.parent_path());
-
-    fs::copy_file(source_file, target_file, fs::copy_options::overwrite_existing);
-    std::cerr << "Copying file " << source_file.string() << " -> " << target_file.string() << std::endl;
-}
-
-
-
 int main(int argc, char** argv) {
     int arg_offset = 1;
     bool stdout_output = true;
-    bool copy_binary = false;
     const char * coutput_arg;
 
     while (true) {
         int c;
-        c = getopt(argc, argv, "c:o:");
+        c = getopt(argc, argv, "o:");
         if (c == -1)
             break;
 
@@ -112,11 +85,6 @@ int main(int argc, char** argv) {
             stdout_output = false;
             coutput_arg = optarg;
             break;
-        case 'c':
-            stdout_output = false;
-            copy_binary = true;
-            coutput_arg = optarg;
-            break;
         }
     }
     arg_offset = optind;
@@ -127,41 +95,16 @@ int main(int argc, char** argv) {
         pack_deck(argv[arg_offset], std::cout);
     else {
         std::ofstream os;
-        fs::path input_arg(argv[arg_offset]);
-        fs::path output_arg(coutput_arg);
-        fs::path output_dir(coutput_arg);
-
-        if (fs::is_directory(output_arg)) {
-            fs::path output_path = output_arg / input_arg.filename();
+        using path = boost::filesystem::path;
+        path input_arg(argv[arg_offset]);
+        path output_arg(coutput_arg);
+        if (boost::filesystem::is_directory(output_arg)) {
+            path output_path = output_arg / input_arg.filename();
             os.open(output_path.string());
-        } else {
+        } else
             os.open(output_arg.string());
-            output_dir = output_arg.parent_path();
-        }
 
-
-        const auto& deck = pack_deck(argv[arg_offset], os);
-        if (copy_binary) {
-            Opm::InitConfig init_config(deck);
-            if (init_config.restartRequested()) {
-                Opm::IOConfig io_config(deck);
-                fs::path restart_file(io_config.getRestartFileName( init_config.getRestartRootName(), init_config.getRestartStep(), false ));
-                copy_file(input_arg.parent_path(), restart_file, output_dir);
-            }
-
-            for (std::size_t import_index = 0; import_index < deck.count("IMPORT"); import_index++) {
-                const auto& import_keyword = deck.getKeyword("IMPORT", import_index);
-                const auto& fname = import_keyword.getRecord(0).getItem("FILE").get<std::string>(0);
-                copy_file(input_arg.parent_path(), fname, output_dir);
-            }
-
-            using GDFILE = Opm::ParserKeywords::GDFILE;
-            if (deck.hasKeyword<GDFILE>()) {
-                const auto& gdfile_keyword = deck.getKeyword<GDFILE>();
-                const auto& fname = gdfile_keyword.getRecord(0).getItem<GDFILE::filename>().get<std::string>(0);
-                copy_file(input_arg.parent_path(), fname, output_dir);
-            }
-        }
+        pack_deck(argv[arg_offset], os);
     }
 }
 

examples/test_util/EclFile.cpp

@@ -0,0 +1,505 @@
+/*
+   Copyright 2019 Equinor ASA.
+
+   This file is part of the Open Porous Media project (OPM).
+
+   OPM is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by
+   the Free Software Foundation, either version 3 of the License, or
+   (at your option) any later version.
+
+   OPM is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with OPM.  If not, see <http://www.gnu.org/licenses/>.
+   */
+
+#include <string>
+#include <string.h>
+#include <sstream>
+#include <iterator>
+#include <iomanip>
+#include <algorithm>
+
+#include "EclFile.hpp"
+
+
+// anonymous namespace for EclFile
+
+namespace {
+  
+bool isEOF(std::fstream *fileH){
+    
+    /* try to read 4 byte (integer), if passed eof of, return true.
+       if not, seek back to current file possition  */
+    
+    int num;
+    long int pos=fileH->tellg();
+    fileH->read((char *)&num, sizeof(num));
+    
+    if (fileH->eof()){
+        return true;
+    } else {
+        fileH->seekg (pos);
+        return false;
+    }
+}
+
+int flipEndianInt(const int &num) {
+
+   unsigned int tmp=__builtin_bswap32(num);
+   
+   return (int)tmp;
+}
+
+float flipEndianFloat(const float &num) {
+
+    float value=num;
+
+    char *floatToConvert = reinterpret_cast<char*>(&value);
+    std::reverse(floatToConvert, floatToConvert+4);
+    
+    return value;
+}
+
+double flipEndianDouble(const double &num) {
+    double value=num;
+    
+    char *doubleToConvert = reinterpret_cast<char*>(&value);
+    std::reverse(doubleToConvert, doubleToConvert+8);
+
+    return value;
+}
+
+std::tuple<const int, const int> block_size_data(EIOD::eclArrType arrType){
+
+    switch(arrType) {
+        case EIOD::INTE  : return std::make_tuple(EIOD::sizeOfInte,EIOD::MaxBlockSizeInte);   break;
+        case EIOD::REAL  : return std::make_tuple(EIOD::sizeOfReal,EIOD::MaxBlockSizeReal);   break;
+        case EIOD::DOUB  : return std::make_tuple(EIOD::sizeOfDoub,EIOD::MaxBlockSizeDoub);   break;
+        case EIOD::LOGI  : return std::make_tuple(EIOD::sizeOfLogi,EIOD::MaxBlockSizeLogi);   break;
+        case EIOD::CHAR  : return std::make_tuple(EIOD::sizeOfChar,EIOD::MaxBlockSizeChar);   break;
+        case EIOD::MESS  : throw std::invalid_argument("Type 'MESS' have not assosiated data") ;   break;
+        default          : throw std::invalid_argument("Unknown type"); break;
+    }
+}
+
+std::string trimr(const std::string &str1) {
+
+    std::string tmpStr=str1;
+    
+    while (tmpStr.back()==' '){
+        tmpStr.pop_back();
+    }
+
+    return std::move(tmpStr);
+}
+
+
+void readBinaryHeader(std::fstream &fileH, std::string &arrName, int &size, EIOD::eclArrType &arrType){
+
+    int bhead;
+    std::string tmpStrName(8,' ');
+    std::string tmpStrType(4,' ');
+
+    if (!fileH.is_open()){
+        std::string message="fstream fileH not open for reading";
+        throw std::runtime_error(message);
+    }
+
+    fileH.read((char *)&bhead, sizeof(bhead));
+    bhead=flipEndianInt(bhead);
+    
+    if (bhead!=16){
+        std::string message="Error reading binary header. Expected 16 bytes of header data, found " + std::to_string(bhead);
+        throw std::runtime_error(message);
+    }
+    
+    fileH.read(&tmpStrName[0], 8);
+    
+    fileH.read((char *)&size, sizeof(size));
+    size=flipEndianInt(size);
+
+    fileH.read(&tmpStrType[0], 4);
+
+    fileH.read((char *)&bhead, sizeof(bhead));
+    bhead=flipEndianInt(bhead);
+    
+    if (bhead!=16){
+        std::string message="Error reading binary header. Expected 16 bytes of header data, found " + std::to_string(bhead);
+        throw std::runtime_error(message);
+    }
+    
+    arrName=tmpStrName;
+    
+    if (tmpStrType=="INTE")
+        arrType=EIOD::INTE;
+    else if (tmpStrType=="REAL")    
+        arrType=EIOD::REAL;
+    else if (tmpStrType=="DOUB")    
+        arrType=EIOD::DOUB;
+    else if (tmpStrType=="CHAR")    
+        arrType=EIOD::CHAR;
+    else if (tmpStrType=="LOGI")    
+        arrType=EIOD::LOGI;
+    else if (tmpStrType=="MESS")    
+        arrType=EIOD::MESS;
+    else
+        throw std::runtime_error("Error, unknown array type '" + tmpStrType +"'");
+    
+}
+
+
+unsigned long int sizeOnDisk(const int num, const EIOD::eclArrType &arrType){
+    
+    unsigned long int size=0;
+
+    if (arrType==EIOD::MESS){
+        if (num>0) {
+            std::string message="In routine calcSizeOfArray, type MESS can not have size > 0";
+            throw std::invalid_argument(message);
+        }
+    } else {
+
+        auto sizeData = block_size_data(arrType);
+
+	    int sizeOfElement = std::get<0>(sizeData);
+        int maxBlockSize = std::get<1>(sizeData);
+        int maxNumberOfElements=maxBlockSize/sizeOfElement;
+       
+        size=num*sizeOfElement;
+        size=size + ((num-1) / maxNumberOfElements)*2*EIOD::sizeOfInte;    // 8 byte (two integers) every 1000 element        
+        
+        if (num>0){
+            size=size+2*EIOD::sizeOfInte;
+        }
+    }
+         
+    return size;
+}
+
+
+std::vector<int> readBinaryInteArray(std::fstream &fileH, const int size){
+
+    std::vector<int> arr;
+    int rest=size;
+    
+    auto sizeData = block_size_data(EIOD::INTE);
+
+    int sizeOfElement = std::get<0>(sizeData);
+    int maxBlockSize = std::get<1>(sizeData);
+    int maxNumberOfElements=maxBlockSize/sizeOfElement;
+
+    arr.reserve(size);
+    
+    if (!fileH.is_open()){
+        std::string message="fstream fileH not open for reading";
+        throw std::runtime_error(message);
+    }
+   
+    while (rest > 0) {   
+ 
+        int num,dhead,dtail;
+
+        fileH.read((char *)&dhead, sizeof(dhead));
+        dhead=flipEndianInt(dhead);
+        
+        num=dhead/sizeOfElement;
+
+        if ((num > maxNumberOfElements) || (num < 0)){
+            std::string message="Error reading binary inte data, inconsistent header data or incorrect number of elements";
+            throw std::runtime_error(message);
+        }
+       
+        for (int i=0;i<num;i++){
+            int value;
+            fileH.read((char *)&value, sizeOfElement);
+            value=flipEndianInt(value);
+            arr.push_back(value);
+        }
+       
+        rest=rest-num;
+       
+        if (((num < maxNumberOfElements) && (rest!=0)) || ((num==maxNumberOfElements) && (rest < 0))) {
+            std::string message="Error reading binary integer data, incorrect number of elements";
+            throw std::runtime_error(message);
+        }
+       
+        fileH.read((char *)&dtail, sizeof(dtail));
+        dtail=flipEndianInt(dtail);
+       
+        if (dhead!=dtail){ 
+            std::string message="Error reading binary real data, tail not matching header.";
+            throw std::runtime_error(message);
+        }
+    } 
+
+    return arr;
+}
+
+std::vector<float> readBinaryRealArray(std::fstream &fileH, const int size){
+
+    std::vector<float> arr;
+    arr.reserve(size);
+
+    auto sizeData = block_size_data(EIOD::REAL);
+
+    int sizeOfElement = std::get<0>(sizeData);
+    int maxBlockSize = std::get<1>(sizeData);
+    int maxNumberOfElements=maxBlockSize/sizeOfElement;
+
+    
+    if (!fileH.is_open()){
+        std::string message="fstream fileH not open for reading";
+        throw std::runtime_error(message);
+    }
+
+    int rest=size;
+
+    while (rest > 0) {   
+ 
+        int num,dhead,dtail;
+
+        fileH.read((char *)&dhead, sizeof(dhead));
+        dhead=flipEndianInt(dhead);
+   
+        num=dhead/sizeOfElement;
+       
+        if ((num > maxNumberOfElements) || (num < 0)){
+            std::string message="Error reading binary real data, inconsistent header data or incorrect number of elements";
+            throw std::runtime_error(message);
+        }
+       
+        for (int i=0;i<num;i++){
+            float value;
+            fileH.read((char *)&value, sizeOfElement);
+            value=flipEndianFloat(value);
+            arr.push_back(value);
+        }
+   
+        rest=rest-num;
+       
+        if (((num < maxNumberOfElements) && (rest!=0)) || ((num==maxNumberOfElements) && (rest < 0))) {
+            std::string message="Error reading binary real data, incorrect number of elements";
+            throw std::runtime_error(message);
+        }
+       
+        fileH.read((char *)&dtail, sizeof(dtail));
+        dtail=flipEndianInt(dtail);
+ 
+        if (dhead!=dtail){ 
+            std::string message="Error reading binary real data, tail not matching header.";
+            throw std::runtime_error(message);
+        }
+    } 
+   
+    return arr;
+}
+
+std::vector<double> readBinaryDoubArray(std::fstream &fileH, const int size){
+
+    std::vector<double> arr;
+    arr.reserve(size);
+
+    auto sizeData = block_size_data(EIOD::DOUB);
+
+    int sizeOfElement = std::get<0>(sizeData);
+    int maxBlockSize = std::get<1>(sizeData);
+    int maxNumberOfElements=maxBlockSize/sizeOfElement;
+
+    if (!fileH.is_open()){
+        std::string message="fstream fileH not open for reading";
+        throw std::runtime_error(message);
+    }
+   
+    int rest=size;
+
+    while (rest > 0) {   
+ 
+        int num,dhead,dtail;
+
+        fileH.read((char *)&dhead, sizeof(dhead));
+        dhead=flipEndianInt(dhead);
+   
+        num=dhead/sizeOfElement;
+       
+        if ((num > maxNumberOfElements) || (num < 0)){
+            std::string message="Error reading binary doub data, inconsistent header data or incorrect number of elements";
+            throw std::runtime_error(message);
+        }
+       
+        for (int i=0;i<num;i++){
+            double value;
+            fileH.read((char *)&value, sizeOfElement);
+            value=flipEndianDouble(value);
+            arr.push_back(value);
+        }
+   
+        rest=rest-num;
+       
+        if (((num < maxNumberOfElements) && (rest!=0)) || ((num==maxNumberOfElements) && (rest < 0))) {
+            std::string message="Error reading binary doub data, incorrect number of elements";
+            throw std::runtime_error(message);
+        }
+
+        fileH.read((char *)&dtail, sizeof(dtail));
+        dtail=flipEndianInt(dtail);
+ 
+        if (dhead!=dtail){ 
+            std::string message="Error reading binary doub data, tail not matching header.";
+            throw std::runtime_error(message);
+        }
+    } 
+   
+    return arr;
+}
+
+std::vector<bool> readBinaryLogiArray(std::fstream &fileH, const int size){
+
+    std::vector<bool> arr;
+    arr.reserve(size);
+
+    int rest=size;
+
+    auto sizeData = block_size_data(EIOD::LOGI);
+
+    int sizeOfElement = std::get<0>(sizeData);
+    int maxBlockSize = std::get<1>(sizeData);
+    int maxNumberOfElements=maxBlockSize/sizeOfElement;
+    
+    if (!fileH.is_open()){
+        std::string message="fstream fileH not open for reading";
+        throw std::runtime_error(message);
+    }
+   
+    while (rest > 0) {   
+ 
+        int num,dhead,dtail;
+
+        fileH.read((char *)&dhead, sizeof(dhead));
+        dhead=flipEndianInt(dhead);
+   
+        num=dhead/sizeOfElement;
+
+        if ((num > maxNumberOfElements) || (num < 0)){
+            std::string message="This ?? Error reading binary logi data, inconsistent header data or incorrect number of elements";
+            throw std::runtime_error(message);
+        }
+
+        for (int i=0;i<num;i++){
+
+            bool value;
+            unsigned int intVal;
+
+            fileH.read((char *)&intVal, sizeOfElement);
+            
+            if (intVal==EIOD::true_value){
+                value=true;
+            } else if (intVal==EIOD::false_value){
+                value=false;
+            } else {
+                std::string message="Error reading log value from element " + std::to_string(i);
+                throw std::runtime_error(message);
+            }
+           
+            arr.push_back(value);
+        }
+   
+        rest=rest-num;
+
+        if (((num < maxNumberOfElements) && (rest!=0)) || ((num==maxNumberOfElements) && (rest < 0))) {
+            std::string message="Error reading binary logi data, incorrect number of elements";
+            throw std::runtime_error(message);
+        }
+       
+        fileH.read((char *)&dtail, sizeof(dtail));
+        dtail=flipEndianInt(dtail);
+ 
+        if (dhead!=dtail){ 
+            std::string message="Error reading binary logi data, tail not matching header.";
+            throw std::runtime_error(message);
+        }
+    } 
+   
+    return arr;
+}
+
+
+std::vector<std::string> readBinaryCharArray(std::fstream &fileH, const int size){
+
+    std::vector<std::string> arr;
+    arr.reserve(size);
+   
+    int rest=size;
+
+    auto sizeData = block_size_data(EIOD::CHAR);
+
+    int sizeOfElement = std::get<0>(sizeData);
+    int maxBlockSize = std::get<1>(sizeData);
+    int maxNumberOfElements=maxBlockSize/sizeOfElement;
+
+    if (!fileH.is_open()){
+        std::string message="fstream fileH not open for reading";
+        throw std::runtime_error(message);
+    }
+   
+    while (rest > 0) {   
+ 
+        int num,dhead,dtail;
+
+        fileH.read((char *)&dhead, sizeof(dhead));
+        dhead=flipEndianInt(dhead);
+        
+        num=dhead/sizeOfElement;
+
+        if ((num > maxNumberOfElements) || (num < 0)){
+            std::string message="Error reading binary char data, inconsistent header data or incorrect number of elements";
+            throw std::runtime_error(message);
+        }
+
+        for (int i=0;i<num;i++){
+            std::string str8(8,' ');
+            fileH.read(&str8[0], sizeOfElement);
+            arr.push_back(trimr(str8));
+        }
+   
+        rest=rest-num;
+
+        if ((num < maxNumberOfElements) && (rest!=0)){
+            std::string message="Error reading binary char data, incorrect number of elements";
+            throw std::runtime_error(message);
+        }
+       
+        fileH.read((char *)&dtail, sizeof(dtail));
+        dtail=flipEndianInt(dtail);
+ 
+        if (dhead!=dtail){ 
+            std::string message="Error reading binary char data, tail not matching header.";
+            throw std::runtime_error(message);
+        }
+    } 
+   
+    return arr;
+}
+
+} // anonymous namespace
+
+EclFile::EclFile(const std::string& filename){
+
+    std::fstream fileH;
+    
+    fileH.open(filename, std::ios::in |  std::ios::binary);
+
+    if (!fileH.good()) {
+        std::string message="Could not open file";
+        throw std::runtime_error(message);
+    }
+
+    fileH.close();
+
+     
+}
+
+

examples/test_util/EclFile.hpp

@@ -16,25 +16,26 @@
    along with OPM.  If not, see <http://www.gnu.org/licenses/>.
    */
 
-#ifndef OPM_IO_ECLUTIL_HPP
-#define OPM_IO_ECLUTIL_HPP
-
-#include <opm/io/eclipse/EclIOdata.hpp>
 
+//#include "EclIO.hpp"
+#include <iostream>
 #include <string>
-#include <tuple>
+#include <fstream>
+#include <vector>
+#include <ctime>
+#include <map>
 
-namespace Opm { namespace EclIO {
+#include <examples/test_util/data/EclIOdata.hpp>
 
-    int flipEndianInt(int num);
-    float flipEndianFloat(float num);
-    double flipEndianDouble(double num);
+namespace EIOD = Opm::ecl;
 
-    std::tuple<int, int> block_size_data_binary(eclArrType arrType);
-    std::tuple<int, int, int> block_size_data_formatted(eclArrType arrType);
+class EclFile 
+{
 
-    std::string trimr(const std::string &str1);
+public:
+    
+    explicit EclFile(const std::string& filename);
+    
+};  
 
-}} // namespace Opm::EclIO
 
-#endif // OPM_IO_ECLUTIL_HPP

examples/test_util/EclFilesComparator.cpp

@@ -0,0 +1,300 @@
+/*
+   Copyright 2016 Statoil ASA.
+
+   This file is part of the Open Porous Media project (OPM).
+
+   OPM is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by
+   the Free Software Foundation, either version 3 of the License, or
+   (at your option) any later version.
+
+   OPM is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with OPM.  If not, see <http://www.gnu.org/licenses/>.
+   */
+
+#include "EclFilesComparator.hpp"
+#include <opm/common/ErrorMacros.hpp>
+#include <opm/common/utility/numeric/calculateCellVol.hpp>
+
+#include <stdio.h>
+
+#include <set>
+#include <iostream>
+#include <iomanip>
+#include <algorithm>
+#include <cmath>
+#include <numeric>
+
+#include <ert/ecl/ecl_file.h>
+#include <ert/ecl/ecl_grid.h>
+#include <ert/ecl/ecl_type.h>
+
+#include <ert/ecl_well/well_info.h>
+
+
+// helper macro to handle error throws or not
+#define HANDLE_ERROR(type, message) \
+  { \
+    if (throwOnError) \
+      OPM_THROW(type, message); \
+    else { \
+      std::cerr << message << std::endl; \
+      ++num_errors; \
+    } \
+  }
+
+
+namespace {
+    /*
+      This is just a basic survival test; we verify that the ERT well
+      loader which is used in Resinsight can load the well description
+      from the restart file.
+    */
+
+    void loadWells( const ecl_grid_type * grid , ecl_file_type * rst_file ) {
+        well_info_type * well_info = well_info_alloc( grid );
+        well_info_add_UNRST_wells2( well_info , ecl_file_get_global_view( rst_file ), true );
+        well_info_free( well_info );
+    }
+
+}
+
+
+void ECLFilesComparator::keywordValidForComparing(const std::string& keyword) const {
+    auto it = std::find(keywords1.begin(), keywords1.end(), keyword);
+    if (it == keywords1.end()) {
+        OPM_THROW(std::runtime_error, "Keyword " << keyword << " does not exist in first file.");
+    }
+    it = find(keywords2.begin(), keywords2.end(), keyword);
+    if (it == keywords2.end()) {
+        OPM_THROW(std::runtime_error, "Keyword " << keyword << " does not exist in second file.");
+    }
+}
+
+
+unsigned int ECLFilesComparator::getEclKeywordData(ecl_kw_type*& ecl_kw1, ecl_kw_type*& ecl_kw2, const std::string& keyword, int occurrence1, int occurrence2) const {
+    ecl_kw1 = ecl_file_iget_named_kw(ecl_file1, keyword.c_str(), occurrence1);
+    ecl_kw2 = ecl_file_iget_named_kw(ecl_file2, keyword.c_str(), occurrence2);
+    const unsigned int numCells1 = ecl_kw_get_size(ecl_kw1);
+    const unsigned int numCells2 = ecl_kw_get_size(ecl_kw2);
+    if (numCells1 != numCells2) {
+        OPM_THROW(std::runtime_error, "For keyword " << keyword << ":"
+                << "\nOccurrence in first file " << occurrence1
+                << "\nOccurrence in second file " << occurrence2
+                << "\nCells in first file: " << numCells1
+                << "\nCells in second file: " << numCells2
+                << "\nThe number of cells differ.");
+    }
+    return numCells1;
+}
+
+
+
+template <typename T>
+void ECLFilesComparator::printValuesForCell(const std::string& /*keyword*/, int occurrence1, int occurrence2, size_t kw_size, size_t cell, const T& value1, const T& value2) const {
+    if (kw_size == static_cast<size_t>(ecl_grid_get_active_size(ecl_grid1))) {
+        int i, j, k;
+        ecl_grid_get_ijk1A(ecl_grid1, cell, &i, &j, &k);
+        // Coordinates from this function are zero-based, hence incrementing
+        i++, j++, k++;
+        std::cout << std::endl
+                  << "Occurrence in first file    = "  << occurrence1 << "\n"
+                  << "Occurrence in second file   = "  << occurrence2 << "\n"
+                  << "Value index                 = "  << cell << "\n"
+                  << "Grid coordinate             = (" << i << ", " << j << ", " << k << ")" << "\n"
+                  << "(first value, second value) = (" << value1 << ", " << value2 << ")\n\n";
+
+        return;
+    }
+
+    if (kw_size == static_cast<size_t>(ecl_grid_get_global_size(ecl_grid1))) {
+        int i, j, k;
+        ecl_grid_get_ijk1(ecl_grid1, cell, &i, &j, &k);
+        // Coordinates from this function are zero-based, hence incrementing
+        i++, j++, k++;
+        std::cout << std::endl
+                  << "Occurrence in first file    = "  << occurrence1 << "\n"
+                  << "Occurrence in second file   = "  << occurrence2 << "\n"
+                  << "Value index                 = "  << cell << "\n"
+                  << "Grid coordinate             = (" << i << ", " << j << ", " << k << ")" << "\n"
+                  << "(first value, second value) = (" << value1 << ", " << value2 << ")\n\n";
+        return;
+    }
+
+    std::cout << std::endl
+              << "Occurrence in first file    = "  << occurrence1 << "\n"
+              << "Occurrence in second file   = "  << occurrence2 << "\n"
+              << "Value index                 = "  << cell << "\n"
+              << "(first value, second value) = (" << value1 << ", " << value2 << ")\n\n";
+}
+
+template void ECLFilesComparator::printValuesForCell<bool>       (const std::string& keyword, int occurrence1, int occurrence2, size_t kw_size, size_t cell, const bool&        value1, const bool&        value2) const;
+template void ECLFilesComparator::printValuesForCell<int>        (const std::string& keyword, int occurrence1, int occurrence2, size_t kw_size, size_t cell, const int&         value1, const int&         value2) const;
+template void ECLFilesComparator::printValuesForCell<double>     (const std::string& keyword, int occurrence1, int occurrence2, size_t kw_size, size_t cell, const double&      value1, const double&      value2) const;
+template void ECLFilesComparator::printValuesForCell<std::string>(const std::string& keyword, int occurrence1, int occurrence2, size_t kw_size, size_t cell, const std::string& value1, const std::string& value2) const;
+
+
+ECLFilesComparator::ECLFilesComparator(int file_type_arg, const std::string& basename1,
+                                       const std::string& basename2,
+                                       double absToleranceArg, double relToleranceArg) :
+ file_type(file_type_arg), absTolerance(absToleranceArg), relTolerance(relToleranceArg) {
+
+    std::string file1, file2;
+    if (file_type == ECL_UNIFIED_RESTART_FILE) {
+        file1 = basename1 + ".UNRST";
+        file2 = basename2 + ".UNRST";
+    }
+    else if (file_type == ECL_INIT_FILE) {
+        file1 = basename1 + ".INIT";
+        file2 = basename2 + ".INIT";
+    }
+    else if (file_type == ECL_RFT_FILE) {
+        file1 = basename1 + ".RFT";
+        file2 = basename2 + ".RFT";
+    }
+    else {
+        OPM_THROW(std::invalid_argument, "Unsupported filetype sent to ECLFilesComparator's constructor."
+                << "Only unified restart (.UNRST), initial (.INIT) and .RFT files are supported.");
+    }
+    ecl_file1 = ecl_file_open(file1.c_str(), 0);
+    ecl_file2 = ecl_file_open(file2.c_str(), 0);
+    ecl_grid1 = ecl_grid_load_case(basename1.c_str());
+    ecl_grid2 = ecl_grid_load_case(basename2.c_str());
+    if (ecl_file1 == nullptr) {
+        OPM_THROW(std::invalid_argument, "Error opening first file: " << file1);
+    }
+    if (ecl_file2 == nullptr) {
+        OPM_THROW(std::invalid_argument, "Error opening second file: " << file2);
+    }
+    if (ecl_grid1 == nullptr) {
+        OPM_THROW(std::invalid_argument, "Error opening first grid file: " << basename1);
+    }
+    if (ecl_grid2 == nullptr) {
+        OPM_THROW(std::invalid_argument, "Error opening second grid file. " << basename2);
+    }
+    unsigned int numKeywords1 = ecl_file_get_num_distinct_kw(ecl_file1);
+    unsigned int numKeywords2 = ecl_file_get_num_distinct_kw(ecl_file2);
+    keywords1.reserve(numKeywords1);
+    keywords2.reserve(numKeywords2);
+    for (unsigned int i = 0; i < numKeywords1; ++i) {
+        std::string keyword(ecl_file_iget_distinct_kw(ecl_file1, i));
+        keywords1.push_back(keyword);
+    }
+    for (unsigned int i = 0; i < numKeywords2; ++i) {
+        std::string keyword(ecl_file_iget_distinct_kw(ecl_file2, i));
+        keywords2.push_back(keyword);
+    }
+
+    if (file_type == ECL_UNIFIED_RESTART_FILE) {
+        loadWells( ecl_grid1 , ecl_file1 );
+        loadWells( ecl_grid2 , ecl_file2 );
+    }
+}
+
+
+
+ECLFilesComparator::~ECLFilesComparator() {
+    ecl_file_close(ecl_file1);
+    ecl_file_close(ecl_file2);
+    ecl_grid_free(ecl_grid1);
+    ecl_grid_free(ecl_grid2);
+}
+
+
+
+void ECLFilesComparator::printKeywords() const {
+    std::cout << "\nKeywords in the first file:\n";
+    for (const auto& it : keywords1) {
+        std::cout << std::setw(15) << std::left << it << " of type " << ecl_type_get_name( ecl_file_iget_named_data_type(ecl_file1, it.c_str(), 0)) << std::endl;
+    }
+    std::cout << "\nKeywords in second file:\n";
+    for (const auto& it : keywords2) {
+        std::cout << std::setw(15) << std::left << it << " of type " << ecl_type_get_name( ecl_file_iget_named_data_type(ecl_file2, it.c_str(), 0)) << std::endl;
+    }
+}
+
+
+
+void ECLFilesComparator::printKeywordsDifference() const {
+    std::vector<std::string> common;
+    std::vector<std::string> uncommon;
+    const std::vector<std::string>* keywordsShort = &keywords1;
+    const std::vector<std::string>* keywordsLong = &keywords2;
+    if (keywords1.size() > keywords2.size()) {
+        keywordsLong = &keywords1;
+        keywordsShort = &keywords2;
+    }
+    for (const auto& it : *keywordsLong) {
+        const auto position = std::find(keywordsShort->begin(), keywordsShort->end(), it);
+        if (position != keywordsShort->end()) {
+            common.push_back(*position);
+        }
+        else {
+            uncommon.push_back(it);
+        }
+    }
+    std::cout << "\nCommon keywords for the two cases:\n";
+    for (const auto& it : common) std::cout << it << std::endl;
+    std::cout << "\nUncommon keywords for the two cases:\n";
+    for (const auto& it : uncommon) std::cout << it << std::endl;
+}
+
+
+
+Deviation ECLFilesComparator::calculateDeviations(double val1, double val2) {
+    val1 = std::abs(val1);
+    val2 = std::abs(val2);
+    Deviation deviation;
+    if (val1 != 0 || val2 != 0) {
+        deviation.abs = std::abs(val1 - val2);
+        if (val1 != 0 && val2 != 0) {
+            deviation.rel = deviation.abs/(std::max(val1, val2));
+        }
+    }
+    return deviation;
+}
+
+
+
+double ECLFilesComparator::median(std::vector<double> vec) {
+    if (vec.empty()) {
+        return 0;
+    }
+    else {
+        size_t n = vec.size()/2;
+        nth_element(vec.begin(), vec.begin() + n, vec.end());
+        if (vec.size() % 2 == 0) {
+            return 0.5*(vec[n-1]+vec[n]);
+        }
+        else {
+            return vec[n];
+        }
+    }
+}
+
+
+
+double ECLFilesComparator::average(const std::vector<double>& vec) {
+    if (vec.empty()) {
+        return 0;
+    }
+    double sum = std::accumulate(vec.begin(), vec.end(), 0.0);
+    return sum/vec.size();
+}
+
+
+
+double ECLFilesComparator::getCellVolume(const ecl_grid_type* ecl_grid,
+                                         const int globalIndex) {
+    std::vector<double> x(8, 0.0);
+    std::vector<double> y(8, 0.0);
+    std::vector<double> z(8, 0.0);
+    for (int i = 0; i < 8; i++) {
+        ecl_grid_get_cell_corner_xyz1(ecl_grid, globalIndex, i, &x.data()[i], &y.data()[i], &z.data()[i]);
+    }
+    return calculateCellVol(x,y,z);
+}

examples/test_util/EclFilesComparator.hpp

@@ -0,0 +1,127 @@
+/*
+   Copyright 2016 Statoil ASA.
+
+   This file is part of the Open Porous Media project (OPM).
+
+   OPM is free software: you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation, either version 3 of the License, or
+   (at your option) any later version.
+
+   OPM is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with OPM.  If not, see <http://www.gnu.org/licenses/>.
+   */
+
+#ifndef ECLFILESCOMPARATOR_HPP
+#define ECLFILESCOMPARATOR_HPP
+
+#include "Deviation.hpp"
+#include <map>
+#include <vector>
+#include <string>
+
+struct ecl_file_struct; //!< Prototype for eclipse file struct, from ERT library.
+typedef struct ecl_file_struct ecl_file_type;
+
+struct ecl_grid_struct; //!< Prototype for eclipse grid struct, from ERT library.
+typedef struct ecl_grid_struct ecl_grid_type;
+struct ecl_kw_struct; //!< Prototype for eclipse keyword struct, from ERT library.
+typedef struct ecl_kw_struct ecl_kw_type;
+
+
+/*! \brief A class for comparing ECLIPSE files.
+    \details ECLFilesComparator opens ECLIPSE files
+             (unified restart, initial and RFT in addition to grid file)
+             from two simulations. This class has only the functions
+             printKeywords() and printKeywordsDifference(), in addition to a
+             couple of get-functions: the comparison logic is implemented in
+             the subclasses RegressionTest and IntegrationTest. */
+class ECLFilesComparator {
+    private:
+        int file_type;
+        double absTolerance      = 0;
+        double relTolerance      = 0;
+    protected:
+        ecl_file_type* ecl_file1 = nullptr;
+        ecl_grid_type* ecl_grid1 = nullptr;
+        ecl_file_type* ecl_file2 = nullptr;
+        ecl_grid_type* ecl_grid2 = nullptr;
+        std::vector<std::string> keywords1, keywords2;
+        bool throwOnError = true; //!< Throw on first error
+        bool analysis = false; //!< Perform full error analysis
+        std::map<std::string, std::vector<Deviation>> deviations;
+        mutable size_t num_errors = 0;
+
+        //! \brief Checks if the keyword exists in both cases.
+        //! \param[in] keyword Keyword to check.
+        //! \details If the keyword does not exist in one of the cases, the function throws an exception.
+        void keywordValidForComparing(const std::string& keyword) const;
+        //! \brief Stores keyword data for a given occurrence
+        //! \param[out] ecl_kw1 Pointer to a ecl_kw_type, which stores keyword data for first case given the occurrence.
+        //! \param[out] ecl_kw2 Pointer to a ecl_kw_type, which stores keyword data for second case given the occurrence.
+        //! \param[in] keyword Which keyword to consider.
+        //! \param[in] occurrence Which keyword occurrence to consider.
+        //! \details This function stores keyword data for the given keyword and occurrence in #ecl_kw1 and #ecl_kw2, and returns the number of cells (for which the keyword has a value at the occurrence). If the number of cells differ for the two cases, an exception is thrown.
+        unsigned int getEclKeywordData(ecl_kw_type*& ecl_kw1, ecl_kw_type*& ecl_kw2, const std::string& keyword, int occurrence1, int occurrence2) const;
+        //! \brief Prints values for a given keyword, occurrence and cell
+        //! \param[in] keyword Which keyword to consider.
+        //! \param[in] occurrence Which keyword occurrence to consider.
+        //! \param[in] cell Which cell occurrence to consider (numbered by global index).
+        //! \param[in] value1 Value for first file, the data type can be bool, int, double or std::string.
+        //! \param[in] value2 Value for second file, the data type can be bool, int, double or std::string.
+        //! \details Templatefunction for printing values when exceptions are thrown. The function is defined for bool, int, double and std::string.
+        template <typename T>
+        void printValuesForCell(const std::string& keyword, int occurrence1, int occurrence2, size_t kw_size, size_t cell, const T& value1, const T& value2) const;
+
+    public:
+        //! \brief Open ECLIPSE files and set tolerances and keywords.
+        //! \param[in] file_type Specifies which filetype to be compared, possible inputs are UNRSTFILE, INITFILE and RFTFILE.
+        //! \param[in] basename1 Full path without file extension to the first case.
+        //! \param[in] basename2 Full path without file extension to the second case.
+        //! \param[in] absTolerance Tolerance for absolute deviation.
+        //! \param[in] relTolerance Tolerance for relative deviation.
+        //! \details The content of the ECLIPSE files specified in the input is stored in the ecl_file_type and ecl_grid_type member variables. In addition the keywords and absolute and relative tolerances (member variables) are set. If the constructor is unable to open one of the ECLIPSE files, an exception will be thrown.
+        ECLFilesComparator(int file_type, const std::string& basename1, const std::string& basename2, double absTolerance, double relTolerance);
+        //! \brief Closing the ECLIPSE files.
+        ~ECLFilesComparator();
+
+        //! \brief Set whether to throw on errors or not.
+        void throwOnErrors(bool dothrow) { throwOnError = dothrow; }
+
+        //! \brief Set whether to perform a full error analysis.
+        void doAnalysis(bool analize) { analysis = analize; }
+
+        //! \brief Returns the number of errors encountered in the performed comparisons.
+        size_t getNoErrors() const { return num_errors; }
+
+        //! \brief Returns the ECLIPSE filetype of this
+        int getFileType() const {return file_type;}
+        //! \brief Returns the absolute tolerance stored as a private member variable in the class
+        double getAbsTolerance() const {return absTolerance;}
+        //! \brief Returns the relative tolerance stored as a private member variable in the class
+        double getRelTolerance() const {return relTolerance;}
+
+        //! \brief Print all keywords and their respective Eclipse type for the two input cases.
+        void printKeywords() const;
+        //! \brief Print common and uncommon keywords for the two input cases.
+        void printKeywordsDifference() const;
+
+        //! \brief Calculate deviations for two values.
+        //! \details Using absolute values of the input arguments: If one of the values are non-zero, the Deviation::abs returned is the difference between the two input values. In addition, if both values are non-zero, the Deviation::rel returned is the absolute deviation divided by the largest value.
+        static Deviation calculateDeviations(double val1, double val2);
+        //! \brief Calculate median of a vector.
+        //! \details Returning the median of the input vector, i.e. the middle value of the sorted vector if the number of elements is odd or the mean of the two middle values if the number of elements are even.
+        static double median(std::vector<double> vec);
+        //! \brief Calculate average of a vector.
+        //! \details Returning the average of the input vector, i.e. the sum of all values divided by the number of elements.
+        static double average(const std::vector<double>& vec);
+         //! \brief Obtain the volume of a cell.
+        static double getCellVolume(const ecl_grid_type* ecl_grid, const int globalIndex);
+};
+
+#endif

examples/test_util/EclIntegrationTest.cpp

@@ -0,0 +1,199 @@
+/*
+   Copyright 2016 Statoil ASA.
+
+   This file is part of the Open Porous Media project (OPM).
+
+   OPM is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by
+   the Free Software Foundation, either version 3 of the License, or
+   (at your option) any later version.
+
+   OPM is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with OPM.  If not, see <http://www.gnu.org/licenses/>.
+*/
+
+#include "EclIntegrationTest.hpp"
+#include <opm/common/ErrorMacros.hpp>
+#include <algorithm>
+#include <cmath>
+#include <iostream>
+#include <set>
+
+#include <ert/ecl/ecl_file.h>
+#include <ert/ecl/ecl_grid.h>
+#include <ert/ecl/ecl_type.h>
+
+#include <ert/ecl_well/well_info.h>
+
+
+// helper macro to handle error throws or not
+#define HANDLE_ERROR(type, message) \
+  { \
+    if (throwOnError) \
+      OPM_THROW(type, message); \
+    else { \
+      std::cerr << message << std::endl; \
+      ++num_errors; \
+    } \
+  }
+
+
+void ECLIntegrationTest::setCellVolumes() {
+    double absTolerance = getAbsTolerance();
+    double relTolerance = getRelTolerance();
+    const unsigned int globalGridCount1 = ecl_grid_get_global_size(ecl_grid1);
+    const unsigned int activeGridCount1 = ecl_grid_get_active_size(ecl_grid1);
+    const unsigned int globalGridCount2 = ecl_grid_get_global_size(ecl_grid2);
+    const unsigned int activeGridCount2 = ecl_grid_get_active_size(ecl_grid2);
+    if (globalGridCount1 != globalGridCount2) {
+        OPM_THROW(std::runtime_error, "In grid file:"
+                << "\nCells in first file: "  << globalGridCount1
+                << "\nCells in second file: " << globalGridCount2
+                << "\nThe number of global cells differ.");
+    }
+    if (activeGridCount1 != activeGridCount2) {
+        OPM_THROW(std::runtime_error, "In grid file:"
+                << "\nCells in first file: "  << activeGridCount1
+                << "\nCells in second file: " << activeGridCount2
+                << "\nThe number of active cells differ.");
+    }
+    for (unsigned int cell = 0; cell < globalGridCount1; ++cell) {
+        const double cellVolume1 = getCellVolume(ecl_grid1, cell);
+        const double cellVolume2 = getCellVolume(ecl_grid2, cell);
+        Deviation dev = calculateDeviations(cellVolume1, cellVolume2);
+        if (dev.abs > absTolerance && dev.rel > relTolerance) {
+            int i, j, k;
+            ecl_grid_get_ijk1(ecl_grid1, cell, &i, &j, &k);
+            // Coordinates from this function are zero-based, hence incrementing
+            i++, j++, k++;
+            OPM_THROW(std::runtime_error, "In grid file: Deviations of cell volume exceed tolerances. "
+                    << "\nFor cell with coordinate (" << i << ", " << j << ", " << k << "):"
+                    << "\nCell volume in first file: "  << cellVolume1
+                    << "\nCell volume in second file: " << cellVolume2
+                    << "\nThe absolute deviation is " << dev.abs << ", and the tolerance limit is " << absTolerance << "."
+                    << "\nThe relative deviation is " << dev.rel << ", and the tolerance limit is " << relTolerance << ".");
+        } // The second input case is used as reference.
+        cellVolumes.push_back(cellVolume2);
+    }
+}
+
+
+
+void ECLIntegrationTest::initialOccurrenceCompare(const std::string& keyword) {
+    ecl_kw_type* ecl_kw1 = nullptr;
+    ecl_kw_type* ecl_kw2 = nullptr;
+    const unsigned int numCells = getEclKeywordData(ecl_kw1, ecl_kw2, keyword, 0, 0);
+    std::vector<double> values1(numCells);
+    initialCellValues.resize(numCells);
+
+    ecl_kw_get_data_as_double(ecl_kw1, values1.data());
+    ecl_kw_get_data_as_double(ecl_kw2, initialCellValues.data());
+
+    // This variable sums up the difference between the keyword value for the first case and the keyword value for the second case, for each cell. The sum is weighted with respect to the cell volume of each cell.
+    double weightedDifference = 0;
+    // This variable sums up the keyword value for the first case for each cell. The sum is weighted with respect to the cell volume of each cell.
+    double weightedTotal = 0;
+    for (size_t cell = 0; cell < initialCellValues.size(); ++cell) {
+        weightedTotal += initialCellValues[cell]*cellVolumes[cell];
+        weightedDifference += std::abs(values1[cell] - initialCellValues[cell])*cellVolumes[cell];
+    }
+    if (weightedTotal != 0) {
+        double ratioValue = weightedDifference/weightedTotal;
+        if ((ratioValue) > getRelTolerance()) {
+            OPM_THROW(std::runtime_error, "\nFor keyword " << keyword << " and occurrence 0:"
+                    << "\nThe ratio of the deviation and the total value is " << ratioValue
+                    << ", which exceeds the relative tolerance of " << getRelTolerance() << "."
+                    << "\nSee the docs for more information about how the ratio is computed.");
+        }
+    }
+}
+
+
+
+void ECLIntegrationTest::occurrenceCompare(const std::string& keyword, int occurrence) const {
+    ecl_kw_type* ecl_kw1 = nullptr;
+    ecl_kw_type* ecl_kw2 = nullptr;
+    const unsigned int numCells = getEclKeywordData(ecl_kw1, ecl_kw2, keyword, occurrence, occurrence);
+    std::vector<double> values1(numCells), values2(numCells);
+    ecl_kw_get_data_as_double(ecl_kw1, values1.data());
+    ecl_kw_get_data_as_double(ecl_kw2, values2.data());
+
+    // This variable sums up the difference between the keyword value for the first case and the keyword value for the second case, for each cell. The sum is weighted with respect to the cell volume of each cell.
+    double weightedDifference = 0;
+    // This variable sums up the difference between the keyword value for the occurrence and the initial keyword value for each cell. The sum is weighted with respect to the cell volume of each cell.
+    double relativeWeightedTotal = 0;
+
+    for (size_t cell = 0; cell < values1.size(); ++cell) {
+        relativeWeightedTotal += std::abs(values1[cell] - initialCellValues[cell])*cellVolumes[cell];
+        weightedDifference += std::abs(values1[cell] - values2[cell])*cellVolumes[cell];
+    }
+
+    if (relativeWeightedTotal != 0) {
+        double ratioValue = weightedDifference/relativeWeightedTotal;
+        if ((ratioValue) > getRelTolerance()) {
+            OPM_THROW(std::runtime_error, "\nFor keyword " << keyword << " and occurrence " << occurrence << ":"
+                    << "\nThe ratio of the deviation and the total value is " << ratioValue
+                    << ", which exceeds the relative tolerance of " << getRelTolerance() << "."
+                    << "\nSee the docs for more information about how the ratio is computed.");
+        }
+    }
+}
+
+
+
+ECLIntegrationTest::ECLIntegrationTest(const std::string& basename1,
+                                       const std::string& basename2,
+                                       double absTolerance, double relTolerance) :
+    ECLFilesComparator(ECL_UNIFIED_RESTART_FILE, basename1, basename2, absTolerance, relTolerance) {
+    std::cout << "\nUsing cell volumes and keyword values from case " << basename2
+              << " as reference." << std::endl << std::endl;
+    setCellVolumes();
+}
+
+
+
+bool ECLIntegrationTest::elementInWhitelist(const std::string& keyword) const {
+    auto it = std::find(keywordWhitelist.begin(), keywordWhitelist.end(), keyword);
+    return it != keywordWhitelist.end();
+}
+
+
+
+void ECLIntegrationTest::equalNumKeywords() const {
+    if (keywords1.size() != keywords2.size()) {
+        OPM_THROW(std::runtime_error, "\nKeywords in first file: " << keywords1.size()
+                << "\nKeywords in second file: " << keywords2.size()
+                << "\nThe number of keywords differ.");
+    }
+}
+
+
+
+void ECLIntegrationTest::results() {
+    for (const auto& it : keywordWhitelist)
+        resultsForKeyword(it);
+}
+
+
+
+void ECLIntegrationTest::resultsForKeyword(const std::string& keyword) {
+    std::cout << "Comparing " << keyword << "...";
+    keywordValidForComparing(keyword);
+    const unsigned int occurrences1 = ecl_file_get_num_named_kw(ecl_file1, keyword.c_str());
+    const unsigned int occurrences2 = ecl_file_get_num_named_kw(ecl_file2, keyword.c_str());
+    if (occurrences1 != occurrences2) {
+        OPM_THROW(std::runtime_error, "For keyword " << keyword << ":"
+                << "\nKeyword occurrences in first file: "  << occurrences1
+                << "\nKeyword occurrences in second file: " << occurrences2
+                << "\nThe number of occurrences differ.");
+    }
+    initialOccurrenceCompare(keyword);
+    for (unsigned int occurrence = 1; occurrence < occurrences1; ++occurrence) {
+        occurrenceCompare(keyword, occurrence);
+    }
+    std::cout << "done." << std::endl;
+}

examples/test_util/EclIntegrationTest.hpp

@@ -0,0 +1,78 @@
+/*
+   Copyright 2016 Statoil ASA.
+
+   This file is part of the Open Porous Media project (OPM).
+
+   OPM is free software: you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation, either version 3 of the License, or
+   (at your option) any later version.
+
+   OPM is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with OPM.  If not, see <http://www.gnu.org/licenses/>.
+   */
+
+#ifndef ECLINTEGRATIONTEST_HPP
+#define ECLINTEGRATIONTEST_HPP
+
+#include "EclFilesComparator.hpp"
+
+/*! \brief A class for executing a integration test for two ECLIPSE files.
+    \details This class inherits from ECLFilesComparator, which opens and closes
+             the input cases and stores keywordnames. The three public functions
+             equalNumKeywords(), results() and resultsForKeyword() can be invoked
+             to compare griddata or keyworddata for all keywords or a given
+             keyword (resultsForKeyword()).
+*/
+class ECLIntegrationTest: public ECLFilesComparator {
+    private:
+        std::vector<double> cellVolumes; //!< Vector of cell volumes in second input case (indexed by global index)
+        std::vector<double> initialCellValues; //!< Keyword values for all cells at first occurrence (index by global index)
+
+        // These are the only keywords which are compared, since SWAT should be "1 - SOIL - SGAS", this keyword is omitted.
+        const std::vector<std::string> keywordWhitelist = {"SGAS", "SWAT", "PRESSURE"};
+
+        void setCellVolumes();
+        void initialOccurrenceCompare(const std::string& keyword);
+        void occurrenceCompare(const std::string& keyword, int occurrence) const;
+    public:
+        //! \brief Sets up the integration test.
+        //! \param[in] basename1 Full path without file extension to the first case.
+        //! \param[in] basename2 Full path without file extension to the second case.
+        //! \param[in] absTolerance Tolerance for absolute deviation.
+        //! \param[in] relTolerance Tolerance for relative deviation.
+        //! \details This constructor calls the constructor of the superclass, with input filetype unified restart. See the docs for ECLFilesComparator for more information.
+        ECLIntegrationTest(const std::string& basename1, const std::string& basename2, double absTolerance, double relTolerance);
+
+        //! \brief Checks if a keyword is supported for comparison.
+        //! \param[in] keyword Keyword to check.
+        bool elementInWhitelist(const std::string& keyword) const;
+        //! \brief Checks if the number of keywords equal in the two input cases.
+        //! \param[in] keyword Keyword to check.
+        void equalNumKeywords() const;
+
+        //! \brief Finds deviations for all supported keywords.
+        //! \details results() loops through all supported keywords for integration test (defined in keywordWhitelist -- this is SGAS, SWAT and PRESSURE) and calls resultsForKeyword() for each keyword.
+        void results();
+        //! \brief Finds deviations for a specific keyword.
+        //! \param[in] keyword Keyword to check.
+        /*! \details First, resultsForKeyword() checks if the keyword exits in both cases, and if the number of keyword occurrences in the two cases differ. If these tests fail, an exception is thrown. Then deviaitons are calculated as described below for each occurrence, and an exception is thrown if the relative error ratio \f$E\f$ is larger than the relative tolerance.
+        * Calculation:\n
+        * Let the keyword values for occurrence \f$n\f$ and cell \f$i\f$ be \f$p_{n,i}\f$ and \f$q_{n,i}\f$ for input case 1 and 2, respectively.
+        * Consider first the initial occurrence (\f$n=0\f$). The function uses the second cases as reference, and calculates the volume weighted sum of \f$q_{0,i}\f$ over all cells \f$i\f$:
+        * \f[ S_0 = \sum_{i} q_{0,i} v_i \f]
+        * where \f$v_{i}\f$ is the volume of cell \f$i\f$ in case 2. Then, the deviations between the cases for each cell are calculated:
+        * \f[ \Delta = \sum_{i} |p_{0,i} - q_{0,i}| v_i.\f]
+        * The error ratio is then \f$E = \Delta/S_0\f$.\n
+        * For all other occurrences \f$n\f$, the deviation value \f$\Delta\f$ is calculated the same way, but the total value \f$S\f$ is calculated relative to the initial occurrence total \f$S_0\f$:
+        * \f[ S = \sum_{i} |q_{n,i} - q_{0,i}| v_i. \f]
+        * The error ratio is \f$ E = \Delta/S\f$. */
+        void resultsForKeyword(const std::string& keyword);
+};
+
+#endif

examples/test_util/EclRegressionTest.cpp

@@ -0,0 +1,352 @@
+/*
+   Copyright 2016 Statoil ASA.
+
+   This file is part of the Open Porous Media project (OPM).
+
+   OPM is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by
+   the Free Software Foundation, either version 3 of the License, or
+   (at your option) any later version.
+
+   OPM is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with OPM.  If not, see <http://www.gnu.org/licenses/>.
+*/
+
+#include "EclRegressionTest.hpp"
+#include <opm/common/ErrorMacros.hpp>
+#include <algorithm>
+#include <cmath>
+#include <iostream>
+#include <set>
+
+#include <ert/ecl/ecl_file.h>
+#include <ert/ecl/ecl_grid.h>
+#include <ert/ecl/ecl_type.h>
+
+#include <ert/ecl_well/well_info.h>
+
+
+// helper macro to handle error throws or not
+#define HANDLE_ERROR(type, message) \
+  { \
+    if (throwOnError) \
+      OPM_THROW(type, message); \
+    else { \
+      std::cerr << message << std::endl; \
+      ++num_errors; \
+    } \
+  }
+
+
+void ECLRegressionTest::printResultsForKeyword(const std::string& keyword) const {
+    std::cout << "Deviation results for keyword " << keyword << " of type "
+        << ecl_type_get_name(ecl_file_iget_named_data_type(ecl_file1, keyword.c_str(), 0))
+        << ":\n";
+    const double absDeviationAverage = average(absDeviation);
+    const double relDeviationAverage = average(relDeviation);
+    std::cout << "Average absolute deviation = " << absDeviationAverage  << std::endl;
+    std::cout << "Median absolute deviation  = " << median(absDeviation) << std::endl;
+    std::cout << "Average relative deviation = " << relDeviationAverage  << std::endl;
+    std::cout << "Median relative deviation  = " << median(relDeviation) << "\n\n";
+}
+
+
+
+void ECLRegressionTest::boolComparisonForOccurrence(const std::string& keyword,
+                                                    int occurrence1, int occurrence2) const {
+    ecl_kw_type* ecl_kw1 = nullptr;
+    ecl_kw_type* ecl_kw2 = nullptr;
+    const unsigned int numCells = getEclKeywordData(ecl_kw1, ecl_kw2, keyword, occurrence1, occurrence2);
+    for (size_t cell = 0; cell < numCells; cell++) {
+        bool data1 = ecl_kw_iget_bool(ecl_kw1, cell);
+        bool data2 = ecl_kw_iget_bool(ecl_kw2, cell);
+        if (data1 != data2) {
+            printValuesForCell(keyword, occurrence1, occurrence2, numCells, cell, data1, data2);
+            HANDLE_ERROR(std::runtime_error, "Values of bool type differ.");
+        }
+    }
+}
+
+
+
+void ECLRegressionTest::charComparisonForOccurrence(const std::string& keyword,
+                                                    int occurrence1, int occurrence2) const {
+    ecl_kw_type* ecl_kw1 = nullptr;
+    ecl_kw_type* ecl_kw2 = nullptr;
+    const unsigned int numCells = getEclKeywordData(ecl_kw1, ecl_kw2, keyword, occurrence1, occurrence2);
+    for (size_t cell = 0; cell < numCells; cell++) {
+        std::string data1(ecl_kw_iget_char_ptr(ecl_kw1, cell));
+        std::string data2(ecl_kw_iget_char_ptr(ecl_kw2, cell));
+        if (data1.compare(data2) != 0) {
+            printValuesForCell(keyword, occurrence1, occurrence2, numCells, cell, data1, data2);
+            HANDLE_ERROR(std::runtime_error, "Values of char type differ.");
+        }
+    }
+}
+
+
+
+void ECLRegressionTest::intComparisonForOccurrence(const std::string& keyword,
+                                                   int occurrence1, int occurrence2) const {
+    ecl_kw_type* ecl_kw1 = nullptr;
+    ecl_kw_type* ecl_kw2 = nullptr;
+    const unsigned int numCells = getEclKeywordData(ecl_kw1, ecl_kw2, keyword, occurrence1, occurrence2);
+    std::vector<int> values1(numCells), values2(numCells);
+    ecl_kw_get_memcpy_int_data(ecl_kw1, values1.data());
+    ecl_kw_get_memcpy_int_data(ecl_kw2, values2.data());
+    for (size_t cell = 0; cell < values1.size(); cell++) {
+        if (values1[cell] != values2[cell]) {
+            printValuesForCell(keyword, occurrence1, occurrence2, values1.size(), cell, values1[cell], values2[cell]);
+            HANDLE_ERROR(std::runtime_error, "Values of int type differ.");
+        }
+    }
+}
+
+
+
+void ECLRegressionTest::doubleComparisonForOccurrence(const std::string& keyword,
+                                                      int occurrence1, int occurrence2) {
+    ecl_kw_type* ecl_kw1 = nullptr;
+    ecl_kw_type* ecl_kw2 = nullptr;
+    const unsigned int numCells = getEclKeywordData(ecl_kw1, ecl_kw2, keyword, occurrence1, occurrence2);
+    std::vector<double> values1(numCells), values2(numCells);
+    ecl_kw_get_data_as_double(ecl_kw1, values1.data());
+    ecl_kw_get_data_as_double(ecl_kw2, values2.data());
+
+    auto it = std::find(keywordDisallowNegatives.begin(), keywordDisallowNegatives.end(), keyword);
+    for (size_t cell = 0; cell < values1.size(); cell++) {
+        deviationsForCell(values1[cell], values2[cell], keyword, occurrence1, occurrence2, cell, it == keywordDisallowNegatives.end());
+    }
+}
+
+
+
+void ECLRegressionTest::deviationsForCell(double val1, double val2,
+                                          const std::string& keyword,
+                                          int occurrence1, int occurrence2,
+                                          size_t kw_size, size_t cell,
+                                          bool allowNegativeValues) {
+    double absTolerance = getAbsTolerance();
+    double relTolerance = getRelTolerance();
+    if (!allowNegativeValues) {
+        if (val1 < 0) {
+            if (std::abs(val1) > absTolerance) {
+                printValuesForCell(keyword, occurrence1, occurrence2, kw_size, cell, val1, val2);
+                HANDLE_ERROR(std::runtime_error, "Negative value in first file, "
+                        << "which in absolute value exceeds the absolute tolerance of " << absTolerance << ".");
+            }
+            val1 = 0;
+        }
+        if (val2 < 0) {
+            if (std::abs(val2) > absTolerance) {
+                printValuesForCell(keyword, occurrence1, occurrence2, kw_size, cell, val1, val2);
+                HANDLE_ERROR(std::runtime_error, "Negative value in second file, "
+                        << "which in absolute value exceeds the absolute tolerance of " << absTolerance << ".");
+            }
+            val2 = 0;
+        }
+    }
+    Deviation dev = calculateDeviations(val1, val2);
+    if (dev.abs > absTolerance && dev.rel > relTolerance) {
+        if (analysis) {
+          deviations[keyword].push_back(dev);
+        } else {
+            printValuesForCell(keyword, occurrence1, occurrence2, kw_size, cell, val1, val2);
+            HANDLE_ERROR(std::runtime_error, "Deviations exceed tolerances."
+                    << "\nThe absolute deviation is " << dev.abs << ", and the tolerance limit is " << absTolerance << "."
+                    << "\nThe relative deviation is " << dev.rel << ", and the tolerance limit is " << relTolerance << ".");
+        }
+    }
+    if (dev.abs != -1) {
+        absDeviation.push_back(dev.abs);
+    }
+    if (dev.rel != -1) {
+        relDeviation.push_back(dev.rel);
+    }
+}
+
+
+
+void ECLRegressionTest::gridCompare(const bool volumecheck) const {
+    double absTolerance = getAbsTolerance();
+    double relTolerance = getRelTolerance();
+    const unsigned int globalGridCount1 = ecl_grid_get_global_size(ecl_grid1);
+    const unsigned int activeGridCount1 = ecl_grid_get_active_size(ecl_grid1);
+    const unsigned int globalGridCount2 = ecl_grid_get_global_size(ecl_grid2);
+    const unsigned int activeGridCount2 = ecl_grid_get_active_size(ecl_grid2);
+    if (globalGridCount1 != globalGridCount2) {
+        OPM_THROW(std::runtime_error, "In grid file:"
+                << "\nCells in first file: "  << globalGridCount1
+                << "\nCells in second file: " << globalGridCount2
+                << "\nThe number of global cells differ.");
+    }
+    if (activeGridCount1 != activeGridCount2) {
+        OPM_THROW(std::runtime_error, "In grid file:"
+                << "\nCells in first file: "  << activeGridCount1
+                << "\nCells in second file: " << activeGridCount2
+                << "\nThe number of active cells differ.");
+    }
+
+    if (!volumecheck) {
+        return;
+    }
+
+    for (unsigned int cell = 0; cell < globalGridCount1; ++cell) {
+        const bool active1 = ecl_grid_cell_active1(ecl_grid1, cell);
+        const bool active2 = ecl_grid_cell_active1(ecl_grid2, cell);
+        if (active1 != active2) {
+            int i, j, k;
+            ecl_grid_get_ijk1(ecl_grid1, cell, &i, &j, &k);
+            // Coordinates from this function are zero-based, hence incrementing
+            i++, j++, k++;
+            HANDLE_ERROR(std::runtime_error, "Grid cell with one-based indices ( "
+                         << i << ", " << j << ", " << k << " ) is "
+                         << (active1 ? "active" : "inactive") << " in first grid, but "
+                         << (active2 ? "active" : "inactive") << " in second grid.");
+        }
+        const double cellVolume1 = getCellVolume(ecl_grid1, cell);
+        const double cellVolume2 = getCellVolume(ecl_grid2, cell);
+        Deviation dev = calculateDeviations(cellVolume1, cellVolume2);
+        if (dev.abs > absTolerance && dev.rel > relTolerance) {
+            int i, j, k;
+            ecl_grid_get_ijk1(ecl_grid1, cell, &i, &j, &k);
+            // Coordinates from this function are zero-based, hence incrementing
+            i++, j++, k++;
+            HANDLE_ERROR(std::runtime_error, "In grid file: Deviations of cell volume exceed tolerances. "
+                    << "\nFor cell with one-based indices (" << i << ", " << j << ", " << k << "):"
+                    << "\nCell volume in first file: "  << cellVolume1
+                    << "\nCell volume in second file: " << cellVolume2
+                    << "\nThe absolute deviation is " << dev.abs << ", and the tolerance limit is " << absTolerance << "."
+                    << "\nThe relative deviation is " << dev.rel << ", and the tolerance limit is " << relTolerance << "."
+                    << "\nCell 1 active: " << active1
+                    << "\nCell 2 active: " << active2);
+        }
+    }
+}
+
+
+
+void ECLRegressionTest::results() {
+    if (!this->acceptExtraKeywords) {
+        if (keywords1.size() != keywords2.size()) {
+            std::set<std::string> keys(keywords1.begin() , keywords1.end());
+            for (const auto& key2: keywords2)
+                keys.insert( key2 );
+
+            for (const auto& key : keys)
+                fprintf(stderr," %8s:%3d     %8s:%3d \n",key.c_str() , ecl_file_get_num_named_kw( ecl_file1 , key.c_str()),
+                                                         key.c_str() , ecl_file_get_num_named_kw( ecl_file2 , key.c_str()));
+
+
+            OPM_THROW(std::runtime_error, "\nKeywords in first file: " << keywords1.size()
+                      << "\nKeywords in second file: " << keywords2.size()
+                      << "\nThe number of keywords differ.");
+        }
+    }
+
+    for (const auto& it : keywords1)
+        resultsForKeyword(it);
+
+    if (analysis) {
+        std::cout << deviations.size() << " keyword"
+                  << (deviations.size() > 1 ? "s":"") << " exhibit failures" << std::endl;
+        for (const auto& iter : deviations) {
+            std::cout << "\t" << iter.first << std::endl;
+            std::cout << "\t\tFails for " << iter.second.size() << " entries" << std::endl;
+            std::cout.precision(7);
+            double absErr = std::max_element(iter.second.begin(), iter.second.end(),
+                                          [](const Deviation& a, const Deviation& b)
+                                          {
+                                            return a.abs < b.abs;
+                                          })->abs;
+            double relErr = std::max_element(iter.second.begin(), iter.second.end(),
+                                          [](const Deviation& a, const Deviation& b)
+                                          {
+                                            return a.rel < b.rel;
+                                          })->rel;
+            std::cout << "\t\tLargest absolute error: "
+                      <<  std::scientific << absErr << std::endl;
+            std::cout << "\t\tLargest relative error: "
+                      <<  std::scientific << relErr << std::endl;
+        }
+    }
+}
+
+
+
+void ECLRegressionTest::resultsForKeyword(const std::string& keyword) {
+    keywordValidForComparing(keyword);
+    const unsigned int occurrences1 = ecl_file_get_num_named_kw(ecl_file1, keyword.c_str());
+    const unsigned int occurrences2 = ecl_file_get_num_named_kw(ecl_file2, keyword.c_str());
+    if (!onlyLastOccurrence && occurrences1 != occurrences2) {
+        OPM_THROW(std::runtime_error, "For keyword " << keyword << ":"
+                << "\nKeyword occurrences in first file: "  << occurrences1
+                << "\nKeyword occurrences in second file: " << occurrences2
+                << "\nThe number of occurrences differ.");
+    }
+    // Assuming keyword type is constant for every occurrence:
+    const ecl_type_enum kw_type = ecl_type_get_type( ecl_file_iget_named_data_type(ecl_file1, keyword.c_str(), 0) );
+    switch(kw_type) {
+        case ECL_DOUBLE_TYPE:
+        case ECL_FLOAT_TYPE:
+            std::cout << "Comparing " << keyword << "...";
+            if (onlyLastOccurrence) {
+                doubleComparisonForOccurrence(keyword, occurrences1 - 1, occurrences2 - 1);
+            }
+            else {
+                for (unsigned int occurrence = 0; occurrence < occurrences1; ++occurrence) {
+                    doubleComparisonForOccurrence(keyword, occurrence, occurrence);
+                }
+            }
+            std::cout << "done." << std::endl;
+            printResultsForKeyword(keyword);
+            absDeviation.clear();
+            relDeviation.clear();
+            return;
+        case ECL_INT_TYPE:
+            std::cout << "Comparing " << keyword << "...";
+            if (onlyLastOccurrence) {
+                intComparisonForOccurrence(keyword, occurrences1 - 1, occurrences2 - 1);
+            }
+            else {
+                for (unsigned int occurrence = 0; occurrence < occurrences1; ++occurrence) {
+                    intComparisonForOccurrence(keyword, occurrence, occurrence);
+                }
+            }
+            break;
+        case ECL_CHAR_TYPE:
+            std::cout << "Comparing " << keyword << "...";
+            if (onlyLastOccurrence) {
+                charComparisonForOccurrence(keyword, occurrences1 - 1, occurrences2 - 1);
+            }
+            else {
+                for (unsigned int occurrence = 0; occurrence < occurrences1; ++occurrence) {
+                    charComparisonForOccurrence(keyword, occurrence, occurrence);
+                }
+            }
+            break;
+        case ECL_BOOL_TYPE:
+            std::cout << "Comparing " << keyword << "...";
+            if (onlyLastOccurrence) {
+                boolComparisonForOccurrence(keyword, occurrences1 - 1, occurrences2 - 1);
+            }
+            else {
+                for (unsigned int occurrence = 0; occurrence < occurrences1; ++occurrence) {
+                    boolComparisonForOccurrence(keyword, occurrence, occurrence);
+                }
+            }
+            break;
+        case ECL_MESS_TYPE:
+            std::cout << "\nKeyword " << keyword << " is of type MESS"
+                << ", which is not supported in regression test." << "\n\n";
+            return;
+        default:
+            std::cout << "\nKeyword " << keyword << "has undefined type." << std::endl;
+            return;
+    }
+    std::cout << "done." << std::endl;
+}

examples/test_util/EclRegressionTest.hpp

@@ -0,0 +1,93 @@
+/*
+   Copyright 2016 Statoil ASA.
+
+   This file is part of the Open Porous Media project (OPM).
+
+   OPM is free software: you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation, either version 3 of the License, or
+   (at your option) any later version.
+
+   OPM is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with OPM.  If not, see <http://www.gnu.org/licenses/>.
+   */
+
+#ifndef ECLREGRESSIONTEST_HPP
+#define ECLREGRESSIONTEST_HPP
+
+#include "EclFilesComparator.hpp"
+
+/*! \brief A class for executing a regression test for two ECLIPSE files.
+    \details This class inherits from ECLFilesComparator, which opens and
+             closes the input cases and stores keywordnames.
+             The three public functions gridCompare(), results() and
+             resultsForKeyword() can be invoked to compare griddata
+             or keyworddata for all keywords or a given keyword (resultsForKeyword()).
+ */
+
+class ECLRegressionTest: public ECLFilesComparator {
+    private:
+        // These vectors store absolute and relative deviations, respecively. Note that they are whiped clean for every new keyword comparison.
+        std::vector<double> absDeviation, relDeviation;
+        // Keywords which should not contain negative values, i.e. uses allowNegativeValues = false in deviationsForCell():
+        const std::vector<std::string> keywordDisallowNegatives = {"SGAS", "SWAT", "PRESSURE"};
+
+        // Only compare last occurrence
+        bool onlyLastOccurrence = false;
+
+        // Accept extra keywords in the restart file of the 'new' simulation.
+        bool acceptExtraKeywords = false;
+
+
+        // Prints results stored in absDeviation and relDeviation.
+        void printResultsForKeyword(const std::string& keyword) const;
+
+        // Function which compares data at specific occurrences and for a specific keyword type. The functions takes two occurrence inputs to also be able to
+        // compare keywords which are shifted relative to each other in the two files. This is for instance handy when running flow with restart from different timesteps,
+        // and comparing the last timestep from the two runs.
+        void boolComparisonForOccurrence(const std::string& keyword, int occurrence1, int occurrence2) const;
+        void charComparisonForOccurrence(const std::string& keyword, int occurrence1, int occurrence2) const;
+        void intComparisonForOccurrence(const std::string& keyword, int occurrence1, int occurrence2) const;
+        void doubleComparisonForOccurrence(const std::string& keyword, int occurrence1, int occurrence2);
+        // deviationsForCell throws an exception if both the absolute deviation AND the relative deviation
+        // are larger than absTolerance and relTolerance, respectively. In addition,
+        // if allowNegativeValues is passed as false, an exception will be thrown when the absolute value
+        // of a negative value exceeds absTolerance. If no exceptions are thrown, the absolute and relative deviations are added to absDeviation and relDeviation.
+        void deviationsForCell(double val1, double val2, const std::string& keyword, int occurrence1, int occurrence2, size_t kw_size, size_t cell, bool allowNegativeValues = true);
+    public:
+        //! \brief Sets up the regression test.
+        //! \param[in] file_type Specifies which filetype to be compared, possible inputs are UNRSTFILE, INITFILE and RFTFILE.
+        //! \param[in] basename1 Full path without file extension to the first case.
+        //! \param[in] basename2 Full path without file extension to the second case.
+        //! \param[in] absTolerance Tolerance for absolute deviation.
+        //! \param[in] relTolerance Tolerance for relative deviation.
+        //! \details This constructor only calls the constructor of the superclass, see the docs for ECLFilesComparator for more information.
+        ECLRegressionTest(int file_type, const std::string& basename1, const std::string& basename2, double absTolerance, double relTolerance):
+            ECLFilesComparator(file_type, basename1, basename2, absTolerance, relTolerance) {}
+
+        //! \brief Option to only compare last occurrence
+        void setOnlyLastOccurrence(bool onlyLastOccurrenceArg) {this->onlyLastOccurrence = onlyLastOccurrenceArg;}
+
+        // Accept extra keywords: If this switch is set to true the comparison
+        // of restart files will ignore extra keywords which are only present
+        // in the new simulation.
+        void setAcceptExtraKeywords(bool acceptExtraKeywordsArg) { this->acceptExtraKeywords = acceptExtraKeywordsArg; }
+
+        //! \brief Compares grid properties of the two cases.
+        // gridCompare() checks if both the number of active and global cells in the two cases are the same. If they are, and volumecheck is true, all cells are looped over to calculate the cell volume deviation for the two cases. If the both the relative and absolute deviation exceeds the tolerances, an exception is thrown.
+        void gridCompare(const bool volumecheck) const;
+        //! \brief Calculates deviations for all keywords.
+        // This function checks if the number of keywords of the two cases are equal, and if it is, resultsForKeyword() is called for every keyword. If not, an exception is thrown.
+        void results();
+        //! \brief Calculates deviations for a specific keyword.
+        //! \param[in] keyword Keyword which should be compared, if this keyword is absent in one of the cases, an exception will be thrown.
+        //! \details This function loops through every report step and every cell and compares the values for the given keyword from the two input cases. If the absolute or relative deviation between the two values for each step exceeds both the absolute tolerance and the relative tolerance (stored in ECLFilesComparator), an exception is thrown. In addition, some keywords are marked for "disallow negative values" -- these are SGAS, SWAT and PRESSURE. An exception is thrown if a value of one of these keywords is both negative and has an absolute value larger than the absolute tolerance. If no exceptions are thrown, resultsForKeyword() uses the private member funtion printResultsForKeyword to print the average and median deviations.
+        void resultsForKeyword(const std::string& keyword);
+};
+
+#endif

examples/test_util/compareECL.cpp

@@ -0,0 +1,381 @@
+/*
+   Copyright 2016 Statoil ASA.
+
+   This file is part of the Open Porous Media project (OPM).
+
+   OPM is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by
+   the Free Software Foundation, either version 3 of the License, or
+   (at your option) any later version.
+
+   OPM is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with OPM.  If not, see <http://www.gnu.org/licenses/>.
+   */
+
+#include "EclIntegrationTest.hpp"
+#include "EclRegressionTest.hpp"
+#include "summaryIntegrationTest.hpp"
+#include "summaryRegressionTest.hpp"
+
+#include <opm/common/ErrorMacros.hpp>
+
+#include <ert/util/util.h>
+#include <ert/util/stringlist.h>
+#include <ert/ecl/ecl_endian_flip.h>
+#include <ert/ecl/ecl_file.h>
+
+#include <iostream>
+#include <string>
+#include <getopt.h>
+
+static void printHelp() {
+    std::cout << "\ncompareECL compares ECLIPSE files (restart (.RST), unified restart (.UNRST), initial (.INIT), summary (.SMRY), unified summary (.UNSMRY) or .RFT) and gridsizes (from .EGRID or .GRID file) from two simulations.\n"
+        << "The program takes four arguments:\n\n"
+        << "1. Case number 1 (full path without extension)\n"
+        << "2. Case number 2 (full path without extension)\n"
+        << "3. Absolute tolerance\n"
+        << "4. Relative tolerance (between 0 and 1)\n\n"
+        << "In addition, the program takes these options (which must be given before the arguments):\n\n"
+        << "-a Run a full analysis of errors.\n"
+        << "-g Will print the vector with the greatest error ratio.\n"
+        << "-h Print help and exit.\n"
+        << "-i Execute integration test (regression test is default).\n"
+        << "   The integration test compares SGAS, SWAT and PRESSURE in unified restart files, so this option can not be used in combination with -t.\n"
+        << "-I Same as -i, but throws an exception when the number of keywords in the two cases differ. Can not be used in combination with -t.\n"
+        << "-k Specify specific keyword to compare (capitalized), for example -k PRESSURE.\n"
+        << "-K Will not allow different amount of keywords in the two files. Throws an exception if the amount are different.\n"
+        << "-l Only do comparison for the last occurrence. This option is only for the regression test, and can therefore not be used in combination with -i or -I.\n"
+        << "-m mainVar. Will calculate the error ratio for one main variable. Valid input is WOPR, WWPR, WGPR or WBHP.\n"
+        << "-n Do not throw on errors.\n"
+        << "-p Print keywords in both cases and exit. Can not be used in combination with -P.\n"
+        << "-P Print common and uncommon keywords in both cases and exit. Can not be used in combination with -p.\n"
+        << "-R Will allow comparison between a restarted simulation and a normal simulation for summary regression tests. The files must end at the same time.\n"
+        << "-s int Sets the number of spikes that are allowed for each keyword in summary integration tests.\n"
+        << "-t Specify ECLIPSE filetype to compare (unified restart is default). Can not be used in combination with -i or -I. Different possible arguments are:\n"
+        << "    -t UNRST \t Compare two unified restart files (.UNRST). This the default value, so it is the same as not passing option -t.\n"
+        << "    -t INIT  \t Compare two initial files (.INIT).\n"
+        << "    -t RFT   \t Compare two RFT files (.RFT).\n"
+        << "    -t RST   \t Compare two cases consisting of restart files (.Xnnnn).\n"
+        << "    -t SMRY  \t Compare two cases consistent of (unified) summary files.\n"
+        << "    -t RST1  \t Compare two cases where the first case consists of restart files (.Xnnnn), and the second case consists of a unified restart file (.UNRST).\n"
+        << "    -t RST2  \t Compare two cases where the first case consists of a unified restart file (.UNRST), and the second case consists of restart files (.Xnnnn).\n"
+        << "   Note that when dealing with restart files (.Xnnnn), the program concatenates all of them into one unified restart file, which is used for comparison and stored in the same directory as the restart files.\n"
+        << "   This will overwrite any existing unified restart file in that directory.\n\n"
+        << "-v For the rate keywords WOPR, WGPR, WWPR and WBHP. Calculates the error volume of the two summary files. This is printed to screen.\n"
+        << "\nExample usage of the program: \n\n"
+        << "compareECL -k PRESSURE <path to first casefile> <path to second casefile> 1e-3 1e-5\n"
+        << "compareECL -t INIT -k PORO <path to first casefile> <path to second casefile> 1e-3 1e-5\n"
+        << "compareECL -i <path to first casefile> <path to second casefile> 0.01 1e-6\n\n"
+        << "Exceptions are thrown (and hence program exits) when deviations are larger than the specified "
+        << "tolerances, or when the number of cells does not match -- either in the grid file or for a "
+        << "specific keyword. Information about the keyword, keyword occurrence (zero based) and cell "
+        << "coordinate is printed when an exception is thrown. For more information about how the cases "
+        << "are compared, see the documentation of the EclFilesComparator class.\n\n";
+}
+
+
+
+void splitBasename(const std::string& basename, std::string& path, std::string& filename) {
+    const size_t lastSlashIndex = basename.find_last_of("/\\");
+    path = basename.substr(0,lastSlashIndex);
+    filename = basename.substr(lastSlashIndex+1);
+}
+
+
+
+// Inspired by the ecl_pack application in the ERT library
+void concatenateRestart(const std::string& basename) {
+    std::string inputPath, inputBase;
+    splitBasename(basename, inputPath, inputBase);
+    stringlist_type* inputFiles = stringlist_alloc_new();
+    const int numFiles = ecl_util_select_filelist(inputPath.c_str(), inputBase.c_str(), ECL_RESTART_FILE, false, inputFiles);
+
+    const char* target_file_name = ecl_util_alloc_filename(inputPath.c_str(), inputBase.c_str(), ECL_UNIFIED_RESTART_FILE, false, -1);
+    fortio_type* target = fortio_open_writer(target_file_name, false, ECL_ENDIAN_FLIP);
+    int dummy;
+    ecl_kw_type* seqnum_kw = ecl_kw_alloc_new("SEQNUM", 1, ECL_INT, &dummy);
+
+    int reportStep = 0;
+    for (int i = 0; i < numFiles; ++i) {
+        ecl_util_get_file_type(stringlist_iget(inputFiles, i), nullptr, &reportStep);
+        ecl_file_type* src_file = ecl_file_open(stringlist_iget(inputFiles, i), 0);
+        ecl_kw_iset_int(seqnum_kw, 0, reportStep);
+        ecl_kw_fwrite(seqnum_kw, target);
+        ecl_file_fwrite_fortio(src_file, target, 0);
+        ecl_file_close(src_file);
+    }
+    fortio_fclose(target);
+    stringlist_free(inputFiles);
+}
+
+//------------------------------------------------//
+
+int main(int argc, char** argv) {
+    // Restart is default
+    ecl_file_enum file_type      = ECL_UNIFIED_RESTART_FILE;
+    // RegressionTest is default
+    bool integrationTest         = false;
+    bool allowDifferentAmount    = true;
+    bool checkNumKeywords        = false;
+    bool findGreatestErrorRatio  = false;
+    bool findVolumeError         = false;
+    bool onlyLastOccurrence      = false;
+    bool printKeywords           = false;
+    bool printKeywordsDifference = false;
+    bool restartFile             = false;
+    bool specificKeyword         = false;
+    bool specificFileType        = false;
+    bool allowSpikes             = false;
+    bool throwOnError            = true;
+    bool throwTooGreatErrorRatio = true;
+    bool acceptExtraKeywords     = false;
+    bool analysis                = false;
+    bool volumecheck             = true;
+    char* keyword                = nullptr;
+    char* fileTypeCstr           = nullptr;
+    const char* mainVariable     = nullptr;
+    int c                        = 0;
+    int spikeLimit               = -1;
+
+    while ((c = getopt(argc, argv, "hiIk:alnpPt:VRgs:m:vKx")) != -1) {
+        switch (c) {
+            case 'a':
+              analysis = true;
+              break;
+            case 'g':
+                findGreatestErrorRatio = true;
+                throwTooGreatErrorRatio = false;
+                break;
+            case 'h':
+                printHelp();
+                return 0;
+            case 'i':
+                integrationTest = true;
+                break;
+            case 'I':
+                integrationTest = true;
+                checkNumKeywords = true;
+                break;
+            case 'k':
+                specificKeyword = true;
+                keyword = optarg;
+                break;
+            case 'K':
+                allowDifferentAmount = false;
+                break;
+            case 'l':
+                onlyLastOccurrence = true;
+                break;
+            case 'm':
+                mainVariable = optarg;
+                break;
+            case 'n':
+                throwOnError = false;
+                break;
+            case 'p':
+                printKeywords = true;
+                break;
+            case 'P':
+                printKeywordsDifference = true;
+                break;
+            case 'R':
+                restartFile = true;
+                break;
+            case 's':
+                allowSpikes = true;
+                spikeLimit = atof(optarg);
+                break;
+            case 't':
+                specificFileType = true;
+                fileTypeCstr = optarg;
+                break;
+            case 'v':
+                findVolumeError = true;
+                break;
+            case 'V':
+                volumecheck = false;
+                break;
+            case 'x':
+                acceptExtraKeywords = true;
+                break;
+            case '?':
+                if (optopt == 'k' || optopt == 'm' || optopt == 's') {
+                    std::cerr << "Option " << optopt << " requires a keyword as argument, see manual (-h) for more information." << std::endl;
+                    return EXIT_FAILURE;
+                }
+                else if (optopt == 't') {
+                    std::cerr << "Option t requires an ECLIPSE filetype as argument, see manual (-h) for more information." << std::endl;
+                    return EXIT_FAILURE;
+                }
+                else {
+                    std::cerr << "Unknown option." << std::endl;
+                    return EXIT_FAILURE;
+                }
+            default:
+                return EXIT_FAILURE;
+        }
+    }
+    int argOffset = optind;
+    if ((printKeywords && printKeywordsDifference) ||
+        (integrationTest && specificFileType)      ||
+        (integrationTest && onlyLastOccurrence)) {
+        std::cerr << "Error: Options given which can not be combined. "
+            << "Please see the manual (-h) for more information." << std::endl;
+        return EXIT_FAILURE;
+    }
+
+    if (argc != argOffset + 4) {
+        std::cerr << "Error: The number of options and arguments given is not correct. "
+            << "Please run compareECL -h to see manual." << std::endl;
+        return EXIT_FAILURE;
+    }
+
+    std::string basename1 = argv[argOffset];
+    std::string basename2 = argv[argOffset + 1];
+    double absTolerance   = strtod(argv[argOffset + 2], nullptr);
+    double relTolerance   = strtod(argv[argOffset + 3], nullptr);
+
+    if (specificFileType) {
+        std::string fileTypeString(fileTypeCstr);
+        for (auto& ch: fileTypeString) ch = toupper(ch);
+        if (fileTypeString== "UNRST") {} //Do nothing
+        else if (fileTypeString == "RST") {
+            concatenateRestart(basename1);
+            concatenateRestart(basename2);
+        }
+        else if (fileTypeString == "RST1") {
+            concatenateRestart(basename1);
+        }
+        else if (fileTypeString == "RST2") {
+            concatenateRestart(basename2);
+        }
+        else if (fileTypeString == "INIT") {
+            file_type = ECL_INIT_FILE;
+        }
+        else if (fileTypeString == "RFT") {
+            file_type = ECL_RFT_FILE;
+        }
+        else if (fileTypeString == "SMRY")
+            file_type = ECL_SUMMARY_FILE;
+        else {
+            std::cerr << "Unknown ECLIPSE filetype specified with option -t. Please run compareECL -h to see manual." << std::endl;
+            return EXIT_FAILURE;
+        }
+    }
+
+    if (restartFile && (file_type != ECL_SUMMARY_FILE || integrationTest)) {
+        std::cerr << "Error: -R can only be used in for summary regression tests." << std::endl;
+        return EXIT_FAILURE;
+    }
+
+    std::cout << "Comparing '" << basename1 << "' to '" << basename2 << "'." << std::endl;
+    try {
+        if (file_type == ECL_SUMMARY_FILE) {
+            if(!integrationTest){
+                SummaryRegressionTest compare(basename1,basename2,absTolerance,relTolerance);
+                compare.throwOnErrors(throwOnError);
+                compare.doAnalysis(analysis);
+                compare.setPrintKeywords(printKeywords);
+                compare.setIsRestartFile(restartFile);
+                compare.setAllowDifferentNumberOfKeywords(acceptExtraKeywords);
+                if(specificKeyword){
+                    compare.getRegressionTest(keyword);
+                }
+                else{
+                    compare.setPrintKeywords(printKeywords);
+                    compare.getRegressionTest();
+                }
+            } else {
+                SummaryIntegrationTest compare(basename1,basename2,absTolerance,relTolerance);
+                compare.throwOnErrors(throwOnError);
+                compare.setFindVectorWithGreatestErrorRatio(findGreatestErrorRatio);
+                compare.setAllowSpikes(allowSpikes);
+                if (mainVariable) {
+                    compare.setOneOfTheMainVariables(true);
+                    std::string str(mainVariable);
+                    std::transform(str.begin(), str.end(),str.begin(), ::toupper);
+                    if(str == "WOPR" ||str=="WWPR" ||str=="WGPR" || str == "WBHP"){
+                        compare.setMainVariable(str);
+                    }else{
+                        throw std::invalid_argument("The input is not a main variable. -m option requires a valid main variable.");
+                    }
+                }
+                compare.setFindVolumeError(findVolumeError);
+                if (spikeLimit != -1) {
+                    compare.setSpikeLimit(spikeLimit);
+                }
+                compare.setAllowDifferentAmountOfKeywords(allowDifferentAmount);
+                compare.setPrintKeywords(printKeywords);
+                compare.setThrowExceptionForTooGreatErrorRatio(throwTooGreatErrorRatio);
+                if(specificKeyword){
+                    compare.setPrintSpecificKeyword(specificKeyword);
+                    compare.getIntegrationTest(keyword);
+                    return 0;
+                }
+                compare.getIntegrationTest();
+            }
+        }
+        else if (integrationTest) {
+            ECLIntegrationTest comparator(basename1, basename2, absTolerance, relTolerance);
+            if (printKeywords) {
+                comparator.printKeywords();
+                return 0;
+            }
+            if (printKeywordsDifference) {
+                comparator.printKeywordsDifference();
+                return 0;
+            }
+            if (checkNumKeywords) {
+                comparator.equalNumKeywords();
+            }
+            if (specificKeyword) {
+                if (comparator.elementInWhitelist(keyword)) {
+                    comparator.resultsForKeyword(keyword);
+                }
+                else {
+                    std::cerr << "Keyword " << keyword << " is not supported for the integration test. Use SGAS, SWAT or PRESSURE." << std::endl;
+                    return EXIT_FAILURE;
+                }
+            }
+            else {
+                comparator.results();
+            }
+        }
+        else {
+            ECLRegressionTest comparator(file_type, basename1, basename2, absTolerance, relTolerance);
+            comparator.throwOnErrors(throwOnError);
+            comparator.doAnalysis(analysis);
+            comparator.setAcceptExtraKeywords(acceptExtraKeywords);
+            if (printKeywords) {
+                comparator.printKeywords();
+                return 0;
+            }
+            if (printKeywordsDifference) {
+                comparator.printKeywordsDifference();
+                return 0;
+            }
+            if (onlyLastOccurrence) {
+                comparator.setOnlyLastOccurrence(true);
+            }
+            if (specificKeyword) {
+                comparator.gridCompare(volumecheck);
+                comparator.resultsForKeyword(keyword);
+            }
+            else {
+                comparator.gridCompare(volumecheck);
+                comparator.results();
+            }
+            if (comparator.getNoErrors() > 0)
+              OPM_THROW(std::runtime_error, comparator.getNoErrors() << " errors encountered in comparisons.");
+        }
+    }
+    catch (const std::exception& e) {
+        std::cerr << "Program threw an exception: " << e.what() << std::endl;
+        return EXIT_FAILURE;
+    }
+    return 0;
+}

examples/test_util/data/EclIOdata.hpp

@@ -17,19 +17,22 @@
   along with OPM.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#ifndef OPM_IO_ECLIODATA_HPP
-#define OPM_IO_ECLIODATA_HPP
+#ifndef OPM_ECLIO_DATA_HPP
+#define OPM_ECLIO_DATA_HPP
 
 #include <tuple>
 
-namespace Opm { namespace EclIO {
+
+namespace Opm {
+
+ namespace ecl {
 
     // type MESS have no assisiated data 
+    
     enum eclArrType {
         INTE, REAL, DOUB, CHAR, LOGI, MESS
     };
-
-    // named constants related to binary file format
+    
     const unsigned int true_value = 0xffffffff;
     const unsigned int false_value = 0x00000000;
 
@@ -45,25 +48,7 @@ namespace Opm { namespace EclIO {
     const int MaxBlockSizeLogi = 4000;    // Maximum block size for LOGI arrays in binary files  
     const int MaxBlockSizeChar =  840;    // Maximum block size for CHAR arrays in binary files      
 
-    // named constants related to formatted file file format
-    const int MaxNumBlockInte = 1000;    // maximum number of Inte values in block => hard line shift
-    const int MaxNumBlockReal = 1000;    // maximum number of Real values in block => hard line shift
-    const int MaxNumBlockDoub = 1000;    // maximum number of Doub values in block => hard line shift
-    const int MaxNumBlockLogi = 1000;    // maximum number of Logi values in block => hard line shift
-    const int MaxNumBlockChar =  105;    // maximum number of Char values in block => hard line shift
+ } // ecl
+} // Opm
 
-    const int numColumnsInte = 6;        // number of columns for Inte values  
-    const int numColumnsReal = 4;        // number of columns for Real values  
-    const int numColumnsDoub = 3;        // number of columns for Doub values  
-    const int numColumnsLogi = 25;       // number of columns for Logi values  
-    const int numColumnsChar = 7;        // number of columns for Char values  
-
-    const int columnWidthInte = 12;      // number of characters fore each Inte Element 
-    const int columnWidthReal = 17;      // number of characters fore each Inte Element 
-    const int columnWidthDoub = 23;      // number of characters fore each Inte Element 
-    const int columnWidthLogi = 3;       // number of characters fore each Inte Element 
-    const int columnWidthChar = 11;      // number of characters fore each Inte Element 
-
-}} // namespace Opm::EclIO
-
-#endif // OPM_IO_ECLIODATA_HPP
+#endif // OPM_ECLIO_DATA_HPP

examples/test_util/summaryComparator.cpp

@@ -0,0 +1,240 @@
+/*
+   Copyright 2016 Statoil ASA.
+   This file is part of the Open Porous Media project (OPM).
+
+   OPM is free software: you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation, either version 3 of the License, or
+   (at your option) any later version.
+
+   OPM is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with OPM.  If not, see <http://www.gnu.org/licenses/>.
+   */
+
+#include "summaryComparator.hpp"
+#include <ert/ecl/ecl_sum.hpp>
+#include <ert/util/stringlist.hpp>
+#include <ert/util/int_vector.hpp>
+#include <ert/util/bool_vector.hpp>
+#include <opm/common/ErrorMacros.hpp>
+#include <cmath>
+#include <numeric>
+
+SummaryComparator::SummaryComparator(const std::string& basename1,
+                                     const std::string& basename2,
+                                     double absoluteTol, double relativeTol){
+    ecl_sum1 = ecl_sum_fread_alloc_case(basename1.c_str(), ":");
+    ecl_sum2 = ecl_sum_fread_alloc_case(basename2.c_str(), ":");
+    if (ecl_sum1 == nullptr || ecl_sum2 == nullptr) {
+        OPM_THROW(std::runtime_error, "Not able to open files");
+    }
+    absoluteTolerance = absoluteTol;
+    relativeTolerance = relativeTol;
+    keys1 = stringlist_alloc_new();
+    keys2 = stringlist_alloc_new();
+    ecl_sum_select_matching_general_var_list( ecl_sum1 , "*" , this->keys1);
+    stringlist_sort(this->keys1 , nullptr );
+    ecl_sum_select_matching_general_var_list( ecl_sum2 , "*" , this->keys2);
+    stringlist_sort(this->keys2 , nullptr );
+
+    if(stringlist_get_size(keys1) <= stringlist_get_size(keys2)){
+        this->keysShort = this->keys1;
+        this->keysLong = this->keys2;
+    }else{
+        this->keysShort = this->keys2;
+        this->keysLong = this->keys1;
+    }
+}
+
+
+SummaryComparator::~SummaryComparator(){
+    ecl_sum_free(ecl_sum1);
+    ecl_sum_free(ecl_sum2);
+    stringlist_free(keys1);
+    stringlist_free(keys2);
+}
+
+
+Deviation SummaryComparator::calculateDeviations(double val1, double val2){
+    double absDev;
+    Deviation deviation;
+    absDev =  std::abs(val1 - val2);
+    deviation.abs = absDev;
+    if (val1 != 0 || val2 != 0) {
+        deviation.rel  = absDev/double(std::max(std::abs(val1), std::abs(val2)));
+    }
+    return deviation;
+}
+
+
+void SummaryComparator::setTimeVecs(std::vector<double> &timeVec1,
+                                    std::vector<double> &timeVec2){
+    timeVec1.reserve(ecl_sum_get_data_length(ecl_sum1));
+    for (int time_index = 0; time_index < ecl_sum_get_data_length(ecl_sum1); time_index++){
+        timeVec1.push_back(ecl_sum_iget_sim_days(ecl_sum1 , time_index ));
+    }
+    timeVec2.reserve(ecl_sum_get_data_length(ecl_sum2));
+    for (int time_index = 0; time_index < ecl_sum_get_data_length(ecl_sum2); time_index++){
+        timeVec2.push_back(ecl_sum_iget_sim_days(ecl_sum2 , time_index ));
+    }
+}
+
+
+void SummaryComparator::getDataVecs(std::vector<double> &dataVec1,
+                                    std::vector<double> &dataVec2,
+                                    const char* keyword){
+    dataVec1.reserve(ecl_sum_get_data_length(ecl_sum1));
+    for (int time_index = 0; time_index < ecl_sum_get_data_length(ecl_sum1); time_index++){
+        dataVec1.push_back(ecl_sum_iget(ecl_sum1, time_index, ecl_sum_get_general_var_params_index( ecl_sum1 , keyword )));
+    }
+    dataVec2.reserve(ecl_sum_get_data_length(ecl_sum2));
+    for (int time_index = 0; time_index < ecl_sum_get_data_length(ecl_sum2); time_index++){
+
+        dataVec2.push_back(ecl_sum_iget(ecl_sum2, time_index, ecl_sum_get_general_var_params_index( ecl_sum2 , keyword )));
+    }
+}
+
+
+void SummaryComparator::setDataSets(const std::vector<double>& timeVec1,
+                                    const std::vector<double>& timeVec2){
+    if(timeVec1.size() < timeVec2.size()){
+        ecl_sum_fileShort = this->ecl_sum1;
+        ecl_sum_fileLong = this->ecl_sum2;
+    }
+    else{
+        ecl_sum_fileShort = this->ecl_sum2;
+        ecl_sum_fileLong = this->ecl_sum1;
+    }
+}
+
+
+void SummaryComparator::chooseReference(const std::vector<double>& timeVec1,
+                                        const std::vector<double>& timeVec2,
+                                        const std::vector<double>& dataVec1,
+                                        const std::vector<double>& dataVec2){
+    if(timeVec1.size() <= timeVec2.size()){
+        referenceVec = &timeVec1; // time vector
+        referenceDataVec = &dataVec1; //data vector
+        checkVec = &timeVec2;
+        checkDataVec = &dataVec2;
+    }
+    else{
+        referenceVec = &timeVec2;
+        referenceDataVec = &dataVec2;
+        checkVec = &timeVec1;
+        checkDataVec = &dataVec1;
+    }
+}
+
+
+void SummaryComparator::getDeviation(size_t refIndex, size_t &checkIndex, Deviation &dev){
+    if((*referenceVec)[refIndex] == (*checkVec)[checkIndex]){
+        dev = SummaryComparator::calculateDeviations((*referenceDataVec)[refIndex], (*checkDataVec)[checkIndex]);
+        checkIndex++;
+        return;
+    }
+    else if((*referenceVec)[refIndex]<(*checkVec)[checkIndex]){
+        double value = SummaryComparator::unitStep((*checkDataVec)[checkIndex]);
+        /*Must be a little careful here. Flow writes out old value first,
+          than changes value. Say there should be a change in production rate from A to B at timestep 300.
+          Then the data of time step 300 is A and the next timestep will have value B. Must use the upper limit. */
+        dev = SummaryComparator::calculateDeviations((*referenceDataVec)[refIndex], value);
+        checkIndex++;
+        return;
+    }
+    else{
+        checkIndex++;
+        getDeviation(refIndex, checkIndex , dev);
+    }
+    if(checkIndex == checkVec->size() -1 ){
+        return;
+    }
+}
+
+
+void SummaryComparator::printUnits(){
+    std::vector<double> timeVec1, timeVec2;
+    setTimeVecs(timeVec1, timeVec2);  // Sets the time vectors, they are equal for all keywords (WPOR:PROD01 etc)
+    setDataSets(timeVec1, timeVec2);
+    for (int jvar = 0; jvar < stringlist_get_size(keysLong); jvar++){
+        std::cout << stringlist_iget(keysLong, jvar) << " unit: " << ecl_sum_get_unit(ecl_sum_fileShort, stringlist_iget(keysLong, jvar)) << std::endl;
+    }
+}
+
+
+//Called only when the keywords are equal in the getDeviations()-function
+const char* SummaryComparator::getUnit(const char* keyword){
+    return ecl_sum_get_unit(ecl_sum_fileShort, keyword);
+}
+
+
+void SummaryComparator::printKeywords(){
+    int ivar = 0;
+    std::vector<std::string> noMatchString;
+    std::cout << "Keywords that are common for the files:" << std::endl;
+    while(ivar < stringlist_get_size(keysLong)){
+        const char* keyword = stringlist_iget(keysLong, ivar);
+        if (stringlist_contains(keysLong, keyword) && stringlist_contains(keysShort, keyword)){
+            std::cout << keyword << std::endl;
+            ivar++;
+        }
+        else{
+            noMatchString.push_back(keyword);
+            ivar++;
+        }
+    }
+    if(noMatchString.size() == 0){
+        std::cout << "No keywords were different" << std::endl;
+        return;
+    }
+    std::cout << "Keywords that are different: " << std::endl;
+    for (const auto& it : noMatchString) std::cout << it << std::endl;
+
+    std::cout << "\nOf the " << stringlist_get_size(keysLong) << " keywords " << stringlist_get_size(keysLong)-noMatchString.size() << " were equal and " << noMatchString.size() << " were different" << std::endl;
+}
+
+
+void SummaryComparator::printDataOfSpecificKeyword(const std::vector<double>& timeVec1,
+                                                   const std::vector<double>& timeVec2,
+                                                   const char* keyword){
+    std::vector<double> dataVec1, dataVec2;
+
+    getDataVecs(dataVec1,dataVec2,keyword);
+    chooseReference(timeVec1, timeVec2,dataVec1,dataVec2);
+    size_t ivar = 0;
+    size_t jvar = 0;
+    const char separator = ' ';
+    const int numWidth = 14;
+    std::cout << std::left << std::setw(numWidth) << std::setfill(separator) << "Time";
+    std::cout << std::left << std::setw(numWidth) << std::setfill(separator) << "Ref data";
+    std::cout << std::left << std::setw(numWidth) << std::setfill(separator) << "Check data" << std::endl;
+
+    while(ivar < referenceVec->size()){
+        if(ivar == referenceVec->size() || jvar == checkVec->size() ){
+            break;
+        }
+        if((*referenceVec)[ivar] == (*checkVec)[jvar]){
+            std::cout << std::left << std::setw(numWidth) << std::setfill(separator) << (*referenceVec)[ivar];
+            std::cout << std::left << std::setw(numWidth) << std::setfill(separator) << (*referenceDataVec)[ivar];
+            std::cout << std::left << std::setw(numWidth) << std::setfill(separator) << (*checkDataVec)[jvar] << std::endl;
+            ivar++;
+            jvar++;
+        }else if((*referenceVec)[ivar] < (*checkVec)[jvar]){
+            std::cout << std::left << std::setw(numWidth) << std::setfill(separator) << (*referenceVec)[ivar];
+            std::cout << std::left << std::setw(numWidth) << std::setfill(separator) << (*referenceDataVec)[ivar];
+            std::cout << std::left << std::setw(numWidth) << std::setfill(separator) << "" << std::endl;
+            ivar++;
+        }
+        else{
+            std::cout << std::left << std::setw(numWidth) << std::setfill(separator) << (*checkVec)[jvar];
+            std::cout << std::left << std::setw(numWidth) << std::setfill(separator) << "";
+            std::cout << std::left << std::setw(numWidth) << std::setfill(separator) << (*checkDataVec)[jvar] << std::endl;
+            jvar++;
+        }
+    }
+}

examples/test_util/summaryComparator.hpp

@@ -0,0 +1,182 @@
+/*
+   Copyright 2016 Statoil ASA.
+
+   This file is part of the Open Porous Media project (OPM).
+
+   OPM is free software: you can redistribute it and/or modify it under
+   the terms of the GNU General Public License as published by
+   the Free Software Foundation, either version 3 of the License, or
+   (at your option) any later version.
+
+   OPM is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with OPM.  If not, see <http://www.gnu.org/licenses/>.
+   */
+
+#ifndef SUMMARYCOMPARATOR_HPP
+#define SUMMARYCOMPARATOR_HPP
+
+#include "Deviation.hpp"
+#include <iostream>
+#include <iomanip>
+#include <map>
+#include <vector>
+#include <algorithm>
+#include <string>
+
+
+// helper macro to handle error throws or not
+#define HANDLE_ERROR(type, message) \
+  { \
+    if (throwOnError) \
+      OPM_THROW(type, message); \
+    else \
+      std::cerr << message << std::endl; \
+  }
+
+
+//! \brief Prototyping struct, encapsuling the stringlist libraries.
+struct stringlist_struct;
+typedef struct stringlist_struct stringlist_type;
+
+//! \brief Prototyping struct, encapsuling the ert libraries.
+struct ecl_sum_struct;
+typedef struct ecl_sum_struct ecl_sum_type;
+
+
+class SummaryComparator {
+    private:
+        double absoluteTolerance = 0; //!< The maximum absolute deviation that is allowed between two values.
+        double relativeTolerance = 0; //!< The maximum relative deviation that is allowed between twi values.
+    protected:
+        ecl_sum_type * ecl_sum1                = nullptr; //!< Struct that contains file1
+        ecl_sum_type * ecl_sum2                = nullptr; //!< Struct that contains file2
+        ecl_sum_type * ecl_sum_fileShort       = nullptr; //!< For keeping track of the file with most/fewest timesteps
+        ecl_sum_type * ecl_sum_fileLong        = nullptr; //!< For keeping track of the file with most/fewest timesteps
+        stringlist_type* keys1                 = nullptr; //!< For storing all the keywords of file1
+        stringlist_type* keys2                 = nullptr; //!< For storing all the keywords of file2
+        stringlist_type * keysShort            = nullptr; //!< For keeping track of the file with most/fewest keywords
+        stringlist_type * keysLong             = nullptr; //!< For keeping track of the file with most/fewest keywords
+        const std::vector<double> * referenceVec     = nullptr; //!< For storing the values of each time step for the file containing the fewer time steps.
+        const std::vector<double> * referenceDataVec = nullptr; //!< For storing the data corresponding to each time step for the file containing the fewer time steps.
+        const std::vector<double> * checkVec         = nullptr; //!< For storing the values of each time step for the file containing the more time steps.
+        const std::vector<double> * checkDataVec     = nullptr; //!< For storing the data values corresponding to each time step for the file containing the more time steps.
+        bool printKeyword = false; //!< Boolean value for choosing whether to print the keywords or not
+        bool printSpecificKeyword = false; //!< Boolean value for choosing whether to print the vectors of a keyword or not
+        bool throwOnError = true; //!< Throw on first error
+        bool analysis = false; //!< Perform error analysis
+        std::map<std::string, std::vector<Deviation>> deviations;
+
+        //! \brief Calculate deviation between two data values and stores it in a Deviation struct.
+        //! \param[in] refIndex Index in reference data
+        //! \param[in] checkindex Index in data to be checked.
+        //! \param[out] dev Holds the result from the comparison on return.
+        //! \details Uses the #referenceVec as basis, and checks its values against the values in #checkDataVec. The function is reccursive, and will update the iterative index j of the #checkVec until #checkVec[j] >= #referenceVec[i]. \n When #referenceVec and #checkVec have the same time value (i.e. #referenceVec[i] == #checkVec[j]) a direct comparison is used, \n when this is not the case, when #referenceVec[i] do not excist as an element in #checkVec, a value is generated, either by the principle of unit step or by interpolation.
+        void getDeviation(size_t refIndex, size_t &checkIndex, Deviation &dev);
+
+        //! \brief Figure out which data file contains the most / less timesteps and assign member variable pointers accordingly.
+        //! \param[in] timeVec1 Data from first file
+        //! \param[in] timeVec2 Data from second file
+        //! \details Figure out which data file that contains the more/fewer time steps and assigns the private member variable pointers #ecl_sum_fileShort / #ecl_sum_fileLong to the correct data sets #ecl_sum1 / #ecl_sum2.
+        void setDataSets(const std::vector<double>& timeVec1,
+                         const std::vector<double>& timeVec2);
+
+        //! \brief  Reads in the time values of each time step.
+        //! \param[in] timeVec1 Vector for storing the time steps from file1
+        //! \param[in] timeVec2 Vector for storing the time steps from file2
+        void setTimeVecs(std::vector<double> &timeVec1,std::vector<double> &timeVec2);
+
+        //! \brief Read the data for one specific keyword into two separate vectors.
+        //! \param[in] dataVec1 Vector for storing the data for one specific keyword from file1
+        //! \param[in] dataVec2 Vector for storing the data for one specific keyword from file2
+        //! \details The two data files do not necessarily have the same amount of data values, but the values must correspond to the same interval in time. Thus possible to interpolate values.
+        void getDataVecs(std::vector<double> &dataVec1,
+                         std::vector<double> &dataVec2, const char* keyword);
+
+        //! \brief Sets one data set as a basis and the other as values to check against.
+        //! \param[in] timeVec1 Used to figure out which dataset that have the more/fewer time steps.
+        //! \param[in] timeVec2 Used to figure out which dataset that have the more/fewer time steps.
+        //! \param[in] dataVec1 For assiging the the correct pointer to the data vector.
+        //! \param[in] dataVec2 For assiging the the correct pointer to the data vector.
+        //! \details Figures out which time vector that contains the fewer elements. Sets this as #referenceVec and its corresponding data as #referenceDataVec. \n The remaining data set is set as #checkVec (the time vector) and #checkDataVec.
+        void chooseReference(const std::vector<double> &timeVec1,
+                             const std::vector<double> &timeVec2,
+                             const std::vector<double> &dataVec1,
+                             const std::vector<double> &dataVec2);
+
+        //! \brief Returns the relative tolerance.
+        double getRelTolerance(){return this->relativeTolerance;}
+
+        //! \brief Returns the absolute tolerance.
+        double getAbsTolerance(){return this->absoluteTolerance;}
+
+        //! \brief Returns the unit of the values of a keyword
+        //! \param[in] keyword The keyword of interest.
+        //! \param[out] ret The unit of the keyword as a const char*.
+        const char* getUnit(const char* keyword);
+
+        //! \brief Prints the units of the files.
+        void printUnits();
+
+        //! \brief Prints the keywords of the files.
+        //! \details The function prints first the common keywords, than the keywords that are different.
+        void printKeywords();
+
+        //! \brief Prints the summary vectors from the two files.
+        //! \details The function requires that the summary vectors of the specific file have been read into the member variables referenceVec etc.
+        void printDataOfSpecificKeyword(const std::vector<double>& timeVec1,
+                                        const std::vector<double>& timeVec2,
+                                        const char* keyword);
+
+    public:
+        //! \brief Creates an SummaryComparator class object
+        //! \param[in] basename1 Path to file1 without extension.
+        //! \param[in] basename1 Path to file2 without extension.
+        //! \param[in] absoluteTolerance The absolute tolerance which is to be used in the test.
+        //! \param[in] relativeTolerance The relative tolerance which is to be used in the test.
+        //! \details The constructor creates an object of the class, and openes the files, an exception is thrown if the opening of the files fails. \n It creates stringlists, in which keywords are to be stored, and figures out which keylist that contains the more/less keywords. \n Also the private member variables aboluteTolerance and relativeTolerance are set.
+        SummaryComparator(const std::string& basename1,
+                          const std::string& basename2,
+                          double absoluteTolerance, double relativeTolerance);
+
+        //! \brief Destructor
+        //! \details The destructor takes care of the allocated memory in which data has been stored.
+        ~SummaryComparator();
+
+        //! \brief Calculates the deviation between two values
+        //! \param[in] val1 The first value of interest.
+        //! \param[in] val2 The second value if interest.
+        //! \param[out] ret Returns a Deviation struct.
+        //! \details The function takes two values, calculates the absolute and relative deviation and returns the result as a Deviation struct.
+        static Deviation calculateDeviations( double val1, double val2);
+
+        //! \brief Sets the private member variable printKeywords
+        //! \param[in] boolean Boolean value
+        //! \details The function sets the private member variable printKeywords. When it is true the function printKeywords will be called.
+        void setPrintKeywords(bool boolean){this->printKeyword = boolean;}
+
+        //! \brief Sets the private member variable printSpecificKeyword
+        //! \param[in] boolean Boolean value
+        //! \details The function sets the private member variable printSpecificKeyword. When true, the summary vector of the keyword for both files will be printed.
+        void setPrintSpecificKeyword(bool boolean){this->printSpecificKeyword = boolean;}
+
+        //! \brief Unit step function
+        //! \param[in] value The input value should be the last know value
+        //! \param[out] ret Return the unit-step-function value.
+        //! \details In this case: The unit step function is used when the data from the two data set, which is to be compared, don't match in time. \n The unit step function is then to be called on the #checkDataVec 's value at the last time step which is before the time of comparison.
+
+        //! \brief Returns a value based on the unit step principle.
+        static double unitStep(double value){return value;}
+
+        //! \brief Set whether to throw on errors or not.
+        void throwOnErrors(bool dothrow) { throwOnError = dothrow; }
+
+        //! \brief Set whether or not to perform error analysis.
+        void doAnalysis(bool analyse) { analysis = analyse; }
+};
+
+#endif

examples/test_util/summaryIntegrationTest.cpp

@@ -0,0 +1,386 @@
+/*
+   Copyright 2016 Statoil ASA.
+
+   This file is part of the Open Porous Media project (OPM).
+
+   OPM is free software: you can redistribute it and/or modify it under the terms of
+   the GNU General Public License as published   by the Free Software Foundation, either
+   version 3 of the License, or (at your option) any later version.
+
+   OPM is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with OPM.  If not, see <http://www.gnu.org/licenses/>.
+   */
+
+
+#include "summaryIntegrationTest.hpp"
+#include <opm/common/ErrorMacros.hpp>
+#include <ert/ecl/ecl_sum.hpp>
+#include <ert/util/stringlist.hpp>
+#include <cmath>
+
+
+void SummaryIntegrationTest::getIntegrationTest(){
+    std::vector<double> timeVec1, timeVec2;
+    setTimeVecs(timeVec1, timeVec2);  // Sets the time vectors, they are equal for all keywords (WPOR:PROD01 etc)
+    setDataSets(timeVec1, timeVec2);
+
+    int ivar = 0;
+    if(!allowDifferentAmountOfKeywords){
+        if(stringlist_get_size(keysShort) != stringlist_get_size(keysLong)){
+            OPM_THROW(std::invalid_argument, "Different ammont of keywords in the two summary files.");
+        }
+    }
+    if(printKeyword){
+        printKeywords();
+        return;
+    }
+
+    std::string keywordWithGreatestErrorRatio;
+    double greatestRatio = 0;
+
+    //Iterates over all keywords from the restricted file, use iterator "ivar". Searches for a  match in the file with more keywords, use the itarator "jvar".
+    while(ivar < stringlist_get_size(keysShort)){
+        const char* keyword = stringlist_iget(keysShort, ivar);
+
+        if(oneOfTheMainVariables){
+            std::string keywordString(keyword);
+            std::string substr = keywordString.substr(0,4);
+            if(substr!= mainVariable){
+                ivar++;
+                continue;
+            }
+        }
+        for (int jvar = 0; jvar < stringlist_get_size(keysLong); jvar++){
+
+            if (strcmp(keyword, stringlist_iget(keysLong, jvar)) == 0){ //When the keywords are equal, proceed in comparing summary files.
+                /*	if(!checkUnits(keyword)){
+                    OPM_THROW(std::runtime_error, "For keyword " << keyword << " the unit of the two files is not equal. Not possible to compare.");
+                    } //Comparing the unit of the two vectors.*/
+                checkForKeyword(timeVec1, timeVec2, keyword);
+                if(findVectorWithGreatestErrorRatio){
+                    WellProductionVolume volume = getSpecificWellVolume(timeVec1,timeVec2, keyword);
+                    findGreatestErrorRatio(volume,greatestRatio, keyword, keywordWithGreatestErrorRatio);
+                }
+                break;
+            }
+            //will only enter here if no keyword match
+            if(jvar == stringlist_get_size(keysLong)-1){
+                if(!allowDifferentAmountOfKeywords){
+                    OPM_THROW(std::invalid_argument, "No match on keyword");
+                }
+            }
+        }
+        ivar++;
+    }
+    if(findVectorWithGreatestErrorRatio){
+        std::cout << "The keyword " << keywordWithGreatestErrorRatio << " had the greatest error ratio, which was " << greatestRatio << std::endl;
+    }
+    if((findVolumeError || oneOfTheMainVariables) && !findVectorWithGreatestErrorRatio){
+        evaluateWellProductionVolume();
+    }
+    if(allowSpikes){
+        std::cout << "checkWithSpikes succeeded." << std::endl;
+    }
+}
+
+
+void SummaryIntegrationTest::getIntegrationTest(const char* keyword){
+    if(stringlist_contains(keysShort,keyword) && stringlist_contains(keysLong, keyword)){
+        std::vector<double> timeVec1, timeVec2;
+        setTimeVecs(timeVec1, timeVec2);  // Sets the time vectors, they are equal for all keywords (WPOR:PROD01 etc)
+        setDataSets(timeVec1, timeVec2);
+
+        if(printSpecificKeyword){
+            printDataOfSpecificKeyword(timeVec1, timeVec2, keyword);
+        }
+        if(findVolumeError){
+            WellProductionVolume volume = getSpecificWellVolume(timeVec1, timeVec2, keyword);
+            if(volume.error == 0){
+                std::cout << "For keyword " << keyword << " the total production volume is 0" << std::endl;
+            }
+            else{
+                std::cout << "For keyword " << keyword << " the total production volume is "<< volume.total;
+                std::cout << ", the error volume is " << volume.error << " the error ratio is " << volume.error/volume.total << std::endl;
+            }
+        }
+        checkForKeyword(timeVec1, timeVec2, keyword);
+        return;
+    }
+    OPM_THROW(std::invalid_argument, "The keyword used is not common for the two files.");
+}
+
+
+void SummaryIntegrationTest::checkForKeyword(const std::vector<double>& timeVec1,
+                                             const std::vector<double>& timeVec2,
+                                             const char* keyword){
+    std::vector<double> dataVec1, dataVec2;
+    getDataVecs(dataVec1,dataVec2,keyword);
+    chooseReference(timeVec1, timeVec2,dataVec1,dataVec2);
+    if(allowSpikes){
+        checkWithSpikes(keyword);
+    }
+    if(findVolumeError ||oneOfTheMainVariables ){
+        volumeErrorCheck(keyword);
+    }
+}
+
+
+int SummaryIntegrationTest::checkDeviation(const Deviation& deviation){
+    double absTol = getAbsTolerance();
+    double relTol = getRelTolerance();
+    if (deviation.rel> relTol && deviation.abs > absTol){
+        return 1;
+    }
+    return 0;
+}
+
+
+void SummaryIntegrationTest::findGreatestErrorRatio(const WellProductionVolume& volume,
+                                                    double &greatestRatio,
+                                                    const char* currentKeyword,
+                                                    std::string &greatestErrorRatio){
+    if (volume.total != 0 && (volume.total - volume.error > getAbsTolerance()) ){
+        if(volume.error/volume.total > greatestRatio){
+            greatestRatio = volume.error/volume.total;
+            std::string currentKeywordStr(currentKeyword);
+            greatestErrorRatio = currentKeywordStr;
+        }
+    }
+}
+
+
+void SummaryIntegrationTest::volumeErrorCheck(const char* keyword){
+    const ecl::smspec_node * node = ecl_sum_get_general_var_node (ecl_sum_fileShort ,keyword);//doesn't matter which ecl_sum_file one uses, the kewyord SHOULD be equal in terms of smspec data.
+    if (node->is_historical())
+        return;
+
+    if (!mainVariable.empty()){
+        std::string keywordString(keyword);
+        std::string firstFour = keywordString.substr(0,4);
+
+        if(mainVariable == firstFour && firstFour == "WOPR"){
+            if(firstFour == "WOPR"){
+                WellProductionVolume result =  getWellProductionVolume(keyword);
+                WOP += result;
+                return;
+            }
+        }
+        if(mainVariable == firstFour && firstFour == "WWPR"){
+            if(firstFour == "WWPR"){
+                WellProductionVolume result = getWellProductionVolume(keyword);
+                WWP += result;
+                return;
+            }
+        }
+        if(mainVariable == firstFour && firstFour == "WGPR"){
+            if(firstFour == "WGPR"){
+                WellProductionVolume result = getWellProductionVolume(keyword);
+                WGP += result;
+                return;
+            }
+        }
+        if(mainVariable == firstFour && firstFour == "WBHP"){
+            if(firstFour == "WBHP"){
+                WellProductionVolume result = getWellProductionVolume(keyword);
+                WBHP += result;
+                return;
+            }
+        }
+    }
+    updateVolumeError(keyword);
+}
+
+
+void SummaryIntegrationTest::updateVolumeError(const char* keyword){
+    std::string keywordString(keyword);
+    std::string firstFour = keywordString.substr(0,4);
+
+    if(firstFour == "WOPR"){
+        WellProductionVolume result =  getWellProductionVolume(keyword);
+        WOP += result;
+    }
+    if(firstFour == "WWPR"){
+        WellProductionVolume result = getWellProductionVolume(keyword);
+        WWP += result;
+    }
+    if(firstFour == "WGPR"){
+        WellProductionVolume result = getWellProductionVolume(keyword);
+        WGP += result;
+
+    }
+    if(firstFour == "WBHP"){
+        WellProductionVolume result = getWellProductionVolume(keyword);
+        WBHP += result;
+    }
+}
+
+
+WellProductionVolume SummaryIntegrationTest::getWellProductionVolume(const char * keyword){
+    double total = integrate(*referenceVec, *referenceDataVec);
+    double error = integrateError(*referenceVec, *referenceDataVec,
+                                  *checkVec, *checkDataVec);
+    WellProductionVolume wPV;
+    wPV.total = total;
+    wPV.error = error;
+    if(wPV.total != 0 && wPV.total-wPV.error > getAbsTolerance()){
+        if( (wPV.error/wPV.total > getRelTolerance()) && throwExceptionForTooGreatErrorRatio){
+            OPM_THROW(std::runtime_error, "For the keyword "<< keyword << " the error ratio was " << wPV.error/wPV.total << " which is greater than the tolerance " << getRelTolerance());
+        }
+    }
+    return wPV;
+}
+
+
+void SummaryIntegrationTest::evaluateWellProductionVolume(){
+    if(mainVariable.empty()){
+        double ratioWOP, ratioWWP, ratioWGP, ratioWBHP;
+        ratioWOP = WOP.error/WOP.total;
+        ratioWWP = WWP.error/WWP.total;
+        ratioWGP = WGP.error/WGP.total;
+        ratioWBHP = WBHP.error/WBHP.total;
+        std::cout << "\n The total oil volume is " << WOP.total << ". The error volume is "<< WOP.error <<  ". The error ratio is " << ratioWOP << std::endl;
+        std::cout << "\n The total water volume is " << WWP.total << ". The error volume is "<< WWP.error <<  ". The error ratio is " << ratioWWP << std::endl;
+        std::cout << "\n The total gas volume is " << WGP.total <<". The error volume is "<< WGP.error <<  ". The error ratio is " << ratioWGP << std::endl;
+        std::cout << "\n The total area under the WBHP curve is " << WBHP.total << ". The area under the error curve is "<< WBHP.error <<  ". The error ratio is " << ratioWBHP << std::endl << std::endl;
+    }
+    if(mainVariable == "WOPR"){
+        std::cout << "\nThe total oil volume is " << WOP.total << ". The error volume is "<< WOP.error <<  ". The error ratio is " << WOP.error/WOP.total << std::endl<< std::endl;
+    }
+    if(mainVariable == "WWPR"){
+        std::cout << "\nThe total water volume is " << WWP.total << ". The error volume is "<< WWP.error <<  ". The error ratio is " << WWP.error/WWP.total << std::endl<< std::endl;
+    }
+    if(mainVariable == "WGPR"){
+        std::cout << "\nThe total gas volume is " << WGP.total <<". The error volume is "<< WGP.error <<  ". The error ratio is " << WGP.error/WGP.total << std::endl<< std::endl;
+    }
+    if(mainVariable == "WBHP"){
+        std::cout << "\nThe total area under the WBHP curve " << WBHP.total << ". The area under the error curve is "<< WBHP.error <<  ". The error ratio is " << WBHP.error/WBHP.total << std::endl << std::endl;
+    }
+}
+
+
+void SummaryIntegrationTest::checkWithSpikes(const char* keyword){
+    int errorOccurrences = 0;
+    size_t jvar = 0 ;
+    bool spikeCurrent = false;
+    Deviation deviation;
+
+    for (size_t ivar = 0; ivar < referenceVec->size(); ivar++){
+        int errorOccurrencesPrev = errorOccurrences;
+        bool spikePrev = spikeCurrent;
+        getDeviation(ivar,jvar, deviation);
+        errorOccurrences += checkDeviation(deviation);
+        if (errorOccurrences != errorOccurrencesPrev){
+            spikeCurrent = true;
+        } else{
+            spikeCurrent = false;
+        }
+        if(spikePrev&&spikeCurrent){
+            std::cout << "For keyword " << keyword << " at time step " << (*referenceVec)[ivar] <<std::endl;
+            OPM_THROW(std::invalid_argument, "For keyword " << keyword << " at time step " << (*referenceVec)[ivar] << ", wwo deviations in a row exceed the limit. Not a spike value. Integration test fails." );
+        }
+        if(errorOccurrences > this->spikeLimit){
+            std::cout << "For keyword " << keyword << std::endl;
+            OPM_THROW(std::invalid_argument, "For keyword " << keyword << " too many spikes in the vector. Integration test fails.");
+        }
+    }
+}
+
+
+WellProductionVolume
+SummaryIntegrationTest::getSpecificWellVolume(const std::vector<double>& timeVec1,
+                                              const std::vector<double>& timeVec2,
+                                              const char* keyword){
+    std::vector<double> dataVec1, dataVec2;
+    getDataVecs(dataVec1,dataVec2,keyword);
+    chooseReference(timeVec1, timeVec2,dataVec1,dataVec2);
+    return getWellProductionVolume(keyword);
+}
+
+
+double SummaryIntegrationTest::integrate(const std::vector<double>& timeVec,
+                                         const std::vector<double>& dataVec){
+    double totalSum = 0;
+    if(timeVec.size() != dataVec.size()){
+        OPM_THROW(std::runtime_error, "The size of the time vector does not match the size of the data vector.");
+    }
+    for(size_t i = 0; i < timeVec.size()-1; i++){
+        double width = timeVec[i+1] - timeVec[i];
+        double height = dataVec[i+1];
+        totalSum += getRectangleArea(height, width);
+    }
+    return totalSum;
+}
+
+
+double SummaryIntegrationTest::integrateError(const std::vector<double>& timeVec1,
+                                              const std::vector<double>& dataVec1,
+                                              const std::vector<double>& timeVec2,
+                                              const std::vector<double>& dataVec2){
+    // When the data corresponds to a rate the integration will become a Riemann
+    // sum.  This function calculates the Riemann sum of the error.  The reason why
+    // a Riemann sum is used is because of the way the data is written to file.
+    // When a change occur (e.g. change of a rate), the data (value and time) is
+    // written to file, THEN the change happens in the simulator, i.e., we will
+    // notice the change at the next step.
+    //
+    // Keep in mind that the summary vector is NOT a continuous curve, only points
+    // of data (time, value).  We have to guess what happens between the data
+    // points, we do this by saying: "There are no change, the only change happens
+    // at the data points."  As stated above, the value of this constant "height" of
+    // the rectangle corresponds to the value of the last time step.  Thus we have
+    // to use the "right hand side value of the rectangle as height
+    //
+    // someDataVector[ivar] instead of someDataVector[ivar-1]
+    //
+    // (which intuition is saying is the correct value to use).
+
+    if(timeVec1.size() != dataVec1.size() || timeVec2.size() != dataVec2.size() ){
+        OPM_THROW(std::runtime_error, "The size of the time vector does not match the size of the data vector.");
+    }
+    double errorSum = 0;
+    double rightEdge, leftEdge, width;
+    size_t i = 1;
+    size_t j = 1;
+    leftEdge = timeVec1[0];
+    while(i < timeVec1.size()){
+        if(j == timeVec2.size() ){
+            break;
+        }
+        if(timeVec1[i] == timeVec2[j]){
+            rightEdge = timeVec1[i];
+            width = rightEdge - leftEdge;
+            double dev = std::fabs(dataVec1[i] - dataVec2[j]);
+            errorSum += getRectangleArea(dev, width);
+            leftEdge = rightEdge;
+            i++;
+            j++;
+            continue;
+        }
+        if(timeVec1[i] < timeVec2[j]){
+            rightEdge = timeVec1[i];
+            width = rightEdge - leftEdge;
+            double value = unitStep(dataVec2[j]);
+            double dev = std::fabs(dataVec1[i]-value);
+            errorSum += getRectangleArea(dev, width);
+            leftEdge = rightEdge;
+            i++;
+            continue;
+        }
+        if(timeVec2[j] < timeVec1[i]){
+            rightEdge = timeVec2[j];
+            width = rightEdge - leftEdge;
+            double value = unitStep(dataVec1[i]);
+            double dev = std::fabs(dataVec2[j]-value);
+            errorSum += getRectangleArea(dev, width);
+            leftEdge = rightEdge;
+            j++;
+            continue;
+        }
+    }
+    return errorSum;
+}

examples/test_util/summaryIntegrationTest.hpp

@@ -0,0 +1,217 @@
+/*
+   Copyright 2016 Statoil ASA.
+
+   This file is part of the Open Porous Media project (OPM).
+
+   OPM is free software: you can redistribute it and/or modify it under
+   the terms of the GNU General Public License as published by
+   the Free Software Foundation, either version 3 of the License, or
+   (at your option) any later version.
+
+   OPM is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with OPM.  If not, see <http://www.gnu.org/licenses/>.
+   */
+
+#include "summaryComparator.hpp"
+
+//! \brief Struct for storing the total area under a graph.
+//! \details Used when plotting summary vector against time. In most cases this represents a volume.
+struct WellProductionVolume{
+    double total=0; //!< The total area under the graph when plotting the summary vector against time. In most cases the total production volume.
+    double error=0; //!< The total area under the graph when plotting the deviation vector against time. In most cases the total error volume.
+
+    //! \brief Overloaded operator
+    //! \param[in] rhs WellProductionVolume struct
+    WellProductionVolume& operator+=(const WellProductionVolume& rhs){
+        this->total += rhs.total;
+        this->error += rhs.error;
+        return *this;
+    }
+};
+
+//! \details The class inherits from the SummaryComparator class, which takes care of all file reading. \n The IntegrationTest class compares values from the two different files and throws exceptions when the deviation is unsatisfying.
+class SummaryIntegrationTest: public SummaryComparator {
+    private:
+        bool allowSpikes = false; //!< Boolean value, when true checkForSpikes is included as a sub test in the integration test. By default: false.
+        bool findVolumeError = false; //!< Boolean value, when true volumeErrorCheck() is included as a sub test in the integration test. By default: false.
+        bool allowDifferentAmountOfKeywords = true; //!< Boolean value, when false the integration test will check wheter the two files have the same amount of keywords. \nIf they don't, an exception will be thrown. By default: true.
+        bool findVectorWithGreatestErrorRatio = false; //!< Boolean value, when true the integration test will find the vector that has the greatest error ratio. By default: false.
+        bool oneOfTheMainVariables = false; //!< Boolean value, when true the integration test will only check for one of the primary variables (WOPR, WGPR, WWPR. WBHP), which will be specified by user. By default: false.
+        bool throwExceptionForTooGreatErrorRatio = true; //!< Boolean value, when true any volume error ratio that exceeds the relativeTolerance will cause an exception to be thrown. By default: true.
+        std::string mainVariable; //!< String variable, where the name of the main variable of interest (one of WOPR, WBHP, WWPR, WGPR) is stored. Can be empty.
+        int spikeLimit = 13370; //!< The limit for how many spikes to allow in the data set of a certain keyword. By default: Set to a high number, \n should not trig the (if spikeOccurrences > spikeLimit){ // throw exception }.
+
+        WellProductionVolume WOP; //!< WellProductionVolume struct for storing the total production volume and total error volume of all the keywords which start with WOPR
+        WellProductionVolume WWP; //!< WellProductionVolume struct for storing the total production volume and total error volume of all the keywords which start with WWPR
+        WellProductionVolume WGP;//!< WellProductionVolume struct for storing the total production volume and total error volume of all the keywords which start with WGPR
+        WellProductionVolume WBHP; //!< WellProductionVolume struct for storing the value of the area under the graph when plotting summary vector/deviation vector against time.This is for keywords starting with WBHP. \nNote: the name of the struct may be misleading, this is not an actual volume.
+
+
+        //! \brief The function gathers the correct data for comparison for a specific keyword
+        //! \param[in] timeVec1 A std::vector<double> that contains the time steps of file 1.
+        //! \param[in] timeVec2 A std::vector<double> that contains the time steps of file 2.
+        //! \param[in] keyword The keyword of interest
+        //! \details The function requires an outer loop which iterates over the keywords of the files. It prepares an integration test by gathering the data, stroing it into two vectors, \n deciding which is to be used as a reference/basis and calling the test function.
+        void checkForKeyword(const std::vector<double>& timeVec1,
+                             const std::vector<double>& timeVec2, const char* keyword);
+
+        //! \brief The function compares the volume error to the total production volume of a certain type of keyword.
+        //! param[in] keyword The keyword of interest.
+        //! \details The function takes in a keyword and checks if it is of interest. Only keywords which say something about the well oil production, well water production, \n well gas production and the well BHP are of interest. The function sums up the total production in the cases where it is possible, \n and sums up the error volumes by a trapezoid integration method. The resulting values are stored in member variable structs of type WellProductionVolume, and double variables. For proper use of the function all the keywords of the file should be checked. This is satisfied if it is called by checkForKeyword.
+        void volumeErrorCheck(const char* keyword);
+
+        //! \brief The function calculates the total production volume and total error volume of a specific keyword
+        //! \param[in] timeVec1 A std::vector<double> that contains the time steps of file 1.
+        //! \param[in] timeVec2 A std::vector<double> that contains the time steps of file 2.
+        //! \param[in] keyword The keyword of interest
+        //! \param[out] ret Returns a WellProductionWolume struct
+        //! \details The function reads the data from the two files into the member variable vectors (of the super class). It returns a WellProductionVolume struct calculated from the vectors corresponding to the keyword.
+        WellProductionVolume getSpecificWellVolume(const std::vector<double>& timeVec1,
+                                                   const std::vector<double>& timeVec2,
+                                                   const char* keyword);
+
+        //! \brief The function is a regression test which allows spikes.
+        //! \param[in] keyword The keyword of interest, the keyword the summary vectors "belong" to.
+        //! \details The function requires the protected member variables referenceVec, referenceDataVec, checkVec and checkDataVec to be stored with data, which is staisfied if it is called by checkForKeyword. \n It compares the two vectors value by value, and if the deviation is unsatisfying, the errorOccurrenceCounter is incremented. If the errorOccurrenceCounter becomes greater than the errorOccurrenceLimit, \n a exception is thrown. The function will allow spike values, however, if two values in a row exceed the deviation limit, they are no longer spikes, and an exception is thrown.
+        void checkWithSpikes(const char* keyword);
+
+        //! \brief Caluculates a deviation, throws exceptions and writes and error message.
+        //! \param[in] deviation Deviation struct
+        //! \param[out] int Returns 0/1, depending on wheter the deviation exceeded the limit or not.
+        //! \details The function checks the values of the Deviation struct against the absolute and relative tolerance, which are private member values of the super class. \n When comparing against the relative tolerance an additional term is added, the absolute deviation has to be greater than 1e-6 for the function to throw an exception. \n When the deviations are too great, the function returns 1.
+        int checkDeviation(const Deviation& deviation);
+
+        //! \brief Calculates the keyword's total production volume and error volume
+        //! \param[in] keyword The keyword of interest.
+        //! \param[out] wellProductionVolume A struct containing the total production volume and the total error volume.
+        //! \details The function calculates the total production volume and total error volume of a keyword, by the trapezoid integral method. \n The function throws and exception if the total error volume is negative. The function returns the results as a struct.
+        WellProductionVolume getWellProductionVolume(const char* keyword);
+
+        //! \brief The function function works properly when the private member variables are set (after running the integration test which findVolumeError = true). \n It prints out the total production volume, the total error volume and the error ratio.
+        void evaluateWellProductionVolume();
+
+        //! \brief The function calculates the total production volume and total error volume
+        //! \param keyword The keyword of interest
+        //! \details The function uses the data that is stored in the member variable vectors. It calculates the total production volume \n and the total error volume of the specified keyword, and adds the result to the private member WellProductionVolume variables of the class.
+        void updateVolumeError(const char* keyword);
+
+        //! \brief Finds the keyword which has the greates error volume ratio
+        //! \param[in] volume WellProductionVolume struct which contains the data used for comparison
+        //! \param[in] greatestRatio Double value taken in by reference. Stores the greatest error ratio value.
+        //! \param[in] currentKeyword The keyword that is under evaluation
+        //! \param[in] greatestErrorRatio String which contains the name of the keyword which has the greatest error ratio
+        //! \details The function requires an outer loop which iterates over the keywords in the files, and calls the function for each keyword. \nThe valiables double greatestRatio and std::string keywordWithTheGreatestErrorRatio must be declared outside the loop. \nWhen the current error ratio is greater than the value stored in greatestRatio, the gratestRatio value is updated with the current error ratio.
+        void findGreatestErrorRatio(const WellProductionVolume& volume,
+                                    double &greatestRatio,
+                                    const char* currentKeyword,
+                                    std::string &greatestErrorRatio);
+
+#if 0
+        //! \brief Checks whether the unit of the two data vectors is the same
+        //! \param[in] keyword The keyword of interest
+        //! \param[out] boolean True/false, depending on whether the units are equal or not
+        bool checkUnits(const char* keyword);
+#endif
+    public:
+        //! \brief Constructor, creates an object of IntegrationTest class.
+        //! \param[in] basename1 Path to file1 without extension.
+        //! \param[in] basename1 Path to file2 without extension.
+        //! \param[in] atol The absolute tolerance which is to be used in the test.
+        //! \param[in] rtol The relative tolerance which is to be used in the test.
+        //! \details The constructor calls the constructor of the super class.
+        SummaryIntegrationTest(const std::string& basename1,
+                               const std::string& basename2,
+                               double atol, double rtol) :
+            SummaryComparator(basename1, basename2,  atol, rtol) {}
+
+        //! \brief This function sets the private member variable allowSpikes.
+        //! \param[in] allowSpikes Boolean value
+        //! \details When allowSpikes is true, the integration test checkWithSpikes is excecuted.
+        void setAllowSpikes(bool allowSpikesArg){this->allowSpikes = allowSpikesArg;}
+
+        //! \brief This function sets the private member variable findVolumeError.
+        //! \param[in] findVolumeError Boolean value
+        //! \details When findVolumeError is true, the integration test volumeErrorCheck and the function evaluateWellProductionVolume are excecuted.
+        void setFindVolumeError(bool findVolumeErrorArg){this->findVolumeError = findVolumeErrorArg;}
+
+        //! \brief This function sets the private member variable oneOfTheMainVariables
+        //! \param[in] oneOfTheMainVariables Boolean value
+        //! \details When oneOfTheMainVariables is true, the integration test runs the substest volumeErrorCheckForOneSpecificVariable.
+        void setOneOfTheMainVariables(bool oneOfTheMainVariablesArg){this->oneOfTheMainVariables = oneOfTheMainVariablesArg;}
+
+        //! \brief This function sets the member variable string #mainVariable
+        //! \param[in] mainVar This is the string should contain one of the main variables. e.g. WOPR
+        void setMainVariable(std::string mainVar){this->mainVariable = mainVar;}
+
+        //! \brief This function sets the private member variable spikeLimit.
+        //! \param[in] lim The value which the spike limit is to be given.
+        void setSpikeLimit(int lim){this->spikeLimit = lim;}
+
+        //! \brief This function sets the private member variable findVectorWithGreatestErrorRatio
+        //! \param[in] findVolumeError Boolean value
+        //! \details When findVectorWithGreatestErrorRatio is true, the integration test will print the vector with the greatest error ratio.
+        void setFindVectorWithGreatestErrorRatio(bool boolean){this->findVectorWithGreatestErrorRatio = boolean;}
+
+        //! \brief This function sets the private member variable allowDifferentAmountsOfKeywords
+        //! \param[in] boolean Boolean value
+        //! \details When allowDifferentAmountOfKeywords is false, the amount of kewyord in the two files will be compared. \nIf the number of keywords are different an exception will be thrown.
+        void setAllowDifferentAmountOfKeywords(bool boolean){this->allowDifferentAmountOfKeywords = boolean;}
+
+        //! \brief This function sets the private member variable throwExceptionForTooGreatErrorRatio
+        //! \param[in] boolean Boolean value
+        //! \details When throwExceptionForTooGreatErrorRatio is false, the function getWellProductionVolume will throw an exception.
+        void setThrowExceptionForTooGreatErrorRatio(bool boolean){this->throwExceptionForTooGreatErrorRatio = boolean;}
+
+        //! \brief This function executes a integration test for all the keywords. If the two files do not match in amount of keywords, an exception is thrown. \n Uses the boolean member variables to know which tests to execute.
+        void getIntegrationTest();
+
+        //! \brief This function executes a integration test for one specific keyword.  If one or both of the files do not have the keyword, an exception is thorwn. \n Uses the boolean member variables to know which tests to execute.
+        void getIntegrationTest(const char* keyword);
+
+        //! \brief This function calculates the area of an rectangle of height height and width time-timePrev
+        //! \param[in] height The height of the rectangle. See important statement of use below.
+        //! \param[in] width The width of the rectangle
+        //! \param[out] area Returns the area of the rectangle
+        //! \details This function is simple. When using it on a summary vector (data values plotted againt time), calculating the area between the two points i and i+1 note this:\nThe width is time_of_i+1 - time_of_i, the height is data_of_i+1 NOT data_of_i. The upper limit must be used.
+        static double getRectangleArea(double height, double width){return height*width;}
+
+        //! \brief This function calculates the area under a graph by doing a Riemann sum
+        //! \param[in] timeVec Contains the time values
+        //! \param[in] dataVec Contains the data values
+        //! \details The function does a Riemann sum integration of the graph formed
+        //!          by the points (timeVec[i] , dataVec[i]).
+        //!          In the case of a summary vector, the summary vector of quantity
+        //!          corresponding to a rate, is a piecewise continus function consisting
+        //!          of unit step functions. Thus the Riemann sum will become an
+        //!          exact expression for the integral of the graph.
+        //!          Important: For the data values correspoding to time i and i-1,
+        //!          the fixed value of the height of the rectangles in the Riemann sum
+        //!          is set by the data value i. The upper limit must be used.
+        static double integrate(const std::vector<double>& timeVec,
+                                const std::vector<double>& dataVec);
+
+        //! \brief This function calculates the Riemann sum of the error between two graphs.
+        //! \param[in] timeVec1 Contains the time values of graph 1
+        //! \param[in] dataVec1 Contains the data values of graph 1
+        //! \param[in] timeVec2 Contains the time values of graph 2
+        //! \param[in] dataVec2 Contains the data values of graph 2
+        //! \details This function takes in two graphs and returns the integrated error.
+        //!          In case of ecl summary vectors: if the vectors correspond to a
+        //!          quantity which is a rate, the vectors will be piecewise
+        //!          continous unit step functions. In this case the error will also
+        //!          be a piecewise continous unit step function. The function uses
+        //!          a Riemann sum when calculating the integral. Thus the integral
+        //!          will become exact. Important: For the data values corresponding
+        //!          to time i and i-1, the fixed value of the height of the rectangles
+        //!          in the Riemann sum is set by the data value i.
+        //!          The upper limit must be used.
+        static double integrateError(const std::vector<double>& timeVec1,
+                                     const std::vector<double>& dataVec1,
+                                     const std::vector<double>& timeVec2,
+                                     const std::vector<double>& dataVec2);
+};

examples/test_util/summaryRegressionTest.cpp

@@ -0,0 +1,178 @@
+/*
+   Copyright 2016 Statoil ASA.
+   This file is part of the Open Porous Media project (OPM).
+
+   OPM is free software: you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation, either version 3 of the License, or
+   (at your option) any later version.
+
+   OPM is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with OPM.  If not, see <http://www.gnu.org/licenses/>.
+   */
+
+#include "summaryRegressionTest.hpp"
+#include <opm/common/ErrorMacros.hpp>
+#include <ert/ecl/ecl_sum.hpp>
+#include <ert/util/stringlist.h>
+#include <string>
+
+void SummaryRegressionTest::getRegressionTest(){
+    std::vector<double> timeVec1, timeVec2;
+    setTimeVecs(timeVec1, timeVec2);  // Sets the time vectors, they are equal for all keywords (WPOR:PROD01 etc)
+    setDataSets(timeVec1, timeVec2); //Figures which dataset that contains more/less values pr keyword vector.
+    std::cout << "Comparing " << timeVec1.size() << " steps." << std::endl;
+    int ivar = 0;
+    if((! this->allowDifferentNumberOfKeywords) &&
+        (stringlist_get_size(keysShort) != stringlist_get_size(keysLong)))
+    {
+        int missing_count = 0;
+        std::cout << "Keywords missing from one case: " << std::endl;
+
+        for (int i=0; i < stringlist_get_size( keysLong); i++) {
+            const char * key = stringlist_iget( keysLong , i );
+            if (!stringlist_contains( keysShort , key)) {
+                std::cout << key << " ";
+
+                missing_count++;
+                if ((missing_count % 8) == 0)
+                    std::cout << std::endl;
+            }
+        }
+        std::cout << std::endl;
+
+        HANDLE_ERROR(std::runtime_error, "Different amount of keywords in the two summary files.");
+    }
+    if(printKeyword){
+        printKeywords();
+    }
+
+
+    //Iterates over all keywords from the restricted file, use iterator "ivar". Searches for a  match in the file with more keywords, use the iterator "jvar".
+    bool throwAtEnd = false;
+    while(ivar < stringlist_get_size(keysShort)){
+        const char* keyword = stringlist_iget(keysShort, ivar);
+        std::string keywordString(keyword);
+        for (int jvar = 0; jvar < stringlist_get_size(keysLong); jvar++){
+            if (strcmp(keyword, stringlist_iget(keysLong, jvar)) == 0){ //When the keywords are equal, proceed in comparing summary files.
+                if (isRestartFile && keywordString.substr(3,1)=="T"){
+                    break;
+                }
+                throwAtEnd |= !checkForKeyword(timeVec1, timeVec2, keyword);
+                break;
+            }
+            //will only enter here if no keyword match
+            if(jvar == stringlist_get_size(keysLong)-1){
+                std::cout << "Could not find keyword: " << stringlist_iget(keysShort, ivar) << std::endl;
+                OPM_THROW(std::runtime_error, "No match on keyword");
+            }
+        }
+        ivar++;
+    }
+    if (analysis) {
+        std::cout << deviations.size() << " summary keyword"
+                  << (deviations.size() > 1 ? "s":"") << " exhibit failures" << std::endl;
+        size_t len = ecl_sum_get_data_length(ecl_sum1);
+        for (const auto& iter : deviations) {
+            std::cout << "\t" << iter.first << std::endl;
+            std::cout << "\t\tFails for " << iter.second.size() << " / " << len << " steps." << std::endl;
+            std::cout.precision(7);
+            double absErr = std::max_element(iter.second.begin(), iter.second.end(),
+                                          [](const Deviation& a, const Deviation& b)
+                                          {
+                                            return a.abs < b.abs;
+                                          })->abs;
+            double relErr = std::max_element(iter.second.begin(), iter.second.end(),
+                                          [](const Deviation& a, const Deviation& b)
+                                          {
+                                            return a.rel < b.rel;
+                                          })->rel;
+            std::cout << "\t\tLargest absolute error: "
+                      <<  std::scientific << absErr << std::endl;
+            std::cout << "\t\tLargest relative error: "
+                      <<  std::scientific << relErr << std::endl;
+        }
+    }
+    if (throwAtEnd)
+      OPM_THROW(std::runtime_error, "Regression test failed.");
+    else if (deviations.empty())
+      std::cout << "Regression test succeeded." << std::endl;
+}
+
+
+
+void SummaryRegressionTest::getRegressionTest(const char* keyword){
+    std::vector<double> timeVec1, timeVec2;
+    setTimeVecs(timeVec1, timeVec2);  // Sets the time vectors, they are equal for all keywords (WPOR:PROD01 etc)
+    setDataSets(timeVec1, timeVec2); //Figures which dataset that contains more/less values pr keyword vector.
+    std::string keywordString(keyword);
+    if(stringlist_contains(keysShort,keyword) && stringlist_contains(keysLong, keyword)){
+        if (isRestartFile && keywordString.substr(3,1)=="T"){
+            return;
+        }
+        if (checkForKeyword(timeVec1, timeVec2, keyword))
+          std::cout << "Regression test succeeded." << std::endl;
+        else
+          OPM_THROW(std::runtime_error, "Regression test failed");
+
+        return;
+    }
+    std::cout << "The keyword suggested, " << keyword << ", is not supported by one or both of the summary files. Please use a different keyword." << std::endl;
+    OPM_THROW(std::runtime_error, "Input keyword from user does not exist in/is not common for the two summary files.");
+}
+
+
+
+bool SummaryRegressionTest::checkDeviation(Deviation deviation, const char* keyword, int refIndex, int checkIndex){
+    double absTol = getAbsTolerance();
+    double relTol = getRelTolerance();
+
+    if (deviation.rel > relTol && deviation.abs > absTol){
+        if (analysis) {
+            deviations[keyword].push_back(deviation);
+        } else {
+            std::cout << "For keyword " << keyword  << std::endl;
+            std::cout << "(days, reference value) and (days, check value) = (" << (*referenceVec)[refIndex] << ", " << (*referenceDataVec)[refIndex]
+              << ") and (" << (*checkVec)[checkIndex-1] << ", " << (*checkDataVec)[checkIndex-1] << ")\n";
+            // -1 in [checkIndex -1] because checkIndex is updated after leaving getDeviation function
+            std::cout << "The absolute deviation is " << deviation.abs << ". The tolerance limit is " << absTol << std::endl;
+            std::cout << "The relative deviation is " << deviation.rel << ". The tolerance limit is " << relTol << std::endl;
+            HANDLE_ERROR(std::runtime_error, "Deviation exceed the limit.");
+        }
+        return false;
+    }
+    return true;
+}
+
+
+
+bool SummaryRegressionTest::checkForKeyword(std::vector<double>& timeVec1, std::vector<double>& timeVec2, const char* keyword){
+    std::vector<double> dataVec1, dataVec2;
+    getDataVecs(dataVec1,dataVec2,keyword);
+    chooseReference(timeVec1, timeVec2,dataVec1,dataVec2);
+    return startTest(keyword);
+}
+
+
+
+bool SummaryRegressionTest::startTest(const char* keyword){
+    size_t jvar = 0;
+    Deviation deviation;
+    bool result = true;
+    for (size_t ivar = 0; ivar < referenceVec->size(); ivar++){
+        getDeviation(ivar, jvar, deviation);//Reads from the protected member variables in the super class.
+        result = checkDeviation(deviation, keyword,ivar, jvar);
+    }
+
+    return result;
+}
+
+void SummaryRegressionTest::setAllowDifferentNumberOfKeywords(const bool allow)
+{
+    this->allowDifferentNumberOfKeywords = allow;
+}

examples/test_util/summaryRegressionTest.hpp

@@ -0,0 +1,87 @@
+/*
+   Copyright 2016 Statoil ASA.
+
+   This file is part of the Open Porous Media project (OPM).
+
+   OPM is free software: you can redistribute it and/or modify it under
+   the terms of the GNU General Public License as published by
+   the Free Software Foundation, either version 3 of the License, or
+   (at your option) any later version.
+
+   OPM is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with OPM.  If not, see <http://www.gnu.org/licenses/>.
+   */
+
+#ifndef SUMMARYREGRESSIONTEST_HPP
+#define SUMMARYREGRESSIONTEST_HPP
+
+#include "summaryComparator.hpp"
+
+//! \details  The class inherits from the SummaryComparator class, which takes care of all file reading. \n The RegressionTest class compares the values from the two different files and throws exceptions when the deviation is unsatisfying.
+class SummaryRegressionTest: public SummaryComparator {
+    private:
+        //! \brief Gathers the correct data for comparison for a specific keyword
+        //! \param[in] timeVec1 The time steps of file 1.
+        //! \param[in] timeVec2 The time steps of file 2.
+        //! \param[in] keyword The keyword of interest
+        //! \details The function prepares a regression test by gathering the data, stroing it into two vectors, \n deciding which is to be used as a reference/basis and calling the test function.
+        //! \return True if check passed, false otherwise.
+        bool checkForKeyword(std::vector<double>& timeVec1, std::vector<double>& timeVec2, const char* keyword);
+
+        //! \brief The regression test
+        //! \param[in] keyword The keyword common for both the files. The vectors associated with the keyword are used for comparison.
+        //! \details Start test uses the private member variables, pointers of std::vector<double> type, which are set to point to the correct vectors in SummaryComparison::chooseReference(...). \n The function iterates over the referenceVev/basis and for each iteration it calculates the deviation with SummaryComparison::getDeviation(..) and stors it in a Deviation struct. \n SummaryComparison::getDeviation takes the int jvar as an reference input, and using it as an iterative index for the values which are to be compared with the basis. \n Thus, by updating the jvar variable every time a deviation is calculated, one keep track jvar and do not have to iterate over already checked values.
+        bool startTest(const char* keyword);
+
+        //! \brief Caluculates a deviation, throws exceptions and writes and error message.
+        //! \param[in] deviation Deviation struct
+        //! \param[in] keyword The keyword that the data that are being compared belongs to.
+        //! \param[in] refIndex The report step of which the deviation originates from in #referenceDataVec.
+        //! \param[in] checkIndex The report step of which the deviation originates from in #checkDataVec.
+        //! \details The function checks the values of the Deviation struct against the absolute and relative tolerance, which are private member values of the super class. \n When comparing against the relative tolerance an additional term is added, the absolute deviation has to be greater than 1e-6 for the function to throw an exception. \n When the deviations are too great, the function writes out which keyword, and at what report step the deviation is too great before optionally throwing an exception.
+        //! \return True if check passed, false otherwise.
+        bool checkDeviation(Deviation deviation, const char* keyword, int refIndex, int checkIndex);
+
+        bool isRestartFile = false; //!< Private member variable, when true the files that are being compared is a restart file vs a normal file
+
+        /// Whether or not to require that the two files have the same
+        /// number of keywords.  Throw exception if not.
+        /// Default value: false (don't allow different number of keywords).
+        bool allowDifferentNumberOfKeywords = false;
+
+    public:
+        //! \brief Constructor, creates an object of RefressionTest class.
+        //! \param[in] basename1 Path to file1 without extension.
+        //! \param[in] basename1 Path to file2 without extension.
+        //! \param[in] relativeTol The relative tolerance which is to be used in the test.
+        //! \param[in] absoluteTol The absolute tolerance which is to be used in the test.
+        //! \details The constructor calls the constructor of the super class.
+        SummaryRegressionTest(const std::string& basename1,
+                              const std::string& basename2,
+                              double relativeTol, double absoluteTol) :
+            SummaryComparator(basename1, basename2, relativeTol, absoluteTol) {}
+
+        //! \details The function executes a regression test for all the keywords. If the two files do not match in amount of keywords, an exception is thrown.
+        void getRegressionTest();
+
+        //! \details The function executes a regression test for one specific keyword. If one or both of the files do not have the keyword, an exception is thrown.
+        void getRegressionTest(const char* keyword);///< Regression test for a certain keyword of the files.
+
+        //! \brief This function sets the private member variable isRestartFiles
+        //! \param[in] boolean Boolean value
+        void setIsRestartFile(bool boolean){this->isRestartFile = boolean;}
+
+        /// \brief Dynamically control whether or not to require equal
+        ///    number of keywords (vectors) in the two result sets.
+        ///
+        /// \param[in] allow Whether or not to allow different number of
+        ///    summary keywords in the two result sets.
+        void setAllowDifferentNumberOfKeywords(const bool allow);
+};
+
+#endif

jenkins/build-opm-module.sh

@@ -3,8 +3,8 @@
 declare -A configurations
 
 declare -A EXTRA_MODULE_FLAGS
-EXTRA_MODULE_FLAGS[opm-simulators]="-DBUILD_EBOS_EXTENSIONS=ON -DBUILD_EBOS_DEBUG_EXTENSIONS=ON -DBUILD_FLOW_VARIANTS=ON"
-EXTRA_MODULE_FLAGS[opm-common]="-DOPM_ENABLE_PYTHON=ON -DOPM_ENABLE_EMBEDDED_PYTHON=ON -DOPM_INSTALL_PYTHON=ON"
+EXTRA_MODULE_FLAGS[opm-common]="-DENABLE_WELL_TEST=ON"
+EXTRA_MODULE_FLAGS[opm-simulators]="-DBUILD_EBOS_EXTENSIONS=ON -DBUILD_EBOS_DEBUG_EXTENSIONS=ON"
 
 # Parse revisions from trigger comment and setup arrays
 # Depends on: 'upstreams', upstreamRev',
@@ -110,12 +110,11 @@ function build_module {
       cmake --build .
     fi
     test $? -eq 0 || exit 2
-    TESTTHREADS=${TESTTHREADS:-1}
     if test -z "$CTEST_CONFIGURATION"
     then
-      ctest -T Test --no-compress-output -j$TESTTHREADS
+      ctest -T Test --no-compress-output
     else
-      ctest -j$TESTTHREADS -C $CTEST_CONFIGURATION --timeout 5000 -T Test --no-compress-output
+      ctest -C $CTEST_CONFIGURATION --timeout 5000 -T Test --no-compress-output
     fi
 
     # Convert to junit format
@@ -146,7 +145,12 @@ function clone_module {
   mkdir -p $WORKSPACE/deps/$1
   cd $WORKSPACE/deps/$1
   git init .
-  git remote add origin https://github.com/OPM/$1
+  if [ "$1" == "libecl" ]
+  then
+    git remote add origin https://github.com/Statoil/$1
+  else
+    git remote add origin https://github.com/OPM/$1
+  fi
   git fetch --depth 1 origin $2:branch_to_build
   git checkout branch_to_build
   git log HEAD -1 | cat

jenkins/build.sh

@@ -6,15 +6,17 @@ source `dirname $0`/build-opm-module.sh
 mkdir deps
 ln -sf $WORKSPACE deps/opm-common
 
-# No upstreams
 declare -a upstreams
+upstreams=(libecl)
+
 declare -A upstreamRev
+upstreamRev[libecl]=master
 
 # Downstreams and revisions
 declare -a downstreams
 downstreams=(opm-material
              opm-grid
-             opm-models
+             ewoms
              opm-simulators
              opm-upscaling
              )
@@ -22,7 +24,7 @@ downstreams=(opm-material
 declare -A downstreamRev
 downstreamRev[opm-material]=master
 downstreamRev[opm-grid]=master
-downstreamRev[opm-models]=master
+downstreamRev[ewoms]=master
 downstreamRev[opm-simulators]=master
 downstreamRev[opm-upscaling]=master
 

jenkins/update-opm-tests.sh

@@ -9,7 +9,7 @@ upstreams=(libecl
            opm-common
            opm-material
            opm-grid
-           opm-models
+           ewoms
            opm-simulators
            opm-upscaling
           )
@@ -19,7 +19,7 @@ upstreamRev[libecl]=master
 upstreamRev[opm-common]=master
 upstreamRev[opm-material]=master
 upstreamRev[opm-grid]=master
-upstreamRev[opm-models]=master
+upstreamRev[ewoms]=master
 upstreamRev[opm-simulators]=master
 upstreamRev[opm-upscaling]=master
 
@@ -45,11 +45,6 @@ done
 export REASON
 export BRANCH_NAME
 $WORKSPACE/deps/opm-simulators/tests/update_reference_data.sh $OPM_TESTS_ROOT
-if test $? -eq 5
-then
-  echo "No tests failed - no data to update. Exiting"
-  exit 0
-fi
 
 # Finally open the pull request
 cd $OPM_TESTS_ROOT
@@ -86,10 +81,6 @@ then
   PRNUMBER=${rev//[!0-9]/}
   DATA_PR=`curl -X GET https://api.github.com/repos/OPM/opm-tests/pulls?head=jenkins4opm:$BRANCH_NAME | grep '"number":' | awk -F ':' '{print $2}' | sed -e 's/,//' -e 's/ //'`
   git push -u jenkins4opm $BRANCH_NAME -f
-fi
-
-if [ -n "$DATA_PR" ]
-then
   curl -d "{ \"body\": \"Existing PR https://github.com/OPM/opm-tests/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-tests -r /tmp/cmsg $BRANCH_NAME

msim/include/opm/msim/msim.hpp

@@ -21,27 +21,28 @@ namespace Opm {
 class EclipseIO;
 class ParseContext;
 class Parser;
-class SummaryState;
+
 class msim {
 
 public:
-    using well_rate_function = double(const EclipseState&, const Schedule&, const SummaryState& st, const data::Solution&, size_t report_step, double seconds_elapsed);
+    using well_rate_function = double(const EclipseState&, const Schedule&, const data::Solution&, size_t report_step, double seconds_elapsed);
     using solution_function = void(const EclipseState&, const Schedule&, data::Solution&, size_t report_step, double seconds_elapsed);
 
     msim(const EclipseState& state);
 
     void well_rate(const std::string& well, data::Rates::opt rate, std::function<well_rate_function> func);
     void solution(const std::string& field, std::function<solution_function> func);
-    void run(Schedule& schedule, EclipseIO& io, bool report_only);
-    void post_step(Schedule& schedule, const SummaryState& st, data::Solution& sol, data::Wells& well_data, size_t report_step) const;
+    void run(Schedule& schedule, EclipseIO& io);
+    void post_step(Schedule& schedule, data::Solution& sol, data::Wells& well_data, size_t report_step, EclipseIO& io) const;
 private:
 
-    void run_step(const Schedule& schedule, SummaryState& st, data::Solution& sol, data::Wells& well_data, size_t report_step, EclipseIO& io) const;
-    void run_step(const Schedule& schedule, SummaryState& st, data::Solution& sol, data::Wells& well_data, size_t report_step, double dt, EclipseIO& io) const;
-    void output(SummaryState& st, size_t report_step, bool substep, double seconds_elapsed, const data::Solution& sol, const data::Wells& well_data, EclipseIO& io) const;
-    void simulate(const Schedule& schedule, const SummaryState& st, data::Solution& sol, data::Wells& well_data, size_t report_step, double seconds_elapsed, double time_step) const;
+    void run_step(const Schedule& schedule, data::Solution& sol, data::Wells& well_data, size_t report_step, EclipseIO& io) const;
+    void run_step(const Schedule& schedule, data::Solution& sol, data::Wells& well_data, size_t report_step, double dt, EclipseIO& io) const;
+    void output(size_t report_step, bool substep, double seconds_elapsed, const data::Solution& sol, const data::Wells& well_data, EclipseIO& io) const;
+    void simulate(const Schedule& schedule, data::Solution& sol, data::Wells& well_data, size_t report_step, double seconds_elapsed, double time_step) const;
 
     EclipseState state;
+
     std::map<std::string, std::map<data::Rates::opt, std::function<well_rate_function>>> well_rates;
     std::map<std::string, std::function<solution_function>> solutions;
 };

msim/src/msim.cpp

@@ -21,7 +21,6 @@
 
 #include <opm/output/eclipse/EclipseIO.hpp>
 #include <opm/output/eclipse/RestartValue.hpp>
-#include <opm/output/eclipse/Summary.hpp>
 #include <opm/output/data/Solution.hpp>
 #include <opm/output/data/Wells.hpp>
 
@@ -34,52 +33,48 @@
 
 namespace Opm {
 
-msim::msim(const EclipseState& state_arg) :
-    state(state_arg)
+msim::msim(const EclipseState& state) :
+    state(state)
 {}
 
-void msim::run(Schedule& schedule, EclipseIO& io, bool report_only) {
+void msim::run(Schedule& schedule, EclipseIO& io) {
     const double week = 7 * 86400;
     data::Solution sol;
     data::Wells well_data;
-    SummaryState st(std::chrono::system_clock::from_time_t(schedule.getStartTime()));
 
     io.writeInitial();
     for (size_t report_step = 1; report_step < schedule.size(); report_step++) {
-        if (report_only)
-            run_step(schedule, st, sol, well_data, report_step, io);
-        else {
-            double time_step = std::min(week, 0.5*schedule.stepLength(report_step - 1));
-            run_step(schedule, st, sol, well_data, report_step, time_step, io);
-        }
-        post_step(schedule, st, sol, well_data, report_step);
+        double time_step = std::min(week, 0.5*schedule.stepLength(report_step - 1));
+        run_step(schedule, sol, well_data, report_step, time_step, io);
+        post_step(schedule, sol, well_data, report_step, io);
     }
 }
 
 
-void msim::post_step(Schedule& schedule, const SummaryState& st, data::Solution& /* sol */, data::Wells& /* well_data */, size_t report_step) const {
-    const auto& actions = schedule.actions(report_step);
+void msim::post_step(Schedule& schedule, data::Solution& /* sol */, data::Wells& /* well_data */, size_t report_step, EclipseIO& io) const {
+    const auto& actions = schedule.actions();
     if (actions.empty())
         return;
 
-    Action::Context context( st );
+    const SummaryState& summary_state = io.summaryState();
+    ActionContext context( summary_state );
+    std::vector<std::string> matching_wells;
 
     auto sim_time = schedule.simTime(report_step);
     for (const auto& action : actions.pending(sim_time)) {
-        auto result = action->eval(sim_time, context);
-        if (result)
-            schedule.applyAction(report_step, *action, result);
+        if (action->eval(sim_time, context, matching_wells))
+            schedule.applyAction(report_step, *action, matching_wells);
     }
 }
 
 
 
-void msim::run_step(const Schedule& schedule, SummaryState& st, data::Solution& sol, data::Wells& well_data, size_t report_step, EclipseIO& io) const {
-    this->run_step(schedule, st, sol, well_data, report_step, schedule.stepLength(report_step - 1), io);
+void msim::run_step(const Schedule& schedule, data::Solution& sol, data::Wells& well_data, size_t report_step, EclipseIO& io) const {
+    this->run_step(schedule, sol, well_data, report_step, schedule.stepLength(report_step - 1), io);
 }
 
 
-void msim::run_step(const Schedule& schedule, SummaryState& st, data::Solution& sol, data::Wells& well_data, size_t report_step, double dt, EclipseIO& io) const {
+void msim::run_step(const Schedule& schedule, data::Solution& sol, data::Wells& well_data, size_t report_step, double dt, EclipseIO& io) const {
     double start_time = schedule.seconds(report_step - 1);
     double end_time = schedule.seconds(report_step);
     double seconds_elapsed = start_time;
@@ -89,20 +84,10 @@ void msim::run_step(const Schedule& schedule, SummaryState& st, data::Solution&
         if ((seconds_elapsed + time_step) > end_time)
             time_step = end_time - seconds_elapsed;
 
-        this->simulate(schedule, st, sol, well_data, report_step, seconds_elapsed, time_step);
+        this->simulate(schedule, sol, well_data, report_step, seconds_elapsed, time_step);
 
         seconds_elapsed += time_step;
-
-        io.summary().eval(st,
-                          report_step,
-                          seconds_elapsed,
-                          this->state,
-                          schedule,
-                          well_data,
-                          {});
-
-        this->output(st,
-                     report_step,
+        this->output(report_step,
                      (seconds_elapsed < end_time),
                      seconds_elapsed,
                      sol,
@@ -113,17 +98,19 @@ void msim::run_step(const Schedule& schedule, SummaryState& st, data::Solution&
 
 
 
-void msim::output(SummaryState& st, size_t report_step, bool /* substep */, double seconds_elapsed, const data::Solution& sol, const data::Wells& well_data, EclipseIO& io) const {
+void msim::output(size_t report_step, bool /* substep */, double seconds_elapsed, const data::Solution& sol, const data::Wells& well_data, EclipseIO& io) const {
     RestartValue value(sol, well_data);
-    io.writeTimeStep(st,
-                     report_step,
+    io.writeTimeStep(report_step,
                      false,
                      seconds_elapsed,
-                     value);
+                     value,
+                     {},
+                     {},
+                     {});
 }
 
 
-void msim::simulate(const Schedule& schedule, const SummaryState& st, data::Solution& sol, data::Wells& well_data, size_t report_step, double seconds_elapsed, double time_step) const {
+void msim::simulate(const Schedule& schedule, data::Solution& sol, data::Wells& well_data, size_t report_step, double seconds_elapsed, double time_step) const {
     for (const auto& sol_pair : this->solutions) {
         auto func = sol_pair.second;
         func(this->state, schedule, sol, report_step, seconds_elapsed + time_step);
@@ -136,7 +123,7 @@ void msim::simulate(const Schedule& schedule, const SummaryState& st, data::Solu
             auto rate = rate_pair.first;
             auto func = rate_pair.second;
 
-            well.rates.set(rate, func(this->state, schedule, st, sol, report_step, seconds_elapsed + time_step));
+            well.rates.set(rate, func(this->state, schedule, sol, report_step, seconds_elapsed + time_step));
         }
 
         // This is complete bogus; a temporary fix to pass an assert() in the

opm-common-prereqs.cmake

@@ -9,11 +9,23 @@ set (opm-common_CONFIG_VAR
 set (opm-common_DEPS
 	# compile with C99 support if available
 	"C99"
-)
-
-list(APPEND opm-common_DEPS
-      # various runtime library enhancements
-      "Boost 1.44.0 COMPONENTS system unit_test_framework REQUIRED"
-)
+	# compile with C++0x/11 support if available
+	"CXX11Features REQUIRED"
+	)
 
+if(ENABLE_ECL_INPUT)
+  list(APPEND opm-common_DEPS
+        "ecl REQUIRED"
+        # various runtime library enhancements
+        "Boost 1.44.0
+          COMPONENTS system filesystem unit_test_framework regex REQUIRED")
+else()
+  list(APPEND opm-common_DEPS
+        # various runtime library enhancements
+        "Boost 1.44.0
+          COMPONENTS system unit_test_framework REQUIRED")
+endif()
+# We need a defined target for libecl when linking.
+# The definition of the target is done implicitly below when
+# libecl is searched for.
 find_package_deps(opm-common)

opm/common/OpmLog/Location.hpp

@@ -1,44 +0,0 @@
-/*
-  Copyright 2015 Statoil ASA.
-
-  This file is part of the Open Porous Media project (OPM).
-
-  OPM is free software: you can redistribute it and/or modify
-  it under the terms of the GNU General Public License as published by
-  the Free Software Foundation, either version 3 of the License, or
-  (at your option) any later version.
-
-  OPM is distributed in the hope that it will be useful,
-  but WITHOUT ANY WARRANTY; without even the implied warranty of
-  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-  GNU General Public License for more details.
-
-  You should have received a copy of the GNU General Public License
-  along with OPM.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#ifndef LOCATION_HPP
-#define LOCATION_HPP
-
-namespace Opm {
-
-class Location {
-public:
-    std::string filename = "<memory string>";
-    std::size_t lineno = 0;
-
-    Location() = default;
-    Location(std::string fname, std::size_t lno) :
-        filename(std::move(fname)),
-        lineno(lno)
-    {}
-
-    bool operator==(const Location& data) const {
-        return filename == data.filename &&
-               lineno == data.lineno;
-    }
-};
-
-}
-
-#endif

opm/common/OpmLog/LogUtil.hpp

@@ -23,10 +23,7 @@
 #include <cstdint>
 #include <string>
 
-#include <opm/common/OpmLog/Location.hpp>
-
 namespace Opm {
-
 namespace Log {
     namespace MessageType {
         const int64_t Debug     =  1;   /* Excessive information */
@@ -59,8 +56,8 @@ namespace Log {
 
 
     bool isPower2(int64_t x);
-    std::string fileMessage(const Location& location, const std::string& msg);
-    std::string fileMessage(int64_t messageType , const Location& location , const std::string& msg);
+    std::string fileMessage(const std::string& path, int line , const std::string& msg);
+    std::string fileMessage(int64_t messageType , const std::string& path, int line , const std::string& msg);
     std::string prefixMessage(int64_t messageType , const std::string& msg);
     std::string colorCodeMessage(int64_t messageType , const std::string& msg);
 

opm/common/utility/ActiveGridCells.hpp

@@ -1,79 +0,0 @@
-/*
-  Copyright 2019 Equinor ASA
-
-  This file is part of the Open Porous Media project (OPM).
-
-  OPM is free software: you can redistribute it and/or modify
-  it under the terms of the GNU General Public License as published by
-  the Free Software Foundation, either version 3 of the License, or
-  (at your option) any later version.
-
-  OPM is distributed in the hope that it will be useful,
-  but WITHOUT ANY WARRANTY; without even the implied warranty of
-  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-  GNU General Public License for more details.
-
-  You should have received a copy of the GNU General Public License
-  along with OPM.  If not, see <http://www.gnu.org/licenses/>.
-*/
-#ifndef ACTIVEGRIDCELLS_HPP
-#define ACTIVEGRIDCELLS_HPP
-
-#include <opm/parser/eclipse/EclipseState/Grid/GridDims.hpp>
-
-#include <array>
-
-namespace Opm
-{
-
-/**
- * \brief Simple class capturing active cells of a grid
- *
- */
-class ActiveGridCells
-    : public GridDims
-{
-public:
-    /// \brief Constructs mapping of active cells.
-    /// \param xyz The cartesian dimensions of the grid
-    /// \param globalCell Pointer to first entry of contiguous
-    ///        array mapping local index to cartesian one.
-    /// \param nc The number of cells of a grid.
-    ActiveGridCells(std::array<int, 3> xyz,
-                    const int* globalCell, std::size_t nc);
-
-    /// \brief Constructs mapping of active cells.
-    /// \param nx Number of cells in x
-    /// \param ny Number of cells in y
-    /// \param nz Number of cells in z
-    /// \param globalCell Pointer to first entry of contiguous
-    ///        array mapping local index to cartesian one.
-    /// \param nc The number of cells of a grid.
-    ActiveGridCells(std::size_t nx, std::size_t ny, std::size_t nz,
-                    const int* globalCell, std::size_t nc);
-
-    bool cellActive(std::size_t i, std::size_t j, std::size_t k) const;
-
-    bool cellActive(std::size_t cartesianIndex) const;
-
-    std::vector<int> actNum() const;
-
-    /// \brief Get the local index of a cell
-    /// \param cartesianIndex The cartesian index of the cell
-    /// \return The local index or -1 if the cell is inactive
-    int localCell(std::size_t cartesianIndex) const;
-    
-    /// \brief Get the local index of a cell
-    /// \param i The index in the i direction
-    /// \param j The index in the j direction
-    /// \param k The index in the k direction
-    /// \return The local index or -1 if the cell is inactive
-    int localCell(std::size_t i, std::size_t j, std::size_t k) const;
-protected:
-    /// \brief Maps the cartesian index to a compressed local index.
-    ///
-    /// nonactive cells are marked with -1.
-    std::vector<int> localCell_;
-};
-} // end namespace Opm
-#endif //  ACTIVEGRIDCELLS_HPP

opm/common/utility/FileSystem.hpp

@@ -1,47 +0,0 @@
-/*
-  Copyright 2019 Equinor ASA
-
-  This file is part of the Open Porous Media project (OPM).
-
-  OPM is free software: you can redistribute it and/or modify
-  it under the terms of the GNU General Public License as published by
-  the Free Software Foundation, either version 3 of the License, or
-  (at your option) any later version.
-
-  OPM is distributed in the hope that it will be useful,
-  but WITHOUT ANY WARRANTY; without even the implied warranty of
-  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-  GNU General Public License for more details.
-
-  You should have received a copy of the GNU General Public License
-  along with OPM.  If not, see <http://www.gnu.org/licenses/>.
-*/
-#ifndef OPM_FILESYSTEM_HPP
-#define OPM_FILESYSTEM_HPP
-
-#if __cplusplus < 201703L || \
-    (defined(__GNUC__) && __GNUC__ < 8)
-#include <experimental/filesystem>
-#else
-#include <filesystem>
-#endif
-
-#include <string>
-
-
-namespace Opm
-{
-#if __cplusplus < 201703L || \
-    (defined(__GNUC__) && __GNUC__ < 8)
-    namespace filesystem = std::experimental::filesystem;
-#else
-    namespace filesystem = std::filesystem;
-#endif
-
-    // A poor man's filesystem::unique_path
-    std::string unique_path(const std::string& input);
-
-} // end namespace Opm
-
-
-#endif //  OPM_FILESYSTEM_HPP

opm/common/utility/TimeService.hpp

@@ -1,84 +0,0 @@
-/*
-  Copyright 2019 Equinor ASA.
-
-  This file is part of the Open Porous Media Project (OPM).
-
-  OPM is free software: you can redistribute it and/or modify
-  it under the terms of the GNU General Public License as published by
-  the Free Software Foundation, either version 3 of the License, or
-  (at your option) any later version.
-
-  OPM is distributed in the hope that it will be useful,
-  but WITHOUT ANY WARRANTY; without even the implied warranty of
-  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-  GNU General Public License for more details.
-
-  You should have received a copy of the GNU General Public License
-  along with OPM.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#ifndef OPM_TIMESERVICE_HEADER_INCLUDED
-#define OPM_TIMESERVICE_HEADER_INCLUDED
-
-#include <chrono>
-#include <ctime>
-
-namespace Opm {
-
-    class TimeStampUTC
-    {
-    public:
-        struct YMD {
-            int year{0};
-            int month{0};
-            int day{0};
-
-            bool operator==(const YMD& data) const
-            {
-                return year == data.year &&
-                       month == data.month &&
-                       day == data.day;
-            }
-        };
-
-        TimeStampUTC() = default;
-
-        explicit TimeStampUTC(const std::time_t tp);
-        explicit TimeStampUTC(const YMD& ymd);
-        TimeStampUTC(const YMD& ymd,
-                     int hour,
-                     int minutes,
-                     int seconds,
-                     int usec);
-
-        TimeStampUTC& operator=(const std::time_t tp);
-        bool operator==(const TimeStampUTC& data) const;
-
-        TimeStampUTC& hour(const int h);
-        TimeStampUTC& minutes(const int m);
-        TimeStampUTC& seconds(const int s);
-        TimeStampUTC& microseconds(const int us);
-
-        const YMD& ymd() const { return ymd_; }
-        int year()         const { return this->ymd_.year;  }
-        int month()        const { return this->ymd_.month; }
-        int day()          const { return this->ymd_.day;   }
-        int hour()         const { return this->hour_;      }
-        int minutes()      const { return this->minutes_;   }
-        int seconds()      const { return this->seconds_;   }
-        int microseconds() const { return this->usec_;      }
-
-    private:
-        YMD ymd_{};
-        int hour_{0};
-        int minutes_{0};
-        int seconds_{0};
-        int usec_{0};
-    };
-
-    TimeStampUTC operator+(const TimeStampUTC& lhs, std::chrono::duration<double> delta);
-    std::time_t asTimeT(const TimeStampUTC& tp);
-
-} // namespace Opm
-
-#endif // OPM_TIMESERVICE_HEADER_INCLUDED

opm/common/utility/numeric/RootFinders.hpp

@@ -1,6 +1,21 @@
+//===========================================================================
+//
+// File: RootFinders.hpp
+//
+// Created: Thu May  6 19:59:42 2010
+//
+// Author(s): Atgeirr F Rasmussen <atgeirr@sintef.no>
+//            Jostein R Natvig    <jostein.r.natvig@sintef.no>
+//
+// $Date$
+//
+// $Revision$
+//
+//===========================================================================
+
 /*
-  Copyright 2010, 2019 SINTEF Digital
-  Copyright 2010, 2019 Equinor ASA
+  Copyright 2010 SINTEF ICT, Applied Mathematics.
+  Copyright 2010 Statoil ASA.
 
   This file is part of the Open Porous Media project (OPM).
 
@@ -280,126 +295,6 @@ namespace Opm
 
 
 
-    template <class ErrorPolicy = ThrowOnError>
-    class RegulaFalsiBisection
-    {
-    public:
-        inline static std::string name()
-        {
-            return "RegulaFalsiBisection";
-        }
-
-        /// Implements a modified regula falsi method as described in
-        /// "Improved algorithms of Illinois-type for the numerical
-        /// solution of nonlinear equations"
-        /// by J. A. Ford. Current variant is the 'Pegasus' method.
-        /// Combines this method with the bisection method, inspired by
-        /// http://phillipmfeldman.org/Python/roots/find_roots.html
-        template <class Functor>
-        inline static double solve(const Functor& f,
-                                   const double a,
-                                   const double b,
-                                   const int max_iter,
-                                   const double tolerance,
-                                   int& iterations_used)
-        {
-            using namespace std;
-            const double sqrt_half = std::sqrt(0.5);
-            const double macheps = numeric_limits<double>::epsilon();
-            const double eps = tolerance + macheps * max(max(fabs(a), fabs(b)), 1.0);
-
-            double x0 = a;
-            double x1 = b;
-            double f0 = f(x0);
-            const double epsF = tolerance + macheps * max(fabs(f0), 1.0);
-            if (fabs(f0) < epsF) {
-                return x0;
-            }
-            double f1 = f(x1);
-            if (fabs(f1) < epsF) {
-                return x1;
-            }
-            if (f0 * f1 > 0.0) {
-                return ErrorPolicy::handleBracketingFailure(a, b, f0, f1);
-            }
-            iterations_used = 0;
-            // In every iteraton, x1 is the last point computed,
-            // and x0 is the last point computed that makes it a bracket.
-            double width = fabs(x1 - x0);
-            double contraction = 1.0;
-            while (width >= 1e-9 * eps) {
-                // If we are contracting sufficiently to at least halve
-                // the interval width in two iterations we use regula
-                // falsi. Otherwise, we take a bisection step to avoid
-                // slow convergence.
-                const double xnew = (contraction < sqrt_half)
-                    ? regulaFalsiStep(x0, x1, f0, f1)
-                    : bisectionStep(x0, x1, f0, f1);
-                const double fnew = f(xnew);
-                ++iterations_used;
-                if (iterations_used > max_iter) {
-                    return ErrorPolicy::handleTooManyIterations(x0, x1, max_iter);
-                }
-                if (fabs(fnew) < epsF) {
-                    return xnew;
-                }
-                // Now we must check which point we must replace.
-                if ((fnew > 0.0) == (f0 > 0.0)) {
-                    // We must replace x0.
-                    x0 = x1;
-                    f0 = f1;
-                } else {
-                    // We must replace x1, this is the case where
-                    // the modification to regula falsi kicks in,
-                    // by modifying f0.
-                    // 1. The classic Illinois method
-                    // const double gamma = 0.5;
-                    // @afr: The next two methods do not work??!!?
-                    // 2. The method called 'Method 3' in the paper.
-                    // const double phi0 = f1/f0;
-                    // const double phi1 = fnew/f1;
-                    // const double gamma = 1.0 - phi1/(1.0 - phi0);
-                    // 3. The method called 'Method 4' in the paper.
-                    // const double phi0 = f1/f0;
-                    // const double phi1 = fnew/f1;
-                    // const double gamma = 1.0 - phi0 - phi1;
-                    //                  cout << "phi0 = " << phi0 <<" phi1 = " << phi1 <<
-                    //                  " gamma = " << gamma << endl;
-                    // 4. The 'Pegasus' method
-                    const double gamma = f1 / (f1 + fnew);
-                    // 5. Straight unmodified Regula Falsi
-                    // const double gamma = 1.0;
-                    f0 *= gamma;
-                }
-                x1 = xnew;
-                f1 = fnew;
-                const double widthnew = fabs(x1 - x0);
-                contraction = widthnew/width;
-                width = widthnew;
-            }
-            return 0.5 * (x0 + x1);
-        }
-
-
-    private:
-        inline static double regulaFalsiStep(const double a, const double b, const double fa, const double fb)
-        {
-            assert(fa * fb < 0.0);
-            return (b * fa - a * fb) / (fa - fb);
-        }
-        inline static double bisectionStep(const double a, const double b, const double fa, const double fb)
-        {
-            static_cast<void>(fa);
-            static_cast<void>(fb);
-            assert(fa * fb < 0.0);
-            return 0.5*(a + b);
-        }
-    };
-
-
-
-
-
     /// Attempts to find an interval bracketing a zero by successive
     /// enlargement of search interval.
     template <class Functor>

opm/common/utility/numeric/calculateCellVol.hpp

@@ -16,10 +16,9 @@
 */
 
 #include <vector>
-#include <array>
 #include <math.h>  
 
 
-double calculateCellVol(const std::array<double,8>& X, const std::array<double,8>& Y, const std::array<double,8>& Z);
+double calculateCellVol(const std::vector<double>& X, const std::vector<double>& Y, const std::vector<double>& Z);
 
 

opm/common/utility/platform_dependent/disable_warnings.h

@@ -69,11 +69,13 @@
 #pragma GCC diagnostic ignored "-Wunused-function"
 #pragma GCC diagnostic ignored "-Wunneeded-internal-declaration"
 #pragma GCC diagnostic ignored "-Wunused-private-field"
+#pragma GCC diagnostic ignored "-Wunused-but-set-variable"
 #pragma GCC diagnostic ignored "-Wunused-variable"
 #pragma GCC diagnostic ignored "-Wunused-local-typedefs"
 #pragma GCC diagnostic ignored "-Wcast-align"
 #pragma GCC diagnostic ignored "-Wcast-qual"
 #pragma GCC diagnostic ignored "-Wignored-attributes"
+#pragma GCC diagnostic ignored "-Wmisleading-indentation"
 #endif // COMPATIBLE_COMPILER
 
 #endif // SILENCE_EXTERNAL_WARNINGS

opm/io/eclipse/EGrid.hpp

@@ -1,65 +0,0 @@
-/*
-   Copyright 2019 Equinor ASA.
-
-   This file is part of the Open Porous Media project (OPM).
-
-   OPM is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by
-   the Free Software Foundation, either version 3 of the License, or
-   (at your option) any later version.
-
-   OPM is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
-
-   You should have received a copy of the GNU General Public License
-   along with OPM.  If not, see <http://www.gnu.org/licenses/>.
-   */
-
-#ifndef OPM_IO_EGRID_HPP
-#define OPM_IO_EGRID_HPP
-
-#include <opm/io/eclipse/EclFile.hpp>
-
-#include <array>
-#include <iostream>
-#include <string>
-#include <fstream>
-#include <vector>
-#include <ctime>
-#include <map>
-
-namespace Opm { namespace EclIO {
-
-class EGrid : public EclFile
-{
-public:
-    explicit EGrid(const std::string& filename);
-
-    int global_index(int i, int j, int k) const;
-    int active_index(int i, int j, int k) const;
-
-    const std::array<int, 3>& dimension() const { return nijk; }
-
-    std::array<int, 3> ijk_from_active_index(int actInd) const;
-    std::array<int, 3> ijk_from_global_index(int globInd) const;
-
-    void getCellCorners(int globindex, std::array<double,8>& X, std::array<double,8>& Y, std::array<double,8>& Z) const;
-    void getCellCorners(const std::array<int, 3>& ijk, std::array<double,8>& X, std::array<double,8>& Y, std::array<double,8>& Z) const;
-
-    int activeCells() const { return nactive; }
-    int totalNumberOfCells() const { return nijk[0] * nijk[1] * nijk[2]; }
-
-private:
-    std::array<int, 3> nijk;
-    int nactive;
-
-    std::vector<int> act_index;
-    std::vector<int> glob_index;
-    std::vector<float> coord_array;
-    std::vector<float> zcorn_array;
-};
-
-}} // namespace Opm::EclIO
-
-#endif // OPM_IO_EGRID_HPP

opm/io/eclipse/ERft.hpp

@@ -1,84 +0,0 @@
-/*
-   Copyright 2019 Equinor ASA.
-
-   This file is part of the Open Porous Media project (OPM).
-
-   OPM is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by
-   the Free Software Foundation, either version 3 of the License, or
-   (at your option) any later version.
-
-   OPM is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
-
-   You should have received a copy of the GNU General Public License
-   along with OPM.  If not, see <http://www.gnu.org/licenses/>.
-   */
-
-#ifndef OPM_IO_ERFT_HPP
-#define OPM_IO_ERFT_HPP
-
-#include <opm/io/eclipse/EclFile.hpp>
-
-#include <ctime>
-#include <map>
-#include <set>
-#include <string>
-#include <tuple>
-#include <utility>
-#include <vector>
-
-namespace Opm { namespace EclIO {
-
-class ERft : public EclFile
-{
-public:
-    explicit ERft(const std::string &filename);
-
-    using RftDate = std::tuple<int,int,int>;
-    template <typename T>
-    const std::vector<T>& getRft(const std::string& name, const std::string& wellName,
-                                 const RftDate& date) const;
-
-    template <typename T>
-    const std::vector<T>& getRft(const std::string& name, const std::string& wellName,
-                                 int year, int month, int day) const;
-
-    std::vector<std::string> listOfWells() const;
-    std::vector<RftDate> listOfdates() const;
-
-    using RftReportList = std::vector<std::pair<std::string, RftDate>>;
-    const RftReportList& listOfRftReports() const { return rftReportList; }
-
-    bool hasRft(const std::string& wellName, const RftDate& date) const;
-    bool hasRft(const std::string& wellName, int year, int month, int day) const;
-
-    std::vector<EclEntry> listOfRftArrays(const std::string& wellName,
-                                          const RftDate& date) const;
-
-    std::vector<EclEntry> listOfRftArrays(const std::string& wellName,
-                                          int year, int month, int day) const;
-
-    bool hasArray(const std::string& arrayName, const std::string& wellName,
-                  const RftDate& date) const;
-
-private:
-    std::map<int, std::pair<int,int>> arrIndexRange;
-    int numReports;
-    std::vector<float> timeList;
-
-    std::set<std::string> wellList;
-    std::set<RftDate> dateList;
-    RftReportList rftReportList;
-
-    std::map<std::pair<std::string,RftDate>,int> reportIndex;  //  mapping report index to wellName and date (tupe)
-
-    int getReportIndex(const std::string& wellName, const RftDate& date) const;
-    int getArrayIndex(const std::string& name, const std::string& wellName,
-                      const RftDate& date) const;
-};
-
-}} // namespace Opm::EclIO
-
-#endif // OPM_IO_ERFT_HPP

opm/io/eclipse/ERst.hpp

@@ -1,80 +0,0 @@
-/*
-   Copyright 2019 Equinor ASA.
-
-   This file is part of the Open Porous Media project (OPM).
-
-   OPM is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by
-   the Free Software Foundation, either version 3 of the License, or
-   (at your option) any later version.
-
-   OPM is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
-
-   You should have received a copy of the GNU General Public License
-   along with OPM.  If not, see <http://www.gnu.org/licenses/>.
-   */
-
-#ifndef OPM_IO_ERST_HPP
-#define OPM_IO_ERST_HPP
-
-#include <opm/io/eclipse/EclFile.hpp>
-
-#include <ios>
-#include <map>
-#include <string>
-#include <unordered_map>
-#include <vector>
-
-namespace Opm { namespace EclIO { namespace OutputStream {
-    class Restart;
-}}}
-
-namespace Opm { namespace EclIO {
-
-class ERst : public EclFile
-{
-public:
-    explicit ERst(const std::string& filename);
-    bool hasReportStepNumber(int number) const;
-
-    void loadReportStepNumber(int number);
-
-    template <typename T>
-    const std::vector<T>& getRst(const std::string& name, int reportStepNumber, int occurrence);
-
-    template <typename T>
-    const std::vector<T>& getRst(int index, int reportStepNumber){
-        auto indRange = this->getIndexRange(reportStepNumber);
-        return  this->get<T>(index + std::get<0>(indRange));
-    }
-
-    int count(const std::string& name, int reportStepNumber) const; 
-
-    const std::vector<int>& listOfReportStepNumbers() const { return seqnum; }
-    
-    std::vector<EclEntry> listOfRstArrays(int reportStepNumber);
-
-    friend class OutputStream::Restart;
-
-private:
-    int nReports;
-    std::vector<int> seqnum;                           // report step numbers, from SEQNUM array in restart file
-    std::unordered_map<int,bool> reportLoaded;
-    std::map<int, std::pair<int,int>> arrIndexRange;   // mapping report step number to array indeces (start and end)
-
-    void initUnified();
-    void initSeparate(const int number);
-
-    int getArrayIndex(const std::string& name, int seqnum, int occurrence) const;
-    std::tuple<int,int> getIndexRange(int reportStepNumber) const; 
-
-    std::streampos
-    restartStepWritePosition(const int seqnumValue) const;
-    
-};
-
-}} // namespace Opm::EclIO
-
-#endif // OPM_IO_ERST_HPP

opm/io/eclipse/ESmry.hpp

@@ -1,70 +0,0 @@
-/*
-   Copyright 2019 Equinor ASA.
-
-   This file is part of the Open Porous Media project (OPM).
-
-   OPM is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by
-   the Free Software Foundation, either version 3 of the License, or
-   (at your option) any later version.
-
-   OPM is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
-
-   You should have received a copy of the GNU General Public License
-   along with OPM.  If not, see <http://www.gnu.org/licenses/>.
-   */
-
-#ifndef OPM_IO_ESMRY_HPP
-#define OPM_IO_ESMRY_HPP
-
-#include <string>
-#include <vector>
-#include <opm/common/utility/FileSystem.hpp>
-
-namespace Opm { namespace EclIO {
-
-class ESmry
-{
-public:
-
-    // input is smspec (or fsmspec file)     
-    explicit ESmry(const std::string& filename, bool loadBaseRunData=false);
-    
-    int numberOfVectors() const { return nVect; }
-
-    bool hasKey(const std::string& key) const;
-
-    const std::vector<float>& get(const std::string& name) const;
-
-    std::vector<float> get_at_rstep(const std::string& name) const;
-
-    const std::vector<std::string>& keywordList() const { return keyword; }
-
-    int timestepIdxAtReportstepStart(const int reportStep) const;
-
-private:
-    int nVect, nI, nJ, nK;
-
-    void ijk_from_global_index(int glob, int &i, int &j, int &k) const;
-    std::vector<std::vector<float>> param;
-    std::vector<std::string> keyword;
-
-    std::vector<int> seqIndex;
-    std::vector<float> seqTime;
-    
-    std::vector<std::string> checkForMultipleResultFiles(const Opm::filesystem::path& rootN, bool formatted) const;
-    
-    void getRstString(const std::vector<std::string>& restartArray, 
-                      Opm::filesystem::path& pathRst,
-                      Opm::filesystem::path& rootN) const;
-
-    void updatePathAndRootName(Opm::filesystem::path& dir, Opm::filesystem::path& rootN) const;
-
-    std::string makeKeyString(const std::string& keyword, const std::string& wgname, int num) const;
-};
-
-}} // namespace Opm::EclIO
-
-#endif // OPM_IO_ESMRY_HPP

opm/io/eclipse/EclFile.hpp

@@ -1,117 +0,0 @@
-/*
-   Copyright 2019 Equinor ASA.
-
-   This file is part of the Open Porous Media project (OPM).
-
-   OPM is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by
-   the Free Software Foundation, either version 3 of the License, or
-   (at your option) any later version.
-
-   OPM is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
-
-   You should have received a copy of the GNU General Public License
-   along with OPM.  If not, see <http://www.gnu.org/licenses/>.
-   */
-
-#ifndef OPM_IO_ECLFILE_HPP
-#define OPM_IO_ECLFILE_HPP
-
-#include <opm/common/ErrorMacros.hpp>
-
-#include <opm/io/eclipse/EclIOdata.hpp>
-
-#include <ios>
-#include <string>
-#include <stdexcept>
-#include <tuple>
-#include <unordered_map>
-#include <vector>
-
-namespace Opm { namespace EclIO {
-
-class EclFile
-{
-public:
-    explicit EclFile(const std::string& filename, bool preload = false);
-    bool formattedInput() { return formatted; }
-
-    void loadData();                            // load all data
-    void loadData(const std::string& arrName);         // load all arrays with array name equal to arrName
-    void loadData(int arrIndex);                // load data based on array indices in vector arrIndex
-    void loadData(const std::vector<int>& arrIndex);   // load data based on array indices in vector arrIndex
-
-    void clearData()
-    {
-      inte_array.clear();
-      real_array.clear();
-      doub_array.clear();
-      logi_array.clear();
-      char_array.clear();
-    }
-
-    using EclEntry = std::tuple<std::string, eclArrType, int>;
-    std::vector<EclEntry> getList() const;
-
-    template <typename T>
-    const std::vector<T>& get(int arrIndex);
-
-    template <typename T>
-    const std::vector<T>& get(const std::string& name);
-
-    bool hasKey(const std::string &name) const;
-
-    const std::vector<std::string>& arrayNames() const { return array_name; }
-    std::size_t size() const;
-
-protected:
-    bool formatted;
-    std::string inputFilename;
-
-    std::unordered_map<int, std::vector<int>> inte_array;
-    std::unordered_map<int, std::vector<bool>> logi_array;
-    std::unordered_map<int, std::vector<double>> doub_array;
-    std::unordered_map<int, std::vector<float>> real_array;
-    std::unordered_map<int, std::vector<std::string>> char_array;
-
-    std::vector<std::string> array_name;
-    std::vector<eclArrType> array_type;
-    std::vector<int> array_size;
-
-    std::vector<unsigned long int> ifStreamPos;
-
-    std::map<std::string, int> array_index;
-
-    template<class T>
-    const std::vector<T>& getImpl(int arrIndex, eclArrType type,
-                                  const std::unordered_map<int, std::vector<T>>& array,
-                                  const std::string& typeStr)
-    {
-        if (array_type[arrIndex] != type) {
-            std::string message = "Array with index " + std::to_string(arrIndex) + " is not of type " + typeStr;
-            OPM_THROW(std::runtime_error, message);
-        }
-
-        if (!arrayLoaded[arrIndex]) {
-          loadData(arrIndex);
-        }
-
-        return array.at(arrIndex);
-    }
-
-    std::streampos
-    seekPosition(const std::vector<std::string>::size_type arrIndex) const;
-
-private:
-    std::vector<bool> arrayLoaded;
-
-    void loadBinaryArray(std::fstream& fileH, std::size_t arrIndex);
-    void loadFormattedArray(const std::string& fileStr, std::size_t arrIndex, long int fromPos);
-    
-};
-
-}} // namespace Opm::EclIO
-
-#endif // OPM_IO_ECLFILE_HPP

opm/io/eclipse/EclOutput.hpp

@@ -1,116 +0,0 @@
-/*
-   Copyright 2019 Statoil ASA.
-
-   This file is part of the Open Porous Media project (OPM).
-
-   OPM is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by
-   the Free Software Foundation, either version 3 of the License, or
-   (at your option) any later version.
-
-   OPM is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
-
-   You should have received a copy of the GNU General Public License
-   along with OPM.  If not, see <http://www.gnu.org/licenses/>.
-   */
-#ifndef OPM_IO_ECLOUTPUT_HPP
-#define OPM_IO_ECLOUTPUT_HPP
-
-#include <fstream>
-#include <ios>
-#include <string>
-#include <typeinfo>
-#include <vector>
-
-#include <opm/io/eclipse/EclIOdata.hpp>
-#include <opm/io/eclipse/PaddedOutputString.hpp>
-
-namespace Opm { namespace EclIO { namespace OutputStream {
-    class Restart;
-    class SummarySpecification;
-}}}
-
-namespace Opm { namespace EclIO {
-
-class EclOutput
-{
-public:
-    EclOutput(const std::string&            filename,
-              const bool                    formatted,
-              const std::ios_base::openmode mode = std::ios::out);
-
-    template<typename T>
-    void write(const std::string& name,
-               const std::vector<T>& data)
-    {
-        eclArrType arrType = MESS;
-        if (typeid(T) == typeid(int))
-            arrType = INTE;
-        else if (typeid(T) == typeid(float))
-            arrType = REAL;
-        else if (typeid(T) == typeid(double))
-            arrType = DOUB;
-        else if (typeid(T) == typeid(bool))
-            arrType = LOGI;
-        else if (typeid(T) == typeid(char))
-            arrType = MESS;
-
-        if (isFormatted)
-        {
-            writeFormattedHeader(name, data.size(), arrType);
-            if (arrType != MESS)
-                writeFormattedArray(data);
-        }
-        else
-        {
-            writeBinaryHeader(name, data.size(), arrType);
-            if (arrType != MESS)
-                writeBinaryArray(data);
-        }
-    }
-
-    void message(const std::string& msg);
-    void flushStream();
-
-    friend class OutputStream::Restart;
-    friend class OutputStream::SummarySpecification;
-
-private:
-    void writeBinaryHeader(const std::string& arrName, int size, eclArrType arrType);
-
-    template <typename T>
-    void writeBinaryArray(const std::vector<T>& data);
-
-    void writeBinaryCharArray(const std::vector<std::string>& data);
-    void writeBinaryCharArray(const std::vector<PaddedOutputString<8>>& data);
-
-    void writeFormattedHeader(const std::string& arrName, int size, eclArrType arrType);
-
-    template <typename T>
-    void writeFormattedArray(const std::vector<T>& data);
-
-    void writeFormattedCharArray(const std::vector<std::string>& data);
-    void writeFormattedCharArray(const std::vector<PaddedOutputString<8>>& data);
-
-    std::string make_real_string(float value) const;
-    std::string make_doub_string(double value) const;
-
-    bool isFormatted;
-    std::ofstream ofileH;
-};
-
-
-template<>
-void EclOutput::write<std::string>(const std::string& name,
-                                   const std::vector<std::string>& data);
-
-template <>
-void EclOutput::write<PaddedOutputString<8>>
-    (const std::string&                        name,
-     const std::vector<PaddedOutputString<8>>& data);
-
-}} // namespace Opm::EclIO
-
-#endif // OPM_IO_ECLOUTPUT_HPP

opm/io/eclipse/OutputStream.hpp

@@ -1,455 +0,0 @@
-/*
-  Copyright (c) 2019 Equinor ASA
-
-  This file is part of the Open Porous Media project (OPM).
-
-  OPM is free software: you can redistribute it and/or modify
-  it under the terms of the GNU General Public License as published by
-  the Free Software Foundation, either version 3 of the License, or
-  (at your option) any later version.
-
-  OPM is distributed in the hope that it will be useful,
-  but WITHOUT ANY WARRANTY; without even the implied warranty of
-  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-  GNU General Public License for more details.
-
-  You should have received a copy of the GNU General Public License
-  along with OPM.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#ifndef OPM_IO_OUTPUTSTREAM_HPP_INCLUDED
-#define OPM_IO_OUTPUTSTREAM_HPP_INCLUDED
-
-#include <opm/io/eclipse/PaddedOutputString.hpp>
-
-#include <array>
-#include <chrono>
-#include <ios>
-#include <memory>
-#include <string>
-#include <vector>
-
-namespace Opm { namespace EclIO {
-
-    class EclOutput;
-
-}} // namespace Opm::EclIO
-
-namespace Opm { namespace EclIO { namespace OutputStream {
-
-    struct Formatted { bool set; };
-    struct Unified   { bool set; };
-
-    /// Abstract representation of an ECLIPSE-style result set.
-    struct ResultSet
-    {
-        /// Output directory.  Commonly "." or location of run's .DATA file.
-        std::string outputDir;
-
-        /// Base name of simulation run.
-        std::string baseName;
-    };
-
-    /// File manager for "init" output streams.
-    class Init
-    {
-    public:
-        /// Constructor.
-        ///
-        /// Opens file stream for writing.
-        ///
-        /// \param[in] rset Output directory and base name of output stream.
-        ///
-        /// \param[in] fmt Whether or not to create formatted output files.
-        explicit Init(const ResultSet& rset,
-                      const Formatted& fmt);
-
-        ~Init();
-
-        Init(const Init& rhs) = delete;
-        Init(Init&& rhs);
-
-        Init& operator=(const Init& rhs) = delete;
-        Init& operator=(Init&& rhs);
-
-        /// Write integer data to underlying output stream.
-        ///
-        /// \param[in] kw Name of output vector (keyword).
-        ///
-        /// \param[in] data Output values.
-        void write(const std::string&      kw,
-                   const std::vector<int>& data);
-
-        /// Write boolean data to underlying output stream.
-        ///
-        /// \param[in] kw Name of output vector (keyword).
-        ///
-        /// \param[in] data Output values.
-        void write(const std::string&       kw,
-                   const std::vector<bool>& data);
-
-        /// Write single precision floating point data to underlying
-        /// output stream.
-        ///
-        /// \param[in] kw Name of output vector (keyword).
-        ///
-        /// \param[in] data Output values.
-        void write(const std::string&        kw,
-                   const std::vector<float>& data);
-
-        /// Write double precision floating point data to underlying
-        /// output stream.
-        ///
-        /// \param[in] kw Name of output vector (keyword).
-        ///
-        /// \param[in] data Output values.
-        void write(const std::string&         kw,
-                   const std::vector<double>& data);
-
-    private:
-        /// Init file output stream.
-        std::unique_ptr<EclOutput> stream_;
-
-        /// Open output stream.
-        ///
-        /// Writes to \c stream_.
-        ///
-        /// \param[in] fname Filename of new output stream.
-        ///
-        /// \param[in] formatted Whether or not to create a
-        ///    formatted output file.
-        void open(const std::string& fname,
-                  const bool         formatted);
-
-        /// Access writable output stream.
-        EclOutput& stream();
-
-        /// Implementation function for public \c write overload set.
-        template <typename T>
-        void writeImpl(const std::string&    kw,
-                       const std::vector<T>& data);
-    };
-
-    /// File manager for restart output streams.
-    class Restart
-    {
-    public:
-        /// Constructor.
-        ///
-        /// Opens file stream pertaining to restart of particular report
-        /// step and also outputs a SEQNUM record in the case of a unified
-        /// output stream.
-        ///
-        /// Must be called before accessing the stream object through the
-        /// stream() member function.
-        ///
-        /// \param[in] rset Output directory and base name of output stream.
-        ///
-        /// \param[in] seqnum Sequence number of new report.  One-based
-        ///    report step ID.
-        ///
-        /// \param[in] fmt Whether or not to create formatted output files.
-        ///
-        /// \param[in] unif Whether or not to create unified output files.
-        explicit Restart(const ResultSet& rset,
-                         const int        seqnum,
-                         const Formatted& fmt,
-                         const Unified&   unif);
-
-        ~Restart();
-
-        Restart(const Restart& rhs) = delete;
-        Restart(Restart&& rhs);
-
-        Restart& operator=(const Restart& rhs) = delete;
-        Restart& operator=(Restart&& rhs);
-
-        /// Generate a message string (keyword type 'MESS') in underlying
-        /// output stream.
-        ///
-        /// \param[in] msg Message string (e.g., "STARTSOL").
-        void message(const std::string& msg);
-
-        /// Write integer data to underlying output stream.
-        ///
-        /// \param[in] kw Name of output vector (keyword).
-        ///
-        /// \param[in] data Output values.
-        void write(const std::string&      kw,
-                   const std::vector<int>& data);
-
-        /// Write boolean data to underlying output stream.
-        ///
-        /// \param[in] kw Name of output vector (keyword).
-        ///
-        /// \param[in] data Output values.
-        void write(const std::string&       kw,
-                   const std::vector<bool>& data);
-
-        /// Write single precision floating point data to underlying
-        /// output stream.
-        ///
-        /// \param[in] kw Name of output vector (keyword).
-        ///
-        /// \param[in] data Output values.
-        void write(const std::string&        kw,
-                   const std::vector<float>& data);
-
-        /// Write double precision floating point data to underlying
-        /// output stream.
-        ///
-        /// \param[in] kw Name of output vector (keyword).
-        ///
-        /// \param[in] data Output values.
-        void write(const std::string&         kw,
-                   const std::vector<double>& data);
-
-        /// Write unpadded string data to underlying output stream.
-        ///
-        /// \param[in] kw Name of output vector (keyword).
-        ///
-        /// \param[in] data Output values.
-        void write(const std::string&              kw,
-                   const std::vector<std::string>& data);
-
-        /// Write padded character data (8 characters per string)
-        /// to underlying output stream.
-        ///
-        /// \param[in] kw Name of output vector (keyword).
-        ///
-        /// \param[in] data Output values.
-        void write(const std::string&                        kw,
-                   const std::vector<PaddedOutputString<8>>& data);
-
-    private:
-        /// Restart output stream.
-        std::unique_ptr<EclOutput> stream_;
-
-        /// Open unified output file and place stream's output indicator
-        /// in appropriate location.
-        ///
-        /// Writes to \c stream_.
-        ///
-        /// \param[in] fname Filename of output stream.
-        ///
-        /// \param[in] formatted Whether or not to create a
-        ///    formatted output file.
-        ///
-        /// \param[in] seqnum Sequence number of new report.  One-based
-        ///    report step ID.
-        void openUnified(const std::string& fname,
-                         const bool         formatted,
-                         const int          seqnum);
-
-        /// Open new output stream.
-        ///
-        /// Handles the case of separate output files or unified output file
-        /// that does not already exist.  Writes to \c stream_.
-        ///
-        /// \param[in] fname Filename of new output stream.
-        ///
-        /// \param[in] formatted Whether or not to create a
-        ///    formatted output file.
-        void openNew(const std::string& fname,
-                     const bool         formatted);
-
-        /// Open existing output file and place stream's output indicator
-        /// in appropriate location.
-        ///
-        /// Writes to \c stream_.
-        ///
-        /// \param[in] fname Filename of output stream.
-        ///
-        /// \param[in] writePos Position at which to place stream's output
-        ///    indicator.  Use \code streampos{ streamoff{-1} } \endcode to
-        ///    place output indicator at end of file (i.e, simple append).
-        void openExisting(const std::string&   fname,
-                          const bool           formatted,
-                          const std::streampos writePos);
-
-        /// Access writable output stream.
-        ///
-        /// Must not be called prior to \c prepareStep.
-        EclOutput& stream();
-
-        /// Implementation function for public \c write overload set.
-        template <typename T>
-        void writeImpl(const std::string&    kw,
-                       const std::vector<T>& data);
-    };
-
-    /// File manager for RFT output streams
-    class RFT
-    {
-    public:
-        struct OpenExisting { bool set; };
-
-        /// Constructor.
-        ///
-        /// Opens file stream for writing.
-        ///
-        /// \param[in] rset Output directory and base name of output stream.
-        ///
-        /// \param[in] fmt Whether or not to create formatted output files.
-        ///
-        /// \param[in] existing Whether or not to open an existing output file.
-        explicit RFT(const ResultSet&    rset,
-                     const Formatted&    fmt,
-                     const OpenExisting& existing);
-
-        ~RFT();
-
-        RFT(const RFT& rhs) = delete;
-        RFT(RFT&& rhs);
-
-        RFT& operator=(const RFT& rhs) = delete;
-        RFT& operator=(RFT&& rhs);
-
-        /// Write integer data to underlying output stream.
-        ///
-        /// \param[in] kw Name of output vector (keyword).
-        ///
-        /// \param[in] data Output values.
-        void write(const std::string&      kw,
-                   const std::vector<int>& data);
-
-        /// Write single precision floating point data to underlying
-        /// output stream.
-        ///
-        /// \param[in] kw Name of output vector (keyword).
-        ///
-        /// \param[in] data Output values.
-        void write(const std::string&        kw,
-                   const std::vector<float>& data);
-
-        /// Write padded character data (8 characters per string)
-        /// to underlying output stream.
-        ///
-        /// \param[in] kw Name of output vector (keyword).
-        ///
-        /// \param[in] data Output values.
-        void write(const std::string&                        kw,
-                   const std::vector<PaddedOutputString<8>>& data);
-
-    private:
-        /// Init file output stream.
-        std::unique_ptr<EclOutput> stream_;
-
-        /// Open output stream.
-        ///
-        /// Writes to \c stream_.
-        ///
-        /// \param[in] fname Filename of new output stream.
-        ///
-        /// \param[in] formatted Whether or not to create a
-        ///    formatted output file.
-        ///
-        /// \param[in] existing Whether or not to open an
-        ///    existing output file (mode ios_base::app).
-        void open(const std::string& fname,
-                  const bool         formatted,
-                  const bool         existing);
-
-        /// Access writable output stream.
-        EclOutput& stream();
-
-        /// Implementation function for public \c write overload set.
-        template <typename T>
-        void writeImpl(const std::string&    kw,
-                       const std::vector<T>& data);
-    };
-
-    class SummarySpecification
-    {
-    public:
-        using StartTime = std::chrono::system_clock::time_point;
-
-        enum class UnitConvention
-        {
-            Metric = 1,
-            Field  = 2,
-            Lab    = 3,
-            Pvt_M  = 4,
-        };
-
-        struct RestartSpecification
-        {
-            std::string root;
-            int step;
-        };
-
-        class Parameters
-        {
-        public:
-            void add(const std::string& keyword,
-                     const std::string& wgname,
-                     const int          num,
-                     const std::string& unit);
-
-            friend class SummarySpecification;
-
-        private:
-            std::vector<PaddedOutputString<8>> keywords{};
-            std::vector<PaddedOutputString<8>> wgnames{};
-            std::vector<int>                   nums{};
-            std::vector<PaddedOutputString<8>> units{};
-        };
-
-        explicit SummarySpecification(const ResultSet&            rset,
-                                      const Formatted&            fmt,
-                                      const UnitConvention        uconv,
-                                      const std::array<int,3>&    cartDims,
-                                      const RestartSpecification& restart,
-                                      const StartTime             start);
-
-        ~SummarySpecification();
-
-        SummarySpecification(const SummarySpecification& rhs) = delete;
-        SummarySpecification(SummarySpecification&& rhs);
-
-        SummarySpecification& operator=(const SummarySpecification& rhs) = delete;
-        SummarySpecification& operator=(SummarySpecification&& rhs);
-
-        void write(const Parameters& params);
-
-    private:
-        int unit_;
-        int restartStep_;
-        std::array<int,3> cartDims_;
-        StartTime startDate_;
-        std::vector<PaddedOutputString<8>> restart_;
-
-        /// Summary specification (SMSPEC) file output stream.
-        std::unique_ptr<EclOutput> stream_;
-
-        void rewindStream();
-        void flushStream();
-
-        EclOutput& stream();
-    };
-
-    std::unique_ptr<EclOutput>
-    createSummaryFile(const ResultSet& rset,
-                      const int        seqnum,
-                      const Formatted& fmt,
-                      const Unified&   unif);
-
-    /// Derive filename corresponding to output stream of particular result
-    /// set, with user-specified file extension.
-    ///
-    /// Low-level string concatenation routine that does not know specific
-    /// relations between base names and file extensions.  Handles details
-    /// of base name ending in a period (full stop) or having a name that
-    /// might otherwise appear to contain a file extension (e.g., CASE.01).
-    ///
-    /// \param[in] rsetDescriptor Output directory and base name of result set.
-    ///
-    /// \param[in] ext Filename extension.
-    ///
-    /// \return outputDir/baseName.ext
-    std::string outputFileName(const ResultSet&   rsetDescriptor,
-                               const std::string& ext);
-
-}}} // namespace Opm::EclIO::OutputStream
-
-#endif //  OPM_IO_OUTPUTSTREAM_HPP_INCLUDED

opm/io/eclipse/rst/connection.hpp

@@ -1,66 +0,0 @@
-/*
-  Copyright 2020 Equinor ASA.
-
-  This file is part of the Open Porous Media project (OPM).
-
-  OPM is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by
-  the Free Software Foundation, either version 3 of the License, or
-  (at your option) any later version.
-
-  OPM is distributed in the hope that it will be useful,
-  but WITHOUT ANY WARRANTY; without even the implied warranty of
-  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-  GNU General Public License for more details.
-
-  You should have received a copy of the GNU General Public License
-  along with OPM.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#ifndef RST_CONNECTION
-#define RST_CONNECTION
-
-#include <array>
-
-#include <opm/parser/eclipse/EclipseState/Schedule/Well/Connection.hpp>
-
-namespace Opm {
-class UnitSystem;
-
-namespace RestartIO {
-
-class Header;
-
-struct RstConnection {
-    RstConnection(const ::Opm::UnitSystem& unit_system, const int* icon, const float* scon, const double *xcon);
-
-    int insert_index;
-    std::array<int,3> ijk;
-    Connection::State state;
-    int drain_sat_table;
-    int imb_sat_table;
-    int completion;
-    Connection::Direction dir;
-    int segment;
-
-    float tran;
-    float depth;
-    float diameter;
-    float kh;
-    float segdist_end;
-    float segdist_start;
-
-    double oil_rate;
-    double water_rate;
-    double gas_rate;
-    double pressure;
-    double resv_rate;
-};
-
-
-}
-}
-
-
-
-
-#endif

opm/io/eclipse/rst/group.hpp

@@ -1,84 +0,0 @@
-/*
-  Copyright 2020 Equinor ASA.
-
-  This file is part of the Open Porous Media project (OPM).
-
-  OPM is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by
-  the Free Software Foundation, either version 3 of the License, or
-  (at your option) any later version.
-
-  OPM is distributed in the hope that it will be useful,
-  but WITHOUT ANY WARRANTY; without even the implied warranty of
-  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-  GNU General Public License for more details.
-
-  You should have received a copy of the GNU General Public License
-  along with OPM.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#ifndef RST_GROUP
-#define RST_GROUP
-
-#include <array>
-#include <vector>
-#include <string>
-
-namespace Opm {
-class UnitSystem;
-
-namespace RestartIO {
-
-struct RstHeader;
-
-struct RstGroup {
-    RstGroup(const UnitSystem& unit_system,
-             const std::string* zwel,
-             const int * igrp,
-             const float * sgrp,
-             const double * xgrp);
-
-    std::string name;
-    float oil_rate_limit;
-    float water_rate_limit;
-    float gas_rate_limit;
-    float liquid_rate_limit;
-    float water_surface_limit;
-    float water_reservoir_limit;
-    float water_reinject_limit;
-    float water_voidage_limit;
-    float gas_surface_limit;
-    float gas_reservoir_limit;
-    float gas_reinject_limit;
-    float gas_voidage_limit;
-
-    double oil_production_rate;
-    double water_production_rate;
-    double gas_production_rate;
-    double liquid_production_rate;
-    double water_injection_rate;
-    double gas_injection_rate;
-    double wct;
-    double gor;
-    double oil_production_total;
-    double water_production_total;
-    double gas_production_total;
-    double voidage_production_total;
-    double water_injection_total;
-    double gas_injection_total;
-    double oil_production_potential;
-    double water_production_potential;
-    double history_total_oil_production;
-    double history_total_water_production;
-    double history_total_water_injection;
-    double history_total_gas_production;
-    double history_total_gas_injection;
-};
-
-
-}
-}
-
-
-
-
-#endif

opm/io/eclipse/rst/header.hpp

@@ -1,127 +0,0 @@
-/*
-  Copyright 2020 Equinor ASA.
-
-  This file is part of the Open Porous Media project (OPM).
-
-  OPM is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by
-  the Free Software Foundation, either version 3 of the License, or
-  (at your option) any later version.
-
-  OPM is distributed in the hope that it will be useful,
-  but WITHOUT ANY WARRANTY; without even the implied warranty of
-  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-  GNU General Public License for more details.
-
-  You should have received a copy of the GNU General Public License
-  along with OPM.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#ifndef RST_HEADER
-#define RST_HEADER
-
-#include <vector>
-#include <ctime>
-#include <cstddef>
-
-namespace Opm {
-namespace RestartIO {
-
-struct RstHeader {
-    RstHeader(const std::vector<int>& intehead, const std::vector<bool>& logihead, const std::vector<double>& doubhead);
-
-    int nx;
-    int ny;
-    int nz;
-    int nactive;
-    int num_wells;
-    int ncwmax;
-    int max_wells_in_group;
-    int max_groups_in_field;
-    int max_wells_in_field;
-    int year;
-    int month;
-    int mday;
-    int hour;
-    int minute;
-    int microsecond;
-    int phase_sum;
-    int niwelz;
-    int nswelz;
-    int nxwelz;
-    int nzwelz;
-    int niconz;
-    int nsconz;
-    int nxconz;
-    int nigrpz;
-    int nsgrpz;
-    int nxgrpz;
-    int nzgrpz;
-    int ncamax;
-    int niaaqz;
-    int nsaaqz;
-    int nxaaqz;
-    int nicaqz;
-    int nscaqz;
-    int nacaqz;
-    int tstep;
-    int report_step;
-    int newtmx;
-    int newtmn;
-    int litmax;
-    int litmin;
-    int mxwsit;
-    int mxwpit;
-    int version;
-    int iprog;
-    int nsegwl;
-    int nswlmx;
-    int nsegmx;
-    int nlbrmx;
-    int nisegz;
-    int nrsegz;
-    int nilbrz;
-    int ntfip ;
-    int nmfipr;
-    int nrfreg;
-    int ntfreg;
-    int nplmix;
-    int ngroup;
-
-    bool e300_radial;
-    bool e100_radial;
-    bool enable_hysteris;
-    bool enable_msw;
-    bool is_live_oil;
-    bool is_wet_gas;
-    bool const_comp_oil;
-    bool dir_relperm;
-    bool reversible_relperm;
-    bool endscale;
-    bool dir_eps;
-    bool reversible_eps;
-    bool alt_eps;
-
-    double next_timestep1;
-    double next_timestep2;
-    double max_timestep;
-    double guide_rate_a;
-    double guide_rate_b;
-    double guide_rate_c;
-    double guide_rate_d;
-    double guide_rate_e;
-    double guide_rate_f;
-    double udq_range;
-    double udq_undefined;
-    double udq_eps;
-
-    std::pair<std::time_t, std::size_t> restart_info() const;
-};
-
-
-}
-}
-
-
-
-
-#endif

opm/io/eclipse/rst/segment.hpp

@@ -1,78 +0,0 @@
-/*
-  Copyright 2020 Equinor ASA.
-
-  This file is part of the Open Porous Media project (OPM).
-
-  OPM is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by
-  the Free Software Foundation, either version 3 of the License, or
-  (at your option) any later version.
-
-  OPM is distributed in the hope that it will be useful,
-  but WITHOUT ANY WARRANTY; without even the implied warranty of
-  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-  GNU General Public License for more details.
-
-  You should have received a copy of the GNU General Public License
-  along with OPM.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#ifndef RST_SEGMENT
-#define RST_SEGMENT
-
-#include <vector>
-
-#include <opm/parser/eclipse/EclipseState/Schedule/MSW/Segment.hpp>
-#include <opm/parser/eclipse/EclipseState/Schedule/MSW/icd.hpp>
-
-namespace Opm {
-class UnitSystem;
-
-namespace RestartIO {
-
-struct RstSegment {
-    RstSegment(const ::Opm::UnitSystem& unit_system, const int* iseg, const double * rseg);
-
-    int segment;
-    int outlet_segment;
-    int branch;
-    Segment::SegmentType segment_type;
-    int icd_scaling_mode;
-    ICDStatus icd_status;
-
-    double dist_outlet;
-    double outlet_dz;
-    double diameter;
-    double roughness;
-    double area;
-    double volume;
-    double dist_bhp_ref;
-    double bhp_ref_dz;
-    double total_flow;
-    double water_flow_fraction;
-    double gas_flow_fraction;
-    double pressure;
-    double valve_length;
-    double valve_area;
-    double valve_flow_coeff;
-    double valve_max_area;
-    double base_strength;
-    double fluid_density;
-    double fluid_viscosity;
-    double critical_water_fraction;
-    double transition_region_width;
-    double max_emulsion_ratio;
-    double max_valid_flow_rate;
-    double icd_length;
-    double valve_area_fraction;
-
-    std::vector<int> inflow_segments;
-};
-
-
-}
-}
-
-
-
-
-#endif

opm/io/eclipse/rst/state.hpp

@@ -1,90 +0,0 @@
-/*
-  Copyright 2020 Equinor ASA.
-
-  This file is part of the Open Porous Media project (OPM).
-
-  OPM is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by
-  the Free Software Foundation, either version 3 of the License, or
-  (at your option) any later version.
-
-  OPM is distributed in the hope that it will be useful,
-  but WITHOUT ANY WARRANTY; without even the implied warranty of
-  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-  GNU General Public License for more details.
-
-  You should have received a copy of the GNU General Public License
-  along with OPM.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#ifndef RST_STATE
-#define RST_STATE
-
-#include <vector>
-#include <string>
-
-#include <opm/io/eclipse/ERst.hpp>
-#include <opm/io/eclipse/rst/header.hpp>
-#include <opm/io/eclipse/rst/group.hpp>
-#include <opm/io/eclipse/rst/well.hpp>
-
-namespace Opm {
-
-class UnitSystem;
-
-namespace RestartIO {
-struct RstState {
-    RstState(const ::Opm::UnitSystem& unit_system,
-             const std::vector<int>& intehead,
-             const std::vector<bool>& logihead,
-             const std::vector<double>& doubhead,
-             const std::vector<std::string>& zgrp,
-             const std::vector<int>& igrp,
-             const std::vector<float>& sgrp,
-             const std::vector<double>& xgrp,
-             const std::vector<std::string>& zwel,
-             const std::vector<int>& iwel,
-             const std::vector<float>& swel,
-             const std::vector<double>& xwel,
-             const std::vector<int>& icon,
-             const std::vector<float>& scon,
-             const std::vector<double>& xcon);
-
-    RstState(const ::Opm::UnitSystem& unit_system,
-             const std::vector<int>& intehead,
-             const std::vector<bool>& logihead,
-             const std::vector<double>& doubhead,
-             const std::vector<std::string>& zgrp,
-             const std::vector<int>& igrp,
-             const std::vector<float>& sgrp,
-             const std::vector<double>& xgrp,
-             const std::vector<std::string>& zwel,
-             const std::vector<int>& iwel,
-             const std::vector<float>& swel,
-             const std::vector<double>& xwel,
-             const std::vector<int>& icon,
-             const std::vector<float>& scon,
-             const std::vector<double>& xcon,
-             const std::vector<int>& iseg,
-             const std::vector<double>& rseg);
-
-
-    static RstState load(EclIO::ERst& rst_file, int report_step);
-
-    const RstWell& get_well(const std::string& wname) const;
-    std::vector<RstWell> wells;
-    std::vector<RstGroup> groups;
-    RstHeader header;
-private:
-    void add_groups(const ::Opm::UnitSystem& unit_system,
-                    const std::vector<std::string>& zgrp,
-                    const std::vector<int>& igrp,
-                    const std::vector<float>& sgrp,
-                    const std::vector<double>& xgrp);
-};
-}
-}
-
-
-
-
-#endif

opm/io/eclipse/rst/well.hpp

@@ -1,124 +0,0 @@
-/*
-  Copyright 2020 Equinor ASA.
-
-  This file is part of the Open Porous Media project (OPM).
-
-  OPM is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by
-  the Free Software Foundation, either version 3 of the License, or
-  (at your option) any later version.
-
-  OPM is distributed in the hope that it will be useful,
-  but WITHOUT ANY WARRANTY; without even the implied warranty of
-  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-  GNU General Public License for more details.
-
-  You should have received a copy of the GNU General Public License
-  along with OPM.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#ifndef RST_WELL
-#define RST_WELL
-
-#include <array>
-#include <vector>
-#include <string>
-#include <unordered_map>
-
-
-#include <opm/io/eclipse/rst/connection.hpp>
-#include <opm/io/eclipse/rst/segment.hpp>
-
-namespace Opm {
-class UnitSystem;
-
-namespace RestartIO {
-
-struct RstHeader;
-
-struct RstWell {
-    RstWell(const ::Opm::UnitSystem& unit_system,
-            const RstHeader& header,
-            const std::string& group_arg,
-            const std::string* zwel,
-            const int * iwel,
-            const float * swel,
-            const double * xwel,
-            const int * icon,
-            const float * scon,
-            const double * xcon);
-
-    RstWell(const ::Opm::UnitSystem& unit_system,
-            const RstHeader& header,
-            const std::string& group_arg,
-            const std::string* zwel,
-            const int * iwel,
-            const float * swel,
-            const double * xwel,
-            const int * icon,
-            const float * scon,
-            const double * xcon,
-            const std::vector<int>& iseg,
-            const std::vector<double>& rseg);
-
-    std::string name;
-    std::string group;
-    std::array<int, 2> ij;
-    std::pair<int,int> k1k2;
-    int wtype;
-    int active_control;
-    int vfp_table;
-    int pred_requested_control;
-    bool allow_xflow;
-    int hist_requested_control;
-    int msw_index;
-    int completion_ordering;
-
-    float orat_target;
-    float wrat_target;
-    float grat_target;
-    float lrat_target;
-    float resv_target;
-    float thp_target;
-    float bhp_target_float;
-    float hist_lrat_target;
-    float hist_grat_target;
-    float hist_bhp_target;
-    float datum_depth;
-
-    double oil_rate;
-    double water_rate;
-    double gas_rate;
-    double liquid_rate;
-    double void_rate;
-    double flow_bhp;
-    double wct;
-    double gor;
-    double oil_total;
-    double water_total;
-    double gas_total;
-    double void_total;
-    double water_inj_total;
-    double gas_inj_total;
-    double gas_fvf;
-    double bhp_target_double;
-    double hist_oil_total;
-    double hist_wat_total;
-    double hist_gas_total;
-    double hist_water_inj_total;
-    double hist_gas_inj_total;
-    double water_void_rate;
-    double gas_void_rate;
-
-    const RstSegment segment(int segment_number) const;
-    std::vector<RstConnection> connections;
-    std::vector<RstSegment> segments;
-};
-
-
-}
-}
-
-
-
-
-#endif

opm/json/JsonObject.hpp

@@ -22,7 +22,7 @@
 
 #include <string>
 
-#include <opm/common/utility/FileSystem.hpp>
+#include <boost/filesystem/path.hpp>
 
 struct cJSON;
 
@@ -30,7 +30,7 @@ namespace Json {
 
     class JsonObject {
     public:
-        explicit JsonObject(const Opm::filesystem::path& jsonFile );
+        explicit JsonObject(const boost::filesystem::path& jsonFile );
         explicit JsonObject(const std::string& inline_json);
         explicit JsonObject(const char * inline_json);
         explicit JsonObject(cJSON * root);

opm/output/data/Aquifer.hpp

@@ -1,59 +0,0 @@
-/*
-  Copyright 2019 Statoil ASA.
-
-  This file is part of the Open Porous Media project (OPM).
-
-  OPM is free software: you can redistribute it and/or modify
-  it under the terms of the GNU General Public License as published by
-  the Free Software Foundation, either version 3 of the License, or
-  (at your option) any later version.
-
-  OPM is distributed in the hope that it will be useful,
-  but WITHOUT ANY WARRANTY; without even the implied warranty of
-  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-  GNU General Public License for more details.
-
-  You should have received a copy of the GNU General Public License
-  along with OPM.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#ifndef OPM_OUTPUT_AQUIFER_HPP
-#define OPM_OUTPUT_AQUIFER_HPP
-
-#include <map>
-#include <memory>
-#include <vector>
-
-#include <opm/parser/eclipse/Units/UnitSystem.hpp>
-
-namespace Opm { namespace data {
-
-    /**
-     * Small struct that keeps track of data for output to restart/summary
-     * files.
-     */
-    enum class AquiferType
-    {
-        Fetkovich, CarterTracey,
-    };
-
-    struct FetkovichData {
-        double initVolume;
-        double prodIndex;
-        double timeConstant;
-    };
-
-    struct AquiferData {
-        int aquiferID;    //< One-based ID, range 1..NANAQ
-        double pressure;  //< Aquifer pressure
-        double volume;    //< Produced liquid volume
-        double initPressure;    //< Aquifer's initial pressure
-        double datumDepth;      //< Aquifer's pressure reference depth
-
-        AquiferType type;
-        std::shared_ptr<FetkovichData> aquFet;
-    };
-
-}} // Opm::data
-
-#endif // OPM_OUTPUT_AQUIFER_HPP

opm/output/data/Cells.hpp

@@ -69,13 +69,6 @@ namespace data {
         UnitSystem::measure dim;   //< Dimension of the data to write
         std::vector<double> data;  //< The actual data itself
         TargetType target;
-
-        bool operator==(const CellData& cell2) const
-        {
-            return dim == cell2.dim &&
-                   data == cell2.data &&
-                   target == cell2.target;
-        }
     };
 
 }

opm/output/data/Wells.hpp

@@ -30,8 +30,6 @@
 #include <unordered_map>
 #include <vector>
 
-#include <opm/parser/eclipse/EclipseState/Schedule/Well/Well.hpp>
-
 namespace Opm {
 
     namespace data {
@@ -84,16 +82,14 @@ namespace Opm {
             /// chaining.
             inline Rates& set( opt m, double value );
 
-            /// Returns true if any of the rates oil, gas, water is nonzero
-            inline bool flowing() const;
+            /// true if any option is set; false otherwise
+            inline bool any() const noexcept;
 
             template <class MessageBufferType>
             void write(MessageBufferType& buffer) const;
             template <class MessageBufferType>
             void read(MessageBufferType& buffer);
 
-            bool operator==(const Rates& rat2) const;
-
         private:
             double& get_ref( opt );
             const double& get_ref( opt ) const;
@@ -121,7 +117,7 @@ namespace Opm {
 
     struct Connection {
         using global_index = size_t;
-        static const constexpr int restart_size = 6;
+        static const constexpr int restart_size = 2;
 
         global_index index;
         Rates rates;
@@ -132,18 +128,6 @@ namespace Opm {
         double cell_saturation_gas;
         double effective_Kh;
 
-        bool operator==(const Connection& conn2) const
-        {
-            return index == conn2.index &&
-                   rates == conn2.rates &&
-                   pressure == conn2.pressure &&
-                   reservoir_rate == conn2.reservoir_rate &&
-                   cell_pressure == conn2.cell_pressure &&
-                   cell_saturation_water == conn2.cell_saturation_water &&
-                   cell_saturation_gas == conn2.cell_saturation_gas &&
-                   effective_Kh == conn2.effective_Kh;
-        }
-
         template <class MessageBufferType>
         void write(MessageBufferType& buffer) const;
         template <class MessageBufferType>
@@ -155,38 +139,6 @@ namespace Opm {
         double pressure;
         std::size_t segNumber;
 
-        bool operator==(const Segment& seg2) const
-        {
-          return rates == seg2.rates &&
-                 pressure == seg2.pressure &&
-                 segNumber == seg2.segNumber;
-        }
-
-        template <class MessageBufferType>
-        void write(MessageBufferType& buffer) const;
-
-        template <class MessageBufferType>
-        void read(MessageBufferType& buffer);
-    };
-
-    struct CurrentControl {
-        bool isProducer{true};
-
-        ::Opm::Well::ProducerCMode prod {
-            ::Opm::Well::ProducerCMode::CMODE_UNDEFINED
-        };
-
-        ::Opm::Well::InjectorCMode inj {
-            ::Opm::Well::InjectorCMode::CMODE_UNDEFINED
-        };
-
-        bool operator==(const CurrentControl& rhs) const
-        {
-            return (this->isProducer == rhs.isProducer)
-                && ((this->isProducer && (this->prod == rhs.prod)) ||
-                    (!this->isProducer && (this->inj == rhs.inj)));
-        }
-
         template <class MessageBufferType>
         void write(MessageBufferType& buffer) const;
 
@@ -202,25 +154,11 @@ namespace Opm {
         int control;
         std::vector< Connection > connections;
         std::unordered_map<std::size_t, Segment> segments;
-        CurrentControl current_control;
-
         inline bool flowing() const noexcept;
         template <class MessageBufferType>
         void write(MessageBufferType& buffer) const;
         template <class MessageBufferType>
         void read(MessageBufferType& buffer);
-
-        bool operator==(const Well& well2) const
-        {
-          return rates == well2.rates &&
-                 bhp == well2.bhp &&
-                 thp == well2.thp &&
-                 temperature == well2.temperature &&
-                 control == well2.control &&
-                 connections == well2.connections &&
-                 segments == well2.segments &&
-                 current_control == well2.current_control;
-        }
     };
 
 
@@ -275,9 +213,10 @@ namespace Opm {
                 this->emplace(name, well);
             }
         }
+
     };
 
-    using Wells = WellRates;
+    using Wells = WellRates;    
 
 
     /* IMPLEMENTATIONS */
@@ -313,28 +252,6 @@ namespace Opm {
         return *this;
     }
 
-    inline bool Rates::operator==(const Rates& rate) const
-    {
-      return mask == rate.mask &&
-             wat == rate.wat &&
-             oil == rate.oil &&
-             gas == rate.gas &&
-             polymer == rate.polymer &&
-             solvent == rate.solvent &&
-             energy == rate.energy &&
-             dissolved_gas == rate.dissolved_gas &&
-             vaporized_oil == rate.vaporized_oil &&
-             reservoir_water == rate.reservoir_water &&
-             reservoir_oil == rate.reservoir_oil &&
-             reservoir_gas == rate.reservoir_gas &&
-             productivity_index_water == rate.productivity_index_water &&
-             productivity_index_gas == rate.productivity_index_gas &&
-             productivity_index_oil == rate.productivity_index_oil &&
-             well_potential_water == rate.well_potential_water &&
-             well_potential_oil == rate.well_potential_oil &&
-             well_potential_gas == rate.well_potential_gas;
-    }
-
 
     /*
      * To avoid error-prone and repetitve work when extending rates with new
@@ -379,15 +296,12 @@ namespace Opm {
                 );
     }
 
-
-    bool inline Rates::flowing() const {
-        return ((this->wat != 0) ||
-                (this->oil != 0) ||
-                (this->gas != 0));
+    inline bool Rates::any() const noexcept {
+        return static_cast< enum_size >( this->mask ) != 0;
     }
 
     inline bool Well::flowing() const noexcept {
-        return this->rates.flowing();
+        return this->rates.any();
     }
 
     template <class MessageBufferType>
@@ -431,18 +345,6 @@ namespace Opm {
         buffer.write(this->pressure);
     }
 
-    template <class MessageBufferType>
-    void CurrentControl::write(MessageBufferType& buffer) const
-    {
-        buffer.write(this->isProducer);
-        if (this->isProducer) {
-            buffer.write(this->prod);
-        }
-        else {
-            buffer.write(this->inj);
-        }
-    }
-
     template <class MessageBufferType>
     void Well::write(MessageBufferType& buffer) const {
         this->rates.write(buffer);
@@ -464,8 +366,6 @@ namespace Opm {
                 seg.second.write(buffer);
             }
         }
-
-        this->current_control.write(buffer);
     }
 
     template <class MessageBufferType>
@@ -509,18 +409,6 @@ namespace Opm {
         buffer.read(this->pressure);
     }
 
-    template <class MessageBufferType>
-    void CurrentControl::read(MessageBufferType& buffer)
-    {
-        buffer.read(this->isProducer);
-        if (this->isProducer) {
-            buffer.read(this->prod);
-        }
-        else {
-            buffer.read(this->inj);
-        }
-    }
-
     template <class MessageBufferType>
     void Well::read(MessageBufferType& buffer) {
         this->rates.read(buffer);
@@ -555,8 +443,6 @@ namespace Opm {
             const auto segNumber = seg.segNumber;
             this->segments.emplace(segNumber, std::move(seg));
         }
-
-        this->current_control.read(buffer);
     }
 
 }} // Opm::data

opm/output/eclipse/AggregateActionxData.hpp

@@ -1,122 +0,0 @@
-/*
-  Copyright (c) 2018 Statoil ASA
-
-  This file is part of the Open Porous Media project (OPM).
-
-  OPM is free software: you can redistribute it and/or modify
-  it under the terms of the GNU General Public License as published by
-  the Free Software Foundation, either version 3 of the License, or
-  (at your option) any later version.
-
-  OPM is distributed in the hope that it will be useful,
-  but WITHOUT ANY WARRANTY; without even the implied warranty of
-  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-  GNU General Public License for more details.
-
-  You should have received a copy of the GNU General Public License
-  along with OPM.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#ifndef OPM_AGGREGATE_Actionx_DATA_HPP
-#define OPM_AGGREGATE_Actionx_DATA_HPP
-
-#include <opm/output/eclipse/WindowedArray.hpp>
-#include <opm/io/eclipse/PaddedOutputString.hpp>
-
-#include <opm/parser/eclipse/EclipseState/Schedule/UDQ/UDQInput.hpp>
-#include <opm/parser/eclipse/EclipseState/Schedule/UDQ/UDQDefine.hpp>
-#include <opm/parser/eclipse/EclipseState/Schedule/UDQ/UDQActive.hpp>
-#include <opm/parser/eclipse/EclipseState/Schedule/UDQ/UDQAssign.hpp>
-#include <opm/parser/eclipse/EclipseState/Schedule/UDQ/UDQEnums.hpp>
-#include <opm/parser/eclipse/EclipseState/Schedule/UDQ/UDQParams.hpp>
-#include <opm/parser/eclipse/EclipseState/Schedule/UDQ/UDQFunctionTable.hpp>
-#include <opm/parser/eclipse/EclipseState/Schedule/Schedule.hpp>
-
-#include <cstddef>
-#include <string>
-#include <vector>
-#include <map>
-
-namespace Opm {
-    class Schedule;
-    class UDQInput;
-    class UDQActive;
-} // Opm
-
-
-
-namespace Opm { namespace RestartIO { namespace Helpers {
-    
-class AggregateActionxData
-{
-public:
-    explicit AggregateActionxData(const std::vector<int>& actDims);
-
-    void captureDeclaredActionxData(    const Opm::Schedule&    sched,
-                                        const Opm::SummaryState& st,
-                                        const std::vector<int>& actDims,
-                                        const std::size_t       simStep);
-
-    const std::vector<int>& getIACT() const
-    {
-        return this->iACT_.data();
-    }
-
-   
-    const std::vector<float>& getSACT() const
-    {
-        return this->sACT_.data();
-    }
-
-    const std::vector<EclIO::PaddedOutputString<8>>& getZACT() const
-    {
-        return this->zACT_.data();
-    }
-
-    const std::vector<EclIO::PaddedOutputString<8>>& getZLACT() const
-    {
-        return this->zLACT_.data();
-    }
- 
-    const std::vector<EclIO::PaddedOutputString<8>>& getZACN() const
-    {
-        return this->zACN_.data();
-    }
-   
-    const std::vector<int>& getIACN() const
-    {
-        return this->iACN_.data();
-    }
-        
-    const std::vector<double>& getSACN() const
-    {
-        return this->sACN_.data();
-    }
-
-private:
-    /// Aggregate 'IACT' array (Integer) for all ACTIONX data  (9 integers pr UDQ)
-    WindowedArray<int> iACT_;
-
-    /// Aggregate 'SACT' array (Integer) for all ACTIONX data  (5 integers pr ACTIONX - currently all zero - meaning unknown)
-    WindowedArray<float> sACT_;
-
-    /// Aggregate 'ZACT' array (Character) for all ACTIONX data. (4 * 8 chars pr ACIONX keyword - name of Action)
-    WindowedArray<EclIO::PaddedOutputString<8>> zACT_;
-   
-    /// Aggregate 'ZLACT' array (Character) for all Actionx data.  (max 16 * 8 characters pr line (default 80 chars pr line)
-    WindowedArray<EclIO::PaddedOutputString<8>> zLACT_;
-
-    /// Aggregate 'ZACN' array (Character) for all Actionx data  (length equal to max no of conditions pr Actionx * the number of Actiox kwords)
-    WindowedArray<EclIO::PaddedOutputString<8>> zACN_;
-
-    /// Aggregate 'IACN' array (Integer) for all Actionx data  (length 26* the max number of conditoins pr Actionx * the number of Actionx kwords)
-    WindowedArray<int> iACN_;
-
-    /// Aggregate 'SACN' array (Integer) for all Actionx data  (16 * max number of Actionx conditions)
-    WindowedArray<double> sACN_;
-
-};
-
-}}} // Opm::RestartIO::Helpers
-
-#endif //OPM_AGGREGATE_WELL_DATA_HPP

opm/output/eclipse/AggregateGroupData.hpp

@@ -20,150 +20,154 @@
 #ifndef OPM_AGGREGATE_GROUP_DATA_HPP
 #define OPM_AGGREGATE_GROUP_DATA_HPP
 
+#include <opm/output/eclipse/CharArrayNullTerm.hpp>
 #include <opm/output/eclipse/WindowedArray.hpp>
 
-#include <opm/io/eclipse/PaddedOutputString.hpp>
-#include <opm/parser/eclipse/EclipseState/Schedule/Group/Group.hpp>
 #include <cstddef>
 #include <string>
 #include <vector>
 #include <map>
 
 namespace Opm {
-class Schedule;
-class SummaryState;
-//class Group;
-class UnitSystem;
+    class Schedule;
+    class SummaryState;
+    class Group;
 } // Opm
 
 namespace Opm { namespace RestartIO { namespace Helpers {
 
-class AggregateGroupData
-{
-public:
-    explicit AggregateGroupData(const std::vector<int>& inteHead);
+    class groupMaps {
+    public:
+	const std::map <size_t, const Opm::Group*>& indexGroupMap() const;
+	const std::map <const std::string, size_t>& groupNameIndexMap() const;
 
-    void captureDeclaredGroupData(const Opm::Schedule&        sched,
-                         const Opm::UnitSystem&               units,
-                         const std::size_t                    simStep,
-                         const Opm::SummaryState&             sumState,
-                         const std::vector<int>&              inteHead);
+	void currentGrpTreeNameSeqIndMap(const Opm::Schedule&                        sched,
+	                                 const size_t                                simStep,
+	                                 const std::map<const std::string , size_t>& GnIMap,
+	                                 const std::map<size_t, const Opm::Group*>&  IGMap);
 
-    const std::vector<int>& getIGroup() const
-    {
-        return this->iGroup_.data();
-    }
-
-    const std::vector<float>& getSGroup() const
-    {
-        return this->sGroup_.data();
-    }
-
-    const std::vector<double>& getXGroup() const
-    {
-        return this->xGroup_.data();
-    }
-
-    const std::vector<EclIO::PaddedOutputString<8>>& getZGroup() const
-    {
-        return this->zGroup_.data();
-    }
-
-    const std::vector<std::string> restart_group_keys = {"GOPP", "GWPP", "GOPR", "GWPR", "GGPR",
-                                                         "GVPR", "GWIR", "GGIR", "GWCT", "GGOR",
-                                                         "GOPT", "GWPT", "GGPT", "GVPT", "GWIT",
-                                                         "GGIT",
-                                                         "GOPTH", "GWPTH", "GGPTH",
-                                                         "GWITH", "GGITH"};
-
-    const std::vector<std::string> restart_field_keys = {"FOPP", "FWPP", "FOPR", "FWPR", "FGPR",
-                                                         "FVPR", "FWIR", "FGIR", "FWCT", "FGOR",
-                                                         "FOPT", "FWPT", "FGPT", "FVPT", "FWIT",
-                                                         "FGIT",
-                                                         "FOPTH", "FWPTH", "FGPTH",
-                                                         "FWITH", "FGITH"};
-
-    const std::map<std::string, size_t> groupKeyToIndex = {
-                                                           {"GOPR",  0},
-                                                           {"GWPR",  1},
-                                                           {"GGPR",  2},
-                                                           {"GVPR",  3},
-                                                           {"GWIR",  5},
-                                                           {"GGIR",  6},
-                                                           {"GWCT",  8},
-                                                           {"GGOR",  9},
-                                                           {"GOPT", 10},
-                                                           {"GWPT", 11},
-                                                           {"GGPT", 12},
-                                                           {"GVPT", 13},
-                                                           {"GWIT", 15},
-                                                           {"GGIT", 16},
-                                                           {"GOPP", 22},
-                                                           {"GWPP", 23},
-                                                           {"GOPTH", 135},
-                                                           {"GWPTH", 139},
-                                                           {"GWITH", 140},
-                                                           {"GGPTH", 143},
-                                                           {"GGITH", 144},
-    };
-    
-    
-    using inj_cmode_enum = Opm::Group::InjectionCMode;
-    const std::map<inj_cmode_enum, int> cmodeToNum = {
-        
-        {inj_cmode_enum::NONE, 0},
-        {inj_cmode_enum::RATE, 1},
-        {inj_cmode_enum::RESV, 2},
-        {inj_cmode_enum::REIN, 3},
-        {inj_cmode_enum::VREP, 4},
-        {inj_cmode_enum::FLD,  0},
-        {inj_cmode_enum::SALE, 0},
+    private:
+	std::map <size_t, const Opm::Group*> m_indexGroupMap;
+	std::map <const std::string, size_t> m_groupNameIndexMap;
     };
 
-    const std::map<std::string, size_t> fieldKeyToIndex = {
-                                                           {"FOPR",  0},
-                                                           {"FWPR",  1},
-                                                           {"FGPR",  2},
-                                                           {"FVPR",  3},
-                                                           {"FWIR",  5},
-                                                           {"FGIR",  6},
-                                                           {"FWCT",  8},
-                                                           {"FGOR",  9},
-                                                           {"FOPT", 10},
-                                                           {"FWPT", 11},
-                                                           {"FGPT", 12},
-                                                           {"FVPT", 13},
-                                                           {"FWIT", 15},
-                                                           {"FGIT", 16},
-                                                           {"FOPP", 22},
-                                                           {"FWPP", 23},
-                                                           {"FOPTH", 135},
-                                                           {"FWPTH", 139},
-                                                           {"FWITH", 140},
-                                                           {"FGPTH", 143},
-                                                           {"FGITH", 144},
+    class AggregateGroupData
+    {
+    public:
+	explicit AggregateGroupData(const std::vector<int>& inteHead);
+
+	void captureDeclaredGroupData(const Opm::Schedule&                 sched,
+				      const std::vector<std::string>&      restart_group_keys,
+				      const std::vector<std::string>&      restart_field_keys,
+				      const std::map<std::string, size_t>& groupKeyToIndex,
+				      const std::map<std::string, size_t>& fieldKeyToIndex,
+				      const bool                           ecl_compatible_rst,
+				      const std::size_t                    simStep,
+				      const Opm::SummaryState&             sumState,
+				      const std::vector<int>&              inteHead);
+
+        const std::vector<int>& getIGroup() const
+        {
+            return this->iGroup_.data();
+        }
+
+        const std::vector<float>& getSGroup() const
+        {
+            return this->sGroup_.data();
+        }
+
+        const std::vector<double>& getXGroup() const
+        {
+            return this->xGroup_.data();
+        }
+
+        const std::vector<CharArrayNullTerm<8>>& getZGroup() const
+        {
+            return this->zGroup_.data();
+        }
+
+	const std::vector<std::string> restart_group_keys = {"GOPP", "GWPP", "GOPR", "GWPR", "GGPR",
+							     "GVPR", "GWIR", "GGIR", "GWCT", "GGOR",
+							     "GOPT", "GWPT", "GGPT", "GVPT", "GWIT",
+							     "GGIT",
+							     "GOPTH", "GWPTH", "GGPTH",
+							     "GWITH", "GGITH"};
+
+	const std::vector<std::string> restart_field_keys = {"FOPP", "FWPP", "FOPR", "FWPR", "FGPR",
+							     "FVPR", "FWIR", "FGIR", "FWCT", "FGOR",
+							     "FOPT", "FWPT", "FGPT", "FVPT", "FWIT",
+							     "FGIT",
+							     "FOPTH", "FWPTH", "FGPTH",
+							     "FWITH", "FGITH"};
+
+	const std::map<std::string, size_t> groupKeyToIndex = {
+	  {"GOPR",  0},
+	  {"GWPR",  1},
+	  {"GGPR",  2},
+	  {"GVPR",  3},
+	  {"GWIR",  5},
+	  {"GGIR",  6},
+	  {"GWCT",  8},
+	  {"GGOR",  9},
+	  {"GOPT", 10},
+	  {"GWPT", 11},
+	  {"GGPT", 12},
+	  {"GVPT", 13},
+	  {"GWIT", 15},
+	  {"GGIT", 16},
+	  {"GOPP", 22},
+	  {"GWPP", 23},
+	  {"GOPTH", 135},
+	  {"GWPTH", 139},
+	  {"GWITH", 140},
+	  {"GGPTH", 143},
+	  {"GGITH", 144},
+	};
+
+	const std::map<std::string, size_t> fieldKeyToIndex = {
+	  {"FOPR",  0},
+	  {"FWPR",  1},
+	  {"FGPR",  2},
+	  {"FVPR",  3},
+	  {"FWIR",  5},
+	  {"FGIR",  6},
+	  {"FWCT",  8},
+	  {"FGOR",  9},
+	  {"FOPT", 10},
+	  {"FWPT", 11},
+	  {"FGPT", 12},
+	  {"FVPT", 13},
+	  {"FWIT", 15},
+	  {"FGIT", 16},
+	  {"FOPP", 22},
+	  {"FWPP", 23},
+	  {"FOPTH", 135},
+	  {"FWPTH", 139},
+	  {"FWITH", 140},
+	  {"FGPTH", 143},
+	  {"FGITH", 144},
+	};
+
+    private:
+        /// Aggregate 'IWEL' array (Integer) for all wells.
+        WindowedArray<int> iGroup_;
+
+        /// Aggregate 'SWEL' array (Real) for all wells.
+        WindowedArray<float> sGroup_;
+
+        /// Aggregate 'XWEL' array (Double Precision) for all wells.
+        WindowedArray<double> xGroup_;
+
+        /// Aggregate 'ZWEL' array (Character) for all wells.
+        WindowedArray<CharArrayNullTerm<8>> zGroup_;
+
+        /// Maximum number of wells in a group.
+        int nWGMax_;
+
+        /// Maximum number of groups
+        int nGMaxz_;
     };
 
-private:
-    /// Aggregate 'IWEL' array (Integer) for all wells.
-    WindowedArray<int> iGroup_;
-
-    /// Aggregate 'SWEL' array (Real) for all wells.
-    WindowedArray<float> sGroup_;
-
-    /// Aggregate 'XWEL' array (Double Precision) for all wells.
-    WindowedArray<double> xGroup_;
-
-    /// Aggregate 'ZWEL' array (Character) for all wells.
-    WindowedArray<EclIO::PaddedOutputString<8>> zGroup_;
-
-    /// Maximum number of wells in a group.
-    int nWGMax_;
-
-    /// Maximum number of groups
-    int nGMaxz_;
-};
-
 }}} // Opm::RestartIO::Helpers
 
 #endif // OPM_AGGREGATE_WELL_DATA_HPP

opm/output/eclipse/AggregateMSWData.hpp

@@ -21,6 +21,7 @@
 #define OPM_AGGREGATE_MSW_DATA_HPP
 
 #include <opm/output/data/Wells.hpp>
+#include <opm/output/eclipse/CharArrayNullTerm.hpp>
 #include <opm/output/eclipse/WindowedArray.hpp>
 
 #include <string>
@@ -54,13 +55,13 @@ namespace Opm { namespace RestartIO { namespace Helpers {
       std::vector<double> sofr;
       std::vector<double> swfr;
       std::vector<double> sgfr;
-    };
-
+    };    
+    
     class AggregateMSWData
     {
     public:
         explicit AggregateMSWData(const std::vector<int>& inteHead);
-
+	
         void captureDeclaredMSWData(const Opm::Schedule& sched,
                                      const std::size_t    rptStep,
 				     const Opm::UnitSystem& units,

opm/output/eclipse/AggregateUDQData.hpp

@@ -1,142 +0,0 @@
-/*
-  Copyright (c) 2018 Statoil ASA
-
-  This file is part of the Open Porous Media project (OPM).
-
-  OPM is free software: you can redistribute it and/or modify
-  it under the terms of the GNU General Public License as published by
-  the Free Software Foundation, either version 3 of the License, or
-  (at your option) any later version.
-
-  OPM is distributed in the hope that it will be useful,
-  but WITHOUT ANY WARRANTY; without even the implied warranty of
-  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-  GNU General Public License for more details.
-
-  You should have received a copy of the GNU General Public License
-  along with OPM.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#ifndef OPM_AGGREGATE_UDQ_DATA_HPP
-#define OPM_AGGREGATE_UDQ_DATA_HPP
-
-#include <opm/output/eclipse/WindowedArray.hpp>
-#include <opm/io/eclipse/PaddedOutputString.hpp>
-
-#include <opm/parser/eclipse/EclipseState/Schedule/UDQ/UDQInput.hpp>
-#include <opm/parser/eclipse/EclipseState/Schedule/UDQ/UDQDefine.hpp>
-#include <opm/parser/eclipse/EclipseState/Schedule/UDQ/UDQActive.hpp>
-#include <opm/parser/eclipse/EclipseState/Schedule/UDQ/UDQAssign.hpp>
-#include <opm/parser/eclipse/EclipseState/Schedule/UDQ/UDQEnums.hpp>
-#include <opm/parser/eclipse/EclipseState/Schedule/UDQ/UDQParams.hpp>
-#include <opm/parser/eclipse/EclipseState/Schedule/UDQ/UDQFunctionTable.hpp>
-#include <opm/parser/eclipse/EclipseState/Schedule/Schedule.hpp>
-
-#include <cstddef>
-#include <string>
-#include <vector>
-#include <map>
-
-namespace Opm {
-    class Schedule;
-    class UDQInput;
-    class UDQActive;
-} // Opm
-
-namespace Opm { namespace RestartIO { namespace Helpers {
-
-class igphData {
-public:
-    const std::vector<int> ig_phase(const Opm::Schedule& sched, const std::size_t simStep, const std::vector<int>& inteHead);
-};
-
-class AggregateUDQData
-{
-public:
-    explicit AggregateUDQData(const std::vector<int>& udqDims);
-
-void captureDeclaredUDQData(const Opm::Schedule&                 sched,
-                       const std::size_t                    simStep,
-                       const Opm::SummaryState&             st,
-                       const std::vector<int>&              inteHead);
-
-    const std::vector<int>& getIUDQ() const
-    {
-        return this->iUDQ_.data();
-    }
-
-    const std::vector<int>& getIUAD() const
-    {
-        return this->iUAD_.data();
-    }
-
-    const std::vector<EclIO::PaddedOutputString<8>>& getZUDN() const
-    {
-        return this->zUDN_.data();
-    }
-
-    const std::vector<EclIO::PaddedOutputString<8>>& getZUDL() const
-    {
-        return this->zUDL_.data();
-    }
-
-    const std::vector<int>& getIGPH() const
-    {
-        return this->iGPH_.data();
-    }
-
-    const std::vector<int>& getIUAP() const
-    {
-        return this->iUAP_.data();
-    }
-
-    const std::vector<double>& getDUDW() const
-    {
-        return this->dUDW_.data();
-    }
-    
-        const std::vector<double>& getDUDG() const
-    {
-        return this->dUDG_.data();
-    }
-    
-    const std::vector<double>& getDUDF() const
-    {
-        return this->dUDF_.data();
-    }
-
-private:
-    /// Aggregate 'IUDQ' array (Integer) for all UDQ data  (3 integers pr UDQ)
-    WindowedArray<int> iUDQ_;
-
-    /// Aggregate 'IUAD' array (Integer) for all UDQ data  (5 integers pr UDQ that is used for various well and group controls)
-    WindowedArray<int> iUAD_;
-
-
-    /// Aggregate 'ZUDN' array (Character) for all UDQ data. (2 * 8 chars pr UDQ -> UNIT keyword)
-    WindowedArray<EclIO::PaddedOutputString<8>> zUDN_;
-
-    /// Aggregate 'ZUDL' array (Character) for all UDQ data.  (16 * 8 chars pr UDQ DEFINE "Data for operation - Msth Expression)
-    WindowedArray<EclIO::PaddedOutputString<8>> zUDL_;
-
-    /// Aggregate 'IGPH' array (Integer) for all UDQ data  (3 - zeroes - as of current understanding)
-    WindowedArray<int> iGPH_;
-
-    /// Aggregate 'IUAP' array (ICharArrayNullTermnteger) for all UDQ data  (1 integer pr UDQ constraint used)
-    WindowedArray<int> iUAP_;
-
-    /// Aggregate 'DUDW' array (Double Precision) for all UDQ data. (Dimension = max no wells * noOfUDQ's)
-    WindowedArray<double> dUDW_;
-    
-    /// Aggregate 'DUDG' array (Double Precision) for all UDQ data. (Dimension = (max no groups + 1) * noOfUDQ's)
-    WindowedArray<double> dUDG_;
-    
-    /// Aggregate 'DUDF' array (Double Precision) for all UDQ data.  (Dimension = Number of FU - UDQ's, with value equal to the actual constraint)
-    WindowedArray<double> dUDF_;
-
-
-};
-
-}}} // Opm::RestartIO::Helpers
-
-#endif //OPM_AGGREGATE_WELL_DATA_HPP

opm/output/eclipse/AggregateWellData.hpp

@@ -20,11 +20,9 @@
 #ifndef OPM_AGGREGATE_WELL_DATA_HPP
 #define OPM_AGGREGATE_WELL_DATA_HPP
 
+#include <opm/output/eclipse/CharArrayNullTerm.hpp>
 #include <opm/output/eclipse/WindowedArray.hpp>
 
-#include <opm/io/eclipse/PaddedOutputString.hpp>
-#include <opm/parser/eclipse/EclipseState/Schedule/Action/ActionResult.hpp>
-
 #include <cstddef>
 #include <string>
 #include <vector>
@@ -40,11 +38,6 @@ namespace Opm { namespace data {
 }} // Opm::data
 
 namespace Opm { namespace RestartIO { namespace Helpers {
-    
-    struct ActionResStatus {
-        std::vector<Opm::Action::Result> result;
-        std::vector<std::string> name;
-    };
 
     class AggregateWellData
     {
@@ -59,6 +52,7 @@ namespace Opm { namespace RestartIO { namespace Helpers {
 
         void captureDynamicWellData(const Opm::Schedule&        sched,
                                     const std::size_t           sim_step,
+				    const bool ecl_compatible_rst,
                                     const Opm::data::WellRates& xw,
                                     const Opm::SummaryState&    smry);
 
@@ -81,7 +75,7 @@ namespace Opm { namespace RestartIO { namespace Helpers {
         }
 
         /// Retrieve Character Well Data Array.
-        const std::vector<EclIO::PaddedOutputString<8>>& getZWell() const
+        const std::vector<CharArrayNullTerm<8>>& getZWell() const
         {
             return this->zWell_.data();
         }
@@ -99,7 +93,7 @@ namespace Opm { namespace RestartIO { namespace Helpers {
         WindowedArray<double> xWell_;
 
         /// Aggregate 'ZWEL' array (Character) for all wells.
-        WindowedArray<EclIO::PaddedOutputString<8>> zWell_;
+        WindowedArray<CharArrayNullTerm<8>> zWell_;
 
         /// Maximum number of groups in model.
         int nWGMax_;

opm/output/eclipse/CharArrayNullTerm.hpp

@@ -17,8 +17,8 @@
   along with OPM.  If not, see <http://www.gnu.org/licenses/>.
 */
 
-#ifndef OPM_PADDEDOUTPUTSTRING_HEADER_HPP
-#define OPM_PADDEDOUTPUTSTRING_HEADER_HPP
+#ifndef OPM_CHARARRAY_HEADER_HPP
+#define OPM_CHARARRAY_HEADER_HPP
 
 #include <algorithm>
 #include <array>
@@ -26,7 +26,7 @@
 #include <cstddef>
 #include <string>
 
-namespace Opm { namespace EclIO {
+namespace Opm { namespace RestartIO { namespace Helpers {
 
     /// Null-terminated, left adjusted, space padded array of N characters.
     ///
@@ -36,30 +36,30 @@ namespace Opm { namespace EclIO {
     ///
     /// \tparam N Number of characters.
     template <std::size_t N>
-    class PaddedOutputString
+    class CharArrayNullTerm
     {
     public:
-        PaddedOutputString()
+        CharArrayNullTerm()
         {
             this->clear();
         }
 
-        explicit PaddedOutputString(const std::string& s)
-            : PaddedOutputString()
+        explicit CharArrayNullTerm(const std::string& s)
+            : CharArrayNullTerm()
         {
             this->copy_in(s.c_str(), s.size());
         }
 
-        ~PaddedOutputString() = default;
+        ~CharArrayNullTerm() = default;
 
-        PaddedOutputString(const PaddedOutputString& rhs) = default;
-        PaddedOutputString(PaddedOutputString&& rhs) = default;
+        CharArrayNullTerm(const CharArrayNullTerm& rhs) = default;
+        CharArrayNullTerm(CharArrayNullTerm&& rhs) = default;
 
-        PaddedOutputString& operator=(const PaddedOutputString& rhs) = default;
-        PaddedOutputString& operator=(PaddedOutputString&& rhs) = default;
+        CharArrayNullTerm& operator=(const CharArrayNullTerm& rhs) = default;
+        CharArrayNullTerm& operator=(CharArrayNullTerm&& rhs) = default;
 
         /// Assign from \code std::string \endcode.
-        PaddedOutputString& operator=(const std::string& s)
+        CharArrayNullTerm& operator=(const std::string& s)
         {
             this->clear();
             this->copy_in(s.data(), s.size());
@@ -99,5 +99,5 @@ namespace Opm { namespace EclIO {
         }
     };
 
-}} // Opm::EclIO
-#endif // OPM_PADDEDOUTPUTSTRING_HEADER_HPP
+}}} // Opm::RestartIO::Helpers
+#endif // CHARARRAY_HEADER

opm/output/eclipse/DoubHEAD.hpp

@@ -25,9 +25,8 @@
 #include <vector>
 
 namespace Opm {
-    struct Tuning;
+    class Tuning;
     class Schedule;
-    class UDQParams;
 }
 
 namespace Opm { namespace RestartIO {
@@ -40,17 +39,6 @@ namespace Opm { namespace RestartIO {
             std::chrono::duration<double, std::chrono::seconds::period> elapsed;
         };
 
-        struct guideRate {
-            double A;
-            double B;
-            double C;
-            double D;
-            double E;
-            double F;
-            double delay;
-            double damping_fact;
-        };
-
         DoubHEAD();
 
         ~DoubHEAD() = default;
@@ -61,6 +49,7 @@ namespace Opm { namespace RestartIO {
         DoubHEAD& operator=(DoubHEAD&& rhs) = default;
 
         DoubHEAD& tuningParameters(const Tuning&     tuning,
+                                   const std::size_t lookup_step,
                                    const double      cnvT);
 
         DoubHEAD& timeStamp(const TimeStamp& ts);
@@ -68,10 +57,7 @@ namespace Opm { namespace RestartIO {
 
         DoubHEAD& drsdt(const Schedule&   sched,
                         const std::size_t lookup_step,
-                        const double      cnvT);
-
-        DoubHEAD& udq_param(const UDQParams& udqPar);
-        DoubHEAD& guide_rate_param(const guideRate& guide_rp);
+			const double      cnvT);
 
         const std::vector<double>& data() const
         {

opm/output/eclipse/EclipseIO.hpp

@@ -23,9 +23,10 @@
 #define OPM_ECLIPSE_WRITER_HPP
 
 #include <map>
-#include <memory>
 #include <string>
 #include <vector>
+#include <array>
+#include <memory>
 
 #include <opm/parser/eclipse/EclipseState/Grid/EclipseGrid.hpp>
 #include <opm/parser/eclipse/EclipseState/Grid/NNC.hpp>
@@ -35,15 +36,11 @@
 #include <opm/output/data/Wells.hpp>
 #include <opm/output/eclipse/RestartValue.hpp>
 
-namespace Opm { namespace out {
-    class Summary;
-}} // namespace Opm::out
-
 namespace Opm {
 
 class EclipseState;
-class Schedule;
 class SummaryConfig;
+class Schedule;
 class SummaryState;
 
 /*!
@@ -174,11 +171,13 @@ public:
      *     hardcoded static map misc_units in Summary.cpp.
      */
 
-    void writeTimeStep( const SummaryState& st,
-                        int report_step,
+    void writeTimeStep( int report_step,
                         bool isSubstep,
                         double seconds_elapsed,
                         RestartValue value,
+                        const std::map<std::string, double>& single_summary_values,
+                        const std::map<std::string, std::vector<double>>& region_summary_values,
+                        const std::map<std::pair<std::string, int>, double>& block_summary_values,
                         const bool write_double = false);
 
 
@@ -220,12 +219,14 @@ public:
       missing, if the bool is false missing keywords will be ignored
       (there will *not* be an empty vector in the return value).
     */
-    RestartValue loadRestart(SummaryState& summary_state, const std::vector<RestartKey>& solution_keys, const std::vector<RestartKey>& extra_keys = {}) const;
-    const out::Summary& summary();
+    RestartValue loadRestart(const std::vector<RestartKey>& solution_keys, const std::vector<RestartKey>& extra_keys = {}) const;
+
 
     EclipseIO( const EclipseIO& ) = delete;
     ~EclipseIO();
 
+    const SummaryState& summaryState() const;
+
 private:
     class Impl;
     std::unique_ptr< Impl > impl;

opm/output/eclipse/InteHEAD.hpp

@@ -25,22 +25,20 @@
 #include <memory>
 #include <vector>
 
-
-namespace Opm {
-
-class UnitSystem;
-
-namespace RestartIO {
+namespace Opm { namespace RestartIO {
 
     class InteHEAD
     {
     public:
+        enum class UnitSystem {
+            Metric, Field, Lab, PVT_M
+        };
+
         struct WellTableDim {
             int numWells;
             int maxPerf;
             int maxWellInGroup;
             int maxGroupInField;
-            int maxWellsInField;
         };
 
         struct WellSegDims {
@@ -91,27 +89,7 @@ namespace RestartIO {
 	struct Group {
 	  int ngroups;
 	};
-	
-	struct UdqParam {
-	  int    udqParam_1;
-      int    no_wudqs;
-      int    no_gudqs;
-      int    no_fudqs;
-      int    no_iuads;
-      int    no_iuaps;
-	};
 
-    struct ActionParam {
-      int   no_actions;
-      int   max_no_sched_lines_per_action;
-      int   max_no_conditions_per_action;
-      int   max_no_characters_per_line;
-     };
-     
-     struct GuideRateNominatedPhase {
-      int   nominated_phase;
-     };
-     
         InteHEAD();
         ~InteHEAD() = default;
 
@@ -132,19 +110,13 @@ namespace RestartIO {
         InteHEAD& params_NWELZ(const int niwelz, const int nswelz, const int nxwelz, const int nzwelz);
         InteHEAD& params_NCON(const int niconz, const int nsconz, const int nxconz);
         InteHEAD& params_GRPZ(const std::array<int, 4>& grpz);
-        InteHEAD& params_NGCTRL(const int gct);
         InteHEAD& params_NAAQZ(const int ncamax, const int niaaqz, const int nsaaqz, const int nxaaqz, const int nicaqz, const int nscaqz, const int nacaqz);
         InteHEAD& stepParam(const int tstep, const int report_step);
         InteHEAD& tuningParam(const TuningPar& tunpar);
         InteHEAD& variousParam(const int version, const int iprog);
         InteHEAD& wellSegDimensions(const WellSegDims& wsdim);
         InteHEAD& regionDimensions(const RegDims& rdim);
-        InteHEAD& ngroups(const Group& gr);
-        InteHEAD& udqParam_1(const UdqParam& udqpar);
-        InteHEAD& actionParam(const ActionParam& act_par);
-        InteHEAD& variousUDQ_ACTIONXParam();
-        InteHEAD& nominatedPhaseGuideRate(GuideRateNominatedPhase nphase);
-        InteHEAD& whistControlMode(int mode);
+	InteHEAD& ngroups(const Group& gr);
 
         const std::vector<int>& data() const
         {

opm/output/eclipse/LogiHEAD.hpp

@@ -1,5 +1,4 @@
 /*
-  Copyright 2019 Equinor ASA.
   Copyright 2016, 2017 Statoil ASA.
 
   This file is part of the Open Porous Media Project (OPM).
@@ -28,49 +27,6 @@ namespace Opm { namespace RestartIO {
     class LogiHEAD
     {
     public:
-        /// Key characteristics of simulation run's PVT model.
-        struct PVTModel
-        {
-            /// Whether or not simulation run uses a live oil model (with
-            /// dissolved gas).
-            bool isLiveOil { false };
-
-            /// Whether or not simulation run uses a wet gas model (with
-            /// vaporised oil).
-            bool isWetGas { false };
-
-            /// Whether or not simulation run uses a constant
-            /// compressibility oil model (keyword PVCDO).
-            bool constComprOil { false };
-        };
-
-        /// Key characteristics of simulation model's saturation functions.
-        struct SatfuncFlags
-        {
-            /// Whether or not simulation run uses directionally dependent
-            /// relative permeability.
-            bool useDirectionalRelPerm { false };
-
-            /// Whether or not simulation run uses reversible relative
-            /// permeability functions.
-            bool useReversibleRelPerm { true };
-
-            /// Whether or not simulation run uses end-point scaling.
-            bool useEndScale { false };
-
-            /// Whether or not simulation run uses directionally dependent
-            /// end-point scaling.
-            bool useDirectionalEPS { false };
-
-            /// Whether or not simulation run uses reversible end-point
-            /// scaling.
-            bool useReversibleEPS { true  };
-
-            /// Whether or not simulation run activates the alternative
-            /// (three-point) end-point scaling feature.
-            bool useAlternateEPS { false };
-        };
-
         LogiHEAD();
         ~LogiHEAD() = default;
 
@@ -86,21 +42,6 @@ namespace Opm { namespace RestartIO {
 			       const bool enableHyster
 			      );
 
-        /// Assign PVT model characteristics.
-        ///
-        /// \param[in] pvt Current run's PVT model characteristics.
-        ///
-        /// \return \code *this \endcode.
-        LogiHEAD& pvtModel(const PVTModel& pvt);
-
-        /// Assign saturation function characteristics.
-        ///
-        /// \param[in] satfunc Current run's saturation function
-        ///    characteristics.
-        ///
-        /// \return \code *this \endcode.
-        LogiHEAD& saturationFunction(const SatfuncFlags& satfunc);
-
         const std::vector<bool>& data() const
         {
             return this->data_;

opm/output/eclipse/RegionCache.hpp

@@ -23,6 +23,7 @@
 #include <vector>
 
 namespace Opm {
+    class Eclipse3DProperties;
     class Schedule;
     class EclipseGrid;
 
@@ -30,7 +31,7 @@ namespace out {
     class RegionCache {
     public:
         RegionCache() = default;
-        RegionCache(const std::vector<int>& fipnum, const EclipseGrid& grid, const Schedule& schedule);
+        RegionCache(const Eclipse3DProperties& properties, const EclipseGrid& grid, const Schedule& schedule);
         const std::vector<std::pair<std::string,size_t>>& connections( int region_id ) const;
 
     private:

opm/output/eclipse/RestartIO.hpp

@@ -24,11 +24,23 @@
 #ifndef RESTART_IO_HPP
 #define RESTART_IO_HPP
 
+#include <opm/parser/eclipse/Units/UnitSystem.hpp>
+#include <opm/parser/eclipse/EclipseState/Runspec.hpp>
+#include <opm/parser/eclipse/EclipseState/Schedule/Well/Well.hpp>
+
+#include <opm/output/data/Cells.hpp>
+#include <opm/output/data/Solution.hpp>
+#include <opm/output/data/Wells.hpp>
 #include <opm/output/eclipse/RestartValue.hpp>
 
 #include <opm/parser/eclipse/EclipseState/Schedule/SummaryState.hpp>
 
-#include <string>
+#include <ert/ecl/EclKW.hpp>
+#include <ert/ecl/ecl_rsthead.h>
+#include <ert/ecl/ecl_rst_file.h>
+#include <ert/util/util.h>
+
+#include <map>
 #include <utility>
 #include <vector>
 
@@ -36,15 +48,11 @@ namespace Opm {
 
     class EclipseGrid;
     class EclipseState;
+    class Phases;
     class Schedule;
 
 } // namespace Opm
 
-namespace Opm { namespace EclIO { namespace OutputStream {
-
-    class Restart;
-
-}}}
 
 /*
   The two free functions RestartIO::save() and RestartIO::load() can
@@ -69,25 +77,24 @@ namespace Opm { namespace EclIO { namespace OutputStream {
 */
 namespace Opm { namespace RestartIO {
 
-    void save(EclIO::OutputStream::Restart& rstFile,
-              int                           report_step,
-              double                        seconds_elapsed,
-              RestartValue                  value,
-              const EclipseState&           es,
-              const EclipseGrid&            grid,
-              const Schedule&               schedule,
-              const SummaryState&           sumState,
-              bool                          write_double = false);
+    void save(const std::string&  filename,
+              int                 report_step,
+              double              seconds_elapsed,
+              RestartValue        value,
+              const EclipseState& es,
+              const EclipseGrid&  grid,
+              const Schedule&     schedule,
+              const SummaryState& sumState,
+              bool                write_double = false);
 
-
-    RestartValue load(const std::string&             filename,
-                      int                            report_step,
-                      SummaryState&                  summary_state,
-                      const std::vector<RestartKey>& solution_keys,
-                      const EclipseState&            es,
-                      const EclipseGrid&             grid,
-                      const Schedule&                schedule,
-                      const std::vector<RestartKey>& extra_keys = {});
+    std::pair<RestartValue, SummaryState>
+    load(const std::string&             filename,
+         int                            report_step,
+         const std::vector<RestartKey>& solution_keys,
+         const EclipseState&            es,
+         const EclipseGrid&             grid,
+         const Schedule&                schedule,
+         const std::vector<RestartKey>& extra_keys = {});
 
 }} // namespace Opm::RestartIO
 

opm/output/eclipse/RestartValue.hpp

@@ -18,27 +18,23 @@
 #ifndef RESTART_VALUE_HPP
 #define RESTART_VALUE_HPP
 
-#include <map>
 #include <string>
-#include <utility>
+#include <map>
 #include <vector>
 
 #include <opm/parser/eclipse/Units/UnitSystem.hpp>
-
-#include <opm/output/data/Aquifer.hpp>
 #include <opm/output/data/Solution.hpp>
 #include <opm/output/data/Wells.hpp>
 
 namespace Opm {
 
+
     class RestartKey {
     public:
 
         std::string key;
         UnitSystem::measure dim;
-        bool required = false;
-
-        RestartKey() = default;
+        bool required;
 
         RestartKey( const std::string& _key, UnitSystem::measure _dim)
             : key(_key),
@@ -53,30 +49,24 @@ namespace Opm {
               required(_required)
         {}
 
-        bool operator==(const RestartKey& key2) const
-        {
-            return key == key2.key &&
-                   dim == key2.dim &&
-                   required == key2.required;
-        }
     };
 
+
     /*
-      A simple class used to communicate values between the simulator and
-      the RestartIO functions.
+      A simple class used to communicate values between the simulator and the
+      RestartIO function.
     */
+
+
     class RestartValue {
     public:
         using ExtraVector = std::vector<std::pair<RestartKey, std::vector<double>>>;
         data::Solution solution;
         data::Wells wells;
         ExtraVector extra;
-        std::vector<data::AquiferData> aquifer;
 
         RestartValue(data::Solution sol, data::Wells wells_arg);
 
-        RestartValue() {}
-
         bool hasExtra(const std::string& key) const;
         void addExtra(const std::string& key, UnitSystem::measure dimension, std::vector<double> data);
         void addExtra(const std::string& key, std::vector<double> data);
@@ -84,15 +74,9 @@ namespace Opm {
 
         void convertFromSI(const UnitSystem& units);
         void convertToSI(const UnitSystem& units);
-
-        bool operator==(const RestartValue& val2) const
-        {
-          return solution == val2.solution &&
-                 wells == val2.wells &&
-                 extra == val2.extra;
-        }
     };
 
 }
 
-#endif // RESTART_VALUE_HPP
+
+#endif