bump version to 2021.10

bump version to 2021.10-rc2
Merge pull request #2793 from atgeirr/backport-of-pr-2761
2021-11-08 08:23:03 +01:00 · 2021-11-03 08:47:25 +01:00 · 2021-10-28 10:06:14 +02:00 · 2021-10-28 10:05:31 +02:00 · 2021-10-28 10:05:31 +02:00 · 2021-10-28 09:50:43 +02:00
800 changed files with 288753 additions and 24967 deletions
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1,5 +1,5 @@
 project(opm-common C CXX)
-cmake_minimum_required (VERSION 2.8)
+cmake_minimum_required (VERSION 3.10)

 option(SIBLING_SEARCH "Search for other modules in sibling directories?" ON)
 list(APPEND CMAKE_MODULE_PATH ${PROJECT_SOURCE_DIR}/cmake/Modules)
@@ -10,7 +10,7 @@ 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(OPM_ENABLE_EMBEDDED_PYTHON "Enable embedded python?" OFF)

 # Output implies input
 if(ENABLE_ECL_OUTPUT)
@@ -42,11 +42,13 @@ set(OPM_PROJECT_EXTRA_CODE_INTREE "#ENABLE_ECL_INPUT is needed by opm-common-pre
 if(ENABLE_ECL_OUTPUT)
  set(OPM_PROJECT_EXTRA_CODE_INSTALLED "${OPM_PROJECT_EXTRA_CODE_INSTALLED}
                                        set(COMPARE_ECL_COMMAND ${CMAKE_INSTALL_PREFIX}/bin${${name}_VER_DIR}/compareECL)
-                                        set(OPM_PACK_COMMAND ${CMAKE_INSTALL_PREFIX}/bin${${name}_VER_DIR}/opmpack)")
+                                        set(OPM_PACK_COMMAND ${CMAKE_INSTALL_PREFIX}/bin${${name}_VER_DIR}/opmpack)
+                                        set(RST_DECK_COMMAND ${CMAKE_INSTALL_PREFIX}/bin${${name}_VER_DIR}/rst_deck)")

  set(OPM_PROJECT_EXTRA_CODE_INTREE "${OPM_PROJECT_EXTRA_CODE_INTREE}
                                     set(COMPARE_ECL_COMMAND ${PROJECT_BINARY_DIR}/bin/compareECL)
-                                     set(OPM_PACK_COMMAND ${PROJECT_BINARY_DIR}/bin/opmpack)")
+                                     set(OPM_PACK_COMMAND ${PROJECT_BINARY_DIR}/bin/opmpack)
+                                     set(RST_DECK_COMMAND ${PROJECT_BINARY_DIR}/bin/rst_deck)")
 endif()

 # project information is in dune.module. Read this file and set variables.
@@ -64,6 +66,20 @@ include(Findopm-tests)
 # with the find module
 include (${project}-prereqs)

+if(ENABLE_ECL_INPUT)
+  # source_hook runs before config_hook and the former needs fmt, hence this
+  # needs to be here.
+  if(fmt_FOUND)
+    # OpmSatellites will not add the library, do it here.
+    list(APPEND opm-common_LIBRARIES fmt::fmt)
+  else()
+    add_definitions(-DFMT_HEADER_ONLY)
+    include_directories(SYSTEM ${PROJECT_SOURCE_DIR}/external/fmtlib/include)
+    # Not sure why this is needed.
+    list(APPEND EXTRA_INCLUDES ${PROJECT_SOURCE_DIR}/external/fmtlib/include)
+  endif()
+endif()
+
 # read the list of components from this file (in the project directory);
 # it should set various lists with the names of the files to include
 include (CMakeLists_files.cmake)
@@ -75,10 +91,7 @@ macro (config_hook)
    endif()

    # For this project
-    add_definitions(-DFMT_HEADER_ONLY)
-    list(APPEND EXTRA_INCLUDES SYSTEM ${PROJECT_SOURCE_DIR}/external/fmtlib/include)
    include_directories(${EXTRA_INCLUDES} ${PROJECT_BINARY_DIR}/include)
-
    # For downstreams
    list(APPEND EXTRA_INCLUDES ${PROJECT_BINARY_DIR}/include)
    set(OPM_PROJECT_EXTRA_CODE_INTREE "${OPM_PROJECT_EXTRA_CODE_INTREE}
@@ -96,8 +109,7 @@ macro (config_hook)
                                            set(HAVE_ECL_OUTPUT 1)")
    endif()

-    # Configure boost targets for old cmake
-    include(cmake/Modules/BoostTargets.cmake)
+    find_package(Boost COMPONENTS filesystem regex system unit_test_framework)

    if (HAVE_DYNAMIC_BOOST_TEST)
      set_target_properties(Boost::unit_test_framework PROPERTIES INTERFACE_COMPILE_DEFINITIONS BOOST_TEST_DYN_LINK=1)
@@ -118,6 +130,9 @@ macro (sources_hook)
    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()
+    if (OPM_ENABLE_PYTHON)
+      list(INSERT opm-common_SOURCES 0 ${PROJECT_BINARY_DIR}/python/cxx/builtin_pybind11.cpp)
+    endif()
  endif()
  set_source_files_properties(src/opm/parser/eclipse/Python/Python.cpp
                              PROPERTIES COMPILE_FLAGS -Wno-shadow)
@@ -148,10 +163,58 @@ endmacro (install_hook)
 # 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})
+  # We need to be compatible with older CMake versions
+  # that do not offer FindPython3
+  # e.g. Ubuntu LTS 18.04 uses cmake 3.10
+  if(${CMAKE_VERSION} VERSION_LESS "3.12.0")
+    find_package(PythonInterp REQUIRED)
+    if (OPM_ENABLE_EMBEDDED_PYTHON)
+      find_package(PythonLibs REQUIRED)
+      list(APPEND opm-common_LIBRARIES ${PYTHON_LIBRARIES})
+    endif()
+    if(PYTHON_VERSION_MAJOR LESS 3)
+      message(SEND_ERROR "OPM requires version 3 of Python but only version ${PYTHON_VERSION_STRING} was found")
+    endif()
+    set(Python3_EXECUTABLE ${PYTHON_EXECUTABLE})
+    set(Python3_LIBRARIES ${PYTHON_LIBRARIES})
+  else()
+    # Be backwards compatible.
+    if(PYTHON_EXECUTABLE AND NOT Python3_EXECUTABLE)
+      set(Python3_EXECUTABLE ${PYTHON_EXECUTABLE})
+    endif()
+    if (OPM_ENABLE_EMBEDDED_PYTHON)
+      find_package(Python3 REQUIRED COMPONENTS Interpreter Development)
+      get_target_property(_lib_path Python3::Python IMPORTED_LOCATION)
+      set(PYTHON_LIBRARY ${_lib_path})
+      set(PYTHON_LIBRARIES {PYTHON_LIBRARY})
+      list(APPEND opm-common_LIBRARIES ${PYTHON_LIBRARY})
+      set(PYTHON_INCLUDE_DIRS ${Python3_INCLUDE_DIRS})
+    else()
+      find_package(Python3 REQUIRED COMPONENTS Interpreter)
+    endif()
+    # Compatibility settings for PythonInterp and PythonLibs
+    # used e.g. in FindCwrap, pybind11
+    set(PYTHON_EXECUTABLE ${Python3_EXECUTABLE})
+  endif()
+  # We always need the PYTHON_INCLUDE_DIR. Unfortunately
+  # When we build pypi packages CMake will fail to determine
+  # these via the usual find_package(PythonLibs or
+  # find_package(Python3 REQUIRED COMPONENTS Interpreter Development)
+  # Hence we overwrite them here.
+  if(NOT PYTHON_INCLUDE_DIRS)
+    execute_process(COMMAND "${PYTHON_EXECUTABLE}" "-c" "from distutils import sysconfig; print(sysconfig.get_python_inc(plat_specific=True), end=\"\");"
+      RESULT_VARIABLE _PYTHON_DIR_SUCCESS
+      OUTPUT_VARIABLE PYTHON_INCLUDE_DIR
+      ERROR_VARIABLE _PYTHON_ERROR_VALUE)
+    if(NOT _PYTHON_DIR_SUCCESS MATCHES 0)
+      message(FATAL_ERROR "Could not determine Python include directory. Error: ${_PYTHON_ERROR_VALUE}.")
+    endif()
+    set(PYTHON_INCLUDE_DIRS ${PYTHON_INCLUDE_DIR})
+  endif()
+  find_package(pybind11 2.2 CONFIG)
+  if (NOT pybind11_FOUND)
+    # Use full path for reuse with pypi
+    set(pybind11_INCLUDE_DIRS ${PROJECT_SOURCE_DIR}/python/pybind11/include ${PYTHON_INCLUDE_DIRS})
  endif()
 endif()

@@ -180,6 +243,10 @@ if (ENABLE_MOCKSIM)
  endif()
 endif()

+if (ENABLE_SCHEDULE_DEBUG)
+  add_compile_definitions( SCHEDULE_DEBUG )
+endif()
+
 # Build the compare utilities
 if(ENABLE_ECL_INPUT)
  add_executable(compareECL
@@ -196,7 +263,11 @@ if(ENABLE_ECL_INPUT)
    test_util/summary.cpp
    )

-  foreach(target compareECL convertECL summary)
+  add_executable(rewriteEclFile
+    test_util/rewriteEclFile.cpp
+    )
+
+  foreach(target compareECL convertECL summary rewriteEclFile)
    target_link_libraries(${target} opmcommon)
    install(TARGETS ${target} DESTINATION bin)
  endforeach()
@@ -230,15 +301,20 @@ if(ENABLE_ECL_INPUT)
      ${PROJECT_BINARY_DIR}/tests
    )

-  foreach(test test_EclIO test_EGrid test_ERft test_ERst test_ESmry)
+  foreach(test test_EclIO test_EGrid test_ERft test_ERst test_ESmry test_EInit test_ExtESmry)
    opm_add_test(${test} CONDITION ENABLE_ECL_INPUT AND Boost_UNIT_TEST_FRAMEWORK_FOUND
                         LIBRARIES ${_libs}
                         WORKING_DIRECTORY ${PROJECT_BINARY_DIR}/tests)
  endforeach()
 endif()

-# Install build system files
-install(DIRECTORY cmake DESTINATION share/opm)
+# Install build system files and documentation
+install(DIRECTORY cmake
+  DESTINATION share/opm USE_SOURCE_PERMISSIONS
+  PATTERN "OPM-CMake.md" EXCLUDE)
+
+install(FILES cmake/OPM-CMake.md
+  DESTINATION ${CMAKE_INSTALL_DOCDIR})

 # Install tab completion skeleton
 install(FILES etc/opm_bash_completion.sh.in DESTINATION share/opm/etc)
@@ -251,7 +327,17 @@ if (OPM_ENABLE_PYTHON)
  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")
+  if(PYTHON_VERSION_MAJOR)
+    set(PY_MAJOR ${PYTHON_VERSION_MAJOR})
+  else()
+    set(PY_MAJOR ${Python3_VERSION_MAJOR})
+  endif()
+  if(PYTHON_VERSION_MINOR)
+    set(PY_MINOR ${PYTHON_VERSION_MINOR})
+  else()
+    set(PY_MINOR ${Python3_VERSION_MINOR})
+  endif()
+  set(PYTHON_INSTALL_PREFIX "lib/python${PY_MAJOR}.${PY_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)
@@ -291,19 +377,35 @@ if (OPM_ENABLE_PYTHON)
  set(opm-common_PYTHON_PACKAGE_VERSION ${OPM_PYTHON_PACKAGE_VERSION_TAG})

  # Generate versioned setup.py
+  if (pybind11_INCLUDE_DIRS)
+    string(REGEX REPLACE ";" "', '"  _tmp "${pybind11_INCLUDE_DIRS}")
+    set(SETUP_PY_PYBIND_INCLUDE_DIR "'${_tmp}'")
+  endif()
+
+  if (TARGET fmt::fmt)
+     get_target_property(SETUP_PY_FMT_LIBS fmt::fmt LOCATION)
+     get_target_property(FMT_FLAGS fmt::fmt INTERFACE_COMPILE_DEFINITIONS)
+     foreach(flag ${FMT_FLAGS})
+       set(SETUP_PY_FMT_FLAGS "${SETUP_PY_FMT_FLAGS} '-D${flag}',")
+     endforeach()
+     list(APPEND opm-common_PYTHON_LINKAGE "'${SETUP_PY_FMT_LIBS}'")
+  else()
+    set(SETUP_PY_FMT_FLAGS "'-DFMT_HEADER_ONLY'")
+  endif()
+
  configure_file (${PROJECT_SOURCE_DIR}/python/setup.py.in ${PROJECT_BINARY_DIR}/python/setup.py)
  file(COPY ${PROJECT_SOURCE_DIR}/python/README.md DESTINATION ${PROJECT_BINARY_DIR}/python)
-  execute_process(COMMAND ${PYTHON_EXECUTABLE} target_name.py
+  execute_process(COMMAND ${Python3_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)
+    COMMAND ${Python3_EXECUTABLE} ${PROJECT_SOURCE_DIR}/python/install.py ${PROJECT_SOURCE_DIR}/python ${PROJECT_BINARY_DIR} 0)

  add_custom_command(OUTPUT python/opm/${python_lib_target}
                     DEPENDS ${PYTHON_CXX_DEPENDS}
                     DEPENDS copy_python
-                     COMMAND ${PYTHON_EXECUTABLE} ${PROJECT_BINARY_DIR}/python/setup.py
+                     COMMAND ${Python3_EXECUTABLE} ${PROJECT_BINARY_DIR}/python/setup.py
                                                      build
                                                      build_ext
                                                      --build-lib=${PROJECT_BINARY_DIR}/python
@@ -327,7 +429,7 @@ if (OPM_ENABLE_PYTHON)
  # 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/opm ${DEST_PREFIX}${CMAKE_INSTALL_PREFIX}/${PYTHON_INSTALL_PREFIX} 1)")
+    install( CODE "execute_process(COMMAND ${Python3_EXECUTABLE} ${PROJECT_BINARY_DIR}/python/install.py ${PROJECT_BINARY_DIR}/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
@@ -335,7 +437,7 @@ if (OPM_ENABLE_PYTHON)
  # 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 test
+           COMMAND ${CMAKE_COMMAND} -E env LD_LIBRARY_PATH=${PROJECT_BINARY_DIR}/lib ${Python3_EXECUTABLE} setup.py build_ext --dry-run --build-lib ${PROJECT_BINARY_DIR}/python test
           )

  set_target_properties(opmcommon PROPERTIES POSITION_INDEPENDENT_CODE ON)
@@ -368,11 +470,17 @@ if (OPM_ENABLE_PYTHON)

  # -------------------------------------------------------------------------
  # 2: Embed the Python interpreter for keywords like PYACTION and PYINPUT
+  target_include_directories(opmcommon SYSTEM PRIVATE "${pybind11_INCLUDE_DIRS}")
  if (OPM_ENABLE_EMBEDDED_PYTHON)
-    add_subdirectory(python/pybind11)
-    target_include_directories(opmcommon SYSTEM PRIVATE "python/pybind11/include;${PYTHON_INCLUDE_DIRS}")
    target_link_libraries(opmcommon PUBLIC ${PYTHON_LIBRARY})
-
    add_definitions(-DEMBEDDED_PYTHON)
  endif()
+else()
+  if (OPM_ENABLE_EMBEDDED_PYTHON)
+    message(WARNING "Inconsistent settings OPM_ENABLE_PYTHON / OPM_ENABLE_EMBEDDED_PYTHON")
+    set(OPM_ENABLE_EMBEDDED_PYTHON OFF CACHE BOOL "Enable embedded python?" FORCE)
+  endif()
 endif()
+
+install(DIRECTORY docs/man1 DESTINATION ${CMAKE_INSTALL_MANDIR}
+  FILES_MATCHING PATTERN "*.1")
--- a/CMakeLists_files.cmake
+++ b/CMakeLists_files.cmake
@@ -26,6 +26,8 @@ list (APPEND MAIN_SOURCE_FILES
      src/opm/common/OpmLog/LogBackend.cpp
      src/opm/common/OpmLog/Logger.cpp
      src/opm/common/OpmLog/LogUtil.cpp
+      src/opm/common/OpmLog/KeywordLocation.cpp
+      src/opm/common/OpmLog/InfoLogger.cpp
      src/opm/common/OpmLog/OpmLog.cpp
      src/opm/common/OpmLog/StreamLog.cpp
      src/opm/common/OpmLog/TimerLog.cpp
@@ -44,24 +46,31 @@ if(ENABLE_ECL_INPUT)
    src/opm/io/eclipse/SummaryNode.cpp
    src/opm/json/JsonObject.cpp
    src/opm/parser/eclipse/Deck/Deck.cpp
+    src/opm/parser/eclipse/Deck/DeckTree.cpp
+    src/opm/parser/eclipse/Deck/FileDeck.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/ImportContainer.cpp
    src/opm/parser/eclipse/Deck/UDAValue.cpp
    src/opm/parser/eclipse/Python/Python.cpp
    src/opm/parser/eclipse/EclipseState/Schedule/Action/PyAction.cpp
-    src/opm/parser/eclipse/EclipseState/AquiferConfig.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/Aquifer/AquiferConfig.cpp
+    src/opm/parser/eclipse/EclipseState/Aquifer/AquiferCT.cpp
+    src/opm/parser/eclipse/EclipseState/Aquifer/Aquifetp.cpp
+    src/opm/parser/eclipse/EclipseState/Aquifer/Aquancon.cpp
+    src/opm/parser/eclipse/EclipseState/Aquifer/AquiferHelpers.cpp
+    src/opm/parser/eclipse/EclipseState/Aquifer/NumericalAquifer/NumericalAquiferCell.cpp
+    src/opm/parser/eclipse/EclipseState/Aquifer/NumericalAquifer/NumericalAquiferConnection.cpp
+    src/opm/parser/eclipse/EclipseState/Aquifer/NumericalAquifer/SingleNumericalAquifer.cpp
+    src/opm/parser/eclipse/EclipseState/Aquifer/NumericalAquifer/NumericalAquifers.cpp
    src/opm/parser/eclipse/EclipseState/checkDeck.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
@@ -72,20 +81,22 @@ 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/MapAxes.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/TranCalculator.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/TracerConfig.cpp
+    src/opm/parser/eclipse/EclipseState/MICPpara.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
@@ -96,6 +107,7 @@ if(ENABLE_ECL_INPUT)
    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/Enums.cpp
    src/opm/parser/eclipse/EclipseState/Schedule/Action/State.cpp
    src/opm/parser/eclipse/EclipseState/Schedule/ArrayDimChecker.cpp
    src/opm/parser/eclipse/EclipseState/Schedule/eval_uda.cpp
@@ -118,25 +130,36 @@ if(ENABLE_ECL_INPUT)
    src/opm/parser/eclipse/EclipseState/Schedule/MSW/AICD.cpp
    src/opm/parser/eclipse/EclipseState/Schedule/MSW/SICD.cpp
    src/opm/parser/eclipse/EclipseState/Schedule/MSW/Valve.cpp
+    src/opm/parser/eclipse/EclipseState/Schedule/Network/Balance.cpp
    src/opm/parser/eclipse/EclipseState/Schedule/Network/Branch.cpp
    src/opm/parser/eclipse/EclipseState/Schedule/Network/ExtNetwork.cpp
    src/opm/parser/eclipse/EclipseState/Schedule/Network/Node.cpp
    src/opm/parser/eclipse/EclipseState/Schedule/OilVaporizationProperties.cpp
    src/opm/parser/eclipse/EclipseState/Schedule/RFTConfig.cpp
    src/opm/parser/eclipse/EclipseState/Schedule/RPTConfig.cpp
+    src/opm/parser/eclipse/EclipseState/Schedule/RSTConfig.cpp
    src/opm/parser/eclipse/EclipseState/Schedule/Schedule.cpp
+    src/opm/parser/eclipse/EclipseState/Schedule/ScheduleDeck.cpp
+    src/opm/parser/eclipse/EclipseState/Schedule/ScheduleState.cpp
    src/opm/parser/eclipse/EclipseState/Schedule/ScheduleTypes.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/WriteRestartFileEvents.cpp
    src/opm/parser/eclipse/EclipseState/Schedule/Well/Connection.cpp
    src/opm/parser/eclipse/EclipseState/Schedule/Well/injection.cpp
+    src/opm/parser/eclipse/EclipseState/Schedule/Well/PAvg.cpp
+    src/opm/parser/eclipse/EclipseState/Schedule/Well/PAvgCalculator.cpp
+    src/opm/parser/eclipse/EclipseState/Schedule/Well/PAvgCalculatorCollection.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/NameOrder.cpp
+    src/opm/parser/eclipse/EclipseState/Schedule/Well/WellMatcher.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/WellMICPProperties.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
@@ -148,10 +171,13 @@ if(ENABLE_ECL_INPUT)
    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/Aqudims.cpp
    src/opm/parser/eclipse/EclipseState/Tables/ColumnSchema.cpp
    src/opm/parser/eclipse/EclipseState/Tables/DenT.cpp
+    src/opm/parser/eclipse/EclipseState/Tables/Eqldims.cpp
    src/opm/parser/eclipse/EclipseState/Tables/JFunc.cpp
    src/opm/parser/eclipse/EclipseState/Tables/PvtxTable.cpp
+    src/opm/parser/eclipse/EclipseState/Tables/Regdims.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
@@ -168,6 +194,7 @@ if(ENABLE_ECL_INPUT)
    src/opm/parser/eclipse/EclipseState/Tables/BrineDensityTable.cpp
    src/opm/parser/eclipse/EclipseState/Tables/RwgsaltTable.cpp
    src/opm/parser/eclipse/EclipseState/Tables/SolventDensityTable.cpp
+    src/opm/parser/eclipse/EclipseState/Tables/Tabdims.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
@@ -215,6 +242,7 @@ if(ENABLE_ECL_INPUT)
          python/cxx/eclipse_config.cpp
          python/cxx/eclipse_grid.cpp
          python/cxx/eclipse_state.cpp
+          python/cxx/emodel_util.cpp
          python/cxx/export.cpp
          python/cxx/group.cpp
          python/cxx/log.cpp
@@ -251,26 +279,37 @@ if(ENABLE_ECL_OUTPUT)
          src/opm/io/eclipse/EclOutput.cpp
          src/opm/io/eclipse/EclUtil.cpp
          src/opm/io/eclipse/EGrid.cpp
+          src/opm/io/eclipse/EInit.cpp
          src/opm/io/eclipse/ERft.cpp
          src/opm/io/eclipse/ERst.cpp
          src/opm/io/eclipse/ERsm.cpp
          src/opm/io/eclipse/ESmry.cpp
+          src/opm/io/eclipse/ExtESmry.cpp
          src/opm/io/eclipse/ESmry_write_rsm.cpp
          src/opm/io/eclipse/OutputStream.cpp
+          src/opm/io/eclipse/ExtSmryOutput.cpp
+          src/opm/io/eclipse/RestartFileView.cpp
          src/opm/io/eclipse/SummaryNode.cpp
+          src/opm/io/eclipse/rst/action.cpp
+          src/opm/io/eclipse/rst/aquifer.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/udq.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/ActiveIndexByColumns.cpp
          src/opm/output/eclipse/AggregateActionxData.cpp
+          src/opm/output/eclipse/AggregateAquiferData.cpp
          src/opm/output/eclipse/AggregateConnectionData.cpp
          src/opm/output/eclipse/AggregateGroupData.cpp
+          src/opm/output/eclipse/AggregateNetworkData.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/AggregateWListData.cpp
+          src/opm/output/eclipse/CreateActionRSTDims.cpp
          src/opm/output/eclipse/CreateDoubHead.cpp
          src/opm/output/eclipse/CreateInteHead.cpp
          src/opm/output/eclipse/CreateLogiHead.cpp
@@ -283,15 +322,19 @@ if(ENABLE_ECL_OUTPUT)
          src/opm/output/eclipse/LoadRestart.cpp
          src/opm/output/eclipse/LogiHEAD.cpp
          src/opm/output/eclipse/RestartIO.cpp
+          src/opm/output/eclipse/Inplace.cpp
          src/opm/output/eclipse/Summary.cpp
          src/opm/output/eclipse/Tables.cpp
+          src/opm/output/eclipse/UDQDims.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/eclipse/WriteRPT.cpp
          src/opm/output/eclipse/report/WELSPECS.cpp
+          src/opm/output/data/Aquifer.cpp
          src/opm/output/data/Solution.cpp
+          src/opm/utility/EModel.cpp
      )
 endif()

@@ -300,6 +343,7 @@ list (APPEND TEST_SOURCE_FILES
      tests/test_calculateCellVol.cpp
      tests/test_cmp.cpp
      tests/test_cubic.cpp
+      tests/test_FileSystem.cpp
      tests/test_messagelimiter.cpp
      tests/test_nonuniformtablelinear.cpp
      tests/test_OpmInputError_format.cpp
@@ -314,6 +358,7 @@ if(ENABLE_ECL_INPUT)
    tests/rst_test.cpp
    tests/test_ERsm.cpp
    tests/test_GuideRate.cpp
+    tests/test_RestartFileView.cpp
    tests/parser/ACTIONX.cpp
    tests/parser/ADDREGTests.cpp
    tests/parser/AquiferTests.cpp
@@ -324,8 +369,6 @@ if(ENABLE_ECL_INPUT)
    tests/parser/CopyRegTests.cpp
    tests/parser/DeckValueTests.cpp
    tests/parser/DeckTests.cpp
-    tests/parser/DynamicStateTests.cpp
-    tests/parser/DynamicVectorTests.cpp
    tests/parser/EclipseGridTests.cpp
    tests/parser/EmbeddedPython.cpp
    tests/parser/EqualRegTests.cpp
@@ -337,8 +380,10 @@ if(ENABLE_ECL_INPUT)
    tests/parser/FunctionalTests.cpp
    tests/parser/GeomodifierTests.cpp
    tests/parser/GroupTests.cpp
+    tests/parser/ImportTests.cpp
    tests/parser/InitConfigTest.cpp
    tests/parser/IOConfigTests.cpp
+    tests/parser/MICPTests.cpp
    tests/parser/MessageLimitTests.cpp
    tests/parser/MultiRegTests.cpp
    tests/parser/MultisegmentWellTests.cpp
@@ -348,6 +393,7 @@ if(ENABLE_ECL_INPUT)
    tests/parser/ParseContextTests.cpp
    tests/parser/ParseContext_EXIT1.cpp
    tests/parser/ParseDATAWithDefault.cpp
+    tests/parser/PAvgTests.cpp
    tests/parser/PYACTION.cpp
    tests/parser/RawKeywordTests.cpp
    tests/parser/test_ReportConfig.cpp
@@ -357,6 +403,7 @@ if(ENABLE_ECL_INPUT)
    tests/parser/RockTableTests.cpp
    tests/parser/RunspecTests.cpp
    tests/parser/SaltTableTests.cpp
+    tests/parser/ScheduleSerializeTest.cpp
    tests/parser/ScheduleRestartTests.cpp
    tests/parser/ScheduleTests.cpp
    tests/parser/SectionTests.cpp
@@ -371,23 +418,28 @@ if(ENABLE_ECL_INPUT)
    tests/parser/TableManagerTests.cpp
    tests/parser/TableSchemaTests.cpp
    tests/parser/ThresholdPressureTest.cpp
-    tests/parser/TimeMapTest.cpp
    tests/parser/TracerTests.cpp
    tests/parser/TransMultTests.cpp
    tests/parser/TuningTests.cpp
    tests/parser/UDQTests.cpp
    tests/parser/UnitTests.cpp
+    tests/parser/integration/NNCTests.cpp
    tests/parser/WellSolventTests.cpp
    tests/parser/WellTracerTests.cpp
    tests/parser/WellTests.cpp
    tests/parser/WLIST.cpp
+    tests/parser/WriteRestartFileEventsTests.cpp
    tests/parser/WTEST.cpp)
 endif()
 if(ENABLE_ECL_OUTPUT)
  list (APPEND TEST_SOURCE_FILES
+          tests/test_ActiveIndexByColumns.cpp
          tests/test_AggregateActionxData.cpp
+          tests/test_AggregateAquiferData.cpp
          tests/test_AggregateWellData.cpp
          tests/test_AggregateGroupData.cpp
+          tests/test_AggregateNetworkData.cpp
+          tests/test_AggregateWListData.cpp
          tests/test_AggregateMSWData.cpp
          tests/test_AggregateConnectionData.cpp
          tests/test_AggregateUDQData.cpp
@@ -398,6 +450,7 @@ if(ENABLE_ECL_OUTPUT)
          tests/test_InteHEAD.cpp
          tests/test_LinearisedOutputTable.cpp
          tests/test_LogiHEAD.cpp
+          tests/test_LGOData.cpp
          tests/test_OutputStream.cpp
          tests/test_regionCache.cpp
          tests/test_PaddedOutputString.cpp
@@ -406,6 +459,7 @@ if(ENABLE_ECL_OUTPUT)
          tests/test_rst.cpp
          tests/test_Solution.cpp
          tests/test_Serializer.cpp
+          tests/test_Inplace.cpp
          tests/test_Summary.cpp
          tests/test_Summary_Group.cpp
          tests/test_Tables.cpp
@@ -420,6 +474,8 @@ list (APPEND TEST_DATA_FILES
 )
 if(ENABLE_ECL_OUTPUT)
  list (APPEND TEST_DATA_FILES
+          tests/GDFILE_NO_ACTNUM.DATA
+          tests/EGRID_NO_ACTNUM.FEGRID
          tests/BASE_SIM.DATA
          tests/BASE_SIM_THPRES.DATA
          tests/RESTART_SIM.DATA
@@ -431,15 +487,24 @@ if(ENABLE_ECL_OUTPUT)
          tests/summary_deck_non_constant_porosity.DATA
          tests/SUMMARY_EFF_FAC.DATA
          tests/SPE1CASE1.DATA
+          tests/SPE1CASE1_RPTONLY.DATA
+          tests/SPE1CASE1_SUMTHIN.DATA
          tests/SPE1CASE1.SMSPEC
          tests/SPE1CASE1A.SMSPEC
+          tests/SPE1CASE1B.DATA
+          tests/props_spe1case1b.inc
          tests/SPE9_CP_PACKED.DATA
          tests/SOFR_TEST.DATA
          tests/UDQ_BASE.DATA
          tests/UDQ_RESTART.DATA
+          tests/UDQ_ACTIONX.X0007
+          tests/UDQ_ACTIONX.DATA
+          tests/UDQ_ACTIONX_RESTART.DATA
          tests/UDQ_TEST_WCONPROD_IUAD-2.DATA
+          tests/9_4C_WINJ_GINJ_UDQ_MSW-UDARATE_TEST_PACK.DATA
          tests/UDQ_ACTIONX_TEST1.DATA
          tests/UDQ_ACTIONX_TEST1_U.DATA
+          tests/TEST_AGGREGATE_MSW.DATA
          tests/include_example_pvt.txt
          tests/include_example_summary.txt
          tests/include_sgof.txt
@@ -447,11 +512,17 @@ if(ENABLE_ECL_OUTPUT)
          tests/include_grid_3x5x4.grdecl
          tests/SPE1CASE2.DATA
          tests/SPE1CASE2_RESTART.DATA
+          tests/SPE1CASE2_RESTART_SKIPREST.DATA
          tests/SPE1CASE2.X0060
          tests/PYACTION.DATA
          tests/0A4_GRCTRL_LRAT_LRAT_GGR_BASE_MODEL2_MSW_ALL.DATA
+          tests/MOD4_TEST_IGRP-DATA.DATA
+          tests/2_WLIFT_MODEL5_NOINC.DATA
+          tests/TEST_NETWORK_ALL.DATA
+          tests/TEST_WLIST.DATA
          tests/act1.py
          tests/MSW.DATA
+          tests/MSW_2WELSEGS.DATA
          tests/EXIT_TEST.DATA
          tests/action_syntax_error.py
          tests/action_missing_run.py
@@ -460,7 +531,7 @@ if(ENABLE_ECL_OUTPUT)
          tests/msim/MSIM_PYACTION.DATA
          tests/msim/action1.py
          tests/msim/action2.py
-      )
+          tests/VFP_CASE.DATA)
 endif()

 list (APPEND EXAMPLE_SOURCE_FILES
@@ -469,6 +540,13 @@ if(ENABLE_ECL_INPUT)
  list (APPEND TEST_DATA_FILES
    tests/ECLFILE.INIT
    tests/ECLFILE.FINIT
+    tests/LGR_TESTMOD.EGRID
+    tests/LGR_TESTMOD.INIT
+    tests/LGR_TESTMOD.UNRST
+    tests/LGR_TESTMOD.X0002
+    tests/MODEL1_IX.INIT
+    tests/MODEL1_IX.SMSPEC
+    tests/MODEL1_IX.UNSMRY
    tests/SPE1CASE1.EGRID
    tests/SPE1CASE1.RFT
    tests/SPE1_TESTCASE.UNRST
@@ -479,15 +557,21 @@ if(ENABLE_ECL_INPUT)
    tests/SPE1CASE1A.UNSMRY
    tests/SPE1CASE1_RST60.SMSPEC
    tests/SPE1CASE1_RST60.UNSMRY
+    tests/SPE1CASE1_RST60.ESMRY
    tests/MODEL2_RESTART.DATA
    tests/restart/MODEL2.UNRST
+    tests/UDQ_WCONPROD.DATA
+    tests/UDQ_WCONPROD_GRID.grdecl
+    tests/UDQ_WCONPROD_RESTART.DATA
+    tests/UDQ_WCONPROD.X0006
  )
  list (APPEND EXAMPLE_SOURCE_FILES
    examples/opmi.cpp
    examples/opmpack.cpp
    examples/opmhash.cpp
+    examples/rst_deck.cpp
    examples/wellgraph.cpp
-    examples/make_lodsmry.cpp
+    examples/make_ext_smry.cpp
  )
 endif()

@@ -500,7 +584,8 @@ if(ENABLE_ECL_INPUT)
    examples/opmi.cpp
    examples/opmpack.cpp
    examples/opmhash.cpp
-    examples/make_lodsmry.cpp
+    examples/rst_deck.cpp
+    examples/make_esmry.cpp
  )
 endif()

@@ -515,6 +600,7 @@ list( APPEND PUBLIC_HEADER_FILES
      opm/common/OpmLog/MessageFormatter.hpp
      opm/common/OpmLog/MessageLimiter.hpp
      opm/common/OpmLog/KeywordLocation.hpp
+      opm/common/OpmLog/InfoLogger.hpp
      opm/common/OpmLog/OpmLog.hpp
      opm/common/OpmLog/StreamLog.hpp
      opm/common/OpmLog/TimerLog.hpp
@@ -570,7 +656,6 @@ if(ENABLE_ECL_INPUT)
       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/FieldData.hpp
       opm/parser/eclipse/EclipseState/Grid/Keywords.hpp
       opm/parser/eclipse/EclipseState/Grid/GridDims.hpp
@@ -588,9 +673,11 @@ if(ENABLE_ECL_INPUT)
       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/MapAxes.hpp
       opm/parser/eclipse/EclipseState/Grid/MinpvMode.hpp
       opm/parser/eclipse/EclipseState/EndpointScaling.hpp
       opm/parser/eclipse/EclipseState/TracerConfig.hpp
+       opm/parser/eclipse/EclipseState/MICPpara.hpp
       opm/parser/eclipse/EclipseState/Tables/DenT.hpp
       opm/parser/eclipse/EclipseState/Tables/SimpleTable.hpp
       opm/parser/eclipse/EclipseState/Tables/StandardCond.hpp
@@ -658,6 +745,7 @@ if(ENABLE_ECL_INPUT)
       opm/parser/eclipse/EclipseState/Tables/SgwfnTable.hpp
       opm/parser/eclipse/EclipseState/Tables/PvdsTable.hpp
       opm/parser/eclipse/EclipseState/Tables/PvtoTable.hpp
+       opm/parser/eclipse/EclipseState/Tables/PvtsolTable.hpp
       opm/parser/eclipse/EclipseState/Tables/Rock2dTable.hpp
       opm/parser/eclipse/EclipseState/Tables/Rock2dtrTable.hpp
       opm/parser/eclipse/EclipseState/Tables/RockwnodTable.hpp
@@ -673,10 +761,14 @@ if(ENABLE_ECL_INPUT)
       opm/parser/eclipse/EclipseState/Tables/TracerVdTable.hpp
       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/Aquifer/Aquancon.hpp
+       opm/parser/eclipse/EclipseState/Aquifer/AquiferConfig.hpp
+       opm/parser/eclipse/EclipseState/Aquifer/AquiferCT.hpp
+       opm/parser/eclipse/EclipseState/Aquifer/Aquifetp.hpp
+       opm/parser/eclipse/EclipseState/Aquifer/NumericalAquifer/NumericalAquiferCell.hpp
+       opm/parser/eclipse/EclipseState/Aquifer/NumericalAquifer/NumericalAquiferConnection.hpp
+       opm/parser/eclipse/EclipseState/Aquifer/NumericalAquifer/SingleNumericalAquifer.hpp
+       opm/parser/eclipse/EclipseState/Aquifer/NumericalAquifer/NumericalAquifers.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
@@ -685,40 +777,50 @@ if(ENABLE_ECL_INPUT)
       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/Enums.hpp
       opm/parser/eclipse/EclipseState/Schedule/Action/ASTNode.hpp
       opm/parser/eclipse/EclipseState/Schedule/Action/PyAction.hpp
       opm/parser/eclipse/EclipseState/Schedule/Action/State.hpp
       opm/parser/eclipse/EclipseState/Schedule/ArrayDimChecker.hpp
       opm/parser/eclipse/EclipseState/Schedule/GasLiftOpt.hpp
+       opm/parser/eclipse/EclipseState/Schedule/Network/Balance.hpp
       opm/parser/eclipse/EclipseState/Schedule/Network/Branch.hpp
       opm/parser/eclipse/EclipseState/Schedule/Network/ExtNetwork.hpp
       opm/parser/eclipse/EclipseState/Schedule/Network/Node.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/PAvg.hpp
+       opm/parser/eclipse/EclipseState/Schedule/Well/PAvgCalculator.hpp
+       opm/parser/eclipse/EclipseState/Schedule/Well/PAvgCalculatorCollection.hpp
       opm/parser/eclipse/EclipseState/Schedule/Well/Well.hpp
       opm/parser/eclipse/EclipseState/Schedule/Well/WList.hpp
+       opm/parser/eclipse/EclipseState/Schedule/Well/NameOrder.hpp
+       opm/parser/eclipse/EclipseState/Schedule/Well/WellMatcher.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/WellMICPProperties.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/WellTestConfig.hpp
       opm/parser/eclipse/EclipseState/Schedule/Well/WellTestState.hpp
       opm/parser/eclipse/EclipseState/Schedule/Well/WellConnections.hpp
-       opm/parser/eclipse/EclipseState/Schedule/DynamicVector.hpp
       opm/parser/eclipse/EclipseState/Schedule/SummaryState.hpp
       opm/parser/eclipse/EclipseState/Schedule/RFTConfig.hpp
       opm/parser/eclipse/EclipseState/Schedule/RPTConfig.hpp
+       opm/parser/eclipse/EclipseState/Schedule/RSTConfig.hpp
       opm/parser/eclipse/EclipseState/Schedule/Schedule.hpp
+       opm/parser/eclipse/EclipseState/Schedule/ScheduleDeck.hpp
+       opm/parser/eclipse/EclipseState/Schedule/ScheduleState.hpp
       opm/parser/eclipse/EclipseState/Schedule/ScheduleTypes.hpp
       opm/parser/eclipse/EclipseState/Schedule/Tuning.hpp
+       opm/parser/eclipse/EclipseState/Schedule/WriteRestartFileEvents.hpp
       opm/parser/eclipse/EclipseState/Schedule/Group/GPMaint.hpp
       opm/parser/eclipse/EclipseState/Schedule/Group/GTNode.hpp
       opm/parser/eclipse/EclipseState/Schedule/Group/Group.hpp
@@ -730,7 +832,6 @@ if(ENABLE_ECL_INPUT)
       opm/parser/eclipse/EclipseState/Schedule/MessageLimits.hpp
       opm/parser/eclipse/EclipseState/Schedule/Events.hpp
       opm/parser/eclipse/EclipseState/Schedule/OilVaporizationProperties.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
@@ -742,7 +843,6 @@ if(ENABLE_ECL_INPUT)
       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
@@ -757,15 +857,19 @@ if(ENABLE_ECL_INPUT)
       opm/parser/eclipse/EclipseState/Schedule/UDQ/UDQInput.hpp
       opm/parser/eclipse/EclipseState/Schedule/UDQ/UDQActive.hpp
       opm/parser/eclipse/EclipseState/Schedule/UDQ/UDQSet.hpp
+       opm/parser/eclipse/EclipseState/Schedule/UDQ/UDQToken.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/FileDeck.hpp
       opm/parser/eclipse/Deck/DeckSection.hpp
+       opm/parser/eclipse/Deck/DeckTree.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/ImportContainer.hpp
       opm/parser/eclipse/Deck/UDAValue.hpp
       opm/parser/eclipse/Deck/value_status.hpp
       opm/parser/eclipse/Python/Python.hpp)
@@ -777,18 +881,25 @@ if(ENABLE_ECL_OUTPUT)
        opm/io/eclipse/EclOutput.hpp
        opm/io/eclipse/EclUtil.hpp
        opm/io/eclipse/EGrid.hpp
+        opm/io/eclipse/EInit.hpp
        opm/io/eclipse/ERft.hpp
        opm/io/eclipse/ERst.hpp
        opm/io/eclipse/ERsm.hpp
        opm/io/eclipse/ESmry.hpp
+        opm/io/eclipse/ExtESmry.hpp
        opm/io/eclipse/PaddedOutputString.hpp
        opm/io/eclipse/OutputStream.hpp
+        opm/io/eclipse/ExtSmryOutput.hpp
+        opm/io/eclipse/RestartFileView.hpp
        opm/io/eclipse/SummaryNode.hpp
+        opm/io/eclipse/rst/action.hpp
+        opm/io/eclipse/rst/aquifer.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/udq.hpp
        opm/io/eclipse/rst/well.hpp
        opm/output/data/Aquifer.hpp
        opm/output/data/Cells.hpp
@@ -796,20 +907,26 @@ if(ENABLE_ECL_OUTPUT)
        opm/output/data/Groups.hpp
        opm/output/data/Solution.hpp
        opm/output/data/Wells.hpp
+        opm/output/eclipse/VectorItems/action.hpp
        opm/output/eclipse/VectorItems/aquifer.hpp
        opm/output/eclipse/VectorItems/connection.hpp
        opm/output/eclipse/VectorItems/group.hpp
+        opm/output/eclipse/VectorItems/network.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/ActiveIndexByColumns.hpp
        opm/output/eclipse/AggregateActionxData.hpp
+        opm/output/eclipse/AggregateAquiferData.hpp
        opm/output/eclipse/AggregateGroupData.hpp
+        opm/output/eclipse/AggregateNetworkData.hpp
        opm/output/eclipse/AggregateConnectionData.hpp
        opm/output/eclipse/AggregateMSWData.hpp
        opm/output/eclipse/AggregateUDQData.hpp
        opm/output/eclipse/AggregateWellData.hpp
+        opm/output/eclipse/AggregateWListData.hpp
        opm/output/eclipse/DoubHEAD.hpp
        opm/output/eclipse/EclipseGridInspector.hpp
        opm/output/eclipse/EclipseIO.hpp
@@ -820,14 +937,17 @@ if(ENABLE_ECL_OUTPUT)
        opm/output/eclipse/RegionCache.hpp
        opm/output/eclipse/RestartIO.hpp
        opm/output/eclipse/RestartValue.hpp
+        opm/output/eclipse/Inplace.hpp
        opm/output/eclipse/Summary.hpp
        opm/output/eclipse/Tables.hpp
+        opm/output/eclipse/UDQDims.hpp
        opm/output/eclipse/WindowedArray.hpp
        opm/output/eclipse/WriteInit.hpp
        opm/output/eclipse/WriteRFT.hpp
        opm/output/eclipse/WriteRPT.hpp
        opm/output/eclipse/WriteRestartHelpers.hpp
        opm/output/OutputWriter.hpp
+        opm/utility/EModel.hpp
        )
 endif()

--- a/CopyHeaders.cmake
+++ b/CopyHeaders.cmake
@@ -6,6 +6,16 @@ execute_process(COMMAND ${CMAKE_COMMAND} -E copy_if_different
                        ${BASE_DIR}/tmp_gen/TestKeywords.cpp
                        ${BASE_DIR}/TestKeywords.cpp)

+if (EXISTS ${BASE_DIR}/python/cxx)
+  execute_process(COMMAND ${CMAKE_COMMAND} -E copy_if_different
+                          ${BASE_DIR}/tmp_gen/builtin_pybind11.cpp
+                          ${BASE_DIR}/python/cxx/builtin_pybind11.cpp)
+endif()
+
+execute_process(COMMAND ${CMAKE_COMMAND} -E copy_if_different
+                        ${BASE_DIR}/tmp_gen/include/opm/parser/eclipse/Parser/ParserKeywords/Builtin.hpp
+                        ${BASE_DIR}/include/opm/parser/eclipse/Parser/ParserKeywords/Builtin.hpp)
+

 file(GLOB HDRS ${BASE_DIR}/tmp_gen/include/opm/parser/eclipse/Parser/ParserKeywords/*.hpp)

--- a/ExtraTests.cmake
+++ b/ExtraTests.cmake
@@ -18,13 +18,13 @@ set(_testdir ${PROJECT_SOURCE_DIR}/tests/parser/data)
 opm_add_test(ParserTests
             SOURCES tests/parser/ParserTests.cpp
             LIBRARIES ${TEST_LIBS}
-             TEST_ARGS ${_testdir}/)
+             TEST_ARGS -- ${_testdir}/)
 list(APPEND EXTRA_TESTS ParserTests)

 opm_add_test(ParserIncludeTests
             SOURCES tests/parser/ParserIncludeTests.cpp
             LIBRARIES ${TEST_LIBS}
-             TEST_ARGS ${_testdir}/parser/)
+             TEST_ARGS -- ${_testdir}/parser/)
 target_compile_definitions(ParserIncludeTests PRIVATE
                           -DHAVE_CASE_SENSITIVE_FILESYSTEM=${HAVE_CASE_SENSITIVE_FILESYSTEM})
 list(APPEND EXTRA_TESTS ParserIncludeTests)
@@ -32,23 +32,21 @@ list(APPEND EXTRA_TESTS ParserIncludeTests)
 opm_add_test(PvtxTableTests
             SOURCES tests/parser/PvtxTableTests.cpp
             LIBRARIES ${TEST_LIBS}
-             TEST_ARGS ${_testdir}/integration_tests/)
+             TEST_ARGS -- ${_testdir}/integration_tests/)
 list(APPEND EXTRA_TESTS PvtxTableTests)

 opm_add_test(EclipseStateTests
             SOURCES tests/parser/EclipseStateTests.cpp
             LIBRARIES ${TEST_LIBS}
-             TEST_ARGS ${_testdir}/integration_tests/)
+             TEST_ARGS -- ${_testdir}/integration_tests/)
 list(APPEND EXTRA_TESTS EclipseStateTests)

 foreach (test BoxTest
              CheckDeckValidity
              EclipseGridCreateFromDeck
-              EDITNNCTests
              IncludeTest
              IntegrationTests
              IOConfigIntegrationTest
-              NNCTests
              ParseKEYWORD
              Polymer
              ScheduleCreateFromDeck
@@ -57,7 +55,7 @@ foreach (test BoxTest
  opm_add_test(${test}
               SOURCES tests/parser/integration/${test}.cpp
               LIBRARIES ${TEST_LIBS}
-               TEST_ARGS ${_testdir}/integration_tests/)
+               TEST_ARGS -- ${_testdir}/integration_tests/)
  list(APPEND EXTRA_TESTS ${test})
 endforeach ()

@@ -71,6 +69,11 @@ opm_add_test( rst_msw
              LIBRARIES ${TEST_LIBS}
              TEST_ARGS tests/MSW.DATA tests/MSW_RESTART.DATA )

+add_test( NAME rst_deck_test
+          COMMAND ${PROJECT_SOURCE_DIR}/tests/rst_test_driver.sh ${PROJECT_BINARY_DIR}/bin/rst_deck ${PROJECT_BINARY_DIR}/bin/opmhash
+          ${PROJECT_SOURCE_DIR}/tests/SPE1CASE2_INCLUDE.DATA)
+
+
 # opm-tests dependent tests
 if(HAVE_OPM_TESTS)
  opm_add_test(parse_write ONLY_COMPILE
@@ -115,8 +118,17 @@ if(HAVE_OPM_TESTS)
  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")
+
+  add_test( NAME rst_deck_test_norne
+             COMMAND ${PROJECT_SOURCE_DIR}/tests/rst_test_driver.sh ${CMAKE_BINARY_DIR}/bin/rst_deck ${CMAKE_BINARY_DIR}/bin/opmhash
+             ${OPM_TESTS_ROOT}/norne/NORNE_ATW2013.DATA)
+
+  set_property(TEST rst_deck_test_norne
+               PROPERTY ENVIRONMENT "OPM_ERRORS_IGNORE=PARSE_RANDOM_SLASH")
+
 endif()

+
 # JSON tests
 opm_add_test(jsonTests
             SOURCES tests/json/jsonTests.cpp
--- a/GenerateKeywords.cmake
+++ b/GenerateKeywords.cmake
@@ -1,6 +1,7 @@
 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/DeckTree.cpp
                  src/opm/parser/eclipse/Deck/DeckValue.cpp
                  src/opm/parser/eclipse/Deck/Deck.cpp
                  src/opm/parser/eclipse/Deck/DeckItem.cpp
@@ -41,7 +42,14 @@ configure_file(src/opm/parser/eclipse/keyword_list.argv.in keyword_list.argv)

 # Generate keyword source

-add_custom_command( OUTPUT
+set( genkw_argv keyword_list.argv
+  ${PROJECT_BINARY_DIR}/tmp_gen/ParserKeywords
+  ${PROJECT_BINARY_DIR}/tmp_gen/ParserInit.cpp
+  ${PROJECT_BINARY_DIR}/tmp_gen/include/
+  opm/parser/eclipse/Parser/ParserKeywords
+  ${PROJECT_BINARY_DIR}/tmp_gen/TestKeywords.cpp)
+
+set( _tmp_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
@@ -68,18 +76,11 @@ add_custom_command( OUTPUT
  ${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
-                  ${PROJECT_BINARY_DIR}/tmp_gen/include/
-                  opm/parser/eclipse/Parser/ParserKeywords
-                  ${PROJECT_BINARY_DIR}/tmp_gen/TestKeywords.cpp
-    DEPENDS genkw ${keyword_files} src/opm/parser/eclipse/share/keywords/keyword_list.cmake
-)
+  ${PROJECT_BINARY_DIR}/tmp_gen/ParserInit.cpp
+  ${PROJECT_BINARY_DIR}/tmp_gen/TestKeywords.cpp)

-# To avoid some rebuilds
-add_custom_command(OUTPUT
+
+set( _target_output
  ${PROJECT_BINARY_DIR}/ParserKeywords/A.cpp
  ${PROJECT_BINARY_DIR}/ParserKeywords/B.cpp
  ${PROJECT_BINARY_DIR}/ParserKeywords/C.cpp
@@ -107,7 +108,24 @@ add_custom_command(OUTPUT
  ${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
-                   COMMAND ${CMAKE_COMMAND} -DBASE_DIR=${PROJECT_BINARY_DIR}
-                                            -P ${PROJECT_SOURCE_DIR}/CopyHeaders.cmake)
+  ${PROJECT_BINARY_DIR}/ParserInit.cpp)
+
+
+if (OPM_ENABLE_PYTHON)
+  list(APPEND genkw_argv ${PROJECT_BINARY_DIR}/tmp_gen/builtin_pybind11.cpp)
+  list(APPEND _tmp_output ${PROJECT_BINARY_DIR}/tmp_gen/builtin_pybind11.cpp)
+  list(APPEND _target_output ${PROJECT_BINARY_DIR}/python/cxx/builtin_pybind11.cpp)
+endif()
+
+
+
+add_custom_command( OUTPUT
+  ${_tmp_output}
+  COMMAND genkw ${genkw_argv}
+  DEPENDS genkw ${keyword_files} src/opm/parser/eclipse/share/keywords/keyword_list.cmake)
+
+# To avoid some rebuilds
+add_custom_command(OUTPUT
+  ${_target_output}
+  DEPENDS ${PROJECT_BINARY_DIR}/tmp_gen/ParserKeywords/A.cpp
+  COMMAND ${CMAKE_COMMAND} -DBASE_DIR=${PROJECT_BINARY_DIR} -P ${PROJECT_SOURCE_DIR}/CopyHeaders.cmake)
--- a/cmake/Modules/BoostTargets.cmake
+++ b/cmake/Modules/BoostTargets.cmake
@@ -1,49 +0,0 @@
-# make targets for boost if find module did not do the job
-
-if(NOT TARGET Boost::system)
-  add_library(Boost::system UNKNOWN IMPORTED)
-  set_target_properties(Boost::system PROPERTIES
-      INTERFACE_INCLUDE_DIRECTORIES "${Boost_INCLUDE_DIRS}"
-      INTERFACE_SYSTEM_INCLUDE_DIRECTORIES "${Boost_INCLUDE_DIRS}"
-      IMPORTED_LOCATION         "${Boost_SYSTEM_LIBRARY}"
-      IMPORTED_LOCATION_DEBUG   "${Boost_SYSTEM_LIBRARY_DEBUG}"
-      IMPORTED_LOCATION_RELEASE "${Boost_SYSTEM_LIBRARY_RELEASE}"
-  )
-endif()
-
-if(NOT TARGET Boost::filesystem)
-  add_library(Boost::filesystem UNKNOWN IMPORTED)
-  set_target_properties(Boost::filesystem PROPERTIES
-     INTERFACE_INCLUDE_DIRECTORIES "${Boost_INCLUDE_DIRS}"
-      INTERFACE_SYSTEM_INCLUDE_DIRECTORIES "${Boost_INCLUDE_DIRS}"
-      INTERFACE_COMPILE_DEFINITIONS BOOST_FILESYSTEM_VERSION=3
-      INTERFACE_LINK_LIBRARIES  "${boost_system}"
-      IMPORTED_LOCATION         "${Boost_FILESYSTEM_LIBRARY}"
-      IMPORTED_LOCATION_DEBUG   "${Boost_FILESYSTEM_LIBRARY_DEBUG}"
-      IMPORTED_LOCATION_RELEASE "${Boost_FILESYSTEM_LIBRARY_RELEASE}"
-  )
-endif()
-
-if(NOT TARGET Boost::regex)
-  add_library(Boost::regex UNKNOWN IMPORTED)
-  set_target_properties(Boost::regex PROPERTIES
-      INTERFACE_INCLUDE_DIRECTORIES "${Boost_INCLUDE_DIRS}"
-      INTERFACE_SYSTEM_INCLUDE_DIRECTORIES "${Boost_INCLUDE_DIRS}"
-      INTERFACE_LINK_LIBRARIES  "${boost_system}"
-      IMPORTED_LOCATION         "${Boost_REGEX_LIBRARY}"
-      IMPORTED_LOCATION_DEBUG   "${Boost_REGEX_LIBRARY_DEBUG}"
-      IMPORTED_LOCATION_RELEASE "${Boost_REGEX_LIBRARY_RELEASE}"
-  )
-endif()
-
-if(NOT TARGET Boost::unit_test_framework)
-  add_library(Boost::unit_test_framework UNKNOWN IMPORTED)
-  set_target_properties(Boost::unit_test_framework PROPERTIES
-      INTERFACE_INCLUDE_DIRECTORIES "${Boost_INCLUDE_DIRS}"
-      INTERFACE_SYSTEM_INCLUDE_DIRECTORIES "${Boost_INCLUDE_DIRS}"
-      INTERFACE_LINK_LIBRARIES  "${boost_system}"
-      IMPORTED_LOCATION         "${Boost_UNIT_TEST_FRAMEWORK_LIBRARY}"
-      IMPORTED_LOCATION_DEBUG   "${Boost_UNIT_TEST_FRAMEWORK_LIBRARY_DEBUG}"
-      IMPORTED_LOCATION_RELEASE "${Boost_UNIT_TEST_FRAMEWORK_LIBRARY_RELEASE}"
-  )
-endif()
--- a/cmake/Modules/FindCwrap.cmake
+++ b/cmake/Modules/FindCwrap.cmake
@@ -1,49 +0,0 @@
-# Find the Python wrappers for module cwrap from ert
-#
-# Set the cache variable CWRAP_PYTHON_PATH to the install location of the root
-# ert package.
-
-find_package(PythonInterp)
-if(PYTHONINTERP_FOUND)
-
-  # We try to find the cwrap Python distribution. This is done by running Python
-  # code which tries to 'import cwrap' and prints out the path to the module if
-  # the import succeeds.
-  #
-  # The normal Python import machinery is employed, so if you have installed cwrap
-  # python in a default location, or alternatively set the PYTHONPATH variable the
-  # cwrap 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 cwrap; print os.path.dirname(os.path.dirname(inspect.getfile(cwrap)))")
-    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( CWRAP_PYTHON_PATH ${stdout_output} CACHE PATH "Python path for cwrap" )
-      break()
-    endif()
-  endforeach()
-endif()
-find_package_handle_standard_args("Cwrap" DEFAULT_MSG CWRAP_PYTHON_PATH)
--- a/cmake/Modules/FindGMP.cmake
+++ b/cmake/Modules/FindGMP.cmake
@@ -0,0 +1,31 @@
+# - Find the GNU Multiprecision library.
+#
+# Will define the following imported target for usage:
+# - GMP::gmp Target for linking/compiling with C library
+# - GMP::gmpxx Target for linking/compiling with C++ library
+find_path(GMP_INCLUDE_DIR gmp.h)
+find_library(GMP_LIBRARY gmp)
+find_path(GMPXX_INCLUDE_DIR gmpxx.h)
+find_library(GMPXX_LIBRARY gmpxx)
+
+include(FindPackageHandleStandardArgs)
+find_package_handle_standard_args(GMP
+  DEFAULT_MSG
+  GMPXX_LIBRARY GMPXX_INCLUDE_DIR GMP_INCLUDE_DIR GMP_LIBRARY)
+
+if(GMP_FOUND)
+  if(NOT TARGET GMP::gmp)
+    add_library(GMP::gmp UNKNOWN IMPORTED GLOBAL)
+    set_target_properties(GMP::gmp PROPERTIES
+      IMPORTED_LOCATION ${GMP_LIBRARY}
+      INTERFACE_INCLUDE_DIRECTORIES ${GMP_INCLUDE_DIR})
+  endif()
+
+  if(NOT TARGET GMP::gmpxx)
+    add_library(GMP::gmpxx UNKNOWN IMPORTED GLOBAL)
+    set_target_properties(GMP::gmpxx PROPERTIES
+      IMPORTED_LOCATION ${GMPXX_LIBRARY}
+      INTERFACE_INCLUDE_DIRECTORIES ${GMPXX_INCLUDE_DIR}
+      TARGET_LINK_LIBRARIES GMP::gmp)
+  endif()
+endif()
--- a/cmake/Modules/FindMETIS.cmake
+++ b/cmake/Modules/FindMETIS.cmake
@@ -8,7 +8,11 @@
 #  HAVE_METIS          - like METIS_FOUND, but for the inclusion in config.h
 #  METIS_INCLUDE_DIRS  - incude paths to use libMETIS
 #  METIS_LIBRARIES     - Link these to use libMETIS
+#  METIS::METIS        - Imported metis target needed for DUNE 2.8.0
+#  METIS_API_VERSION   - The METIS api version scotch is supporting.

+set(METIS_API_VERSION 0 CACHE STRING
+  "METIS API version provided by METIS or scotch-metis library")
 set(METIS_SEARCH_PATH "/usr" "/usr/local" "/opt" "/opt/local")
 set(METIS_NO_DEFAULT_PATH "")
 if(METIS_ROOT)
@@ -35,9 +39,27 @@ find_library(METIS_LIBRARIES
  ${METIS_NO_DEFAULT_PATH})

 set (METIS_FOUND FALSE)
+
 if (METIS_INCLUDE_DIRS OR METIS_LIBRARIES)
  set(METIS_FOUND TRUE)
  set(HAVE_METIS TRUE)
+  file(READ "${METIS_INCLUDE_DIRS}/metis.h" metisheader)
+  string(REGEX MATCH "#define METIS_VER_MAJOR[ ]+([0-9]+)" METIS_MAJOR_VERSION ${metisheader})
+  if(NOT METIS_API_VERSION AND METIS_MAJOR_VERSION)
+#    string(REGEX REPLACE ".*#define METIS_VER_MAJOR[ ]+([0-9]+).*" "\\1"
+#    METIS_MAJOR_VERSION "${metisheader}")
+    if(METIS_MAJOR_VERSION GREATER_EQUAL 3 AND METIS_MAJOR_VERSION LESS 5)
+      set(METIS_API_VERSION "3")
+    else()
+      set(METIS_API_VERSION "${METIS_MAJOR_VERSION}")
+    endif()
+  endif()
+
+  add_library(METIS::METIS UNKNOWN IMPORTED)
+  set_target_properties(METIS::METIS PROPERTIES
+    IMPORTED_LOCATION ${METIS_LIBRARIES}
+    INTERFACE_INCLUDE_DIRECTORIES ${METIS_INCLUDE_DIRS}
+    INTERFACE_COMPILE_DEFINITIONS METIS_API_VERSION=${METIS_API_VERSION})
 endif()

 # print a message to indicate status of this package
--- a/cmake/Modules/FindPTScotch.cmake
+++ b/cmake/Modules/FindPTScotch.cmake
@@ -70,6 +70,20 @@ if(PTSCOTCH_FOUND)
  set(PTSCOCH_LINK_FLAGS "${DUNE_MPI_LINK_FLAGS}"
    CACHE STRING "PT-Scotch link flags")
  set(HAVE_PTSCOTCH 1)
+  if(NOT TARGET PTScotch::Scotch)
+    add_library(PTScotch::Scotch UNKNOWN IMPORTED GLOBAL)
+    set_target_properties(PTScotch::Scotch PROPERTIES
+      IMPORTED_LOCATION "${SCOTCH_LIBRARY}"
+      INCLUDE_DIRECTORIES "${PTSCOTCH_INCLUDE_DIRS}"
+      INTERFACE_LINK_LIBRARIES "${PTSCOTCHERR_LIBRARY}")
+  endif()
+  if(NOT TARGET PTScotch::PTScotch)
+    add_library(PTScotch::PTScotch UNKNOWN IMPORTED GLOBAL)
+    set_target_properties(PTScotch::PTScotch PROPERTIES
+      IMPORTED_LOCATION "${PTSCOTCH_LIBRARY}"
+      INCLUDE_DIRECTORIES "${PTSCOTCH_INCLUDE_DIRS}"
+      INTERFACE_LINK_LIBRARIES "PTScotch::Scotch;${MPI_DUNE_LIBRARIES}")
+  endif()
  # log result
  file(APPEND ${CMAKE_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/CMakeOutput.log
    "Determing location of PT-Scotch succeded:\n"
--- a/cmake/Modules/FindParMETIS.cmake
+++ b/cmake/Modules/FindParMETIS.cmake
@@ -60,6 +60,19 @@ set(CMAKE_REQUIRED_FLAGS "${CMAKE_REQUIRED_FLAGS} ${MPI_C_COMPILE_FLAGS}")

 include(CheckIncludeFile)
 check_include_file(parmetis.h PARMETIS_FOUND)
+
+if(NOT PARMETIS_FOUND)
+  # If we are using the ParMETIS bindings of PTScotch, we need
+  # to use the scotch include path as partmetis.h includes scotch.h
+  find_package(PTScotch)
+  set(CMAKE_REQUIRED_INCLUDES ${CMAKE_REQUIRED_INCLUDES} ${PTSCOTCH_INCLUDE_DIR})
+    unset(PARMETIS_FOUND CACHE) # force recheck of include file
+    check_include_file(parmetis.h PARMETIS_FOUND)
+    if(PARMETIS_FOUND)
+      set(PARMETIS_SCOTCH_INCLUDE_DIRS ${PTSCOTCH_INCLUDE_DIRS})
+    endif()
+endif()
+
 _search_parmetis_lib(PARMETIS_LIBRARY parmetis "The main ParMETIS library.")

 # behave like a CMake module is supposed to behave
@@ -77,7 +90,7 @@ find_package_handle_standard_args(
 cmake_pop_check_state()

 if(PARMETIS_FOUND)
-  set(PARMETIS_INCLUDE_DIRS ${PARMETIS_INCLUDE_DIR})
+  set(PARMETIS_INCLUDE_DIRS ${PARMETIS_INCLUDE_DIR} ${PARMETIS_SCOTCH_INCLUDE_DIRS})
  set(PARMETIS_LIBRARIES ${PARMETIS_LIBRARY} ${METIS_LIBRARIES} ${MPI_C_LIBRARIES}
    CACHE FILEPATH "All libraries needed to link programs using ParMETIS")
  set(PARMETIS_LINK_FLAGS "${DUNE_C_LINK_FLAGS}"
@@ -89,6 +102,13 @@ if(PARMETIS_FOUND)
    "Include directory: ${PARMETIS_INCLUDE_DIRS}\n"
    "Library directory: ${PARMETIS_LIBRARIES}\n\n")

+  if(NOT TARGET ParMETIS::ParMETIS)
+    add_library(ParMETIS::ParMETIS UNKNOWN IMPORTED GLOBAL)
+    set_target_properties(ParMETIS::ParMETIS PROPERTIES
+      IMPORTED_LOCATION ${PARMETIS_LIBRARY}
+      INCLUDE_DIRECTORIES "${PARMETIS_INCLUDE_DIRS}"
+      INTERFACE_LINK_LIBRARIES "${METIS_LIBRARIES};${MPI_C_LIBRARIES}")
+  endif()
 endif(PARMETIS_FOUND)

 mark_as_advanced(PARMETIS_INCLUDE_DIRS PARMETIS_LIBRARIES HAVE_PARMETIS)
--- a/cmake/Modules/FindQuadmath.cmake
+++ b/cmake/Modules/FindQuadmath.cmake
@@ -34,6 +34,11 @@ int main(void){
  if (QUADMATH_FOUND)
    set(QUADMATH_LIBRARIES "quadmath")
    set(HAVE_QUAD "${QUADMATH_FOUND}")
+    add_library(QuadMath::QuadMath INTERFACE IMPORTED)
+    set_target_properties(QuadMath::QuadMath PROPERTIES
+      INTERFACE_LINK_LIBRARIES quadmath
+      INTERFACE_COMPILE_DEFINITIONS _GLIBCXX_USE_FLOAT128
+      INTERFACE_COMPILE_OPTIONS $<$<CXX_COMPILER_ID:GNU>:-fext-numeric-literals>)
  endif()
 endif()

--- a/cmake/Modules/FindSuiteSparse.cmake
+++ b/cmake/Modules/FindSuiteSparse.cmake
@@ -280,6 +280,32 @@ if (SuiteSparse_LIBRARIES)
  list (REVERSE SuiteSparse_LIBRARIES)
 endif (SuiteSparse_LIBRARIES)

+if(SuiteSparse_FOUND)
+  if(NOT TARGET SuiteSparse::SuiteSparse)
+    add_library(SuiteSparse::SuiteSparse INTERFACE IMPORTED GLOBAL)
+    set_property(TARGET SuiteSparse::SuiteSparse PROPERTY
+      INTERFACE_INCLUDE_DIRECTORIES ${SuiteSparse_INCLUDE_DIRS})
+    if(config_LIBRARY)
+      set_property(TARGET SuiteSparse::SuiteSparse PROPERTY
+	INTERFACE_LINK_LIBRARIES ${config_LIBRARY})
+    endif()
+  endif()
+  foreach(_module ${SuiteSparse_MODULES})
+    string (TOUPPER ${_module} _MODULE)
+    if(SuiteSparse_${_MODULE}_FOUND)
+      if(NOT TARGET SuiteSparse::${_module})
+	message(STATUS "Creating target SuitSparse::${_module}")
+	add_library(SuiteSparse::${_module} UNKNOWN IMPORTED GLOBAL)
+	set_target_properties(SuiteSparse::${_module} PROPERTIES
+	  IMPORTED_LOCATION ${${_MODULE}_LIBRARY}
+	  INCLUDE_DIRECTORIES ${${_MODULE}_INCLUDE_DIRS}
+	  INTERFACE_LINK_LIBRARIES "${config_LIBRARY}")
+	target_link_libraries(SuiteSparse::SuiteSparse
+          INTERFACE SuiteSparse::${_module})
+      endif()
+    endif()
+  endforeach(_module)
+endif()
 # print a message to indicate status of this package
 include (FindPackageHandleStandardArgs)
 find_package_handle_standard_args (SuiteSparse
--- a/cmake/Modules/FindSuperLU.cmake
+++ b/cmake/Modules/FindSuperLU.cmake
@@ -180,6 +180,16 @@ if(SUPERLU_FOUND)
  if (SUPERLU_BLAS_LIBRARY)
    list(APPEND SUPERLU_LIBRARIES ${SUPERLU_BLAS_LIBRARY})
  endif()
+  if(NOT TARGET SuperLU::SuperLU)
+    add_library(SuperLU::SuperLU UNKNOWN IMPORTED GLOBAL)
+    set_target_properties(SuperLU::SuperLU PROPERTIES
+      IMPORTED_LOCATION ${SUPERLU_LIBRARY}
+      INCLUDE_DIRECTORIES ${SUPERLU_INCLUDE_DIRS})
+    if(SUPERLU_BLAS_LIBRARY)
+      set_property(TARGET SuperLU::SuperLU PROPERTY
+	INTERFACE_LINK_LIBRARIES ${SUPERLU_BLAS_LIBRARY})
+    endif()
+  endif()
 endif()

 cmake_pop_check_state()
--- a/cmake/Modules/FindTBB.cmake
+++ b/cmake/Modules/FindTBB.cmake
@@ -0,0 +1,34 @@
+# Poor man's FindTBB that will create the CMake targets
+# used by DUNE.
+# If the TBB version is new enough it will ship its own
+# TBBConfig.cmake and we are good
+find_package(TBB QUIET CONFIG)
+
+if(NOT TBB_FOUND)
+  # Fall back to using pkgconfig
+  find_package(PkgConfig QUIET)
+  if (PKG_CONFIG_FOUND)
+    pkg_check_modules(PkgConfigTBB IMPORTED_TARGET GLOBAL tbb QUIET)
+    if(NOT TARGET PkgConfig::PkgConfigTBB)
+      # workaround bug in old FindPkgConfig.cmake which adds
+      # pkgcfg_lib_PkgConfigTBB_atomic-NOTFOUND  because it cannot
+      # find the atomic lib of the compiler (not in platforms default
+      # library path. It will therefore not create the target and we
+      # try that manually.
+      string(REPLACE ";pkgcfg_lib_PkgConfigTBB_atomic-NOTFOUND" "" _find_tbb_libs "${PkgConfigTBB_LINK_LIBRARIES}")
+      if(_find_tbb_libs)
+	add_library(PkgConfig::PkgConfigTBB INTERFACE IMPORTED GLOBAL)
+	set_property(TARGET PkgConfig::PkgConfigTBB PROPERTY
+	  INTERFACE_LINK_LIBRARIES "${_find_tbb_libs}")
+      endif()
+    endif()
+    if(TARGET PkgConfig::PkgConfigTBB)
+      if(NOT TARGET TBB::tbb)
+	message(STATUS "Found TBB library using pkg config")
+	add_library(TBB::tbb ALIAS PkgConfig::PkgConfigTBB)
+      endif()
+    endif()
+  endif(PKG_CONFIG_FOUND)
+else()
+  message(STATUS "Found TBB library using config mode")
+endif(NOT TBB_FOUND)
--- a/cmake/Modules/Findcjson.cmake
+++ b/cmake/Modules/Findcjson.cmake
@@ -6,10 +6,6 @@

 include (FindPackageHandleStandardArgs)

-if ((NOT CJSON_ROOT) AND OPM_PARSER_ROOT)
-  set( CJSON_ROOT ${OPM_PARSER_ROOT}) 
-endif()
-
 if (CJSON_ROOT)
  set (_no_default_path "NO_DEFAULT_PATH")
 else (CJSON_ROOT)
@@ -18,10 +14,9 @@ endif (CJSON_ROOT)


 find_path (CJSON_INCLUDE_DIR
-  NAMES "cjson/cJSON.h"
+  NAMES "cJSON.h"
  HINTS "${CJSON_ROOT}"
-  PATHS "${PROJECT_SOURCE_DIR}"
-  PATH_SUFFIXES "include" "external"
+  PATH_SUFFIXES "cjson"
  DOC "Path to cjson library header files"
  ${_no_default_path} )

@@ -36,11 +31,7 @@ string(REGEX REPLACE "${PROJECT_SOURCE_DIR}/?(.*)" "\\1"  BUILD_DIR_SUFFIX "${PR
 find_library (CJSON_LIBRARY
  NAMES "cjson"
  HINTS "${CJSON_ROOT}"
-  PATHS "${PROJECT_BINARY_DIR}/../opm-parser"
-        "${PROJECT_BINARY_DIR}/../opm-parser${BUILD_DIR_SUFFIX}"
-        "${PROJECT_BINARY_DIR}/../../opm-parser/${BUILD_DIR_SUFFIX}"
  PATH_SUFFIXES "lib" "lib${_BITS}" "lib/${CMAKE_LIBRARY_ARCHITECTURE}"
-                "opm/json"
  DOC "Path to cjson library archive/shared object files"
  ${_no_default_path} )

--- a/cmake/Modules/Finddune-common.cmake
+++ b/cmake/Modules/Finddune-common.cmake
@@ -19,7 +19,9 @@ find_opm_package (
  "BLAS REQUIRED;
  LAPACK REQUIRED;
  CxaDemangle;
-  MPI
+  MPI;
+  TBB;
+  GMP
  "
  # header to search for
  "dune/common/fvector.hh"
@@ -28,7 +30,7 @@ find_opm_package (
  "dunecommon"

  # defines to be added to compilations
-  "DUNE_COMMON_FIELDVECTOR_SIZE_IS_METHOD=1"
+  ""

  # test program
 "#include <dune/common/fvector.hh>
--- a/cmake/Modules/Finddune-fem.cmake
+++ b/cmake/Modules/Finddune-fem.cmake
@@ -24,7 +24,8 @@ find_opm_package (
   dune-alugrid;
   ZLIB;
   ZOLTAN;
-   METIS
+   METIS;
+   Quadmath
  "
  # header to search for
  "dune/fem/space/shapefunctionset/legendre.hh"
--- a/cmake/Modules/LibtoolArchives.cmake
+++ b/cmake/Modules/LibtoolArchives.cmake
@@ -16,7 +16,36 @@ function (linker_cmdline what INTO outvar FROM)
  # (you get an error message about argument not parsed). translate each
  # of the libraries into a linker option
  set (deplib_list "")
+  set (deplib_list_tmp "")
  foreach (deplib IN LISTS ARGN)
+    # resolve imported targets
+    string(FIND ${deplib} "::" _sep)
+    if (_sep GREATER "-1")
+      set(_lib "")
+      # the code below does not really work for imported interface library
+      # as cmake will error out whene querying IMPORTED_LOCATION, because the
+      # property is not whitelisted. I have no idea how to determine if
+      # a library is an imported interface library
+      # At least it works for resolving OpenMP::OpenMP_CXX
+      #
+      # get_property(_def TARGET ${deplib} PROPERTY IMPORTED_LOCATION DEFINED)
+      # if (_def)
+      #   get_property(_def TARGET ${deplib} PROPERTY IMPORTED_LOCATION SET)
+      #   if (_def)
+      #     get_target_property(_tmp_lib ${deplib} IMPORTED_LOCATION)
+      #    list(APPEND _lib ${_tmp_lib})
+      #   endif()
+      # endif()
+      get_property(_def TARGET ${deplib} PROPERTY INTERFACE_LINK_LIBRARIES SET)
+      if (_def)
+	get_target_property(_tmp_lib ${deplib} INTERFACE_LINK_LIBRARIES)
+	list(APPEND _lib ${_tmp_lib})
+      endif()
+      set(deplib ${_lib})
+    endif()
+    list(APPEND deplib_list_tmp ${deplib})
+  endforeach()
+  foreach (deplib IN LISTS deplib_list_tmp)
 	# starts with a hyphen already? then just add it
 	string (SUBSTRING ${deplib} 0 1 dash)
 	if (${dash} STREQUAL "-")
@@ -44,18 +73,20 @@ function (linker_cmdline what INTO outvar FROM)
 	  # is more or less lost. remove system default path, to lessen the
 	  # chance that we pick the wrong library
 	  if (NOT ((deplib_dir STREQUAL "/usr/lib") OR
-			   (deplib_dir STREQUAL "/usr/${CMAKE_INSTALL_LIBDIR}")))
-		   list (APPEND deplib_list "-L${deplib_dir}")
-	  endif (NOT ((deplib_dir STREQUAL "/usr/lib") OR
-			      (deplib_dir STREQUAL "/usr/${CMAKE_INSTALL_LIBDIR}")))
+                (deplib_dir STREQUAL "") OR
+		(deplib_dir STREQUAL "/usr/${CMAKE_INSTALL_LIBDIR}")))
+	    list (APPEND deplib_list "-L${deplib_dir}")
+	  endif ()
 	  # if there was no translation of the name, the library is named
 	  # unconventionally (.so.3gf, I'm looking at you), so pass this
 	  # name unmodified to the linker switch
-	  if (deplib_orig STREQUAL deplib_name)
+	  if (deplib_orig STREQUAL deplib_name AND
+	      NOT deplib_orig STREQUAL "stdc++fs")
 		list (APPEND deplib_list "-l:${deplib_orig}")
-	  else (deplib_orig STREQUAL deplib_name)
+	  else ()
 		list (APPEND deplib_list "-l${deplib_name}")
-	  endif (deplib_orig STREQUAL deplib_name)
+	  endif (deplib_orig STREQUAL deplib_name AND
+	    NOT deplib_orig STREQUAL "stdc++fs")
 	endif (${dash} STREQUAL "-")
  endforeach (deplib)
  # caller determines whether we want it returned as a list or a string
--- a/cmake/Modules/OpmBashCompletion.cmake
+++ b/cmake/Modules/OpmBashCompletion.cmake
@@ -1,6 +1,16 @@
 # Installs bash tab completion for a product
 macro(opm_add_bash_completion binary)
+  option(USE_BASH_COMPLETIONS_DIR
+    "Whether to use the new bash completion dir (/usr/share/bash-completion/completions) with load on demand"
+    OFF)
+  if(USE_BASH_COMPLETIONS_DIR)
+    set(_BASH_COMPLETION_FILE ${binary})
+    set(_BASH_COMPLETION_INSTALL_DIR ${CMAKE_INSTALL_DATAROOTDIR}/bash-completion/completions)
+  else()
+    set(_BASH_COMPLETION_FILE ${binary}_bash_completion.sh)
+    set(_BASH_COMPLETION_INSTALL_DIR ${CMAKE_INSTALL_SYSCONFDIR}/bash_completion.d)
+  endif()
  set(PRODUCT ${binary})
-  configure_file(${OPM_MACROS_ROOT}/etc/opm_bash_completion.sh.in ${binary}_bash_completion.sh @ONLY)
-  install(FILES ${PROJECT_BINARY_DIR}/${binary}_bash_completion.sh DESTINATION ${CMAKE_INSTALL_SYSCONFDIR}/bash_completion.d)
+  configure_file(${OPM_MACROS_ROOT}/etc/opm_bash_completion.sh.in ${_BASH_COMPLETION_FILE} @ONLY)
+  install(FILES ${PROJECT_BINARY_DIR}/${_BASH_COMPLETION_FILE} DESTINATION ${_BASH_COMPLETION_INSTALL_DIR})
 endmacro()
--- a/cmake/Modules/OpmCompile.cmake
+++ b/cmake/Modules/OpmCompile.cmake
@@ -29,12 +29,18 @@ macro (opm_compile opm)

  # create this library, if there are any compilation units
  link_directories (${${opm}_LIBRARY_DIRS})
-  add_definitions (${${opm}_DEFINITIONS})
+  if(CMAKE_VERSION VERSION_GREATER_EQUAL "3.12")
+    # Some modules may still export definitions using -D, strip it
+    string(REGEX REPLACE "-D" "" _clean_defs "${${opm}_DEFINITIONS}")
+    add_compile_definitions(${_clean_defs})
+  else()
+    add_definitions(${${opm}_DEFINITIONS})
+  endif()
  set (${opm}_VERSION "${${opm}_VERSION_MAJOR}.${${opm}_VERSION_MINOR}")
  if (${opm}_SOURCES)
        add_library (${${opm}_TARGET} ${${opm}_LIBRARY_TYPE} ${${opm}_SOURCES})
        set_target_properties (${${opm}_TARGET} PROPERTIES
-          SOVERSION ${${opm}_VERSION_MAJOR}
+          SOVERSION ${${opm}_VERSION}
          VERSION ${${opm}_VERSION}
          LINK_FLAGS "${${opm}_LINKER_FLAGS_STR}"
          POSITION_INDEPENDENT_CODE TRUE 
--- a/cmake/Modules/OpmFind.cmake
+++ b/cmake/Modules/OpmFind.cmake
@@ -130,9 +130,18 @@ macro (find_and_append_package_to prefix name)
    # and the likes which is only done via opm_find_package
    if ( (NOT DEFINED ${name}_FOUND AND NOT DEFINED ${NAME}_FOUND )
         OR _search_components GREATER -1)
-       string(REGEX MATCH "(opm)-.*" _is_opm ${name})
+      string(REGEX MATCH "(opm)-.*" _is_opm ${name})
      if(NOT _is_opm)
-        find_package (${name} ${ARGN})
+        # When using Boost >= 1.70 and e.g. CMake 3.18 we need to make sure that
+        # subsequent searches are using config mode too. Otherwise the library
+        # list will be completely messed up. We use a set Boost_Dir to detect that
+        # previous searches were done using config mode.
+        if("${name}" STREQUAL "Boost" AND Boost_DIR)
+          set(_CONFIG_MODE CONFIG)
+        else()
+          set(_CONFIG_MODE "")
+        endif()
+        find_package (${name} ${ARGN} ${_CONFIG_MODE})
      else()
        if(${name}_DIR)
          find_package (${name} ${${prefix}_VERSION_MAJOR}.${${prefix}_VERSION_MINOR} ${ARGN} NO_MODULE PATHS ${${name}_DIR} NO_DEFAULT_PATH)
@@ -163,7 +172,21 @@ macro (find_and_append_package_to prefix name)
  string (REPLACE "-" "_" NAME "${NAME}")

  if (${name}_FOUND OR ${NAME}_FOUND)
-	foreach (var IN LISTS _opm_proj_vars)
+      foreach (var IN LISTS _opm_proj_vars)
+          if("${var}" STREQUAL "DEFINITIONS"
+            AND CMAKE_VERSION VERSION_LESS "3.12")
+            # For old Cmake versions we use add_definitions which
+            # requires -D qualifier add that
+            set(_defs)
+            foreach(_def IN LISTS ${name}_${var})
+              if(_def MATCHES "^[a-zA-Z].*")
+                list(APPEND _defs "-D${_def}")
+              else()
+                list(APPEND _defs "${_def}")
+              endif()
+            endforeach()
+            set(${name}_${var} "${_defs}")
+          endif()
 	  if (DEFINED ${name}_${var})
 		list (APPEND ${prefix}_${var} ${${name}_${var}})
 	  # some packages define an uppercase version of their own name
--- a/cmake/Modules/OpmInit.cmake
+++ b/cmake/Modules/OpmInit.cmake
@@ -135,6 +135,13 @@ if (NOT USE_MPI)
  set (CMAKE_DISABLE_FIND_PACKAGE_MPI TRUE)
 endif ()

+# Compiler standard version needs to be requested here as prereqs is included
+# before OpmLibMain and some tests need/use CXX_STANDARD_VERSION (e.g. pybind11)
+# Languages and global compiler settings
+set(CMAKE_CXX_STANDARD 17)
+set(CMAKE_CXX_STANDARD_REQUIRED ON)
+set(CMAKE_CXX_EXTENSIONS OFF)
+
 # quadmath must be explicitly enabled
 # This needs to be in OpmInit as prereqs is called before OpmLibMain is included.
 option (USE_QUADMATH "Use high precision floating point library (slow)" OFF)
--- a/cmake/Modules/OpmLibMain.cmake
+++ b/cmake/Modules/OpmLibMain.cmake
@@ -20,16 +20,6 @@
 include (AddOptions)
 no_default_options ()

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

--- a/cmake/Modules/OpmPackage.cmake
+++ b/cmake/Modules/OpmPackage.cmake
@@ -95,10 +95,19 @@ macro (find_opm_package module deps header lib defs prog conf)

  # compile with this option to avoid avalanche of warnings
  set (${module}_DEFINITIONS "${${module}_DEFINITIONS}")
+  # -D to compile definitions for older CMake versions
+  set (_D_PREFIX "")
+  if(CMAKE_VERSION VERSION_LESS "3.12")
+    set(_D_PREFIX "-D")
+  endif()
  foreach (_def IN ITEMS ${defs})
-	list (APPEND ${module}_DEFINITIONS "-D${_def}")
+    if(_def MATCHES "^[A-Za-z].*")
+      list (APPEND ${module}_DEFINITIONS "${_D_PREFIX}${_def}")
+    endif()
  endforeach (_def)

+  list (APPEND ${module}_DEFINITIONS ${defs})
+
  # tidy the lists before returning them
  remove_dup_deps (${module})

--- a/cmake/Modules/OpmProject.cmake
+++ b/cmake/Modules/OpmProject.cmake
@@ -30,7 +30,6 @@ function (configure_pc_file name source dest prefix libdir includedir)
  set (minor "${${name}_VERSION_MINOR}")
  set (target "${${name}_LIBRARY}")
  linker_cmdline (STRING INTO target from ${target})
-
  configure_file (${source} ${dest} @ONLY)
 endfunction (configure_pc_file name source dist prefix libdir includedir)

@@ -101,16 +100,24 @@ function (opm_cmake_config name)
  # and we have existing entries pointing to that install directory.
  # Since they will yield a duplicate in next replace anyways, we filter them out first
  # to get avoid those the bogus entries.
-  string(REPLACE "${CMAKE_INSTALL_PREFIX}/include${${name}_VER_DIR}" "" ${name}_INCLUDE_DIRS "${${name}_INCLUDE_DIRS}")
+  # First with trailing / to change /usr/include/package to package and not /package
+  # Fixes broken pkg-config files for Debian/Ubuntu packaging.
+  string(FIND "${${name}_INCLUDE_DIRS}" "${PROJECT_SOURCE_DIR}" _source_in_include)

-  # replace the build directory with the target directory in the
-  # variables that contains build paths
-  string (REPLACE
-	"${PROJECT_SOURCE_DIR}"
-	"${CMAKE_INSTALL_PREFIX}/include${${name}_VER_DIR}"
-	${name}_INCLUDE_DIRS
-	"${${name}_INCLUDE_DIRS}"
-	)
+  if(_source_in_include GREATER "-1")
+    string(REGEX REPLACE "${CMAKE_INSTALL_PREFIX}/include${${name}_VER_DIR}[;$]" "" ${name}_INCLUDE_DIRS "${${name}_INCLUDE_DIRS}")
+    # Get rid of empty entries
+    string(REPLACE ";;" ";" ${name}_INCLUDE_DIRS "${${name}_INCLUDE_DIRS}")
+
+    # replace the build directory with the target directory in the
+    # variables that contains build paths
+    string (REPLACE
+      "${PROJECT_SOURCE_DIR}"
+      "${CMAKE_INSTALL_PREFIX}/include${${name}_VER_DIR}"
+      ${name}_INCLUDE_DIRS
+      "${${name}_INCLUDE_DIRS}"
+      )
+  endif()
  string (REPLACE
 	"${CMAKE_LIBRARY_OUTPUT_DIRECTORY}"
 	"${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_LIBDIR}${${name}_VER_DIR}"
--- a/cmake/Modules/UseDynamicBoost.cmake
+++ b/cmake/Modules/UseDynamicBoost.cmake
@@ -1,4 +1,11 @@
-find_package (Boost 1.44.0 COMPONENTS unit_test_framework QUIET)
+# When using Boost >= 1.70 and e.g. CMake 3.18 we need to make sure that
+# subsequent searches are using config mode too. Otherwise the library
+# list will be completely messed up. We use a set Boost_Dir to detect that
+# previous searches were done using config mode.
+if(Boost_DIR)
+  set(_Boost_CONFIG_MODE CONFIG)
+endif()
+find_package (Boost 1.44.0 COMPONENTS unit_test_framework QUIET ${_Boost_CONFIG_MODE})

 if (Boost_UNIT_TEST_FRAMEWORK_FOUND)
  # setup to do a test compile
--- a/cmake/Modules/UseOptimization.cmake
+++ b/cmake/Modules/UseOptimization.cmake
@@ -63,9 +63,9 @@ if (CXX_COMPAT_GCC)

  # use these options for release builds - full optimization
  add_options (ALL_LANGUAGES "${_prof_RELEASE}" ${_opt_rel} ${_opt_flags})
-  option(WITH_NDEBUG "Disable asserts in release mode" ON)
-  if(WITH_NDEBUG)
-    add_options (ALL_LANGUAGES "${_prof_RELEASE}" -DNDEBUG)
+  option(WITH_NDEBUG "Disable asserts in release mode" OFF)
+  if(NOT WITH_NDEBUG)
+    add_options (ALL_LANGUAGES "${_prof_RELEASE}" -UNDEBUG)
  endif()

 else ()
--- a/cmake/Modules/compat-2.8.3/CMakeParseArguments.cmake
+++ b/cmake/Modules/compat-2.8.3/CMakeParseArguments.cmake
@@ -1,138 +0,0 @@
-# CMAKE_PARSE_ARGUMENTS(<prefix> <options> <one_value_keywords> <multi_value_keywords> args...)
-#
-# CMAKE_PARSE_ARGUMENTS() is intended to be used in macros or functions for
-# parsing the arguments given to that macro or function.
-# It processes the arguments and defines a set of variables which hold the
-# values of the respective options.
-#
-# The <options> argument contains all options for the respective macro,
-# i.e. keywords which can be used when calling the macro without any value
-# following, like e.g. the OPTIONAL keyword of the install() command.
-#
-# The <one_value_keywords> argument contains all keywords for this macro
-# which are followed by one value, like e.g. DESTINATION keyword of the
-# install() command.
-#
-# The <multi_value_keywords> argument contains all keywords for this macro
-# which can be followed by more than one value, like e.g. the TARGETS or
-# FILES keywords of the install() command.
-#
-# When done, CMAKE_PARSE_ARGUMENTS() will have defined for each of the
-# keywords listed in <options>, <one_value_keywords> and
-# <multi_value_keywords> a variable composed of the given <prefix>
-# followed by "_" and the name of the respective keyword.
-# These variables will then hold the respective value from the argument list.
-# For the <options> keywords this will be TRUE or FALSE.
-#
-# All remaining arguments are collected in a variable
-# <prefix>_UNPARSED_ARGUMENTS, this can be checked afterwards to see whether
-# your macro was called with unrecognized parameters.
-#
-# As an example here a my_install() macro, which takes similar arguments as the
-# real install() command:
-#
-#   function(MY_INSTALL)
-#     set(options OPTIONAL FAST)
-#     set(oneValueArgs DESTINATION RENAME)
-#     set(multiValueArgs TARGETS CONFIGURATIONS)
-#     cmake_parse_arguments(MY_INSTALL "${options}" "${oneValueArgs}" "${multiValueArgs}" ${ARGN} )
-#     ...
-#
-# Assume my_install() has been called like this:
-#   my_install(TARGETS foo bar DESTINATION bin OPTIONAL blub)
-#
-# After the cmake_parse_arguments() call the macro will have set the following
-# variables:
-#   MY_INSTALL_OPTIONAL = TRUE
-#   MY_INSTALL_FAST = FALSE (this option was not used when calling my_install()
-#   MY_INSTALL_DESTINATION = "bin"
-#   MY_INSTALL_RENAME = "" (was not used)
-#   MY_INSTALL_TARGETS = "foo;bar"
-#   MY_INSTALL_CONFIGURATIONS = "" (was not used)
-#   MY_INSTALL_UNPARSED_ARGUMENTS = "blub" (no value expected after "OPTIONAL"
-#
-# You can the continue and process these variables.
-#
-# Keywords terminate lists of values, e.g. if directly after a one_value_keyword
-# another recognized keyword follows, this is interpreted as the beginning of
-# the new option.
-# E.g. my_install(TARGETS foo DESTINATION OPTIONAL) would result in
-# MY_INSTALL_DESTINATION set to "OPTIONAL", but MY_INSTALL_DESTINATION would
-# be empty and MY_INSTALL_OPTIONAL would be set to TRUE therefor.
-
-#=============================================================================
-# Copyright 2010 Alexander Neundorf <neundorf@kde.org>
-#
-# Distributed under the OSI-approved BSD License (the "License");
-# see accompanying file Copyright.txt for details.
-#
-# This software is distributed WITHOUT ANY WARRANTY; without even the
-# implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
-# See the License for more information.
-#=============================================================================
-# (To distribute this file outside of CMake, substitute the full
-#  License text for the above reference.)
-
-
-if(__CMAKE_PARSE_ARGUMENTS_INCLUDED)
-  return()
-endif()
-set(__CMAKE_PARSE_ARGUMENTS_INCLUDED TRUE)
-
-
-function(CMAKE_PARSE_ARGUMENTS prefix _optionNames _singleArgNames _multiArgNames)
-  # first set all result variables to empty/FALSE
-  foreach(arg_name ${_singleArgNames} ${_multiArgNames})
-    set(${prefix}_${arg_name})
-  endforeach(arg_name)
-
-  foreach(option ${_optionNames})
-    set(${prefix}_${option} FALSE)
-  endforeach(option)
-
-  set(${prefix}_UNPARSED_ARGUMENTS)
-
-  set(insideValues FALSE)
-  set(currentArgName)
-
-  # now iterate over all arguments and fill the result variables
-  foreach(currentArg ${ARGN})
-    list(FIND _optionNames "${currentArg}" optionIndex)  # ... then this marks the end of the arguments belonging to this keyword
-    list(FIND _singleArgNames "${currentArg}" singleArgIndex)  # ... then this marks the end of the arguments belonging to this keyword
-    list(FIND _multiArgNames "${currentArg}" multiArgIndex)  # ... then this marks the end of the arguments belonging to this keyword
-
-    if(${optionIndex} EQUAL -1  AND  ${singleArgIndex} EQUAL -1  AND  ${multiArgIndex} EQUAL -1)
-      if(insideValues)
-        if("${insideValues}" STREQUAL "SINGLE")
-          set(${prefix}_${currentArgName} ${currentArg})
-          set(insideValues FALSE)
-        elseif("${insideValues}" STREQUAL "MULTI")
-          list(APPEND ${prefix}_${currentArgName} ${currentArg})
-        endif()
-      else(insideValues)
-        list(APPEND ${prefix}_UNPARSED_ARGUMENTS ${currentArg})
-      endif(insideValues)
-    else()
-      if(NOT ${optionIndex} EQUAL -1)
-        set(${prefix}_${currentArg} TRUE)
-        set(insideValues FALSE)
-      elseif(NOT ${singleArgIndex} EQUAL -1)
-        set(currentArgName ${currentArg})
-        set(${prefix}_${currentArgName})
-        set(insideValues "SINGLE")
-      elseif(NOT ${multiArgIndex} EQUAL -1)
-        set(currentArgName ${currentArg})
-        set(${prefix}_${currentArgName})
-        set(insideValues "MULTI")
-      endif()
-    endif()
-
-  endforeach(currentArg)
-
-  # propagate the result variables to the caller:
-  foreach(arg_name ${_singleArgNames} ${_multiArgNames} ${_optionNames})
-    set(${prefix}_${arg_name}  ${${prefix}_${arg_name}} PARENT_SCOPE)
-  endforeach(arg_name)
-  set(${prefix}_UNPARSED_ARGUMENTS ${${prefix}_UNPARSED_ARGUMENTS} PARENT_SCOPE)
-
-endfunction(CMAKE_PARSE_ARGUMENTS _options _singleArgs _multiArgs)
--- a/cmake/Modules/compat-2.8.5/FindGit.cmake
+++ b/cmake/Modules/compat-2.8.5/FindGit.cmake
@@ -1,47 +0,0 @@
-# The module defines the following variables:
-#   GIT_EXECUTABLE - path to git command line client
-#   GIT_FOUND - true if the command line client was found
-# Example usage:
-#   find_package(Git)
-#   if(GIT_FOUND)
-#     message("git found: ${GIT_EXECUTABLE}")
-#   endif()
-
-#=============================================================================
-# Copyright 2010 Kitware, Inc.
-#
-# Distributed under the OSI-approved BSD License (the "License");
-# see accompanying file Copyright.txt for details.
-#
-# This software is distributed WITHOUT ANY WARRANTY; without even the
-# implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
-# See the License for more information.
-#=============================================================================
-# (To distribute this file outside of CMake, substitute the full
-#  License text for the above reference.)
-
-# Look for 'git' or 'eg' (easy git)
-#
-set(git_names git eg)
-
-# Prefer .cmd variants on Windows unless running in a Makefile
-# in the MSYS shell.
-#
-if(WIN32)
-  if(NOT CMAKE_GENERATOR MATCHES "MSYS")
-    set(git_names git.cmd git eg.cmd eg)
-  endif()
-endif()
-
-find_program(GIT_EXECUTABLE
-  NAMES ${git_names}
-  PATH_SUFFIXES Git/cmd Git/bin
-  DOC "git command line client"
-  )
-mark_as_advanced(GIT_EXECUTABLE)
-
-# Handle the QUIETLY and REQUIRED arguments and set GIT_FOUND to TRUE if
-# all listed variables are TRUE
-
-include(FindPackageHandleStandardArgs)
-find_package_handle_standard_args(Git DEFAULT_MSG GIT_EXECUTABLE)
--- a/cmake/Modules/compat-2.8.7/CMakePushCheckState.cmake
+++ b/cmake/Modules/compat-2.8.7/CMakePushCheckState.cmake
@@ -1,61 +0,0 @@
-# This module defines two macros:
-# CMAKE_PUSH_CHECK_STATE()
-# and
-# CMAKE_POP_CHECK_STATE()
-# These two macros can be used to save and restore the state of the variables
-# CMAKE_REQUIRED_FLAGS, CMAKE_REQUIRED_DEFINITIONS, CMAKE_REQUIRED_LIBRARIES
-# and CMAKE_REQUIRED_INCLUDES used by the various Check-files coming with CMake,
-# like e.g. check_function_exists() etc.
-# The variable contents are pushed on a stack, pushing multiple times is supported.
-# This is useful e.g. when executing such tests in a Find-module, where they have to be set,
-# but after the Find-module has been executed they should have the same value
-# as they had before.
-#
-# Usage:
-#   cmake_push_check_state()
-#   set(CMAKE_REQUIRED_DEFINITIONS ${CMAKE_REQUIRED_DEFINITIONS} -DSOME_MORE_DEF)
-#   check_function_exists(...)
-#   cmake_pop_check_state()
-
-#=============================================================================
-# Copyright 2006-2011 Alexander Neundorf, <neundorf@kde.org>
-#
-# Distributed under the OSI-approved BSD License (the "License");
-# see accompanying file Copyright.txt for details.
-#
-# This software is distributed WITHOUT ANY WARRANTY; without even the
-# implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
-# See the License for more information.
-#=============================================================================
-# (To distribute this file outside of CMake, substitute the full
-#  License text for the above reference.)
-
-
-MACRO(CMAKE_PUSH_CHECK_STATE)
-
-   IF(NOT DEFINED _CMAKE_PUSH_CHECK_STATE_COUNTER)
-      SET(_CMAKE_PUSH_CHECK_STATE_COUNTER 0)
-   ENDIF()
-
-   MATH(EXPR _CMAKE_PUSH_CHECK_STATE_COUNTER "${_CMAKE_PUSH_CHECK_STATE_COUNTER}+1")
-
-   SET(_CMAKE_REQUIRED_INCLUDES_SAVE_${_CMAKE_PUSH_CHECK_STATE_COUNTER}    ${CMAKE_REQUIRED_INCLUDES})
-   SET(_CMAKE_REQUIRED_DEFINITIONS_SAVE_${_CMAKE_PUSH_CHECK_STATE_COUNTER} ${CMAKE_REQUIRED_DEFINITIONS})
-   SET(_CMAKE_REQUIRED_LIBRARIES_SAVE_${_CMAKE_PUSH_CHECK_STATE_COUNTER}   ${CMAKE_REQUIRED_LIBRARIES})
-   SET(_CMAKE_REQUIRED_FLAGS_SAVE_${_CMAKE_PUSH_CHECK_STATE_COUNTER}       ${CMAKE_REQUIRED_FLAGS})
-ENDMACRO(CMAKE_PUSH_CHECK_STATE)
-
-MACRO(CMAKE_POP_CHECK_STATE)
-
-# don't pop more than we pushed
-   IF("${_CMAKE_PUSH_CHECK_STATE_COUNTER}" GREATER "0")
-
-      SET(CMAKE_REQUIRED_INCLUDES    ${_CMAKE_REQUIRED_INCLUDES_SAVE_${_CMAKE_PUSH_CHECK_STATE_COUNTER}})
-      SET(CMAKE_REQUIRED_DEFINITIONS ${_CMAKE_REQUIRED_DEFINITIONS_SAVE_${_CMAKE_PUSH_CHECK_STATE_COUNTER}})
-      SET(CMAKE_REQUIRED_LIBRARIES   ${_CMAKE_REQUIRED_LIBRARIES_SAVE_${_CMAKE_PUSH_CHECK_STATE_COUNTER}})
-      SET(CMAKE_REQUIRED_FLAGS       ${_CMAKE_REQUIRED_FLAGS_SAVE_${_CMAKE_PUSH_CHECK_STATE_COUNTER}})
-
-      MATH(EXPR _CMAKE_PUSH_CHECK_STATE_COUNTER "${_CMAKE_PUSH_CHECK_STATE_COUNTER}-1")
-   ENDIF()
-
-ENDMACRO(CMAKE_POP_CHECK_STATE)
--- a/cmake/Modules/compat-2.8.7/FindBLAS.cmake
+++ b/cmake/Modules/compat-2.8.7/FindBLAS.cmake
@@ -1,624 +0,0 @@
-# - Find BLAS library
-# This module finds an installed fortran library that implements the BLAS
-# linear-algebra interface (see http://www.netlib.org/blas/).
-# The list of libraries searched for is taken
-# from the autoconf macro file, acx_blas.m4 (distributed at
-# http://ac-archive.sourceforge.net/ac-archive/acx_blas.html).
-#
-# This module sets the following variables:
-#  BLAS_FOUND - set to true if a library implementing the BLAS interface
-#    is found
-#  BLAS_LINKER_FLAGS - uncached list of required linker flags (excluding -l
-#    and -L).
-#  BLAS_LIBRARIES - uncached list of libraries (using full path name) to
-#    link against to use BLAS
-#  BLAS95_LIBRARIES - uncached list of libraries (using full path name)
-#    to link against to use BLAS95 interface
-#  BLAS95_FOUND - set to true if a library implementing the BLAS f95 interface
-#    is found
-#  BLA_STATIC  if set on this determines what kind of linkage we do (static)
-#  BLA_VENDOR  if set checks only the specified vendor, if not set checks
-#     all the possibilities
-#  BLA_F95     if set on tries to find the f95 interfaces for BLAS/LAPACK
-##########
-### List of vendors (BLA_VENDOR) valid in this module
-##  Goto,ATLAS PhiPACK,CXML,DXML,SunPerf,SCSL,SGIMATH,IBMESSL,Intel10_32 (intel mkl v10 32 bit),Intel10_64lp (intel mkl v10 64 bit,lp thread model, lp64 model),
-##  Intel( older versions of mkl 32 and 64 bit), ACML,ACML_MP,ACML_GPU,Apple, NAS, Generic
-# C/CXX should be enabled to use Intel mkl
-
-#=============================================================================
-# Copyright 2007-2009 Kitware, Inc.
-#
-# Distributed under the OSI-approved BSD License (the "License");
-# see accompanying file Copyright.txt for details.
-#
-# This software is distributed WITHOUT ANY WARRANTY; without even the
-# implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
-# See the License for more information.
-#=============================================================================
-# (To distribute this file outside of CMake, substitute the full
-#  License text for the above reference.)
-
-include(CheckFunctionExists)
-include(CheckFortranFunctionExists)
-
-set(_blas_ORIG_CMAKE_FIND_LIBRARY_SUFFIXES ${CMAKE_FIND_LIBRARY_SUFFIXES})
-
-# Check the language being used
-get_property( _LANGUAGES_ GLOBAL PROPERTY ENABLED_LANGUAGES )
-if( _LANGUAGES_ MATCHES Fortran )
-  set( _CHECK_FORTRAN TRUE )
-elseif( (_LANGUAGES_ MATCHES C) OR (_LANGUAGES_ MATCHES CXX) )
-  set( _CHECK_FORTRAN FALSE )
-else()
-  if(BLAS_FIND_REQUIRED)
-    message(FATAL_ERROR "FindBLAS requires Fortran, C, or C++ to be enabled.")
-  else(BLAS_FIND_REQUIRED)
-    message(STATUS "Looking for BLAS... - NOT found (Unsupported languages)")
-    return()
-  endif(BLAS_FIND_REQUIRED)
-endif( )
-
-macro(Check_Fortran_Libraries LIBRARIES _prefix _name _flags _list _thread)
-# This macro checks for the existence of the combination of fortran libraries
-# given by _list.  If the combination is found, this macro checks (using the
-# Check_Fortran_Function_Exists macro) whether can link against that library
-# combination using the name of a routine given by _name using the linker
-# flags given by _flags.  If the combination of libraries is found and passes
-# the link test, LIBRARIES is set to the list of complete library paths that
-# have been found.  Otherwise, LIBRARIES is set to FALSE.
-
-# N.B. _prefix is the prefix applied to the names of all cached variables that
-# are generated internally and marked advanced by this macro.
-
-set(_libdir ${ARGN})
-
-set(_libraries_work TRUE)
-set(${LIBRARIES})
-set(_combined_name)
-if (NOT _libdir)
-  if (WIN32)
-    set(_libdir ENV LIB)
-  elseif (APPLE)
-    set(_libdir /usr/local/lib /usr/lib /usr/local/lib64 /usr/lib64 ENV DYLD_LIBRARY_PATH)
-  else ()
-    set(_libdir /usr/local/lib /usr/lib /usr/local/lib64 /usr/lib64 ENV LD_LIBRARY_PATH)
-  endif ()
-endif ()
-foreach(_library ${_list})
-  set(_combined_name ${_combined_name}_${_library})
-
-  if(_libraries_work)
-    if (BLA_STATIC)
-      if (WIN32)
-        set(CMAKE_FIND_LIBRARY_SUFFIXES .lib ${CMAKE_FIND_LIBRARY_SUFFIXES})
-      endif ( WIN32 )
-      if (APPLE)
-        set(CMAKE_FIND_LIBRARY_SUFFIXES .lib ${CMAKE_FIND_LIBRARY_SUFFIXES})
-      else (APPLE)
-        set(CMAKE_FIND_LIBRARY_SUFFIXES .a ${CMAKE_FIND_LIBRARY_SUFFIXES})
-      endif (APPLE)
-    else (BLA_STATIC)
-      if (CMAKE_SYSTEM_NAME STREQUAL "Linux")
-        # for ubuntu's libblas3gf and liblapack3gf packages
-        set(CMAKE_FIND_LIBRARY_SUFFIXES ${CMAKE_FIND_LIBRARY_SUFFIXES} .so.3gf)
-      endif ()
-    endif (BLA_STATIC)
-    find_library(${_prefix}_${_library}_LIBRARY
-      NAMES ${_library}
-      PATHS ${_libdir}
-      )
-    mark_as_advanced(${_prefix}_${_library}_LIBRARY)
-    set(${LIBRARIES} ${${LIBRARIES}} ${${_prefix}_${_library}_LIBRARY})
-    set(_libraries_work ${${_prefix}_${_library}_LIBRARY})
-  endif(_libraries_work)
-endforeach(_library ${_list})
-if(_libraries_work)
-  # Test this combination of libraries.
-  set(CMAKE_REQUIRED_LIBRARIES ${_flags} ${${LIBRARIES}} ${_threads})
-#  message("DEBUG: CMAKE_REQUIRED_LIBRARIES = ${CMAKE_REQUIRED_LIBRARIES}")
-  if (_CHECK_FORTRAN)
-    check_fortran_function_exists("${_name}" ${_prefix}${_combined_name}_WORKS)
-  else()
-    check_function_exists("${_name}_" ${_prefix}${_combined_name}_WORKS)
-  endif()
-  set(CMAKE_REQUIRED_LIBRARIES)
-  mark_as_advanced(${_prefix}${_combined_name}_WORKS)
-  set(_libraries_work ${${_prefix}${_combined_name}_WORKS})
-endif(_libraries_work)
-if(NOT _libraries_work)
-  set(${LIBRARIES} FALSE)
-endif(NOT _libraries_work)
-#message("DEBUG: ${LIBRARIES} = ${${LIBRARIES}}")
-endmacro(Check_Fortran_Libraries)
-
-set(BLAS_LINKER_FLAGS)
-set(BLAS_LIBRARIES)
-set(BLAS95_LIBRARIES)
-if ($ENV{BLA_VENDOR} MATCHES ".+")
-  set(BLA_VENDOR $ENV{BLA_VENDOR})
-else ($ENV{BLA_VENDOR} MATCHES ".+")
-  if(NOT BLA_VENDOR)
-    set(BLA_VENDOR "All")
-  endif(NOT BLA_VENDOR)
-endif ($ENV{BLA_VENDOR} MATCHES ".+")
-
-if (BLA_VENDOR STREQUAL "Goto" OR BLA_VENDOR STREQUAL "All")
- if(NOT BLAS_LIBRARIES)
-  # gotoblas (http://www.tacc.utexas.edu/tacc-projects/gotoblas2)
-  check_fortran_libraries(
-  BLAS_LIBRARIES
-  BLAS
-  sgemm
-  ""
-  "goto2"
-  ""
-  )
- endif(NOT BLAS_LIBRARIES)
-endif (BLA_VENDOR STREQUAL "Goto" OR BLA_VENDOR STREQUAL "All")
-
-if (BLA_VENDOR STREQUAL "ATLAS" OR BLA_VENDOR STREQUAL "All")
- if(NOT BLAS_LIBRARIES)
-  # BLAS in ATLAS library? (http://math-atlas.sourceforge.net/)
-  check_fortran_libraries(
-  BLAS_LIBRARIES
-  BLAS
-  dgemm
-  ""
-  "f77blas;atlas"
-  ""
-  )
- endif(NOT BLAS_LIBRARIES)
-endif (BLA_VENDOR STREQUAL "ATLAS" OR BLA_VENDOR STREQUAL "All")
-
-# BLAS in PhiPACK libraries? (requires generic BLAS lib, too)
-if (BLA_VENDOR STREQUAL "PhiPACK" OR BLA_VENDOR STREQUAL "All")
- if(NOT BLAS_LIBRARIES)
-  check_fortran_libraries(
-  BLAS_LIBRARIES
-  BLAS
-  sgemm
-  ""
-  "sgemm;dgemm;blas"
-  ""
-  )
- endif(NOT BLAS_LIBRARIES)
-endif (BLA_VENDOR STREQUAL "PhiPACK" OR BLA_VENDOR STREQUAL "All")
-
-# BLAS in Alpha CXML library?
-if (BLA_VENDOR STREQUAL "CXML" OR BLA_VENDOR STREQUAL "All")
- if(NOT BLAS_LIBRARIES)
-  check_fortran_libraries(
-  BLAS_LIBRARIES
-  BLAS
-  sgemm
-  ""
-  "cxml"
-  ""
-  )
- endif(NOT BLAS_LIBRARIES)
-endif (BLA_VENDOR STREQUAL "CXML" OR BLA_VENDOR STREQUAL "All")
-
-# BLAS in Alpha DXML library? (now called CXML, see above)
-if (BLA_VENDOR STREQUAL "DXML" OR BLA_VENDOR STREQUAL "All")
- if(NOT BLAS_LIBRARIES)
-  check_fortran_libraries(
-  BLAS_LIBRARIES
-  BLAS
-  sgemm
-  ""
-  "dxml"
-  ""
-  )
- endif(NOT BLAS_LIBRARIES)
-endif (BLA_VENDOR STREQUAL "DXML" OR BLA_VENDOR STREQUAL "All")
-
-# BLAS in Sun Performance library?
-if (BLA_VENDOR STREQUAL "SunPerf" OR BLA_VENDOR STREQUAL "All")
- if(NOT BLAS_LIBRARIES)
-  check_fortran_libraries(
-  BLAS_LIBRARIES
-  BLAS
-  sgemm
-  "-xlic_lib=sunperf"
-  "sunperf;sunmath"
-  ""
-  )
-  if(BLAS_LIBRARIES)
-    set(BLAS_LINKER_FLAGS "-xlic_lib=sunperf")
-  endif(BLAS_LIBRARIES)
- endif(NOT BLAS_LIBRARIES)
-endif (BLA_VENDOR STREQUAL "SunPerf" OR BLA_VENDOR STREQUAL "All")
-
-# BLAS in SCSL library?  (SGI/Cray Scientific Library)
-if (BLA_VENDOR STREQUAL "SCSL" OR BLA_VENDOR STREQUAL "All")
- if(NOT BLAS_LIBRARIES)
-  check_fortran_libraries(
-  BLAS_LIBRARIES
-  BLAS
-  sgemm
-  ""
-  "scsl"
-  ""
-  )
- endif(NOT BLAS_LIBRARIES)
-endif (BLA_VENDOR STREQUAL "SCSL" OR BLA_VENDOR STREQUAL "All")
-
-# BLAS in SGIMATH library?
-if (BLA_VENDOR STREQUAL "SGIMATH" OR BLA_VENDOR STREQUAL "All")
- if(NOT BLAS_LIBRARIES)
-  check_fortran_libraries(
-  BLAS_LIBRARIES
-  BLAS
-  sgemm
-  ""
-  "complib.sgimath"
-  ""
-  )
- endif(NOT BLAS_LIBRARIES)
-endif (BLA_VENDOR STREQUAL "SGIMATH" OR BLA_VENDOR STREQUAL "All")
-
-# BLAS in IBM ESSL library? (requires generic BLAS lib, too)
-if (BLA_VENDOR STREQUAL "IBMESSL" OR BLA_VENDOR STREQUAL "All")
- if(NOT BLAS_LIBRARIES)
-  check_fortran_libraries(
-  BLAS_LIBRARIES
-  BLAS
-  sgemm
-  ""
-  "essl;blas"
-  ""
-  )
- endif(NOT BLAS_LIBRARIES)
-endif (BLA_VENDOR STREQUAL "IBMESSL" OR BLA_VENDOR STREQUAL "All")
-
-#BLAS in acml library?
-if (BLA_VENDOR MATCHES "ACML.*" OR BLA_VENDOR STREQUAL "All")
- if( ((BLA_VENDOR STREQUAL "ACML") AND (NOT BLAS_ACML_LIB_DIRS)) OR
-     ((BLA_VENDOR STREQUAL "ACML_MP") AND (NOT BLAS_ACML_MP_LIB_DIRS)) OR
-     ((BLA_VENDOR STREQUAL "ACML_GPU") AND (NOT BLAS_ACML_GPU_LIB_DIRS))
-   )
-   # try to find acml in "standard" paths
-   if( WIN32 )
-    file( GLOB _ACML_ROOT "C:/AMD/acml*/ACML-EULA.txt" )
-   else()
-    file( GLOB _ACML_ROOT "/opt/acml*/ACML-EULA.txt" )
-   endif()
-   if( WIN32 )
-    file( GLOB _ACML_GPU_ROOT "C:/AMD/acml*/GPGPUexamples" )
-   else()
-    file( GLOB _ACML_GPU_ROOT "/opt/acml*/GPGPUexamples" )
-   endif()
-   list(GET _ACML_ROOT 0 _ACML_ROOT)
-   list(GET _ACML_GPU_ROOT 0 _ACML_GPU_ROOT)
-   if( _ACML_ROOT )
-    get_filename_component( _ACML_ROOT ${_ACML_ROOT} PATH )
-    if( SIZEOF_INTEGER EQUAL 8 )
-     set( _ACML_PATH_SUFFIX "_int64" )
-    else()
-    set( _ACML_PATH_SUFFIX "" )
-   endif()
-   if( CMAKE_Fortran_COMPILER_ID STREQUAL "Intel" )
-    set( _ACML_COMPILER32 "ifort32" )
-    set( _ACML_COMPILER64 "ifort64" )
-   elseif( CMAKE_Fortran_COMPILER_ID STREQUAL "SunPro" )
-    set( _ACML_COMPILER32 "sun32" )
-    set( _ACML_COMPILER64 "sun64" )
-   elseif( CMAKE_Fortran_COMPILER_ID STREQUAL "PGI" )
-    set( _ACML_COMPILER32 "pgi32" )
-    if( WIN32 )
-     set( _ACML_COMPILER64 "win64" )
-    else()
-     set( _ACML_COMPILER64 "pgi64" )
-    endif()
-   elseif( CMAKE_Fortran_COMPILER_ID STREQUAL "Open64" )
-    # 32 bit builds not supported on Open64 but for code simplicity
-    # We'll just use the same directory twice
-    set( _ACML_COMPILER32 "open64_64" )
-    set( _ACML_COMPILER64 "open64_64" )
-   elseif( CMAKE_Fortran_COMPILER_ID STREQUAL "NAG" )
-    set( _ACML_COMPILER32 "nag32" )
-    set( _ACML_COMPILER64 "nag64" )
-   else() #if( CMAKE_Fortran_COMPILER_ID STREQUAL "GNU" )
-    set( _ACML_COMPILER32 "gfortran32" )
-    set( _ACML_COMPILER64 "gfortran64" )
-   endif()
-
-   if( BLA_VENDOR STREQUAL "ACML_MP" )
-    set(_ACML_MP_LIB_DIRS
-     "${_ACML_ROOT}/${_ACML_COMPILER32}_mp${_ACML_PATH_SUFFIX}/lib"
-     "${_ACML_ROOT}/${_ACML_COMPILER64}_mp${_ACML_PATH_SUFFIX}/lib" )
-   else() #if( _BLAS_VENDOR STREQUAL "ACML" )
-    set(_ACML_LIB_DIRS
-     "${_ACML_ROOT}/${_ACML_COMPILER32}${_ACML_PATH_SUFFIX}/lib"
-     "${_ACML_ROOT}/${_ACML_COMPILER64}${_ACML_PATH_SUFFIX}/lib" )
-   endif()
-  endif()
- elseif(BLAS_${BLA_VENDOR}_LIB_DIRS)
-   set(_${BLA_VENDOR}_LIB_DIRS ${BLAS_${BLA_VENDOR}_LIB_DIRS})
- endif()
-
- if( BLA_VENDOR STREQUAL "ACML_MP" )
-  foreach( BLAS_ACML_MP_LIB_DIRS ${_ACML_MP_LIB_DIRS})
-   check_fortran_libraries (
-     BLAS_LIBRARIES
-     BLAS
-     sgemm
-     "" "acml_mp;acml_mv" "" ${BLAS_ACML_MP_LIB_DIRS}
-   )
-   if( BLAS_LIBRARIES )
-    break()
-   endif()
-  endforeach()
- elseif( BLA_VENDOR STREQUAL "ACML_GPU" )
-  foreach( BLAS_ACML_GPU_LIB_DIRS ${_ACML_GPU_LIB_DIRS})
-   check_fortran_libraries (
-     BLAS_LIBRARIES
-     BLAS
-     sgemm
-     "" "acml;acml_mv;CALBLAS" "" ${BLAS_ACML_GPU_LIB_DIRS}
-   )
-   if( BLAS_LIBRARIES )
-    break()
-   endif()
-  endforeach()
- else() #if( _BLAS_VENDOR STREQUAL "ACML" )
-  foreach( BLAS_ACML_LIB_DIRS ${_ACML_LIB_DIRS} )
-   check_fortran_libraries (
-     BLAS_LIBRARIES
-     BLAS
-     sgemm
-     "" "acml;acml_mv" "" ${BLAS_ACML_LIB_DIRS}
-   )
-   if( BLAS_LIBRARIES )
-    break()
-   endif()
-  endforeach()
- endif()
-
- # Either acml or acml_mp should be in LD_LIBRARY_PATH but not both
- if(NOT BLAS_LIBRARIES)
-  check_fortran_libraries(
-  BLAS_LIBRARIES
-  BLAS
-  sgemm
-  ""
-  "acml;acml_mv"
-  ""
-  )
- endif(NOT BLAS_LIBRARIES)
- if(NOT BLAS_LIBRARIES)
-  check_fortran_libraries(
-  BLAS_LIBRARIES
-  BLAS
-  sgemm
-  ""
-  "acml_mp;acml_mv"
-  ""
-  )
- endif(NOT BLAS_LIBRARIES)
- if(NOT BLAS_LIBRARIES)
-  check_fortran_libraries(
-  BLAS_LIBRARIES
-  BLAS
-  sgemm
-  ""
-  "acml;acml_mv;CALBLAS"
-  ""
-  )
- endif(NOT BLAS_LIBRARIES)
-endif () # ACML
-
-# Apple BLAS library?
-if (BLA_VENDOR STREQUAL "Apple" OR BLA_VENDOR STREQUAL "All")
-if(NOT BLAS_LIBRARIES)
-  check_fortran_libraries(
-  BLAS_LIBRARIES
-  BLAS
-  dgemm
-  ""
-  "Accelerate"
-  ""
-  )
- endif(NOT BLAS_LIBRARIES)
-endif (BLA_VENDOR STREQUAL "Apple" OR BLA_VENDOR STREQUAL "All")
-
-if (BLA_VENDOR STREQUAL "NAS" OR BLA_VENDOR STREQUAL "All")
- if ( NOT BLAS_LIBRARIES )
-    check_fortran_libraries(
-    BLAS_LIBRARIES
-    BLAS
-    dgemm
-    ""
-    "vecLib"
-    ""
-    )
- endif ( NOT BLAS_LIBRARIES )
-endif (BLA_VENDOR STREQUAL "NAS" OR BLA_VENDOR STREQUAL "All")
-# Generic BLAS library?
-if (BLA_VENDOR STREQUAL "Generic" OR BLA_VENDOR STREQUAL "All")
- if(NOT BLAS_LIBRARIES)
-  check_fortran_libraries(
-  BLAS_LIBRARIES
-  BLAS
-  sgemm
-  ""
-  "blas"
-  ""
-  )
- endif(NOT BLAS_LIBRARIES)
-endif (BLA_VENDOR STREQUAL "Generic" OR BLA_VENDOR STREQUAL "All")
-
-#BLAS in intel mkl 10 library? (em64t 64bit)
-if (BLA_VENDOR MATCHES "Intel*" OR BLA_VENDOR STREQUAL "All")
- if (NOT WIN32)
-  set(LM "-lm")
- endif ()
- if (_LANGUAGES_ MATCHES C OR _LANGUAGES_ MATCHES CXX)
-  if(BLAS_FIND_QUIETLY OR NOT BLAS_FIND_REQUIRED)
-    find_package(Threads)
-  else(BLAS_FIND_QUIETLY OR NOT BLAS_FIND_REQUIRED)
-    find_package(Threads REQUIRED)
-  endif(BLAS_FIND_QUIETLY OR NOT BLAS_FIND_REQUIRED)
-  if (WIN32)
-  if(BLA_F95)
-    if(NOT BLAS95_LIBRARIES)
-    check_fortran_libraries(
-    BLAS95_LIBRARIES
-    BLAS
-    sgemm
-    ""
-    "mkl_blas95;mkl_intel_c;mkl_intel_thread;mkl_core;libguide40"
-    ""
-    )
-    endif(NOT BLAS95_LIBRARIES)
-  else(BLA_F95)
-    if(NOT BLAS_LIBRARIES)
-    check_fortran_libraries(
-    BLAS_LIBRARIES
-    BLAS
-    SGEMM
-    ""
-    "mkl_c_dll;mkl_intel_thread_dll;mkl_core_dll;libguide40"
-    ""
-    )
-    endif(NOT BLAS_LIBRARIES)
-  endif(BLA_F95)
-  else(WIN32)
-  if (BLA_VENDOR STREQUAL "Intel10_32" OR BLA_VENDOR STREQUAL "All")
-    if(BLA_F95)
-      if(NOT BLAS95_LIBRARIES)
-      check_fortran_libraries(
-      BLAS95_LIBRARIES
-      BLAS
-      sgemm
-      ""
-      "mkl_blas95;mkl_intel;mkl_intel_thread;mkl_core;guide"
-      "${CMAKE_THREAD_LIBS_INIT};${LM}"
-      )
-      endif(NOT BLAS95_LIBRARIES)
-    else(BLA_F95)
-    if(NOT BLAS_LIBRARIES)
-      check_fortran_libraries(
-      BLAS_LIBRARIES
-      BLAS
-      sgemm
-      ""
-      "mkl_intel;mkl_intel_thread;mkl_core;guide"
-      "${CMAKE_THREAD_LIBS_INIT}"
-      "${LM}"
-      )
-      endif(NOT BLAS_LIBRARIES)
-    endif(BLA_F95)
-  endif (BLA_VENDOR STREQUAL "Intel10_32" OR BLA_VENDOR STREQUAL "All")
-  if (BLA_VENDOR STREQUAL "Intel10_64lp" OR BLA_VENDOR STREQUAL "All")
-   if(BLA_F95)
-    if(NOT BLAS95_LIBRARIES)
-      check_fortran_libraries(
-      BLAS95_LIBRARIES
-      BLAS
-      sgemm
-      ""
-      "mkl_blas95;mkl_intel_lp64;mkl_intel_thread;mkl_core;guide"
-      "${CMAKE_THREAD_LIBS_INIT};${LM}"
-      )
-    endif(NOT BLAS95_LIBRARIES)
-   else(BLA_F95)
-     if(NOT BLAS_LIBRARIES)
-      check_fortran_libraries(
-      BLAS_LIBRARIES
-      BLAS
-      sgemm
-      ""
-      "mkl_intel_lp64;mkl_intel_thread;mkl_core;guide"
-      "${CMAKE_THREAD_LIBS_INIT};${LM}"
-      )
-     endif(NOT BLAS_LIBRARIES)
-   endif(BLA_F95)
-  endif (BLA_VENDOR STREQUAL "Intel10_64lp" OR BLA_VENDOR STREQUAL "All")
-  endif (WIN32)
-  #older vesions of intel mkl libs
-  # BLAS in intel mkl library? (shared)
-  if(NOT BLAS_LIBRARIES)
-    check_fortran_libraries(
-    BLAS_LIBRARIES
-    BLAS
-    sgemm
-    ""
-    "mkl;guide"
-    "${CMAKE_THREAD_LIBS_INIT};${LM}"
-    )
-  endif(NOT BLAS_LIBRARIES)
-  #BLAS in intel mkl library? (static, 32bit)
-  if(NOT BLAS_LIBRARIES)
-    check_fortran_libraries(
-    BLAS_LIBRARIES
-    BLAS
-    sgemm
-    ""
-    "mkl_ia32;guide"
-    "${CMAKE_THREAD_LIBS_INIT};${LM}"
-    )
-  endif(NOT BLAS_LIBRARIES)
-  #BLAS in intel mkl library? (static, em64t 64bit)
-  if(NOT BLAS_LIBRARIES)
-    check_fortran_libraries(
-    BLAS_LIBRARIES
-    BLAS
-    sgemm
-    ""
-    "mkl_em64t;guide"
-    "${CMAKE_THREAD_LIBS_INIT};${LM}"
-    )
-  endif(NOT BLAS_LIBRARIES)
- endif (_LANGUAGES_ MATCHES C OR _LANGUAGES_ MATCHES CXX)
-endif (BLA_VENDOR MATCHES "Intel*" OR BLA_VENDOR STREQUAL "All")
-
-
-if(BLA_F95)
- if(BLAS95_LIBRARIES)
-    set(BLAS95_FOUND TRUE)
-  else(BLAS95_LIBRARIES)
-    set(BLAS95_FOUND FALSE)
-  endif(BLAS95_LIBRARIES)
-
-  if(NOT BLAS_FIND_QUIETLY)
-    if(BLAS95_FOUND)
-      message(STATUS "A library with BLAS95 API found.")
-    else(BLAS95_FOUND)
-      if(BLAS_FIND_REQUIRED)
-        message(FATAL_ERROR
-        "A required library with BLAS95 API not found. Please specify library location.")
-      else(BLAS_FIND_REQUIRED)
-        message(STATUS
-        "A library with BLAS95 API not found. Please specify library location.")
-      endif(BLAS_FIND_REQUIRED)
-    endif(BLAS95_FOUND)
-  endif(NOT BLAS_FIND_QUIETLY)
-  set(BLAS_FOUND TRUE)
-  set(BLAS_LIBRARIES "${BLAS95_LIBRARIES}")
-else(BLA_F95)
-  if(BLAS_LIBRARIES)
-    set(BLAS_FOUND TRUE)
-  else(BLAS_LIBRARIES)
-    set(BLAS_FOUND FALSE)
-  endif(BLAS_LIBRARIES)
-
-  if(NOT BLAS_FIND_QUIETLY)
-    if(BLAS_FOUND)
-      message(STATUS "A library with BLAS API found.")
-    else(BLAS_FOUND)
-      if(BLAS_FIND_REQUIRED)
-        message(FATAL_ERROR
-        "A required library with BLAS API not found. Please specify library location."
-        )
-      else(BLAS_FIND_REQUIRED)
-        message(STATUS
-        "A library with BLAS API not found. Please specify library location."
-        )
-      endif(BLAS_FIND_REQUIRED)
-    endif(BLAS_FOUND)
-  endif(NOT BLAS_FIND_QUIETLY)
-endif(BLA_F95)
-
-set(CMAKE_FIND_LIBRARY_SUFFIXES ${_blas_ORIG_CMAKE_FIND_LIBRARY_SUFFIXES})
--- a/cmake/Modules/compat-2.8.7/FindLAPACK.cmake
+++ b/cmake/Modules/compat-2.8.7/FindLAPACK.cmake
@@ -1,307 +0,0 @@
-# - Find LAPACK library
-# This module finds an installed fortran library that implements the LAPACK
-# linear-algebra interface (see http://www.netlib.org/lapack/).
-#
-# The approach follows that taken for the autoconf macro file, acx_lapack.m4
-# (distributed at http://ac-archive.sourceforge.net/ac-archive/acx_lapack.html).
-#
-# This module sets the following variables:
-#  LAPACK_FOUND - set to true if a library implementing the LAPACK interface
-#    is found
-#  LAPACK_LINKER_FLAGS - uncached list of required linker flags (excluding -l
-#    and -L).
-#  LAPACK_LIBRARIES - uncached list of libraries (using full path name) to
-#    link against to use LAPACK
-#  LAPACK95_LIBRARIES - uncached list of libraries (using full path name) to
-#    link against to use LAPACK95
-#  LAPACK95_FOUND - set to true if a library implementing the LAPACK f95
-#    interface is found
-#  BLA_STATIC  if set on this determines what kind of linkage we do (static)
-#  BLA_VENDOR  if set checks only the specified vendor, if not set checks
-#     all the possibilities
-#  BLA_F95     if set on tries to find the f95 interfaces for BLAS/LAPACK
-### List of vendors (BLA_VENDOR) valid in this module
-##  Intel(mkl), ACML,Apple, NAS, Generic
-
-#=============================================================================
-# Copyright 2007-2009 Kitware, Inc.
-#
-# Distributed under the OSI-approved BSD License (the "License");
-# see accompanying file Copyright.txt for details.
-#
-# This software is distributed WITHOUT ANY WARRANTY; without even the
-# implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
-# See the License for more information.
-#=============================================================================
-# (To distribute this file outside of CMake, substitute the full
-#  License text for the above reference.)
-
-set(_lapack_ORIG_CMAKE_FIND_LIBRARY_SUFFIXES ${CMAKE_FIND_LIBRARY_SUFFIXES})
-
-get_property(_LANGUAGES_ GLOBAL PROPERTY ENABLED_LANGUAGES)
-if (NOT _LANGUAGES_ MATCHES Fortran)
-include(CheckFunctionExists)
-else (NOT _LANGUAGES_ MATCHES Fortran)
-include(CheckFortranFunctionExists)
-endif (NOT _LANGUAGES_ MATCHES Fortran)
-
-set(LAPACK_FOUND FALSE)
-set(LAPACK95_FOUND FALSE)
-
-# TODO: move this stuff to separate module
-
-macro(Check_Lapack_Libraries LIBRARIES _prefix _name _flags _list _blas _threads)
-# This macro checks for the existence of the combination of fortran libraries
-# given by _list.  If the combination is found, this macro checks (using the
-# Check_Fortran_Function_Exists macro) whether can link against that library
-# combination using the name of a routine given by _name using the linker
-# flags given by _flags.  If the combination of libraries is found and passes
-# the link test, LIBRARIES is set to the list of complete library paths that
-# have been found.  Otherwise, LIBRARIES is set to FALSE.
-
-# N.B. _prefix is the prefix applied to the names of all cached variables that
-# are generated internally and marked advanced by this macro.
-
-set(_libraries_work TRUE)
-set(${LIBRARIES})
-set(_combined_name)
-if (NOT _libdir)
-  if (WIN32)
-    set(_libdir ENV LIB)
-  elseif (APPLE)
-    set(_libdir /usr/local/lib /usr/lib /usr/local/lib64 /usr/lib64 ENV DYLD_LIBRARY_PATH)
-  else ()
-    set(_libdir /usr/local/lib /usr/lib /usr/local/lib64 /usr/lib64 ENV LD_LIBRARY_PATH)
-  endif ()
-endif ()
-foreach(_library ${_list})
-  set(_combined_name ${_combined_name}_${_library})
-
-  if(_libraries_work)
-    if (BLA_STATIC)
-      if (WIN32)
-        set(CMAKE_FIND_LIBRARY_SUFFIXES .lib ${CMAKE_FIND_LIBRARY_SUFFIXES})
-      endif ( WIN32 )
-      if (APPLE)
-        set(CMAKE_FIND_LIBRARY_SUFFIXES .lib ${CMAKE_FIND_LIBRARY_SUFFIXES})
-      else (APPLE)
-        set(CMAKE_FIND_LIBRARY_SUFFIXES .a ${CMAKE_FIND_LIBRARY_SUFFIXES})
-      endif (APPLE)
-    else (BLA_STATIC)
-			if (CMAKE_SYSTEM_NAME STREQUAL "Linux")
-        # for ubuntu's libblas3gf and liblapack3gf packages
-        set(CMAKE_FIND_LIBRARY_SUFFIXES ${CMAKE_FIND_LIBRARY_SUFFIXES} .so.3gf)
-      endif ()
-    endif (BLA_STATIC)
-    find_library(${_prefix}_${_library}_LIBRARY
-      NAMES ${_library}
-      PATHS ${_libdir}
-      )
-    mark_as_advanced(${_prefix}_${_library}_LIBRARY)
-    set(${LIBRARIES} ${${LIBRARIES}} ${${_prefix}_${_library}_LIBRARY})
-    set(_libraries_work ${${_prefix}_${_library}_LIBRARY})
-  endif(_libraries_work)
-endforeach(_library ${_list})
-
-if(_libraries_work)
-  # Test this combination of libraries.
-  if(UNIX AND BLA_STATIC)
-    set(CMAKE_REQUIRED_LIBRARIES ${_flags} "-Wl,--start-group" ${${LIBRARIES}} ${_blas} "-Wl,--end-group" ${_threads})
-  else(UNIX AND BLA_STATIC)
-    set(CMAKE_REQUIRED_LIBRARIES ${_flags} ${${LIBRARIES}} ${_blas} ${_threads})
-  endif(UNIX AND BLA_STATIC)
-#  message("DEBUG: CMAKE_REQUIRED_LIBRARIES = ${CMAKE_REQUIRED_LIBRARIES}")
-  if (NOT _LANGUAGES_ MATCHES Fortran)
-    check_function_exists("${_name}_" ${_prefix}${_combined_name}_WORKS)
-  else (NOT _LANGUAGES_ MATCHES Fortran)
-    check_fortran_function_exists(${_name} ${_prefix}${_combined_name}_WORKS)
-  endif (NOT _LANGUAGES_ MATCHES Fortran)
-  set(CMAKE_REQUIRED_LIBRARIES)
-  mark_as_advanced(${_prefix}${_combined_name}_WORKS)
-  set(_libraries_work ${${_prefix}${_combined_name}_WORKS})
-  #message("DEBUG: ${LIBRARIES} = ${${LIBRARIES}}")
-endif(_libraries_work)
-
- if(_libraries_work)
-   set(${LIBRARIES} ${${LIBRARIES}} ${_blas} ${_threads})
- else(_libraries_work)
-    set(${LIBRARIES} FALSE)
- endif(_libraries_work)
-
-endmacro(Check_Lapack_Libraries)
-
-
-set(LAPACK_LINKER_FLAGS)
-set(LAPACK_LIBRARIES)
-set(LAPACK95_LIBRARIES)
-
-
-if(LAPACK_FIND_QUIETLY OR NOT LAPACK_FIND_REQUIRED)
-  find_package(BLAS)
-else(LAPACK_FIND_QUIETLY OR NOT LAPACK_FIND_REQUIRED)
-  find_package(BLAS REQUIRED)
-endif(LAPACK_FIND_QUIETLY OR NOT LAPACK_FIND_REQUIRED)
-
-
-if(BLAS_FOUND)
-  set(LAPACK_LINKER_FLAGS ${BLAS_LINKER_FLAGS})
-  if ($ENV{BLA_VENDOR} MATCHES ".+")
-    set(BLA_VENDOR $ENV{BLA_VENDOR})
-  else ($ENV{BLA_VENDOR} MATCHES ".+")
-    if(NOT BLA_VENDOR)
-      set(BLA_VENDOR "All")
-    endif(NOT BLA_VENDOR)
-  endif ($ENV{BLA_VENDOR} MATCHES ".+")
-
-if (BLA_VENDOR STREQUAL "Goto" OR BLA_VENDOR STREQUAL "All")
- if(NOT LAPACK_LIBRARIES)
-  check_lapack_libraries(
-  LAPACK_LIBRARIES
-  LAPACK
-  cheev
-  ""
-  "goto2"
-  "${BLAS_LIBRARIES}"
-  ""
-  )
- endif(NOT LAPACK_LIBRARIES)
-endif (BLA_VENDOR STREQUAL "Goto" OR BLA_VENDOR STREQUAL "All")
-
-
-#acml lapack
- if (BLA_VENDOR MATCHES "ACML.*" OR BLA_VENDOR STREQUAL "All")
-   if (BLAS_LIBRARIES MATCHES ".+acml.+")
-     set (LAPACK_LIBRARIES ${BLAS_LIBRARIES})
-   endif ()
- endif ()
-
-# Apple LAPACK library?
-if (BLA_VENDOR STREQUAL "Apple" OR BLA_VENDOR STREQUAL "All")
- if(NOT LAPACK_LIBRARIES)
-  check_lapack_libraries(
-  LAPACK_LIBRARIES
-  LAPACK
-  cheev
-  ""
-  "Accelerate"
-  "${BLAS_LIBRARIES}"
-  ""
-  )
- endif(NOT LAPACK_LIBRARIES)
-endif (BLA_VENDOR STREQUAL "Apple" OR BLA_VENDOR STREQUAL "All")
-if (BLA_VENDOR STREQUAL "NAS" OR BLA_VENDOR STREQUAL "All")
-  if ( NOT LAPACK_LIBRARIES )
-    check_lapack_libraries(
-    LAPACK_LIBRARIES
-    LAPACK
-    cheev
-    ""
-    "vecLib"
-    "${BLAS_LIBRARIES}"
-    ""
-    )
-  endif ( NOT LAPACK_LIBRARIES )
-endif (BLA_VENDOR STREQUAL "NAS" OR BLA_VENDOR STREQUAL "All")
-# Generic LAPACK library?
-if (BLA_VENDOR STREQUAL "Generic" OR
-    BLA_VENDOR STREQUAL "ATLAS" OR
-    BLA_VENDOR STREQUAL "All")
-  if ( NOT LAPACK_LIBRARIES )
-    check_lapack_libraries(
-    LAPACK_LIBRARIES
-    LAPACK
-    cheev
-    ""
-    "lapack"
-    "${BLAS_LIBRARIES}"
-    ""
-    )
-  endif ( NOT LAPACK_LIBRARIES )
-endif ()
-#intel lapack
- if (BLA_VENDOR MATCHES "Intel*" OR BLA_VENDOR STREQUAL "All")
-  if (_LANGUAGES_ MATCHES C OR _LANGUAGES_ MATCHES CXX)
-   if(LAPACK_FIND_QUIETLY OR NOT LAPACK_FIND_REQUIRED)
-      find_PACKAGE(Threads)
-   else(LAPACK_FIND_QUIETLY OR NOT LAPACK_FIND_REQUIRED)
-       find_package(Threads REQUIRED)
-   endif(LAPACK_FIND_QUIETLY OR NOT LAPACK_FIND_REQUIRED)
-   if (BLA_F95)
-    if(NOT LAPACK95_LIBRARIES)
-     check_lapack_libraries(
-     LAPACK95_LIBRARIES
-     LAPACK
-     cheev
-     ""
-     "mkl_lapack95"
-     "${BLAS95_LIBRARIES}"
-     "${CMAKE_THREAD_LIBS_INIT}"
-     )
-    endif(NOT LAPACK95_LIBRARIES)
-   else(BLA_F95)
-    if(NOT LAPACK_LIBRARIES)
-     check_lapack_libraries(
-     LAPACK_LIBRARIES
-     LAPACK
-     cheev
-     ""
-     "mkl_lapack"
-     "${BLAS_LIBRARIES}"
-     "${CMAKE_THREAD_LIBS_INIT}"
-     )
-    endif(NOT LAPACK_LIBRARIES)
-   endif(BLA_F95)
-  endif (_LANGUAGES_ MATCHES C OR _LANGUAGES_ MATCHES CXX)
- endif(BLA_VENDOR MATCHES "Intel*" OR BLA_VENDOR STREQUAL "All")
-else(BLAS_FOUND)
-  message(STATUS "LAPACK requires BLAS")
-endif(BLAS_FOUND)
-
-if(BLA_F95)
- if(LAPACK95_LIBRARIES)
-  set(LAPACK95_FOUND TRUE)
- else(LAPACK95_LIBRARIES)
-  set(LAPACK95_FOUND FALSE)
- endif(LAPACK95_LIBRARIES)
- if(NOT LAPACK_FIND_QUIETLY)
-  if(LAPACK95_FOUND)
-    message(STATUS "A library with LAPACK95 API found.")
-  else(LAPACK95_FOUND)
-    if(LAPACK_FIND_REQUIRED)
-      message(FATAL_ERROR
-      "A required library with LAPACK95 API not found. Please specify library location."
-      )
-    else(LAPACK_FIND_REQUIRED)
-      message(STATUS
-      "A library with LAPACK95 API not found. Please specify library location."
-      )
-    endif(LAPACK_FIND_REQUIRED)
-  endif(LAPACK95_FOUND)
- endif(NOT LAPACK_FIND_QUIETLY)
- set(LAPACK_FOUND "${LAPACK95_FOUND}")
- set(LAPACK_LIBRARIES "${LAPACK95_LIBRARIES}")
-else(BLA_F95)
- if(LAPACK_LIBRARIES)
-  set(LAPACK_FOUND TRUE)
- else(LAPACK_LIBRARIES)
-  set(LAPACK_FOUND FALSE)
- endif(LAPACK_LIBRARIES)
-
- if(NOT LAPACK_FIND_QUIETLY)
-  if(LAPACK_FOUND)
-    message(STATUS "A library with LAPACK API found.")
-  else(LAPACK_FOUND)
-    if(LAPACK_FIND_REQUIRED)
-      message(FATAL_ERROR
-      "A required library with LAPACK API not found. Please specify library location."
-      )
-    else(LAPACK_FIND_REQUIRED)
-      message(STATUS
-      "A library with LAPACK API not found. Please specify library location."
-      )
-    endif(LAPACK_FIND_REQUIRED)
-  endif(LAPACK_FOUND)
- endif(NOT LAPACK_FIND_QUIETLY)
-endif(BLA_F95)
-
-set(CMAKE_FIND_LIBRARY_SUFFIXES ${_lapack_ORIG_CMAKE_FIND_LIBRARY_SUFFIXES})
--- a/cmake/Templates/Doxyfile
+++ b/cmake/Templates/Doxyfile
@@ -816,7 +816,7 @@ HTML_COLORSTYLE_GAMMA  = 80
 # page will contain the date and time when the page was generated. Setting
 # this to NO can help when comparing the output of multiple runs.

-HTML_TIMESTAMP         = YES
+HTML_TIMESTAMP         = NO

 # If the HTML_DYNAMIC_SECTIONS tag is set to YES then the generated HTML
 # documentation will contain sections that can be hidden and shown after the
--- a/cmake/Templates/opm-project-config.cmake.in
+++ b/cmake/Templates/opm-project-config.cmake.in
@@ -93,6 +93,16 @@ if(NOT @opm-project_NAME@_FOUND)

  # this is the contents of config.h as far as our probes can tell:

+  # Require correct CMake standard. Needed for user modules as
+  # some software will add incompatible compile switches like
+  # -std=gnu++11 otherwise when search for (I guess because of
+  # imported targets using INTERFACE_COMPILE_FEATURES), and will
+  # break compilation because of missing c++17 features.
+  if(NOT CMAKE_CXX_STANDARD)
+    set(CMAKE_CXX_STANDARD @CMAKE_CXX_STANDARD@)
+    set(CMAKE_CXX_STANDARD_REQUIRED ON)
+    set(CMAKE_CXX_EXTENSIONS OFF)
+  endif()

  # The settings in this block do not mix well with the DEST_PREFIX
  # setting.
@@ -104,6 +114,7 @@ if(NOT @opm-project_NAME@_FOUND)
    @OPM_PROJECT_EXTRA_CODE@
    # end extra code

+    include(OpmPackage)
    include(@opm-project_NAME@-prereqs)
  endif()
 endif()
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-opm-common (2019.04-pre~xenial) xenial; urgency=medium
+opm-common (2021.10-rfinal-1~bionic) bionic; urgency=medium

  * New release

--- a/debian/rules
+++ b/debian/rules
@@ -20,7 +20,7 @@ override_dh_auto_build:

 # consider using -DUSE_VERSIONED_DIR=ON if backporting
 override_dh_auto_configure:
-	dh_auto_configure --buildsystem=cmake -- -DCMAKE_BUILD_TYPE=RelWithDebInfo -DSTRIP_DEBUGGING_SYMBOLS=ON -DBUILD_SHARED_LIBS=1 -DCMAKE_INSTALL_DOCDIR=share/doc/libopm-common1 -DWHOLE_PROG_OPTIM=ON -DUSE_RUNPATH=OFF -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 -DOPM_ENABLE_PYTHON=1 -DOPM_INSTALL_PYTHON=1 -DPYTHON_EXECUTABLE=/usr/bin/python3 -DOPM_ENABLE_EMBEDDED_PYTHON=1

 override_dh_auto_install:
 	dh_auto_install -- install-html
--- a/docs/keywords.txt
+++ b/docs/keywords.txt
@@ -153,7 +153,7 @@ we currently have five different categories:

     To infer the number of records in the keyword based on an
     internal calculation is not supported, hence for these keywords
-     size is given as unkown, and the keywords are terminated when the
+     size is given as unknown, and the keywords are terminated when the
     next valid keyword is found:

        {"name" : "VFPPROD" , "size" : "UNKNOWN", ....
--- a/docs/man1/compareECL.1
+++ b/docs/man1/compareECL.1
@@ -0,0 +1,65 @@
+.\" DO NOT MODIFY THIS FILE!  It was generated by help2man 1.47.8.
+.TH COMPAREECL "1" "April 2021" "compareECL 2020.04" "User Commands"
+.SH NAME
+compareECL \- Comparator for Eclipse files
+.SH DESCRIPTION
+compareECL 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.
+The program takes four arguments:
+.PP
+1. Case number 1, reference case (full path without extension)
+2. Case number 2, test case (full path without extension)
+3. Absolute tolerance
+4. Relative tolerance (between 0 and 1)
+.PP
+In addition, the program takes these options (which must be given before the arguments):
+.PP
+\fB\-a\fR Run a full analysis of errors.
+\fB\-h\fR Print help and exit.
+\fB\-d\fR Use report steps only when comparing results from summary files.
+\fB\-i\fR Execute integration test (regression test is default).
+.IP
+The integration test compares SGAS, SWAT and PRESSURE in unified restart files, and WOPR, WGPR, WWPR and WBHP (all wells) in summary file.
+.PP
+\fB\-k\fR Specify specific keyword to compare (capitalized), for examples \fB\-k\fR PRESSURE or \fB\-k\fR WOPR:A\-1H
+\fB\-l\fR Only do comparison for the last Report Step. This option is only valid for restart files.
+\fB\-n\fR Do not throw on errors.
+\fB\-p\fR Print keywords in both cases and exit.
+\fB\-r\fR compare a spesific report time step number in a restart file.
+\fB\-t\fR Specify ECLIPSE filetype to compare, (default behaviour is that all files are compared if found). Different possible arguments are:
+.TP
+\fB\-t\fR UNRST
+Compare two unified restart files (.UNRST). This the default value, so it is the same as not passing option \fB\-t\fR.
+.TP
+\fB\-t\fR EGRID
+Compare two EGrid files (.EGRID).
+.TP
+\fB\-t\fR INIT
+Compare two initial files (.INIT).
+.TP
+\fB\-t\fR RFT
+Compare two RFT files (.RFT).
+.TP
+\fB\-t\fR SMRY
+Compare two cases consistent of (unified) summary files.
+.PP
+\fB\-x\fR Allow extra keywords in case number 2. These additional keywords (not found in case number1) will be ignored in the comparison.
+.PP
+Example usage of the program:
+.PP
+compareECL \fB\-k\fR PRESSURE <path to first casefile> <path to second casefile> 1e\-3 1e\-5
+compareECL \fB\-t\fR INIT \fB\-k\fR PORO <path to first casefile> <path to second casefile> 1e\-3 1e\-5
+compareECL \fB\-i\fR <path to first casefile> <path to second casefile> 0.01 1e\-6
+.PP
+Exceptions are thrown (and hence program exits) when deviations are larger than the specified tolerances, or when the number of cells does not match \fB\-\-\fR 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.
+.SH "SEE ALSO"
+The full documentation for
+.B compareECL
+is maintained as a Texinfo manual.  If the
+.B info
+and
+.B compareECL
+programs are properly installed at your site, the command
+.IP
+.B info compareECL
+.PP
+should give you access to the complete manual.
--- a/docs/man1/convertECL.1
+++ b/docs/man1/convertECL.1
@@ -0,0 +1,24 @@
+.\" DO NOT MODIFY THIS FILE!  It was generated by help2man 1.47.8.
+.TH CONVERTECL "1" "April 2021" "convertECL 2020.04" "User Commands"
+.SH NAME
+convertECL \- Converter for Eclipse files (binary <-> formatted format)
+.SH DESCRIPTION
+convertECL needs one argument which is the input file to be converted. If this is a binary file the output file will be formatted. If the input file is formatted the output will be binary.
+.PP
+In addition, the program takes these options (which must be given before the arguments):
+.PP
+\fB\-h\fR Print help and exit.
+\fB\-l\fR list report step numbers in the selected restart file.
+\fB\-r\fR extract and convert a spesific report time step number from a unified restart file.
+.SH "SEE ALSO"
+The full documentation for
+.B convertECL
+is maintained as a Texinfo manual.  If the
+.B info
+and
+.B convertECL
+programs are properly installed at your site, the command
+.IP
+.B info convertECL
+.PP
+should give you access to the complete manual.
--- a/docs/man1/opmhash.1
+++ b/docs/man1/opmhash.1
@@ -0,0 +1,54 @@
+.\" DO NOT MODIFY THIS FILE!  It was generated by help2man 1.47.8.
+.TH OPMHASH "1" "April 2021" "opmhash 2020.04" "User Commands"
+.SH NAME
+opmhash \- Hasher for summary keywords in Eclipse files
+.SH DESCRIPTION
+opmhash: invalid option \fB\-\-\fR 'h'
+The purpose of the opmhash program is to load a deck and create a summary, by
+diffing two such summaries it is simple to determine if two decks are similar.
+For each keyword a hash of the normalized content is calculated. The output of
+the program will look like this:
+.TP
+RUNSPEC
+: 13167205945009276792
+.TP
+TITLE
+: 16047371705964514902
+.TP
+DIMENS
+: 1264233216877515756
+.TP
+NONNC
+: 10052807539267647959
+.TP
+OIL
+: 6013609912232720008
+.TP
+WATER
+: 14106203893673265964
+.TP
+Total
+: 7362809723723482303
+.PP
+Where the 'random' integer following each keyword is the hash of the content of
+that keyword. The hashing is insensitive to changes in white\-space and comments
+and file location. At the bottom comes a total hash of the complete content. The
+hash of each keyword is insensitive to shuffling of keywords, but the total hash
+depends on the keyword order.
+.SH OPTIONS
+.HP
+\fB\-l\fR : Add filename and linenumber information to each keyword.
+.HP
+\fB\-s\fR : Short form \- only print the hash of the complete deck.
+.SH "SEE ALSO"
+The full documentation for
+.B opmhash
+is maintained as a Texinfo manual.  If the
+.B info
+and
+.B opmhash
+programs are properly installed at your site, the command
+.IP
+.B info opmhash
+.PP
+should give you access to the complete manual.
--- a/docs/man1/opmpack.1
+++ b/docs/man1/opmpack.1
@@ -0,0 +1,42 @@
+.\" DO NOT MODIFY THIS FILE!  It was generated by help2man 1.47.8.
+.TH OPMPACK "1" "April 2021" "opmpack 2020.04" "User Commands"
+.SH NAME
+opmpack \- Validator and printer of deck in Eclipse files without comments
+.SH DESCRIPTION
+opmpack: invalid option \fB\-\-\fR 'h'
+.PP
+The opmpack program will load a deck, resolve all include
+files and then print it out again on stdout. All comments
+will be stripped and the value types will be validated.
+.PP
+By passing the option \fB\-o\fR you can redirect the output to a file
+or a directory.
+.PP
+Print on stdout:
+.TP
+opmpack
+\fI\,/path/to/case/CASE.DATA\/\fP
+.PP
+Print MY_CASE.DATA in /tmp:
+.IP
+opmpack \fB\-o\fR \fI\,/tmp\/\fP /path/to/MY_CASE.DATA
+.PP
+Print NEW_CASE in cwd:
+.IP
+opmpack \fB\-o\fR NEW_CASE.DATA path/to/MY_CASE.DATA
+.PP
+As an alternative to the \fB\-o\fR option you can use \fB\-c\fR; that is equivalent to \fB\-o\fR \-
+but restart and import files referred to in the deck are also copied. The \fB\-o\fR and
+\fB\-c\fR options are mutually exclusive.
+.SH "SEE ALSO"
+The full documentation for
+.B opmpack
+is maintained as a Texinfo manual.  If the
+.B info
+and
+.B opmpack
+programs are properly installed at your site, the command
+.IP
+.B info opmpack
+.PP
+should give you access to the complete manual.
--- a/docs/man1/rst_deck.1
+++ b/docs/man1/rst_deck.1
@@ -0,0 +1,7 @@
+.TH RST_DECK
+.SH NAME
+rst_deck \- Create a version of deck ready for restart
+
+
+
+
--- a/docs/man1/summary.1
+++ b/docs/man1/summary.1
@@ -0,0 +1,24 @@
+.\" DO NOT MODIFY THIS FILE!  It was generated by help2man 1.47.8.
+.TH SUMMARY "1" "April 2021" "summary 2020.04" "User Commands"
+.SH NAME
+summary \- Printer for summary keys in Eclipse summary files
+.SH DESCRIPTION
+summary needs a minimum of two arguments. First is smspec filename and then list of vectors
+.PP
+In addition, the program takes these options (which must be given before the arguments):
+.PP
+\fB\-h\fR Print help and exit.
+\fB\-l\fR list all summary vectors.
+\fB\-r\fR extract data only for report steps.
+.SH "SEE ALSO"
+The full documentation for
+.B summary
+is maintained as a Texinfo manual.  If the
+.B info
+and
+.B summary
+programs are properly installed at your site, the command
+.IP
+.B info summary
+.PP
+should give you access to the complete manual.
--- a/dune.module
+++ b/dune.module
@@ -5,8 +5,8 @@

 Module: opm-common
 Description: Open Porous Media Initiative shared infrastructure
-Version: 2020.10-pre
-Label: 2020.10-pre
+Version: 2021.10
+Label: 2021.10
 Maintainer: opm@opm-project.org
 MaintainerName: OPM community
 Url: http://opm-project.org
--- a/examples/make_ext_smry.cpp
+++ b/examples/make_ext_smry.cpp
@@ -25,7 +25,7 @@

 #include "config.h"

-#if HAVE_OPENMP
+#if _OPENMP
 #include <omp.h>
 #endif

@@ -39,7 +39,7 @@ static void printHelp() {
    std::cout << "\nThis program create one or more lodsmry files, designed for effective load on the demand.   \n"
              << "These files are created with input from the smspec and unsmry file. \n"
              << "\nIn addition, the program takes these options (which must be given before the arguments):\n\n"
-              << "-f if LODSMRY file exist, this will be replaced. Default behaviour is that existing file is kept.\n"
+              << "-f if ESMRY file exist, this will be replaced. Default behaviour is that existing file is kept.\n"
              << "-n Maximum number of threads to be used if mulitple files should be created.\n"
              << "-h Print help and exit.\n\n";
 }
@@ -48,7 +48,9 @@ static void printHelp() {
 int main(int argc, char **argv) {

    int c                          = 0;
-    int max_threads [[maybe_unused]] = -1;
+#ifdef _OPENMP
+    int max_threads = -1;
+#endif
    bool force                     = false;

    while ((c = getopt(argc, argv, "fn:h")) != -1) {
@@ -60,7 +62,11 @@ int main(int argc, char **argv) {
            printHelp();
            return 0;
        case 'n':
+#ifdef _OPENMP
            max_threads = atoi(optarg);
+#else
+            std::cerr << "OpenMP is disabled - using single thread only\n";
+#endif
            break;
        default:
            return EXIT_FAILURE;
@@ -69,7 +75,7 @@ int main(int argc, char **argv) {

    int argOffset = optind;

-#if HAVE_OPENMP
+#ifdef _OPENMP
    int available_threads = omp_get_max_threads();

    if (max_threads < 0)
@@ -89,21 +95,21 @@ int main(int argc, char **argv) {
    for (int f = argOffset; f < argc; f ++){
        Opm::filesystem::path inputFileName = argv[f];

-        Opm::filesystem::path lodFileName = inputFileName.parent_path() / inputFileName.stem();
-        lodFileName = lodFileName += ".LODSMRY";
+        Opm::filesystem::path esmryFileName = inputFileName.parent_path() / inputFileName.stem();
+        esmryFileName = esmryFileName += ".ESMRY";

-        if (Opm::EclIO::fileExists(lodFileName) && (force))
-            remove (lodFileName);
+        if (Opm::EclIO::fileExists(esmryFileName) && (force))
+            remove (esmryFileName);

        Opm::EclIO::ESmry smryFile(argv[f]);
-        if (!smryFile.make_lodsmry_file()){
+        if (!smryFile.make_esmry_file()){
            std::cout << "\n! Warning, smspec already have one lod file, existing kept use option -f to replace this" << std::endl;
        }
    }

    auto lap1 = std::chrono::system_clock::now();
    std::chrono::duration<double> elapsed_seconds1 = lap1-lap0;
-    std::cout << "\nruntime for creating " << (argc-argOffset) << " LODSMRY files: " << elapsed_seconds1.count() << " seconds\n" << std::endl;
+    std::cout << "\nruntime for creating " << (argc-argOffset) << " ESMRY files: " << elapsed_seconds1.count() << " seconds\n" << std::endl;

    return 0;
 }
--- a/examples/msim.cpp
+++ b/examples/msim.cpp
@@ -43,7 +43,7 @@ int main(int /* argc */, char** argv) {
    Opm::Deck deck = parser.parseFile(deck_file, parse_context, error_guard);
    Opm::EclipseState state(deck);
    Opm::Schedule schedule(deck, state, parse_context, error_guard, python);
-    Opm::SummaryConfig summary_config(deck, schedule, state.getTableManager(), state.aquifer(),
+    Opm::SummaryConfig summary_config(deck, schedule, state.fieldProps(), state.aquifer(),
                                      parse_context, error_guard);

    if (error_guard) {
--- a/examples/opmhash.cpp
+++ b/examples/opmhash.cpp
@@ -19,7 +19,9 @@
 #include <getopt.h>

 #include <vector>
-
+#include <iostream>
+#include <sstream>
+#include <cstdlib>
 #include <fmt/format.h>

 #include <opm/parser/eclipse/Parser/Parser.hpp>
@@ -49,7 +51,7 @@ struct keyword {
 };


-std::vector<keyword> load_deck(const char * deck_file) {
+std::vector<keyword> load_deck(const std::string& deck_file) {
    Opm::ParseContext parseContext;
    Opm::ErrorGuard errors;
    Opm::Parser parser;
@@ -73,7 +75,7 @@ std::vector<keyword> load_deck(const char * deck_file) {
 }


-std::size_t deck_hash(const std::vector<keyword>& keywords) {
+std::size_t make_deck_hash(const std::vector<keyword>& keywords) {
    std::stringstream ss;
    for (const auto& kw : keywords)
        ss << kw.content_hash;
@@ -82,14 +84,14 @@ std::size_t deck_hash(const std::vector<keyword>& keywords) {
 }


-void print_keywords(const std::vector<keyword>& keywords, bool location_info) {
+void print_keywords(const std::vector<keyword>& keywords, std::size_t deck_hash, bool location_info) {
    for (const auto& kw : keywords) {
        if (location_info)
            fmt::print("{:8s} : {}:{} {} \n", kw.name, kw.filename, kw.line_number, kw.content_hash);
        else
            fmt::print("{:8s} : {} \n", kw.name, kw.content_hash);
    }
-    fmt::print("\n{:8s} : {}\n", "Total", deck_hash(keywords));
+    fmt::print("\n{:8s} : {}\n", "Total", deck_hash);
 }


@@ -118,6 +120,12 @@ Options:

 -l : Add filename and linenumber information to each keyword.
 -s : Short form - only print the hash of the complete deck.
+ -S : Silent form - will not print any deck output.
+
+It is possible to add multiple deck arguments, they are then scanned repeatedly,
+and the decks are compared. In the case of multiple deck arguments the exit
+status of the program will be zero if all are equal and nonzero in case of
+differences.

 )";
    std::cerr << help_text << std::endl;
@@ -129,10 +137,11 @@ int main(int argc, char** argv) {
    int arg_offset = 1;
    bool location_info = false;
    bool short_form = false;
+    bool silent = false;

    while (true) {
        int c;
-        c = getopt(argc, argv, "ls");
+        c = getopt(argc, argv, "lsS");
        if (c == -1)
            break;

@@ -143,16 +152,53 @@ int main(int argc, char** argv) {
        case 's':
            short_form = true;
            break;
+        case 'S':
+            silent = true;
+            break;
        }
    }
    arg_offset = optind;
    if (arg_offset >= argc)
        print_help_and_exit();

-    auto keywords = load_deck(argv[arg_offset]);
-    if (short_form)
-        std::cout << deck_hash(keywords) << std::endl;
-    else
-        print_keywords(keywords, location_info);
+
+    std::vector<std::pair<std::string, std::size_t>> deck_hash_table;
+    for (int iarg = arg_offset; iarg < argc; iarg++) {
+        const std::string deck_file = argv[iarg];
+        auto keywords = load_deck(deck_file);
+        auto deck_hash = make_deck_hash(keywords);
+        deck_hash_table.emplace_back(deck_file, deck_hash);
+        if (silent)
+            continue;
+
+        if (short_form)
+            std::cout << deck_hash << std::endl;
+        else
+            print_keywords(keywords, deck_hash, location_info);
+    }
+
+    if (deck_hash_table.size() > 1) {
+        bool equal = true;
+        const auto& [first_deck, first_hash] = deck_hash_table[0];
+        for (std::size_t index = 1; index < deck_hash_table.size(); index++) {
+            const auto& [deck, hash] = deck_hash_table[index];
+            if (first_hash != hash)
+                equal = false;
+
+            if (silent)
+                continue;
+
+            fmt::print("{} {} {}\n",
+                       first_deck,
+                       (first_hash == hash) ? "==" : "!=",
+                       deck);
+        }
+
+        if (equal)
+            std::exit(EXIT_SUCCESS);
+        else
+            std::exit(EXIT_FAILURE);
+    }
+
 }

--- a/examples/opmi.cpp
+++ b/examples/opmi.cpp
@@ -34,6 +34,7 @@
 #include <opm/common/OpmLog/OpmLog.hpp>
 #include <opm/common/OpmLog/StreamLog.hpp>
 #include <opm/common/OpmLog/LogUtil.hpp>
+#include <opm/common/utility/TimeService.hpp>


 void initLogging() {
@@ -49,30 +50,30 @@ inline void loadDeck( const char * deck_file) {

    std::cout << "Loading deck: " << deck_file << " ..... "; std::cout.flush();

-    std::chrono::system_clock::time_point start;
+    Opm::time_point start;

-    start = std::chrono::system_clock::now();
+    start = Opm::TimeService::now();
    auto deck = parser.parseFile(deck_file, parseContext, errors);
-    auto deck_time = std::chrono::system_clock::now() - start;
+    auto deck_time = Opm::TimeService::now() - start;

    std::cout << "parse complete - creating EclipseState .... ";  std::cout.flush();

-    start = std::chrono::system_clock::now();
+    start = Opm::TimeService::now();
    Opm::EclipseState state( deck );
-    auto state_time = std::chrono::system_clock::now() - start;
+    auto state_time = Opm::TimeService::now() - start;

    std::cout << "creating Schedule .... ";  std::cout.flush();

-    start = std::chrono::system_clock::now();
+    start = Opm::TimeService::now();
    Opm::Schedule schedule( deck, state, python);
-    auto schedule_time = std::chrono::system_clock::now() - start;
+    auto schedule_time = Opm::TimeService::now() - start;

    std::cout << "creating SummaryConfig .... ";  std::cout.flush();

-    start = std::chrono::system_clock::now();
-    Opm::SummaryConfig summary( deck, schedule, state.getTableManager( ), state.aquifer(),
+    start = Opm::TimeService::now();
+    Opm::SummaryConfig summary( deck, schedule, state.fieldProps(), state.aquifer(),
                                parseContext, errors );
-    auto summary_time = std::chrono::system_clock::now() - start;
+    auto summary_time = Opm::TimeService::now() - start;

    std::cout << "complete." << std::endl << std::endl;
    std::cout << "Time: " << std::endl;
--- a/examples/rst_deck.cpp
+++ b/examples/rst_deck.cpp
@@ -0,0 +1,271 @@
+/*
+  Copyright 2021 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 <cstdlib>
+#include <fstream>
+#include <iostream>
+#include <getopt.h>
+#include <fmt/format.h>
+#include <unordered_set>
+
+#include <opm/parser/eclipse/Deck/DeckKeyword.hpp>
+#include <opm/common/utility/FileSystem.hpp>
+#include <opm/parser/eclipse/Units/UnitSystem.hpp>
+#include <opm/parser/eclipse/Parser/ParserKeywords/I.hpp>
+#include <opm/parser/eclipse/Parser/ParserKeywords/P.hpp>
+#include <opm/parser/eclipse/Parser/ParserKeywords/G.hpp>
+#include <opm/parser/eclipse/Parser/ParserKeywords/R.hpp>
+#include <opm/parser/eclipse/Parser/ParserKeywords/S.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>
+#include <opm/parser/eclipse/Deck/FileDeck.hpp>
+
+namespace fs = Opm::filesystem;
+
+const std::unordered_set<std::string> remove_from_solution = {"EQUIL", "PRESSURE", "SWAT", "SGAS"};
+
+void print_help_and_exit(const std::optional<std::string> error_msg = {}) {
+
+    if (error_msg.has_value()) {
+        std::cerr << "Error:" << std::endl;
+        std::cerr << error_msg.value() << std::endl;
+        std::cerr << "------------------------------------------------------" << std::endl;
+    }
+
+    std::string keep_keywords;
+    for (const auto& kw : Opm::FileDeck::rst_keep_in_solution)
+        keep_keywords += kw + " ";
+
+    const std::string help_text = fmt::format(R"(
+
+The rst_deck program will load a simulation deck and parameters for a restart
+and reformat the deck to become a restart deck. Before the updated deck is
+output the program will update the SOLUTION and SCHEDULE sections. All keywords
+from the SOLUTION section will be cleared out(1) and a RESTART keyword will be
+inserted. In the SCHEDULE section the program can either remove all keywords up
+until the restart date, or alternatively insert SKIPREST immediately following
+the SCHEDULE keyword(2).
+
+When creating the updated restart deck the program can either link to unmodified
+include files with INCLUDE statements, create a copy of deck structure in an
+alternative location or create one large file with all keywords in the same
+file. Apart from the alterations to support restart the output deck will be
+equivalent to the input deck, but formatting is not retained and comments have
+been stripped away.
+
+Arguments:
+
+1. The data file we are starting with.
+
+2. The basename of the restart file - with an optional path prefix and a :N to
+   restart from step N(3). A restart step value of 0 is interpreted as a dry run
+   - a deck which has not been set up for restart will be written out.
+
+3. Basename of the restart deck we create, can optionally contain a path prefix;
+   the path will be created if it does not already exist. This argument is
+   optional, if it is not provided the program will dump a restart deck on
+   stdout. If the argument corresponds to an existing directory the restart case
+   will get the same name as the base case.
+
+Options:
+
+-s: Manipulate the SCHEDULE section by inserting a SKIPREST keyword immediately
+    following the SCHEDULE keyword. If the -s option is not used the SCHEDULE
+    section will be modified by removing all keywords until we reach the restart
+    date. NB: Currently the -s option is required
+
+-m: [share|inline|copy] The restart deck can reuse the unmodified include files
+    from the base case, this is mode 'share' and is the default. With mode
+    'inline' the restart deck will be one long file and with mode 'copy' the
+    file structure of the base case will be retained. The default if no -m
+    option is given is the 'share' mode.
+
+    In the case of 'share' and 'copy' the correct path to include files will be
+    negotiated based on the path given to the output case in the third argument.
+    If the restart deck is passed to stdout the include files will be resolved
+    based on output in cwd. 
+
+Example:
+
+   rst_deck /path/to/history/HISTORY.DATA rst/HISTORY:30 /path/to/rst/RESTART -s
+
+1: The program has a compiled list of keywords which will be retained in the
+   SOLUTION section. The current value of that list is: {}
+
+2: Current version of the program *only* supports the SKIPREST option, and the
+   -s option is required.
+
+3: The second argument is treated purely as a string and inserted verbatim into
+   the updated restart deck. In a future version we might interpret the second
+   argument as a file path and check the content and also do filesystem
+   manipulations from it.
+
+)", keep_keywords);
+
+    std::cerr << help_text << std::endl;
+    if (error_msg.has_value())
+        std::exit(EXIT_FAILURE);
+
+    std::exit(EXIT_SUCCESS);
+}
+
+
+
+struct options {
+    std::string input_deck;
+    std::pair<std::string, int> restart;
+    std::optional<std::string> target;
+
+    Opm::FileDeck::OutputMode mode{Opm::FileDeck::OutputMode::SHARE};
+    bool skiprest{false};
+};
+
+
+Opm::FileDeck load_deck(const options& opt) {
+    Opm::ParseContext parseContext(Opm::InputError::WARN);
+    Opm::ErrorGuard errors;
+    Opm::Parser parser;
+
+    /* Use the same default ParseContext as flow. */
+    parseContext.update(Opm::ParseContext::PARSE_RANDOM_SLASH, Opm::InputError::IGNORE);
+    parseContext.update(Opm::ParseContext::PARSE_MISSING_DIMS_KEYWORD, Opm::InputError::WARN);
+    parseContext.update(Opm::ParseContext::SUMMARY_UNKNOWN_WELL, Opm::InputError::WARN);
+    parseContext.update(Opm::ParseContext::SUMMARY_UNKNOWN_GROUP, Opm::InputError::WARN);
+    auto deck = parser.parseFile(opt.input_deck, parseContext, errors);
+    return Opm::FileDeck{ deck };
+}
+
+
+Opm::FileDeck::OutputMode mode(const std::string& mode_arg) {
+    if (mode_arg == "inline")
+        return Opm::FileDeck::OutputMode::INLINE;
+
+    if (mode_arg == "share")
+        return Opm::FileDeck::OutputMode::SHARE;
+
+    if (mode_arg == "copy")
+        return Opm::FileDeck::OutputMode::COPY;
+
+    print_help_and_exit(fmt::format("Mode argument: \'{}\' not recognized. Valid options are inline|share|copy", mode_arg));
+    return Opm::FileDeck::OutputMode::INLINE;
+}
+
+std::pair<std::string, std::size_t> split_restart(const std::string& restart_base) {
+    auto sep_pos = restart_base.rfind(':');
+    if (sep_pos == std::string::npos)
+        print_help_and_exit(fmt::format("Expected restart argument on the form: BASE:NUMBER - e.g. HISTORY:60"));
+
+    return std::make_pair(restart_base.substr(0, sep_pos), std::stoi(restart_base.substr(sep_pos + 1)));
+}
+
+
+options load_options(int argc, char **argv) {
+    options opt;
+    while (true) {
+        int c;
+        c = getopt(argc, argv, "hm:s");
+        if (c == -1)
+            break;
+
+        switch(c) {
+        case 'm':
+            opt.mode = mode(optarg);
+            break;
+        case 's':
+            opt.skiprest = true;
+            break;
+        case 'h':
+            print_help_and_exit();
+            break;
+        }
+    }
+
+    auto arg_offset = optind;
+    if (arg_offset >= argc)
+        print_help_and_exit();
+
+    opt.input_deck = argv[arg_offset];
+    opt.restart = split_restart(argv[arg_offset + 1]);
+    if ((argc - arg_offset) >= 3) {
+        opt.target = argv[arg_offset + 2];
+        if (opt.mode == Opm::FileDeck::OutputMode::COPY) {
+            auto target = fs::path(opt.target.value()).parent_path();
+            if (fs::exists(target)) {
+                auto input = fs::path(opt.input_deck).parent_path();
+                if (fs::equivalent(target, input))
+                    opt.mode = Opm::FileDeck::OutputMode::SHARE;
+            }
+        }
+    } else {
+        if (opt.mode == Opm::FileDeck::OutputMode::COPY)
+            print_help_and_exit("When writing output to stdout you must use inline|share mode");
+    }
+
+    return opt;
+}
+
+
+void update_solution(const options& opt, Opm::FileDeck& file_deck)
+{
+    if (opt.restart.second == 0)
+        return;
+
+    const auto solution = file_deck.find("SOLUTION");
+    if (!solution.has_value())
+        print_help_and_exit(fmt::format("Could not find SOLUTION section in input deck: {}", opt.input_deck));
+
+    auto summary = file_deck.find("SUMMARY");
+    if (!summary.has_value())
+        print_help_and_exit(fmt::format("Could not find SUMMARY section in input deck: {}", opt.input_deck));
+
+    file_deck.rst_solution(opt.restart.first, opt.restart.second);
+}
+
+
+void update_schedule(const options& opt, Opm::FileDeck& file_deck)
+{
+    if (opt.restart.second == 0)
+        return;
+
+    if (opt.skiprest)
+        file_deck.insert_skiprest();
+}
+
+
+int main(int argc, char** argv) {
+    auto options = load_options(argc, argv);
+    auto file_deck = load_deck(options);
+    update_solution(options, file_deck);
+    update_schedule(options, file_deck);
+    if (!options.target.has_value())
+        file_deck.dump_stdout(fs::current_path(), options.mode);
+    else {
+        std::string target = options.target.value();
+        if (fs::is_directory(target))
+            file_deck.dump( fs::absolute(target), fs::path(options.input_deck).filename(), options.mode );
+        else {
+            auto target_path = fs::path( fs::absolute(options.target.value()) );
+            file_deck.dump( fs::absolute(target_path.parent_path()), target_path.filename(), options.mode );
+        }
+    }
+}
+
--- a/examples/wellgraph.cpp
+++ b/examples/wellgraph.cpp
@@ -20,6 +20,7 @@
 #include <fstream>
 #include <iomanip>
 #include <chrono>
+#include <sstream>

 #include <opm/parser/eclipse/Parser/Parser.hpp>
 #include <opm/parser/eclipse/Parser/ParseContext.hpp>
@@ -45,7 +46,7 @@ inline void createDot(const Opm::Schedule& schedule, const std::string& casename
    os << "// Convert output to PDF with 'dot -Tpdf " << casename << ".gv > " << casename << ".pdf'\n";
    os << "strict digraph \"" << casename << "\"\n{\n";
    const auto groupnames = schedule.groupNames();
-    const std::size_t last = schedule.getTimeMap().last();
+    const std::size_t last = schedule.size() - 1;
    // Group -> Group relations.
    for (const auto& gn : groupnames) {
        const auto& g = schedule.getGroup(gn, last);
--- a/jenkins/build-opm-module.sh
+++ b/jenkins/build-opm-module.sh
@@ -3,7 +3,7 @@
 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 -DOPM_ENABLE_PYTHON=ON"
+EXTRA_MODULE_FLAGS[opm-simulators]="-DBUILD_EBOS_EXTENSIONS=ON -DBUILD_EBOS_DEBUG_EXTENSIONS=ON -DBUILD_FLOW_VARIANTS=ON -DOPM_ENABLE_PYTHON=ON -DBUILD_FLOW_POLY_GRID=ON"
 EXTRA_MODULE_FLAGS[opm-common]="-DOPM_ENABLE_PYTHON=ON -DOPM_ENABLE_EMBEDDED_PYTHON=ON -DOPM_INSTALL_PYTHON=ON"

 # Parse revisions from trigger comment and setup arrays
@@ -222,8 +222,12 @@ function build_downstreams {

 # $1 = Name of main module
 function build_module_full {
+  PY_MAJOR=`python3 --version | awk -F ' ' '{print $2}' | awk -F '.' '{print $1}'`
+  PY_MINOR=`python3 --version | awk -F ' ' '{print $2}' | awk -F '.' '{print $2}'`
  for configuration in ${!configurations[@]}
  do
+    export PYTHONPATH="$WORKSPACE/$configuration/install/lib/python$PY_MAJOR.$PY_MINOR/dist-packages"
+
    # Build upstream modules
    build_upstreams

--- a/jenkins/setup-opm-tests.sh
+++ b/jenkins/setup-opm-tests.sh
@@ -14,6 +14,9 @@ then
    if ! test -d $WORKSPACE/deps/opm-tests
    then
      cp $OPM_TESTS_ROOT_PREDEFINED $WORKSPACE/deps/opm-tests -R
+      pushd $WORKSPACE/deps/opm-tests
+      echo "opm-tests revision: `git rev-parse HEAD`"
+      popd
    fi
  else
    # We need a full repo checkout
@@ -29,6 +32,9 @@ else
  if ! test -d $WORKSPACE/deps/opm-tests
  then
    cp $OPM_TESTS_ROOT $WORKSPACE/deps/opm-tests -R
+    pushd $WORKSPACE/deps/opm-tests
+    echo "opmt-tests-revision: `git rev-parse HEAD`"
+    popd
  fi
 fi
 OPM_TESTS_ROOT=$WORKSPACE/deps/opm-tests
--- a/jenkins/update-opm-tests.sh
+++ b/jenkins/update-opm-tests.sh
@@ -37,14 +37,14 @@ do
    prnumber=${rev//[!0-9]/}
    BRANCH_NAME="${BRANCH_NAME}_${repo}_$prnumber"
    test -n "$REASON" && REASON+="        "
-    REASON+="https://github.com/OPM/$repo/pull/$prnumber\n"
+    REASON+="PR https://github.com/OPM/$repo/pull/$prnumber\n"
  fi
 done

 # Do the commit
 export REASON
 export BRANCH_NAME
-$WORKSPACE/deps/opm-simulators/tests/update_reference_data.sh $OPM_TESTS_ROOT
+$WORKSPACE/deps/opm-simulators/tests/update_reference_data.sh $OPM_TESTS_ROOT $WORKSPACE/$configuration/build-opm-simulators $WORKSPACE/$configuration/install/bin/convertECL
 if test $? -eq 5
 then
  echo "No tests failed - no data to update. Exiting"
@@ -90,7 +90,7 @@ 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
+  curl -d "{ \"body\": \"Existing PR https://github.com/OPM/opm-tests/pull/$DATA_PR was updated\" }" -H "Authorization: token ${GH_TOKEN}" -X POST https://api.github.com/repos/OPM/$MAIN_REPO/issues/$PRNUMBER/comments
 else
  git-open-pull -u jenkins4opm --base-account OPM --base-repo opm-tests -r /tmp/cmsg $BRANCH_NAME
 fi
--- a/msim/include/opm/msim/msim.hpp
+++ b/msim/include/opm/msim/msim.hpp
@@ -1,9 +1,10 @@
 #ifndef ISIM_MAIN_HPP
 #define ISIM_MAIN_HPP

+#include <chrono>
 #include <functional>
-#include <string>
 #include <map>
+#include <string>

 #include <opm/parser/eclipse/Parser/ErrorGuard.hpp>
 #include <opm/parser/eclipse/Deck/Deck.hpp>
@@ -26,6 +27,7 @@ class Parser;
 class Python;
 class SummaryState;
 class UDQState;
+class WellTestState;

 namespace Action {
 class State;
@@ -44,13 +46,13 @@ public:
    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, Action::State& action_state, SummaryState& st, data::Solution& sol, data::Wells& well_data, data::GroupAndNetworkValues& group_nwrk_data, size_t report_step);
+    void post_step(Schedule& schedule, Action::State& action_state, SummaryState& st, data::Solution& sol, data::Wells& well_data, data::GroupAndNetworkValues& group_nwrk_data, size_t report_step, const time_point& sim_time);
 private:

-    void run_step(const Schedule& schedule, Action::State& action_state, SummaryState& st, UDQState& udq_state, data::Solution& sol, data::Wells& well_data, data::GroupAndNetworkValues& group_nwrk_data, size_t report_step, EclipseIO& io) const;
-    void run_step(const Schedule& schedule, Action::State& action_state, SummaryState& st, UDQState& udq_state, data::Solution& sol, data::Wells& well_data, data::GroupAndNetworkValues& group_nwrk_data, size_t report_step, double dt, EclipseIO& io) const;
-    void output(Action::State& action_state, SummaryState& st, const UDQState& udq_state, size_t report_step, bool substep, double seconds_elapsed, const data::Solution& sol, const data::Wells& well_data, const data::GroupAndNetworkValues& group_data, EclipseIO& io) const;
-    void simulate(const Schedule& schedule, const SummaryState& st, data::Solution& sol, data::Wells& well_data, data::GroupAndNetworkValues& group_nwrk_data, size_t report_step, double seconds_elapsed, double time_step) const;
+    void run_step(const Schedule& schedule, Action::State& action_state, WellTestState& wtest_state, SummaryState& st, UDQState& udq_state, data::Solution& sol, data::Wells& well_data, data::GroupAndNetworkValues& group_nwrk_data, size_t report_step, EclipseIO& io) const;
+    void run_step(const Schedule& schedule, Action::State& action_state, WellTestState& wtest_state, SummaryState& st, UDQState& udq_state, data::Solution& sol, data::Wells& well_data, data::GroupAndNetworkValues& group_nwrk_data, size_t report_step, double dt, EclipseIO& io) const;
+    void output(Action::State& action_state, WellTestState& wtest_state, SummaryState& st, const UDQState& udq_state, size_t report_step, bool substep, double seconds_elapsed, const data::Solution& sol, const data::Wells& well_data, const data::GroupAndNetworkValues& group_data, EclipseIO& io) const;
+    void simulate(const Schedule& schedule, WellTestState& wtest_state, const SummaryState& st, data::Solution& sol, data::Wells& well_data, data::GroupAndNetworkValues& group_nwrk_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;
--- a/msim/src/msim.cpp
+++ b/msim/src/msim.cpp
@@ -18,7 +18,9 @@
 */

 #include <iostream>
+#include <utility>

+#include <opm/output/eclipse/Inplace.hpp>
 #include <opm/output/eclipse/EclipseIO.hpp>
 #include <opm/output/eclipse/RestartValue.hpp>
 #include <opm/output/eclipse/Summary.hpp>
@@ -32,6 +34,7 @@
 #include <opm/parser/eclipse/EclipseState/Schedule/Action/State.hpp>
 #include <opm/parser/eclipse/EclipseState/Schedule/UDQ/UDQState.hpp>
 #include <opm/parser/eclipse/EclipseState/Schedule/UDQ/UDQConfig.hpp>
+#include <opm/parser/eclipse/EclipseState/Schedule/Well/WellTestState.hpp>
 #include <opm/parser/eclipse/Parser/Parser.hpp>
 #include <opm/parser/eclipse/Parser/ParseContext.hpp>
 #include <opm/parser/eclipse/Parser/ErrorGuard.hpp>
@@ -46,8 +49,9 @@ msim::msim(const EclipseState& state_arg) :
 void msim::run(Schedule& schedule, EclipseIO& io, bool report_only) {
    const double week = 7 * 86400;
    data::Solution sol;
-    SummaryState st(std::chrono::system_clock::from_time_t(schedule.getStartTime()));
+    SummaryState st(TimeService::from_time_t(schedule.getStartTime()));
    UDQState udq_state(schedule.getUDQConfig(0).params().undefinedValue());
+    WellTestState wtest_state;
    Action::State action_state;
    Python python;

@@ -56,12 +60,13 @@ void msim::run(Schedule& schedule, EclipseIO& io, bool report_only) {
        data::Wells well_data;
        data::GroupAndNetworkValues group_nwrk_data;
        if (report_only)
-            run_step(schedule, action_state, st, udq_state, sol, well_data, group_nwrk_data, report_step, io);
+            run_step(schedule, action_state, wtest_state, st, udq_state, sol, well_data, group_nwrk_data, report_step, io);
        else {
            double time_step = std::min(week, 0.5*schedule.stepLength(report_step - 1));
-            run_step(schedule, action_state, st, udq_state, sol, well_data, group_nwrk_data, report_step, time_step, io);
+            run_step(schedule, action_state, wtest_state, st, udq_state, sol, well_data, group_nwrk_data, report_step, time_step, io);
        }
-        post_step(schedule, action_state, st, sol, well_data, group_nwrk_data, report_step);
+        auto sim_time = TimeService::from_time_t( schedule.simTime(report_step) );
+        post_step(schedule, action_state, st, sol, well_data, group_nwrk_data, report_step, sim_time);
        const auto& exit_status = schedule.exitStatus();
        if (exit_status.has_value())
            return;
@@ -73,18 +78,17 @@ UDAValue msim::uda_val() {
 }


-void msim::post_step(Schedule& schedule, Action::State& action_state, SummaryState& st, data::Solution& /* sol */, data::Wells& /* well_data */, data::GroupAndNetworkValues& /* grp_nwrk_data */, size_t report_step) {
-    const auto& actions = schedule.actions(report_step);
+void msim::post_step(Schedule& schedule, Action::State& action_state, SummaryState& st, data::Solution& /* sol */, data::Wells& /* well_data */, data::GroupAndNetworkValues& /* grp_nwrk_data */, size_t report_step, const time_point& sim_time) {
+    const auto& actions = schedule[report_step].actions.get();
    if (actions.empty())
        return;

-    Action::Context context( st , schedule.getWListManager(report_step));
+    Action::Context context( st , schedule[report_step].wlist_manager.get());

-    auto sim_time = schedule.simTime(report_step);
-    for (const auto& action : actions.pending(action_state, sim_time)) {
+    for (const auto& action : actions.pending(action_state, std::chrono::system_clock::to_time_t(sim_time))) {
        auto result = action->eval(context);
        if (result)
-            schedule.applyAction(report_step, *action, result);
+            schedule.applyAction(report_step, sim_time, *action, result, {});
    }

    for (const auto& pyaction : actions.pending_python())
@@ -93,12 +97,12 @@ void msim::post_step(Schedule& schedule, Action::State& action_state, SummarySta



-void msim::run_step(const Schedule& schedule, Action::State& action_state, SummaryState& st, UDQState& udq_state, data::Solution& sol, data::Wells& well_data, data::GroupAndNetworkValues& grp_nwrk_data, size_t report_step, EclipseIO& io) const {
-    this->run_step(schedule, action_state, st, udq_state, sol, well_data, grp_nwrk_data, report_step, schedule.stepLength(report_step - 1), io);
+void msim::run_step(const Schedule& schedule, Action::State& action_state, WellTestState& wtest_state, SummaryState& st, UDQState& udq_state, data::Solution& sol, data::Wells& well_data, data::GroupAndNetworkValues& grp_nwrk_data, size_t report_step, EclipseIO& io) const {
+    this->run_step(schedule, action_state, wtest_state, st, udq_state, sol, well_data, grp_nwrk_data, report_step, schedule.stepLength(report_step - 1), io);
 }


-void msim::run_step(const Schedule& schedule, Action::State& action_state, SummaryState& st, UDQState& udq_state, data::Solution& sol, data::Wells& well_data, data::GroupAndNetworkValues& group_nwrk_data, size_t report_step, double dt, EclipseIO& io) const {
+void msim::run_step(const Schedule& schedule, Action::State& action_state, WellTestState& wtest_state, SummaryState& st, UDQState& udq_state, data::Solution& sol, data::Wells& well_data, data::GroupAndNetworkValues& group_nwrk_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;
@@ -108,22 +112,24 @@ void msim::run_step(const Schedule& schedule, Action::State& action_state, Summa
        if ((seconds_elapsed + time_step) > end_time)
            time_step = end_time - seconds_elapsed;

-        this->simulate(schedule, st, sol, well_data, group_nwrk_data, report_step, seconds_elapsed, time_step);
+        this->simulate(schedule, wtest_state, st, sol, well_data, group_nwrk_data, report_step, seconds_elapsed, time_step);

        seconds_elapsed += time_step;

        io.summary().eval(st,
                          report_step,
                          seconds_elapsed,
-                          this->state,
-                          schedule,
                          well_data,
                          group_nwrk_data,
+                          {},
+                          {},
+                          {},
                          {});

-        schedule.getUDQConfig( report_step ).eval(report_step, st, udq_state);
+        schedule.getUDQConfig( report_step ).eval(report_step, schedule.wellMatcher(report_step), st, udq_state);

        this->output(action_state,
+                     wtest_state,
                     st,
                     udq_state,
                     report_step,
@@ -138,19 +144,20 @@ void msim::run_step(const Schedule& schedule, Action::State& action_state, Summa



-void msim::output(Action::State& action_state, SummaryState& st, const UDQState& udq_state, size_t report_step, bool substep, double seconds_elapsed, const data::Solution& sol, const data::Wells& well_data, const data::GroupAndNetworkValues& group_nwrk_data, EclipseIO& io) const {
-    RestartValue value(sol, well_data, group_nwrk_data);
+void msim::output(Action::State& action_state, WellTestState& wtest_state, SummaryState& st, const UDQState& udq_state, size_t report_step, bool substep, double seconds_elapsed, const data::Solution& sol, const data::Wells& well_data, const data::GroupAndNetworkValues& group_nwrk_data, EclipseIO& io) const {
+    RestartValue value(sol, well_data, group_nwrk_data, {});
    io.writeTimeStep(action_state,
+                     wtest_state,
                     st,
                     udq_state,
                     report_step,
                     substep,
                     seconds_elapsed,
-                     value);
+                     std::move(value));
 }


-void msim::simulate(const Schedule& schedule, const SummaryState& st, data::Solution& sol, data::Wells& well_data, data::GroupAndNetworkValues& /* group_nwrk_data */, size_t report_step, double seconds_elapsed, double time_step) const {
+void msim::simulate(const Schedule& schedule, WellTestState&, const SummaryState& st, data::Solution& sol, data::Wells& well_data, data::GroupAndNetworkValues& /* group_nwrk_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);
--- a/opm-common-prereqs.cmake
+++ b/opm-common-prereqs.cmake
@@ -16,6 +16,10 @@ list(APPEND opm-common_DEPS
      # various runtime library enhancements
      "Boost 1.44.0 COMPONENTS system unit_test_framework REQUIRED"
      "OpenMP QUIET"
+      "cjson"
+      # Still it produces compile errors complaining that it
+      # cannot format UDQVarType. Hence we use the same version
+      # as the embedded one.
+      "fmt 7.0.3"
 )
-
 find_package_deps(opm-common)
--- a/opm/common/ErrorMacros.hpp
+++ b/opm/common/ErrorMacros.hpp
@@ -53,7 +53,7 @@
    do {                                                                \
        std::ostringstream oss__;                                       \
        oss__ << "[" << __FILE__ << ":" << __LINE__ << "] " << message; \
-        Opm::OpmLog::error(oss__.str());                                \
+        ::Opm::OpmLog::error(oss__.str());                                \
        throw Exception(oss__.str());                                   \
    } while (false)

--- a/opm/common/OpmLog/InfoLogger.hpp
+++ b/opm/common/OpmLog/InfoLogger.hpp
@@ -0,0 +1,47 @@
+/*
+  Copyright 2020 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 INFO_LOGGER_HPP
+#define INFO_LOGGER_HPP
+
+#include <cstddef>
+#include <string>
+
+namespace Opm {
+
+/*
+  A small utility class to use in the situation where the first N messages
+  should go to OpmLog::info() and then the subsequent messages should go to
+  OpmLog::note()
+*/
+
+class InfoLogger {
+public:
+    InfoLogger(const std::string& context_arg, std::size_t info_limit);
+    void operator()(const std::string& msg);
+private:
+    std::string context;
+    std::size_t info_limit;
+    std::size_t info_count=0;
+    void (*log_function)(const std::string&);
+};
+
+}
+
+#endif
--- a/opm/common/OpmLog/KeywordLocation.hpp
+++ b/opm/common/OpmLog/KeywordLocation.hpp
@@ -50,9 +50,8 @@ public:
        lineno(lno)
    {}

-    std::string message() const {
-        return this->keyword + " in " + this->filename + " at line " + std::to_string(this->lineno);
-    }
+
+    std::string format(const std::string& msg_fmt) const;

    static KeywordLocation serializeObject()
    {
--- a/opm/common/OpmLog/LogUtil.hpp
+++ b/opm/common/OpmLog/LogUtil.hpp
@@ -23,10 +23,10 @@
 #include <cstdint>
 #include <string>

-#include <opm/common/OpmLog/KeywordLocation.hpp>
-
 namespace Opm {

+class KeywordLocation;
+
 namespace Log {
    namespace MessageType {
        const int64_t Debug     =  1;   /* Excessive information */
--- a/opm/common/OpmLog/OpmLog.hpp
+++ b/opm/common/OpmLog/OpmLog.hpp
@@ -88,6 +88,8 @@ public:
    }


+    static bool stdoutIsTerminal();
+
 private:
    static std::shared_ptr<Logger> getLogger();
    static std::shared_ptr<Logger> m_logger;
--- a/opm/common/utility/FileSystem.hpp
+++ b/opm/common/utility/FileSystem.hpp
@@ -34,8 +34,11 @@ namespace Opm
 #if __cplusplus < 201703L || \
    (defined(__GNUC__) && __GNUC__ < 8 && !defined(__clang__))
    namespace filesystem = std::experimental::filesystem;
+    filesystem::path proximate(const filesystem::path& p,
+                               const filesystem::path& base = filesystem::current_path());
 #else
    namespace filesystem = std::filesystem;
+    using filesystem::proximate;
 #endif

    // A poor man's filesystem::unique_path
--- a/opm/common/utility/Serializer.hpp
+++ b/opm/common/utility/Serializer.hpp
@@ -17,14 +17,14 @@
  along with OPM.  If not, see <http://www.gnu.org/licenses/>.
 */

+#ifndef OPM_SERIALIZER_HPP
+#define OPM_SERIALIZER_HPP
+
 #include <cstring>
 #include <string>
 #include <unordered_map>
 #include <vector>

-#ifndef OPM_SERIALIZER_HPP
-#define OPM_SERIALIZER_HPP
-
 namespace Opm {
 /*
  This is a very basic serialization class used to support serialization of
@@ -61,8 +61,26 @@ public:
        return value;
    }

+    template<typename T>
+    void put_vector(const std::vector<T>& values) {
+        this->put(values.size());
+        this->pack(values.data(), values.size() * sizeof(T));
+    }
+
+
+
+    template<typename T>
+    std::vector<T> get_vector() {
+        std::size_t size = this->get<std::size_t>();
+        std::vector<T> values(size);
+        for (std::size_t index=0; index < size; index++)
+            values[index] = this->get<T>();
+
+        return values;
+    }
+
    template<typename K, typename T>
-    void put(const std::unordered_map<K,T>& values) {
+    void put_map(const std::unordered_map<K,T>& values) {
        this->put(values.size());
        for (const auto& value_pair : values) {
            this->put(value_pair.first);
@@ -71,7 +89,7 @@ public:
    }

    template<typename K, typename T>
-    std::unordered_map<K,T> get() {
+    std::unordered_map<K,T> get_map() {
        std::unordered_map<K,T> values;
        auto size = this->get<std::size_t>();
        for (std::size_t index = 0; index < size; index++) {
--- a/opm/common/utility/String.hpp
+++ b/opm/common/utility/String.hpp
@@ -3,6 +3,10 @@

 #include <algorithm>
 #include <cctype>
+#include <cstdlib>
+#include <cstring>
+#include <cmath>
+#include <optional>
 #include <sstream>
 #include <string>
 #include <vector>
@@ -103,6 +107,25 @@ inline std::vector<std::string> split_string(const std::string& input,
    return result;
 }

+inline std::string format_double(double d) {
+    double integral_part;
+    const double decimal_part = std::modf(d, &integral_part);
+
+    if (decimal_part == 0)
+        return std::to_string(static_cast<int>(d));
+    else
+        return std::to_string(d);
 }

+
+inline std::optional<double> try_parse_double(const std::string& token) {
+    char * end_ptr;
+    auto value = std::strtod(token.c_str(), &end_ptr);
+    if (std::strlen(end_ptr) == 0)
+        return value;
+
+    return std::nullopt;
+}
+
+}
 #endif //OPM_UTILITY_STRING_HPP
--- a/opm/common/utility/TimeService.hpp
+++ b/opm/common/utility/TimeService.hpp
@@ -22,9 +22,32 @@

 #include <chrono>
 #include <ctime>
+#include <string>
+#include <unordered_map>
+#include <opm/parser/eclipse/Deck/DeckRecord.hpp>
+

 namespace Opm {

+    using time_point = std::chrono::time_point<std::chrono::system_clock, std::chrono::duration<int64_t, std::ratio<1,1000>>>;
+
+    namespace TimeService {
+    std::time_t to_time_t(const time_point& tp);
+    time_point from_time_t(std::time_t t);
+    time_point now();
+
+    std::time_t advance(const std::time_t tp, const double sec);
+    std::time_t makeUTCTime(std::tm timePoint);
+    const std::unordered_map<std::string , int>& eclipseMonthIndices();
+    const std::unordered_map<int, std::string>& eclipseMonthNames();
+    int eclipseMonth(const std::string& name);
+    bool valid_month(const std::string& month_name);
+
+    std::time_t mkdatetime(int in_year, int in_month, int in_day, int hour, int minute, int second);
+    std::time_t mkdate(int in_year, int in_month, int in_day);
+    std::time_t timeFromEclipse(const DeckRecord &dateRecord);
+    }
+
    class TimeStampUTC
    {
    public:
@@ -99,6 +122,8 @@ namespace Opm {
    TimeStampUTC operator+(const TimeStampUTC& lhs, std::chrono::duration<double> delta);
    std::time_t asTimeT(const TimeStampUTC& tp);
    std::time_t asLocalTimeT(const TimeStampUTC& tp);
+    time_point asTimePoint(const TimeStampUTC& tp);
+

 } // namespace Opm

--- a/opm/common/utility/numeric/RootFinders.hpp
+++ b/opm/common/utility/numeric/RootFinders.hpp
@@ -22,7 +22,9 @@
 #define OPM_ROOTFINDERS_HEADER

 #include <opm/common/ErrorMacros.hpp>
+#include <opm/common/OpmLog/OpmLog.hpp>

+#include <string>
 #include <algorithm>
 #include <limits>
 #include <cmath>
@@ -35,8 +37,11 @@ namespace Opm
    {
        static double handleBracketingFailure(const double x0, const double x1, const double f0, const double f1)
        {
-            OPM_THROW(std::runtime_error, "Error in parameters, zero not bracketed: [a, b] = ["
-                  << x0 << ", " << x1 << "]    f(a) = " << f0 << "   f(b) = " << f1);
+            std::ostringstream sstr;
+            sstr << "Error in parameters, zero not bracketed: [a, b] = ["
+                 << x0 << ", " << x1 << "]    f(a) = " << f0 << "   f(b) = " << f1;
+            OpmLog::debug(sstr.str());
+            OPM_THROW_NOLOG(std::runtime_error, sstr.str());
            return -1e100; // Never reached.
        }
        static double handleTooManyIterations(const double x0, const double x1, const int maxiter)
--- a/opm/common/utility/numeric/SparseVector.hpp
+++ b/opm/common/utility/numeric/SparseVector.hpp
@@ -5,7 +5,7 @@
 // Created: Mon Jun 29 15:28:59 2009
 //
 // Author(s): Atgeirr F Rasmussen <atgeirr@sintef.no>
-//            B<EFBFBD>rd Skaflestad     <bard.skaflestad@sintef.no>
+//            Bård Skaflestad     <bard.skaflestad@sintef.no>
 //
 // $Date$
 //
--- a/opm/common/utility/numeric/calculateCellVol.hpp
+++ b/opm/common/utility/numeric/calculateCellVol.hpp
@@ -19,7 +19,11 @@
 #include <array>
 #include <math.h>  

+#ifndef CALCULATE_CELLVOL
+#define CALCULATE_CELLVOL

 double calculateCellVol(const std::array<double,8>& X, const std::array<double,8>& Y, const std::array<double,8>& Z);
+double calculateCylindricalCellVol(const double R1, const double R2, const double dTheta, const double dZ);

+#endif

--- a/opm/common/utility/parameters/Parameter.hpp
+++ b/opm/common/utility/parameters/Parameter.hpp
@@ -4,7 +4,7 @@
 //
 // Created: Tue Jun  2 16:00:21 2009
 //
-// Author(s): B<EFBFBD>rd Skaflestad     <bard.skaflestad@sintef.no>
+// Author(s): Bård Skaflestad     <bard.skaflestad@sintef.no>
 //            Atgeirr F Rasmussen <atgeirr@sintef.no>
 //
 // $Date$
--- a/opm/common/utility/parameters/ParameterGroup.hpp
+++ b/opm/common/utility/parameters/ParameterGroup.hpp
@@ -4,7 +4,7 @@
 //
 // Created: Tue Jun  2 19:11:11 2009
 //
-// Author(s): B<EFBFBD>rd Skaflestad     <bard.skaflestad@sintef.no>
+// Author(s): Bård Skaflestad     <bard.skaflestad@sintef.no>
 //            Atgeirr F Rasmussen <atgeirr@sintef.no>
 //
 // $Date$
--- a/opm/common/utility/parameters/ParameterGroup_impl.hpp
+++ b/opm/common/utility/parameters/ParameterGroup_impl.hpp
@@ -4,7 +4,7 @@
 //
 // Created: Tue Jun  2 19:06:46 2009
 //
-// Author(s): B<EFBFBD>rd Skaflestad     <bard.skaflestad@sintef.no>
+// Author(s): Bård Skaflestad     <bard.skaflestad@sintef.no>
 //            Atgeirr F Rasmussen <atgeirr@sintef.no>
 //
 // $Date$
@@ -142,7 +142,7 @@ namespace Opm {
 		    assignments.push_back(std::make_pair(name, value));
 		    continue;
 		}
-        	OpmLog::warning("Too many assignements  (' "
+                OpmLog::warning("Too many assignments  (' "
                	        + ID_delimiter_assignment
 	                        + "') detected in argument " + to_string(i));
 	    }
--- a/opm/common/utility/parameters/ParameterMapItem.hpp
+++ b/opm/common/utility/parameters/ParameterMapItem.hpp
@@ -4,7 +4,7 @@
 //
 // Created: Tue Jun  2 19:05:54 2009
 //
-// Author(s): B<EFBFBD>rd Skaflestad     <bard.skaflestad@sintef.no>
+// Author(s): Bård Skaflestad     <bard.skaflestad@sintef.no>
 //            Atgeirr F Rasmussen <atgeirr@sintef.no>
 //
 // $Date$
--- a/opm/common/utility/parameters/ParameterRequirement.hpp
+++ b/opm/common/utility/parameters/ParameterRequirement.hpp
@@ -4,7 +4,7 @@
 //
 // Created: Tue Jun  2 19:05:02 2009
 //
-// Author(s): B<EFBFBD>rd Skaflestad     <bard.skaflestad@sintef.no>
+// Author(s): Bård Skaflestad     <bard.skaflestad@sintef.no>
 //            Atgeirr F Rasmussen <atgeirr@sintef.no>
 //
 // $Date$
--- a/opm/common/utility/parameters/ParameterStrings.hpp
+++ b/opm/common/utility/parameters/ParameterStrings.hpp
@@ -4,7 +4,7 @@
 //
 // Created: Tue Jun  2 19:04:15 2009
 //
-// Author(s): B<EFBFBD>rd Skaflestad     <bard.skaflestad@sintef.no>
+// Author(s): Bård Skaflestad     <bard.skaflestad@sintef.no>
 //            Atgeirr F Rasmussen <atgeirr@sintef.no>
 //
 // $Date$
--- a/opm/common/utility/parameters/ParameterTools.hpp
+++ b/opm/common/utility/parameters/ParameterTools.hpp
@@ -4,7 +4,7 @@
 //
 // Created: Tue Jun  2 19:02:19 2009
 //
-// Author(s): B<EFBFBD>rd Skaflestad     <bard.skaflestad@sintef.no>
+// Author(s): Bård Skaflestad     <bard.skaflestad@sintef.no>
 //            Atgeirr F Rasmussen <atgeirr@sintef.no>
 //
 // $Date$
--- a/opm/io/eclipse/EGrid.hpp
+++ b/opm/io/eclipse/EGrid.hpp
@@ -20,6 +20,7 @@
 #define OPM_IO_EGRID_HPP

 #include <opm/io/eclipse/EclFile.hpp>
+#include <opm/common/utility/FileSystem.hpp>

 #include <array>
 #include <iostream>
@@ -34,7 +35,7 @@ namespace Opm { namespace EclIO {
 class EGrid : public EclFile
 {
 public:
-    explicit EGrid(const std::string& filename);
+    explicit EGrid(const std::string& filename, std::string grid_name = "global");

    int global_index(int i, int j, int k) const;
    int active_index(int i, int j, int k) const;
@@ -44,20 +45,69 @@ public:
    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;
+    void getCellCorners(int globindex, std::array<double,8>& X, std::array<double,8>& Y, std::array<double,8>& Z);
+    void getCellCorners(const std::array<int, 3>& ijk, std::array<double,8>& X, std::array<double,8>& Y, std::array<double,8>& Z);
+
+    std::vector<std::array<float, 3>> getXYZ_layer(int layer, bool bottom=false);
+    std::vector<std::array<float, 3>> getXYZ_layer(int layer, const std::array<int, 4>& box, bool bottom=false);

    int activeCells() const { return nactive; }
    int totalNumberOfCells() const { return nijk[0] * nijk[1] * nijk[2]; }

+    void load_grid_data();
+    void load_nnc_data();
+    bool is_radial() const { return m_radial; }
+
+    const std::vector<int>& hostCellsGlobalIndex() const { return host_cells; }
+    std::vector<std::array<int, 3>> hostCellsIJK();
+
+    // zero based: i1, j1,k1, i2,j2,k2, transmisibility
+    using NNCentry = std::tuple<int, int, int, int, int, int, float>;
+    std::vector<NNCentry> get_nnc_ijk();
+
+    const std::vector<std::string>& list_of_lgrs() const { return lgr_names; }
+
+    const std::vector<float>& get_mapaxes() const { return m_mapaxes; }
+    const std::string& get_mapunits() const { return m_mapunits; }
+
 private:
+    Opm::filesystem::path inputFileName, initFileName;
+    std::string m_grid_name;
+    bool m_radial;
+
+    std::vector<float> m_mapaxes;
+    std::string m_mapunits;
+
    std::array<int, 3> nijk;
+    std::array<int, 3> host_nijk;
+
    int nactive;
+    mutable bool m_nncs_loaded;

    std::vector<int> act_index;
    std::vector<int> glob_index;
+
    std::vector<float> coord_array;
    std::vector<float> zcorn_array;
+
+    std::vector<int> nnc1_array;
+    std::vector<int> nnc2_array;
+    std::vector<float> transnnc_array;
+    std::vector<int> host_cells;
+
+    std::vector<std::string> lgr_names;
+
+    int zcorn_array_index;
+    int coord_array_index;
+    int actnum_array_index;
+    int nnc1_array_index;
+    int nnc2_array_index;
+
+    std::vector<float> get_zcorn_from_disk(int layer, bool bottom);
+
+    void getCellCorners(const std::array<int, 3>& ijk, const std::vector<float>& zcorn_layer,
+                           std::array<double,4>& X, std::array<double,4>& Y, std::array<double,4>& Z);
+
 };

 }} // namespace Opm::EclIO
--- a/opm/io/eclipse/EInit.hpp
+++ b/opm/io/eclipse/EInit.hpp
@@ -0,0 +1,74 @@
+/*
+   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 OPM_IO_EINIT_HPP
+#define OPM_IO_EINIT_HPP
+
+#include <opm/io/eclipse/EclFile.hpp>
+
+#include <array>
+#include <vector>
+#include <map>
+
+namespace Opm { namespace EclIO {
+
+class EInit : public EclFile
+{
+public:
+    explicit EInit(const std::string& filename);
+
+    const std::vector<std::string>& list_of_lgrs() const { return lgr_names; }
+
+    std::vector<EclFile::EclEntry> list_arrays() const;
+    std::vector<EclFile::EclEntry> list_arrays(const std::string& grid_name) const;
+
+    const std::array<int, 3>& grid_dimension(const std::string& grid_name = "global") const;
+    int activeCells(const std::string& grid_name = "global") const;
+
+    bool hasLGR(const std::string& name) const;
+
+    template <typename T>
+    const std::vector<T>& getInitData(const std::string& name, const std::string& grid_name = "global")
+    {
+        return this->ImplgetInitData<T>(name, grid_name);
+    }
+
+protected:
+
+    template <typename T>
+    const std::vector<T>& ImplgetInitData(const std::string& name, const std::string& grid_name = "global");
+
+private:
+    std::array<int, 3> global_nijk;
+    std::vector<std::array<int, 3>> lgr_nijk;
+
+    int global_nactive;
+    std::vector<int> lgr_nactive;
+
+    std::vector<std::string> lgr_names;
+
+    std::map<std::string,int> global_array_index;
+    std::vector<std::map<std::string,int>> lgr_array_index;
+
+    int get_array_index(const std::string& name, const std::string& grid_name) const;
+    int get_lgr_index(const std::string& grid_name) const;
+};
+
+}} // namespace Opm::EclIO
+
+#endif // OPM_IO_EINIT_HPP
--- a/opm/io/eclipse/ERst.hpp
+++ b/opm/io/eclipse/ERst.hpp
@@ -27,6 +27,7 @@
 #include <unordered_map>
 #include <vector>

+
 namespace Opm { namespace EclIO { namespace OutputStream {
    class Restart;
 }}}
@@ -37,43 +38,64 @@ class ERst : public EclFile
 {
 public:
    explicit ERst(const std::string& filename);
+
    bool hasReportStepNumber(int number) const;
+    bool hasLGR(const std::string& gridname, int reportStepNumber) const;

    void loadReportStepNumber(int number);

    template <typename T>
-    const std::vector<T>& getRst(const std::string& name, int reportStepNumber, int occurrence);
+    const std::vector<T>& getRestartData(const std::string& name, int reportStepNumber)
+    {
+        return getRestartData<T>(name,reportStepNumber, 0);
+    }

    template <typename T>
-    const std::vector<T>& getRst(int index, int reportStepNumber){
+    const std::vector<T>& getRestartData(const std::string& name, int reportStepNumber, int occurrence);
+
+    template <typename T>
+    const std::vector<T>& getRestartData(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; 
+    template <typename T>
+    const std::vector<T>& getRestartData(const std::string& name, int reportStepNumber, const std::string& lgr_name);
+
+    template <typename T>
+    const std::vector<T>& getRestartData(int index, int reportStepNumber, const std::string& lgr_name);
+
+    int occurrence_count(const std::string& name, int reportStepNumber) const;
    size_t numberOfReportSteps() const { return seqnum.size(); };

    const std::vector<int>& listOfReportStepNumbers() const { return seqnum; }
-    
+
    std::vector<EclEntry> listOfRstArrays(int reportStepNumber);
+    std::vector<EclEntry> listOfRstArrays(int reportStepNumber, const std::string& lgr_name);

    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;
+    mutable std::unordered_map<int,bool> reportLoaded;
    std::map<int, std::pair<int,int>> arrIndexRange;   // mapping report step number to array indeces (start and end)
+    std::vector<std::vector<std::string>> lgr_names;                           // report step numbers, from SEQNUM array in restart file

    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; 
+    int get_start_index_lgrname(int number, const std::string& lgr_name);
+
+    int getArrayIndex(const std::string& name, int seqnum, int occurrence);
+    int getArrayIndex(const std::string& name, int number, const std::string& lgr_name);
+
+    std::tuple<int,int> getIndexRange(int reportStepNumber) const;

    std::streampos
    restartStepWritePosition(const int seqnumValue) const;
-    
+
 };

 }} // namespace Opm::EclIO
--- a/opm/io/eclipse/ESmry.hpp
+++ b/opm/io/eclipse/ESmry.hpp
@@ -28,12 +28,14 @@
 #include <stdint.h>

 #include <opm/common/utility/FileSystem.hpp>
+#include <opm/common/utility/TimeService.hpp>
 #include <opm/io/eclipse/SummaryNode.hpp>

 namespace Opm { namespace EclIO {

 using ArrSourceEntry = std::tuple<std::string, std::string, int, uint64_t>;
 using TimeStepEntry = std::tuple<int, int, uint64_t>;
+using RstEntry = std::tuple<std::string, int>;

 class ESmry
 {
@@ -48,18 +50,18 @@ public:

    const std::vector<float>& get(const std::string& name) const;
    const std::vector<float>& get(const SummaryNode& node) const;
-    std::vector<std::chrono::system_clock::time_point> dates() const;
+    std::vector<time_point> dates() const;

    std::vector<float> get_at_rstep(const std::string& name) const;
    std::vector<float> get_at_rstep(const SummaryNode& node) const;
-    std::vector<std::chrono::system_clock::time_point> dates_at_rstep() const;
+    std::vector<time_point> dates_at_rstep() const;

    void LoadData(const std::vector<std::string>& vectList) const;
    void LoadData() const;

-    bool make_lodsmry_file();
+    bool make_esmry_file();

-    std::chrono::system_clock::time_point startdate() const { return startdat; }
+    time_point startdate() const { return startdat; }

    const std::vector<std::string>& keywordList() const;
    std::vector<std::string> keywordList(const std::string& pattern) const;
@@ -73,13 +75,17 @@ public:
    const std::string& get_unit(const SummaryNode& node) const;

    void write_rsm(std::ostream&) const;
-    void write_rsm_file(std::optional<Opm::filesystem::path> = std::nullopt) const;
+    void write_rsm_file(std::optional<filesystem::path> = std::nullopt) const;
+
+    bool all_steps_available();

 private:
-    Opm::filesystem::path inputFileName, lodFileName;
+
+    filesystem::path inputFileName;
+    RstEntry restart_info;
+
    int nI, nJ, nK, nSpecFiles;
-    bool fromSingleRun, lodEnabeled;
-    uint64_t lod_offset, lod_arr_size;
+    bool fromSingleRun;
    size_t nVect, nTstep;

    std::vector<bool> formattedFiles;
@@ -87,6 +93,7 @@ private:
    mutable std::vector<std::vector<float>> vectorData;
    mutable std::vector<bool> vectorLoaded;
    std::vector<TimeStepEntry> timeStepList;
+    std::vector<TimeStepEntry> miniStepList;
    std::vector<std::map<int, int>> arrayPos;
    std::vector<std::string> keyword;
    std::map<std::string, int> keyword_index;
@@ -95,23 +102,26 @@ private:
    std::vector<std::vector<std::string>> keywordListSpecFile;

    std::vector<int> seqIndex;
+    std::vector<int> mini_steps;

    void ijk_from_global_index(int glob, int &i, int &j, int &k) const;

    std::vector<SummaryNode> summaryNodes;
    std::unordered_map<std::string, std::string> kwunits;

-    std::chrono::system_clock::time_point startdat;
+    time_point startdat;

-    std::vector<std::string> checkForMultipleResultFiles(const Opm::filesystem::path& rootN, bool formatted) const;
+    std::vector<std::string> checkForMultipleResultFiles(const filesystem::path& rootN, bool formatted) const;

    void getRstString(const std::vector<std::string>& restartArray,
-                      Opm::filesystem::path& pathRst,
-                      Opm::filesystem::path& rootN) const;
+                      filesystem::path& pathRst,
+                      filesystem::path& rootN) const;

-    void updatePathAndRootName(Opm::filesystem::path& dir, Opm::filesystem::path& rootN) const;
+    void updatePathAndRootName(filesystem::path& dir, filesystem::path& rootN) const;

-    std::string makeKeyString(const std::string& keyword, const std::string& wgname, int num) const;
+
+    std::string makeKeyString(const std::string& keyword, const std::string& wgname, int num,
+                              const std::optional<Opm::EclIO::lgr_info> lgr_info) const;

    std::string unpackNumber(const SummaryNode&) const;
    std::string lookupKey(const SummaryNode&) const;
@@ -134,8 +144,9 @@ private:
    std::vector<std::tuple <std::string, uint64_t>> getListOfArrays(std::string filename, bool formatted);
    std::vector<int> makeKeywPosVector(int speInd) const;
    std::string read_string_from_disk(std::fstream& fileH, uint64_t size) const;
-    void inspect_lodsmry();
-    void Load_from_lodsmry(const std::vector<int>& keywIndVect) const;
+
+    void read_ministeps_from_disk();
+    int read_ministep_formatted(std::fstream& fileH);
 };

 }} // namespace Opm::EclIO
--- a/opm/io/eclipse/EclFile.hpp
+++ b/opm/io/eclipse/EclFile.hpp
@@ -19,11 +19,10 @@
 #ifndef OPM_IO_ECLFILE_HPP
 #define OPM_IO_ECLFILE_HPP

-#include <opm/common/ErrorMacros.hpp>
-
 #include <opm/io/eclipse/EclIOdata.hpp>

 #include <ios>
+#include <map>
 #include <string>
 #include <stdexcept>
 #include <tuple>
@@ -35,8 +34,13 @@ namespace Opm { namespace EclIO {
 class EclFile
 {
 public:
+    struct Formatted {
+        bool value;
+    };
+
    explicit EclFile(const std::string& filename, bool preload = false);
-    bool formattedInput() { return formatted; }
+    EclFile(const std::string& filename, Formatted fmt, bool preload = false);
+    bool formattedInput() const { return formatted; }

    void loadData();                            // load all data
    void loadData(const std::string& arrName);         // load all arrays with array name equal to arrName
@@ -55,6 +59,8 @@ public:
    using EclEntry = std::tuple<std::string, eclArrType, int64_t>;
    std::vector<EclEntry> getList() const;

+    const std::vector<int>& getElementSizeList() const { return array_element_size; }
+
    template <typename T>
    const std::vector<T>& get(int arrIndex);

@@ -66,6 +72,7 @@ public:

    const std::vector<std::string>& arrayNames() const { return array_name; }
    std::size_t size() const;
+    bool is_ix() const;

 protected:
    bool formatted;
@@ -80,6 +87,7 @@ protected:
    std::vector<std::string> array_name;
    std::vector<eclArrType> array_type;
    std::vector<int64_t> array_size;
+    std::vector<int> array_element_size;

    std::vector<uint64_t> ifStreamPos;

@@ -88,19 +96,7 @@ protected:
    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);
-    }
+                                  const std::string& typeStr);

    std::streampos
    seekPosition(const std::vector<std::string>::size_type arrIndex) const;
@@ -110,7 +106,11 @@ private:

    void loadBinaryArray(std::fstream& fileH, std::size_t arrIndex);
    void loadFormattedArray(const std::string& fileStr, std::size_t arrIndex, int64_t fromPos);
-    
+    void load(bool preload);
+
+    std::vector<unsigned int> get_bin_logi_raw_values(int arrIndex) const;
+    std::vector<std::string> get_fmt_real_raw_str_values(int arrIndex) const;
+
 };

 }} // namespace Opm::EclIO
--- a/opm/io/eclipse/EclIOdata.hpp
+++ b/opm/io/eclipse/EclIOdata.hpp
@@ -24,26 +24,28 @@

 namespace Opm { namespace EclIO {

-    // type MESS have no assisiated data 
+    // type MESS have no assisiated data
    enum eclArrType {
-        INTE, REAL, DOUB, CHAR, LOGI, MESS
+        INTE, REAL, DOUB, CHAR, LOGI, MESS, C0NN
    };

    // named constants related to binary file format
-    const unsigned int true_value = 0xffffffff;
+    const unsigned int true_value_ecl = 0xffffffff;
+    const unsigned int true_value_ix = 0x1000000;
    const unsigned int false_value = 0x00000000;

+
    const int sizeOfInte =  4;    // number of bytes pr integer (inte) element
    const int sizeOfReal =  4;    // number of bytes pr float (real) element
    const int sizeOfDoub =  8;    // number of bytes pr double (doub) element
    const int sizeOfLogi =  4;    // number of bytes pr bool (logi) element
    const int sizeOfChar =  8;    // number of bytes pr string (char) element

-    const int MaxBlockSizeInte = 4000;    // Maximum block size for INTE arrays in binary files  
-    const int MaxBlockSizeReal = 4000;    // Maximum block size for REAL arrays in binary files  
-    const int MaxBlockSizeDoub = 8000;    // Maximum block size for DOUB arrays in binary files  
-    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      
+    const int MaxBlockSizeInte = 4000;    // Maximum block size for INTE arrays in binary files
+    const int MaxBlockSizeReal = 4000;    // Maximum block size for REAL arrays in binary files
+    const int MaxBlockSizeDoub = 8000;    // Maximum block size for DOUB arrays in binary files
+    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
@@ -52,17 +54,17 @@ namespace Opm { namespace EclIO {
    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

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

--- a/opm/io/eclipse/EclOutput.hpp
+++ b/opm/io/eclipse/EclOutput.hpp
@@ -47,59 +47,71 @@ public:
               const std::vector<T>& data)
    {
        eclArrType arrType = MESS;
+        int element_size = 4;
+
        if (typeid(T) == typeid(int))
            arrType = INTE;
        else if (typeid(T) == typeid(float))
            arrType = REAL;
-        else if (typeid(T) == typeid(double))
+        else if (typeid(T) == typeid(double)){
            arrType = DOUB;
-        else if (typeid(T) == typeid(bool))
+            element_size = 8;
+        } else if (typeid(T) == typeid(bool))
            arrType = LOGI;
        else if (typeid(T) == typeid(char))
            arrType = MESS;

        if (isFormatted)
        {
-            writeFormattedHeader(name, data.size(), arrType);
+            writeFormattedHeader(name, data.size(), arrType, element_size);
            if (arrType != MESS)
                writeFormattedArray(data);
        }
        else
        {
-            writeBinaryHeader(name, data.size(), arrType);
+            writeBinaryHeader(name, data.size(), arrType, element_size);
            if (arrType != MESS)
                writeBinaryArray(data);
        }
    }

+    // when this function is used array type will be assumed C0NN (not CHAR).
+    // Also in cases where element size is 8 or less, element size will be 8.
+
+    void write(const std::string& name, const std::vector<std::string>& data, int element_size);
+
    void message(const std::string& msg);
    void flushStream();

+    void set_ix() { ix_standard = true; }
+
    friend class OutputStream::Restart;
    friend class OutputStream::SummarySpecification;

 private:
-    void writeBinaryHeader(const std::string& arrName, int64_t size, eclArrType arrType);
+    void writeBinaryHeader(const std::string& arrName, int64_t size, eclArrType arrType, int element_size);

    template <typename T>
    void writeBinaryArray(const std::vector<T>& data);

-    void writeBinaryCharArray(const std::vector<std::string>& data);
+    void writeBinaryCharArray(const std::vector<std::string>& data, int element_size);
    void writeBinaryCharArray(const std::vector<PaddedOutputString<8>>& data);

-    void writeFormattedHeader(const std::string& arrName, int size, eclArrType arrType);
+    void writeFormattedHeader(const std::string& arrName, int size, eclArrType arrType, int element_size);

    template <typename T>
    void writeFormattedArray(const std::vector<T>& data);

-    void writeFormattedCharArray(const std::vector<std::string>& data);
+    void writeFormattedCharArray(const std::vector<std::string>& data, int element_size);
    void writeFormattedCharArray(const std::vector<PaddedOutputString<8>>& data);

    void writeArrayType(const eclArrType arrType);
-    std::string make_real_string(float value) const;
-    std::string make_doub_string(double value) const;
+    std::string make_real_string_ecl(float value) const;
+    std::string make_real_string_ix(float value) const;
+    std::string make_doub_string_ecl(double value) const;
+    std::string make_doub_string_ix(double value) const;

-    bool isFormatted;
+    bool isFormatted, ix_standard;
    std::ofstream ofileH;
 };

--- a/opm/io/eclipse/EclUtil.hpp
+++ b/opm/io/eclipse/EclUtil.hpp
@@ -35,41 +35,49 @@ namespace Opm { namespace EclIO {
    bool isEOF(std::fstream* fileH);
    bool fileExists(const std::string& filename);
    bool isFormatted(const std::string& filename);
+    bool is_number(const std::string& numstr);

    std::tuple<int, int> block_size_data_binary(eclArrType arrType);
    std::tuple<int, int, int> block_size_data_formatted(eclArrType arrType);

    std::string trimr(const std::string &str1);

-    uint64_t sizeOnDiskBinary(int64_t num, Opm::EclIO::eclArrType arrType);
-    uint64_t sizeOnDiskFormatted(const int64_t num, Opm::EclIO::eclArrType arrType);
+    uint64_t sizeOnDiskBinary(int64_t num, Opm::EclIO::eclArrType arrType, int elementSize);
+    uint64_t sizeOnDiskFormatted(const int64_t num, Opm::EclIO::eclArrType arrType, int elementSize);

    void readBinaryHeader(std::fstream& fileH, std::string& tmpStrName,
                      int& tmpSize, std::string& tmpStrType);

    void readBinaryHeader(std::fstream& fileH, std::string& arrName,
-                      int64_t& size, Opm::EclIO::eclArrType &arrType);
+                      int64_t& size, Opm::EclIO::eclArrType &arrType, int& elementSize);

    void readFormattedHeader(std::fstream& fileH, std::string& arrName,
-                      int64_t &num, Opm::EclIO::eclArrType &arrType);
+                      int64_t &num, Opm::EclIO::eclArrType &arrType, int& elementSize);

    template<typename T, typename T2>
    std::vector<T> readBinaryArray(std::fstream& fileH, const int64_t size, Opm::EclIO::eclArrType type,
-                               std::function<T(T2)>& flip);
+                               std::function<T(T2)>& flip, int elementSize);

    std::vector<int> readBinaryInteArray(std::fstream &fileH, const int64_t size);
    std::vector<float> readBinaryRealArray(std::fstream& fileH, const int64_t size);
    std::vector<double> readBinaryDoubArray(std::fstream& fileH, const int64_t size);
    std::vector<bool> readBinaryLogiArray(std::fstream &fileH, const int64_t size);
+    std::vector<unsigned int> readBinaryRawLogiArray(std::fstream &fileH, const int64_t size);
    std::vector<std::string> readBinaryCharArray(std::fstream& fileH, const int64_t size);
+    std::vector<std::string> readBinaryC0nnArray(std::fstream& fileH, const int64_t size, int elementSize);

    template<typename T>
    std::vector<T> readFormattedArray(const std::string& file_str, const int size, int64_t fromPos,
                                       std::function<T(const std::string&)>& process);

    std::vector<int> readFormattedInteArray(const std::string& file_str, const int64_t size, int64_t fromPos);
-    std::vector<std::string> readFormattedCharArray(const std::string& file_str, const int64_t size, int64_t fromPos);
+
+    std::vector<std::string> readFormattedCharArray(const std::string& file_str, const int64_t size,
+                                                    int64_t fromPos, int elementSize);
+
    std::vector<float> readFormattedRealArray(const std::string& file_str, const int64_t size, int64_t fromPos);
+    std::vector<std::string> readFormattedRealRawStrings(const std::string& file_str, const int64_t size, int64_t fromPos);
+
    std::vector<bool> readFormattedLogiArray(const std::string& file_str, const int64_t size, int64_t fromPos);
    std::vector<double> readFormattedDoubArray(const std::string& file_str, const int64_t size, int64_t fromPos);

--- a/opm/io/eclipse/ExtESmry.hpp
+++ b/opm/io/eclipse/ExtESmry.hpp
@@ -0,0 +1,106 @@
+/*
+   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_ExtESmry_HPP
+#define OPM_IO_ExtESmry_HPP
+
+#include <chrono>
+#include <ostream>
+#include <string>
+#include <unordered_map>
+#include <vector>
+#include <map>
+#include <stdint.h>
+
+#include <opm/common/utility/FileSystem.hpp>
+#include <opm/common/utility/TimeService.hpp>
+
+namespace Opm { namespace EclIO {
+
+using ArrSourceEntry = std::tuple<std::string, std::string, int, uint64_t>;
+using TimeStepEntry = std::tuple<int, int, uint64_t>;
+using RstEntry = std::tuple<std::string, int>;
+
+// start, rstart + rstnum, keycheck, units, rstep, tstep
+using LodsmryHeadType = std::tuple<time_point, RstEntry, std::vector<std::string>, std::vector<std::string>,
+                                    std::vector<int>, std::vector<int>>;
+
+class ExtESmry
+{
+public:
+
+    // input is esmry, only binary supported.
+    explicit ExtESmry(const std::string& filename, bool loadBaseRunData=false);
+
+    const std::vector<float>& get(const std::string& name);
+    std::vector<float> get_at_rstep(const std::string& name);
+    std::string& get_unit(const std::string& name);
+
+    void loadData();
+    void loadData(const std::vector<std::string>& stringVect);
+
+    time_point startdate() const { return m_startdat; }
+
+    bool hasKey(const std::string& key) const;
+
+    size_t numberOfTimeSteps() const { return m_nTstep; }
+    size_t numberOfVectors() const { return m_nVect; }
+
+    const std::vector<std::string>& keywordList() const { return m_keyword;}
+    std::vector<std::string> keywordList(const std::string& pattern) const;
+
+    std::vector<time_point> dates();
+
+    bool all_steps_available();
+
+
+private:
+    filesystem::path m_inputFileName;
+    std::vector<filesystem::path> m_lodsmry_files;
+
+    bool m_loadBaseRun;
+    std::vector<std::map<std::string, int>> m_keyword_index;
+    std::vector<std::tuple<int,int>> m_tstep_range;
+    std::vector<std::string> m_keyword;
+    std::vector<int> m_rstep;
+    std::vector<int> m_tstep;
+    std::vector<std::vector<int>> m_rstep_v;
+    std::vector<std::vector<int>> m_tstep_v;
+    std::vector<std::vector<float>> m_vectorData;
+    std::vector<bool> m_vectorLoaded;
+    std::unordered_map<std::string, std::string> kwunits;
+
+    size_t m_nVect;
+    std::vector<size_t> m_nTstep_v;
+    size_t m_nTstep;
+    std::vector<int> m_seqIndex;
+
+    std::vector<uint64_t> m_lod_offset;
+    std::vector<uint64_t> m_lod_arr_size;
+
+    time_point m_startdat;
+
+    uint64_t open_esmry(Opm::filesystem::path& inputFileName, LodsmryHeadType& lodsmry_head);
+
+    void updatePathAndRootName(Opm::filesystem::path& dir, Opm::filesystem::path& rootN);
+};
+
+}} // namespace Opm::EclIO
+
+
+#endif // OPM_IO_ExtESmry_HPP
--- a/opm/io/eclipse/ExtSmryOutput.hpp
+++ b/opm/io/eclipse/ExtSmryOutput.hpp
@@ -0,0 +1,68 @@
+/*
+   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_ExtSmryOutput_HPP
+#define OPM_IO_ExtSmryOutput_HPP
+
+#include <string>
+
+#include <opm/parser/eclipse/EclipseState/EclipseState.hpp>
+
+
+namespace Opm {
+
+class EclipseState;
+
+}
+
+namespace Opm { namespace EclIO {
+
+
+class ExtSmryOutput
+{
+
+public:
+    ExtSmryOutput(const std::vector<std::string>& valueKeys, const std::vector<std::string>& valueUnits,
+                 const EclipseState& es, const time_t start_time);
+
+    void write(const std::vector<float>& ts_data, int report_step);
+
+private:
+
+    std::string m_outputFileName;
+    int m_nTimeSteps;
+    int m_nVect;
+    bool m_fmt;
+
+    std::vector<int> m_start_date_vect;
+    std::string m_restart_rootn;
+    int m_restart_step;
+    std::vector<std::string> m_smry_keys;
+    std::vector<std::string> m_smryUnits;
+    std::vector<int> m_rstep;
+    std::vector<int> m_tstep;
+    std::vector<std::vector<float>> m_smrydata;
+
+    std::array<int, 3> ijk_from_global_index(const GridDims& dims, int globInd) const;
+    std::vector<std::string> make_modified_keys(const std::vector<std::string>& valueKeys, const GridDims& dims);
+};
+
+
+}} // namespace Opm::EclIO
+
+#endif // OPM_IO_ExtSmryOutput_HPP
--- a/opm/io/eclipse/OutputStream.hpp
+++ b/opm/io/eclipse/OutputStream.hpp
@@ -21,6 +21,7 @@
 #define OPM_IO_OUTPUTSTREAM_HPP_INCLUDED

 #include <opm/io/eclipse/PaddedOutputString.hpp>
+#include <opm/common/utility/TimeService.hpp>

 #include <array>
 #include <chrono>
@@ -362,7 +363,7 @@ namespace Opm { namespace EclIO { namespace OutputStream {
    class SummarySpecification
    {
    public:
-        using StartTime = std::chrono::system_clock::time_point;
+        using StartTime = time_point;

        enum class UnitConvention
        {
--- a/opm/io/eclipse/RestartFileView.hpp
+++ b/opm/io/eclipse/RestartFileView.hpp
@@ -0,0 +1,70 @@
+/*
+  Copyright 2021 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_RESTART_FILE_VIEW_HPP
+#define OPM_RESTART_FILE_VIEW_HPP
+
+#include <cstddef>
+#include <memory>
+#include <vector>
+
+namespace Opm { namespace EclIO {
+    class ERst;
+}} // Opm::EclIO
+
+namespace Opm { namespace EclIO {
+
+class RestartFileView
+{
+public:
+    explicit RestartFileView(std::shared_ptr<ERst> restart_file,
+                             const int             report_step);
+
+    ~RestartFileView();
+
+    RestartFileView(const RestartFileView& rhs) = delete;
+    RestartFileView(RestartFileView&& rhs);
+
+    RestartFileView& operator=(const RestartFileView& rhs) = delete;
+    RestartFileView& operator=(RestartFileView&& rhs);
+
+    std::size_t simStep() const;
+    int reportStep() const;
+
+    int occurrenceCount(const std::string& vector) const;
+
+    template <typename ElmType>
+    bool hasKeyword(const std::string& vector) const;
+
+    template <typename ElmType>
+    const std::vector<ElmType>&
+    getKeyword(const std::string& vector, const int occurrence = 0) const;
+
+    const std::vector<int>& intehead() const;
+    const std::vector<bool>& logihead() const;
+    const std::vector<double>& doubhead() const;
+
+private:
+    class Implementation;
+    std::unique_ptr<Implementation> pImpl_;
+};
+
+}} // Opm::RestartIO
+
+#endif // OPM_RESTART_FILE_VIEW_HPP
--- a/opm/io/eclipse/SummaryNode.hpp
+++ b/opm/io/eclipse/SummaryNode.hpp
@@ -24,9 +24,15 @@
 #include <optional>
 #include <string>
 #include <unordered_set>
+#include <array>

 namespace Opm { namespace EclIO {

+    struct lgr_info {
+        std::string name;
+        std::array<int, 3> ijk;
+    };
+
 struct SummaryNode {
    enum class Category {
        Well,
@@ -48,15 +54,18 @@ struct SummaryNode {
        Pressure,
        Count,
        Mode,
+        ProdIndex,
        Undefined,
    };

+
    std::string keyword;
    Category    category;
    Type        type;
    std::string wgname;
    int         number;
-    std::string fip_region;
+    std::optional<std::string> fip_region;
+    std::optional<lgr_info> lgr;

    constexpr static int default_number { std::numeric_limits<int>::min() };

--- a/opm/io/eclipse/rst/action.hpp
+++ b/opm/io/eclipse/rst/action.hpp
@@ -0,0 +1,78 @@
+/*
+  Copyright 2021 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_ACTIONX
+#define RST_ACTIONX
+
+#include <ctime>
+#include <optional>
+#include <string>
+#include <variant>
+#include <vector>
+
+#include <opm/parser/eclipse/EclipseState/Schedule/Action/Enums.hpp>
+#include <opm/parser/eclipse/Deck/DeckKeyword.hpp>
+
+namespace Opm {
+
+namespace RestartIO {
+
+struct RstAction {
+    struct Quantity {
+        std::variant<std::string, double> quantity;
+        std::optional<std::string> wgname;
+
+        Quantity() = default;
+        Quantity(const std::string * zacn, double sacn_value);
+        Quantity(const std::string& quantity);
+        Quantity(double value);
+    };
+
+
+    struct Condition {
+        static bool valid(const std::string * zacn, const int * iacn);
+        Condition(const std::string * zacn, const int * iacn, const double * sacn);
+        Action::Logical logic;
+        Action::Comparator cmp_op;
+        Quantity lhs;
+        Quantity rhs;
+        bool left_paren{false};
+        bool right_paren{false};
+
+        std::vector<std::string> tokens() const;
+    };
+
+
+    RstAction(const std::string& name_arg, int max_run_arg, int run_count_arg, double min_wait_arg, std::time_t start_time, std::time_t last_run, std::vector<Condition> conditions_arg);
+
+    std::string name;
+    int max_run;
+    int run_count;
+    double min_wait;
+    std::time_t start_time;
+    std::optional<std::time_t> last_run;
+    std::vector<Condition> conditions;
+    std::vector<DeckKeyword> keywords;
+};
+
+}
+}
+
+
+
+#endif
--- a/opm/io/eclipse/rst/aquifer.hpp
+++ b/opm/io/eclipse/rst/aquifer.hpp
@@ -0,0 +1,132 @@
+/*
+  Copyright 2021 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_RESTART_AQUIFER_HPP
+#define OPM_RESTART_AQUIFER_HPP
+
+#include <opm/parser/eclipse/EclipseState/Grid/FaceDir.hpp>
+
+#include <cstddef>
+#include <memory>
+#include <optional>
+#include <unordered_map>
+#include <utility>
+#include <vector>
+
+namespace Opm {
+    class AquiferConfig;
+    class EclipseGrid;
+    class UnitSystem;
+} // Opm
+
+namespace Opm { namespace EclIO {
+    class RestartFileView;
+}} // Opm::EclIO
+
+namespace Opm { namespace RestartIO {
+
+    class RstAquifer
+    {
+    public:
+        struct CarterTracy {
+            int aquiferID{};
+            int inftableID{};
+            int pvttableID{};
+
+            double porosity{};
+            double datum_depth{};
+            double total_compr{};
+            double inner_radius{};
+            double permeability{};
+            double thickness{};
+            double angle_fraction{};
+            double initial_pressure{};
+
+            double time_constant{};
+            double influx_constant{};
+            double water_density{};
+            double water_viscosity{};
+        };
+
+        struct Fetkovich {
+            int aquiferID{};
+            int pvttableID{};
+
+            double prod_index{};
+            double total_compr{};
+            double initial_watvolume{};
+            double datum_depth{};
+
+            double initial_pressure{};
+            double time_constant{};
+        };
+
+        class Connections {
+        public:
+            struct Cell {
+                std::size_t global_index;
+                double influx_coeff;
+                double effective_facearea;
+                FaceDir::DirEnum face_dir;
+            };
+
+            const std::vector<Cell>& cells() const
+            {
+                return this->cells_;
+            }
+
+            void reserve(const std::vector<Cell>::size_type cpty)
+            {
+                this->cells_.reserve(cpty);
+            }
+
+            template <typename... Args>
+            void emplace_back(Args&&... args)
+            {
+                this->cells_.push_back(Cell { std::forward<Args>(args)... });
+            }
+
+        private:
+            std::vector<Cell> cells_{};
+        };
+
+        explicit RstAquifer(std::shared_ptr<EclIO::RestartFileView> rstView,
+                            const EclipseGrid*                      grid,
+                            const UnitSystem&                       usys);
+
+        RstAquifer(const RstAquifer& rhs);
+        RstAquifer(RstAquifer&& rhs);
+        RstAquifer& operator=(const RstAquifer& rhs);
+        RstAquifer& operator=(RstAquifer&& rhs);
+
+        ~RstAquifer();
+
+        bool hasAnalyticAquifers() const;
+
+        const std::vector<CarterTracy>&             carterTracy() const;
+        const std::vector<Fetkovich>&               fetkovich() const;
+        const std::unordered_map<int, Connections>& connections() const;
+
+    private:
+        class Implementation;
+        std::unique_ptr<Implementation> pImpl_;
+    };
+}} // Opm::RestartIO
+
+#endif  // OPM_RESTART_AQUIFER_HPP
--- a/opm/io/eclipse/rst/group.hpp
+++ b/opm/io/eclipse/rst/group.hpp
@@ -44,6 +44,8 @@ struct RstGroup {
    int prod_cmode;
    int winj_cmode;
    int ginj_cmode;
+    int guide_rate_def;
+    int exceed_action;

    float oil_rate_limit;
    float water_rate_limit;
--- a/opm/io/eclipse/rst/header.hpp
+++ b/opm/io/eclipse/rst/header.hpp
@@ -84,11 +84,13 @@ struct RstHeader {
    int nilbrz;
    int ntfip ;
    int nmfipr;
-    int nrfreg;
-    int ntfreg;
-    int nplmix;
    int ngroup;
    int nwgmax;
+    int nwell_udq;
+    int ngroup_udq;
+    int nfield_udq;
+    int num_action;
+    int guide_rate_nominated_phase;

    bool e300_radial;
    bool e100_radial;
@@ -120,7 +122,9 @@ struct RstHeader {
    double udq_undefined;
    double udq_eps;

+    std::time_t sim_time() const;
    std::pair<std::time_t, std::size_t> restart_info() const;
+    int num_udq() const;
 };


--- a/opm/io/eclipse/rst/state.hpp
+++ b/opm/io/eclipse/rst/state.hpp
@@ -19,70 +19,53 @@
 #ifndef RST_STATE
 #define RST_STATE

-#include <vector>
+#include <memory>
 #include <string>
+#include <vector>

-#include <opm/io/eclipse/ERst.hpp>
 #include <opm/io/eclipse/rst/header.hpp>
+#include <opm/io/eclipse/rst/aquifer.hpp>
 #include <opm/io/eclipse/rst/group.hpp>
 #include <opm/io/eclipse/rst/well.hpp>
+#include <opm/io/eclipse/rst/udq.hpp>
+#include <opm/io/eclipse/rst/action.hpp>
+
 #include <opm/parser/eclipse/Units/UnitSystem.hpp>

 #include <opm/parser/eclipse/EclipseState/Schedule/Tuning.hpp>
-
+#include <opm/parser/eclipse/EclipseState/Runspec.hpp>

 namespace Opm {
+    class EclipseGrid;
+    class Parser;
+    class Parser;
+} // namespace Opm
+
+namespace Opm { namespace EclIO {
+    class RestartFileView;
+}} // namespace Opm::EclIO
+
+namespace Opm { namespace RestartIO {

-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);
+    RstState(std::shared_ptr<EclIO::RestartFileView> rstView,
+             const ::Opm::EclipseGrid*               grid);

-    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);
+    static RstState load(std::shared_ptr<EclIO::RestartFileView> rstView,
+                         const Runspec& runspec,
+                         const Parser& parser,
+                         const ::Opm::EclipseGrid*               grid = nullptr);

    const RstWell& get_well(const std::string& wname) const;

-    const ::Opm::UnitSystem unit_system;
+    ::Opm::UnitSystem unit_system;
    RstHeader header;
+    RstAquifer aquifers;
    std::vector<RstWell> wells;
    std::vector<RstGroup> groups;
+    std::vector<RstUDQ> udqs;
+    RstUDQActive udq_active;
+    std::vector<RstAction> actions;
    Tuning tuning;

 private:
@@ -93,11 +76,45 @@ private:
                    const std::vector<int>& igrp,
                    const std::vector<float>& sgrp,
                    const std::vector<double>& xgrp);
+
+    void add_wells(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);
+
+    void add_msw(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);
+
+    void add_udqs(const std::vector<int>& iudq,
+                  const std::vector<std::string>& zudn,
+                  const std::vector<std::string>& zudl,
+                  const std::vector<double>& dudw,
+                  const std::vector<double>& dudg,
+                  const std::vector<double>& dudf);
+
+    void add_actions(const Parser& parser,
+                     const Runspec& runspec,
+                     std::time_t sim_time,
+                     const std::vector<std::string>& zact,
+                     const std::vector<int>& iact,
+                     const std::vector<float>& sact,
+                     const std::vector<std::string>& zacn,
+                     const std::vector<int>& iacn,
+                     const std::vector<double>& sacn,
+                     const std::vector<std::string>& zlact);
+
 };
-}
-}
-
-

+}} // namespace Opm::RestartIO

 #endif
--- a/opm/io/eclipse/rst/udq.hpp
+++ b/opm/io/eclipse/rst/udq.hpp
@@ -0,0 +1,112 @@
+/*
+  Copyright 2021 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_UDQ
+#define RST_UDQ
+
+#include <cstddef>
+#include <optional>
+#include <string>
+#include <unordered_set>
+#include <utility>
+#include <variant>
+#include <vector>
+
+#include <opm/parser/eclipse/EclipseState/Schedule/UDQ/UDQEnums.hpp>
+#include <opm/parser/eclipse/EclipseState/Runspec.hpp>
+
+namespace Opm {
+
+namespace RestartIO {
+
+struct RstHeader;
+
+class RstUDQ {
+public:
+    struct RstDefine {
+        RstDefine(const std::string& expression_arg, UDQUpdate status_arg);
+
+        std::string expression;
+        UDQUpdate status;
+        std::vector<std::pair<std::string, double>> values;
+        std::optional<double> field_value;
+    };
+
+    struct RstAssign {
+        void update_value(const std::string& name_arg, double new_value);
+
+        std::optional<double> value;
+        std::unordered_set<std::string> selector;
+    };
+
+
+    RstUDQ(const std::string& name_arg,
+           const std::string& unit_arg,
+           const std::string& define_arg,
+           UDQUpdate status_arg);
+
+    RstUDQ(const std::string& name_arg,
+           const std::string& unit_arg);
+
+    void add_value(double value);
+    void add_value(const std::string& wgname, double value);
+
+    bool is_define() const;
+    double assign_value() const;
+    const std::unordered_set<std::string>& assign_selector() const;
+    const std::string& expression() const;
+    const std::vector<std::pair<std::string, double>>& values() const;
+    std::optional<double> field_value() const;
+
+    std::string name;
+    std::string unit;
+    UDQVarType var_type;
+
+private:
+    std::variant<std::monostate, RstDefine, RstAssign> data;
+};
+
+
+
+class RstUDQActive {
+
+    struct RstRecord {
+        RstRecord(UDAControl c, std::size_t i, std::size_t u1, std::size_t u2);
+
+
+        UDAControl control;
+        std::size_t input_index;
+        std::size_t use_count;
+        std::size_t wg_offset;
+    };
+
+
+public:
+    RstUDQActive() = default;
+    RstUDQActive(const std::vector<int>& iuad, const std::vector<int>& iuap, const std::vector<int>& igph);
+
+    std::vector<RstRecord> iuad;
+    std::vector<int> wg_index;
+    std::vector<Phase> ig_phase;
+};
+}
+}
+
+
+
+#endif
--- a/opm/io/eclipse/rst/well.hpp
+++ b/opm/io/eclipse/rst/well.hpp
@@ -69,12 +69,16 @@ struct RstWell {
    int well_status;
    int active_control;
    int vfp_table;
-    int pred_requested_control;
    bool allow_xflow;
+    int preferred_phase;
    int hist_requested_control;
    int msw_index;
    int completion_ordering;
    int pvt_table;
+    int msw_pressure_drop_model;
+    int wtest_config_reasons;
+    int wtest_close_reason;
+    int wtest_remaining;

    float orat_target;
    float wrat_target;
@@ -90,6 +94,8 @@ struct RstWell {
    float drainage_radius;
    float efficiency_factor;
    float alq_value;
+    float wtest_interval;
+    float wtest_startup;

    double oil_rate;
    double water_rate;
--- a/opm/output/OutputWriter.hpp
+++ b/opm/output/OutputWriter.hpp
@@ -42,7 +42,6 @@ struct PhaseUsage;
 * Use the create() function to setup a chain of writer based on the
 * configuration values, e.g.
 *
- * \example
 * \code{.cpp}
 *  ParameterGroup params (argc, argv, false);
 *  auto parser = std::make_shared <const Deck> (
--- a/opm/output/data/Aquifer.hpp
+++ b/opm/output/data/Aquifer.hpp
@@ -15,62 +15,384 @@

  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 <cstddef>
 #include <map>
 #include <memory>
+#include <string>
+#include <unordered_map>
+#include <utility>
+#include <variant>
 #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,
+        Fetkovich, CarterTracy, Numerical,
    };

-    struct FetkovichData {
-        double initVolume;
-        double prodIndex;
-        double timeConstant;
+    struct FetkovichData
+    {
+        double initVolume{};
+        double prodIndex{};
+        double timeConstant{};
+
+        bool operator==(const FetkovichData& other) const;
+
+        // MessageBufferType API should be similar to Dune::MessageBufferIF
+        template <class MessageBufferType>
+        void write(MessageBufferType& buffer) const;
+
+        // MessageBufferType API should be similar to Dune::MessageBufferIF
+        template <class MessageBufferType>
+        void read(MessageBufferType& buffer);
    };

-    struct AquiferData {
-        int aquiferID;    //< One-based ID, range 1..NANAQ
-        double pressure;  //< Aquifer pressure
-        double fluxRate; //< Aquifer influx rate (liquid aquifer)
-        // TODO: volume should have a better name, since meaning not clear
-        double volume;    //< Produced liquid volume
-        double initPressure;    //< Aquifer's initial pressure
-        double datumDepth;      //< Aquifer's pressure reference depth
+    struct CarterTracyData
+    {
+        double timeConstant{};
+        double influxConstant{};
+        double waterDensity{};
+        double waterViscosity{};

-        AquiferType type;
-        std::shared_ptr<FetkovichData> aquFet;
+        double dimensionless_time{};
+        double dimensionless_pressure{};

-        double get(const std::string& key) const
+        bool operator==(const CarterTracyData& other) const;
+
+        // MessageBufferType API should be similar to Dune::MessageBufferIF
+        template <class MessageBufferType>
+        void write(MessageBufferType& buffer) const;
+
+        // MessageBufferType API should be similar to Dune::MessageBufferIF
+        template <class MessageBufferType>
+        void read(MessageBufferType& buffer);
+    };
+
+    struct NumericAquiferData
+    {
+        std::vector<double> initPressure{};
+
+        bool operator==(const NumericAquiferData& other) const;
+
+        // MessageBufferType API should be similar to Dune::MessageBufferIF
+        template <class MessageBufferType>
+        void write(MessageBufferType& buffer) const;
+
+        // MessageBufferType API should be similar to Dune::MessageBufferIF
+        template <class MessageBufferType>
+        void read(MessageBufferType& buffer);
+    };
+
+    namespace detail {
+        template <AquiferType>
+        struct TypeMap;
+
+        template <> struct TypeMap<AquiferType::CarterTracy>
        {
-            if ( key == "AAQR" ) {
-                return this->fluxRate;
-            } else if ( key == "AAQT" ) {
-                return this->volume;
-            } else if ( key == "AAQP" ) {
-                return this->pressure;
-            }
-            return 0.;
+            using Alternative = CarterTracyData;
+        };
+
+        template <> struct TypeMap<AquiferType::Fetkovich>
+        {
+            using Alternative = FetkovichData;
+        };
+
+        template <> struct TypeMap<AquiferType::Numerical>
+        {
+            using Alternative = NumericAquiferData;
+        };
+
+        template <AquiferType t>
+        using TypeMap_t = typename TypeMap<t>::Alternative;
+    } // namespace detail
+
+    class TypeSpecificData
+    {
+    private:
+        template <typename T>
+        bool is() const
+        {
+            return std::holds_alternative<T>(this->options_);
        }
+
+        template <typename T>
+        const T* get() const
+        {
+            return this->template is<T>()
+                ? &std::get<T>(this->options_)
+                : nullptr;
+        }
+
+        template <typename T>
+        T* get()
+        {
+            return this->template is<T>()
+                ? &std::get<T>(this->options_)
+                : nullptr;
+        }
+
+    public:
+        TypeSpecificData() = default;
+
+        TypeSpecificData(const TypeSpecificData&) = default;
+        TypeSpecificData(TypeSpecificData&&) = default;
+
+        TypeSpecificData& operator=(const TypeSpecificData&) = default;
+        TypeSpecificData& operator=(TypeSpecificData&&) = default;
+
+        bool operator==(const TypeSpecificData& that) const
+        {
+            return std::visit(Equal{}, this->options_, that.options_);
+        }
+
+        template <AquiferType t>
+        auto* create()
+        {
+            return &this->options_.emplace<detail::TypeMap_t<t>>();
+        }
+
+        template <AquiferType t>
+        bool is() const
+        {
+            return this->template is<detail::TypeMap_t<t>>();
+        }
+
+        template <AquiferType t>
+        auto const* get() const
+        {
+            return this->template get<detail::TypeMap_t<t>>();
+        }
+
+        template <AquiferType t>
+        auto* getMutable()
+        {
+            return this->template get<detail::TypeMap_t<t>>();
+        }
+
+        template <typename MessageBufferType>
+        void write(MessageBufferType& buffer) const
+        {
+            buffer.write(this->options_.index());
+            std::visit(Write<MessageBufferType>{buffer}, this->options_);
+        }
+
+        template <typename MessageBufferType>
+        void read(MessageBufferType& buffer)
+        {
+            auto type = 0 * this->options_.index();
+            buffer.read(type);
+
+            if (type < std::variant_size_v<Types>) {
+                this->create(type);
+
+                std::visit(Read<MessageBufferType>{buffer}, this->options_);
+            }
+        }
+
+    private:
+        using Types = std::variant<std::monostate,
+                                   CarterTracyData,
+                                   FetkovichData,
+                                   NumericAquiferData>;
+
+        struct Equal
+        {
+            template <typename T1, typename T2>
+            bool operator()(const T1&, const T2&) const
+            {
+                return false;
+            }
+
+            template <typename T>
+            bool operator()(const T& e1, const T& e2) const
+            {
+                return e1 == e2;
+            }
+
+            bool operator()(const std::monostate&,
+                            const std::monostate&) const
+            {
+                return true;
+            }
+        };
+
+        template <typename MessageBufferType>
+        class Read
+        {
+        public:
+            explicit Read(MessageBufferType& buffer)
+                : buffer_{ buffer }
+            {}
+
+            template <typename T>
+            void operator()(T& alternative)
+            {
+                return alternative.read(this->buffer_);
+            }
+
+            void operator()(std::monostate&)
+            {}
+
+        private:
+            MessageBufferType& buffer_;
+        };
+
+        template <typename MessageBufferType>
+        class Write
+        {
+        public:
+            explicit Write(MessageBufferType& buffer)
+                : buffer_{ buffer }
+            {}
+
+            template <typename T>
+            void operator()(const T& alternative) const
+            {
+                return alternative.write(this->buffer_);
+            }
+
+            void operator()(const std::monostate&) const
+            {}
+
+        private:
+            MessageBufferType& buffer_;
+        };
+
+        Types options_{};
+
+        void create(const std::size_t option);
+    };
+
+    struct AquiferData
+    {
+        int aquiferID = 0;         //< One-based ID, range 1..NANAQ
+        double pressure = 0.0;     //< Aquifer pressure
+        double fluxRate = 0.0;     //< Aquifer influx rate (liquid aquifer)
+        double volume = 0.0;       //< Produced liquid volume
+        double initPressure = 0.0; //< Aquifer's initial pressure
+        double datumDepth = 0.0;   //< Aquifer's pressure reference depth
+
+        TypeSpecificData typeData{};
+
+        double get(const std::string& key) const;
+
+        bool operator==(const AquiferData& other) const;
+
+        // MessageBufferType API should be similar to Dune::MessageBufferIF
+        template <class MessageBufferType>
+        void write(MessageBufferType& buffer) const;
+
+        // MessageBufferType API should be similar to Dune::MessageBufferIF
+        template <class MessageBufferType>
+        void read(MessageBufferType& buffer);
+
+    private:
+        using GetSummaryValue = double (AquiferData::*)() const;
+        using SummaryValueDispatchTable = std::unordered_map<std::string, GetSummaryValue>;
+
+        static SummaryValueDispatchTable summaryValueDispatchTable_;
+
+        double aquiferFlowRate() const;
+        double aquiferPressure() const;
+        double aquiferTotalProduction() const;
+        double carterTracyDimensionlessTime() const;
+        double carterTracyDimensionlessPressure() const;
    };

    // TODO: not sure what extension we will need
    using Aquifers = std::map<int, AquiferData>;

+    template <class MessageBufferType>
+    void FetkovichData::write(MessageBufferType& buffer) const
+    {
+        buffer.write(this->initVolume);
+        buffer.write(this->prodIndex);
+        buffer.write(this->timeConstant);
+    }
+
+    template <class MessageBufferType>
+    void FetkovichData::read(MessageBufferType& buffer)
+    {
+        buffer.read(this->initVolume);
+        buffer.read(this->prodIndex);
+        buffer.read(this->timeConstant);
+    }
+
+    template <class MessageBufferType>
+    void CarterTracyData::write(MessageBufferType& buffer) const
+    {
+        buffer.write(this->timeConstant);
+        buffer.write(this->influxConstant);
+        buffer.write(this->waterDensity);
+        buffer.write(this->waterViscosity);
+        buffer.write(this->dimensionless_time);
+        buffer.write(this->dimensionless_pressure);
+    }
+
+    template <class MessageBufferType>
+    void CarterTracyData::read(MessageBufferType& buffer)
+    {
+        buffer.read(this->timeConstant);
+        buffer.read(this->influxConstant);
+        buffer.read(this->waterDensity);
+        buffer.read(this->waterViscosity);
+        buffer.read(this->dimensionless_time);
+        buffer.read(this->dimensionless_pressure);
+    }
+
+    template <class MessageBufferType>
+    void NumericAquiferData::write(MessageBufferType& buffer) const
+    {
+        buffer.write(this->initPressure.size());
+
+        for (const auto& pressure : this->initPressure) {
+            buffer.write(pressure);
+        }
+    }
+
+    template <class MessageBufferType>
+    void NumericAquiferData::read(MessageBufferType& buffer)
+    {
+        decltype(this->initPressure.size()) size{};
+        buffer.read(size);
+
+        this->initPressure.resize(size, 0.0);
+        for (auto& pressure : this->initPressure) {
+            buffer.read(pressure);
+        }
+    }
+
+    template <class MessageBufferType>
+    void AquiferData::write(MessageBufferType& buffer) const
+    {
+        buffer.write(this->aquiferID);
+        buffer.write(this->pressure);
+        buffer.write(this->fluxRate);
+        buffer.write(this->volume);
+        buffer.write(this->initPressure);
+        buffer.write(this->datumDepth);
+
+        this->typeData.write(buffer);
+    }
+
+    template <class MessageBufferType>
+    void AquiferData::read(MessageBufferType& buffer)
+    {
+        buffer.read(this->aquiferID);
+        buffer.read(this->pressure);
+        buffer.read(this->fluxRate);
+        buffer.read(this->volume);
+        buffer.read(this->initPressure);
+        buffer.read(this->datumDepth);
+
+        this->typeData.read(buffer);
+    }
 }} // Opm::data

 #endif // OPM_OUTPUT_AQUIFER_HPP
--- a/opm/output/data/Groups.hpp
+++ b/opm/output/data/Groups.hpp
@@ -28,7 +28,7 @@
 #include <vector>

 #include <opm/output/data/GuideRateValue.hpp>
-
+#include <opm/json/JsonObject.hpp>
 #include <opm/parser/eclipse/EclipseState/Schedule/Group/Group.hpp>

 namespace Opm { namespace data {
@@ -54,6 +54,12 @@ namespace Opm { namespace data {
        inline GroupConstraints& set(Opm::Group::ProductionCMode cpc,
                                     Opm::Group::InjectionCMode  cgic,
                                     Opm::Group::InjectionCMode  cwic);
+
+        void init_json(Json::JsonObject& json_data) const {
+            json_data.add_item("prod", Opm::Group::ProductionCMode2String(this->currentProdConstraint));
+            json_data.add_item("water_inj", Opm::Group::InjectionCMode2String(this->currentGasInjectionConstraint));
+            json_data.add_item("gas_inj", Opm::Group::InjectionCMode2String(this->currentWaterInjectionConstraint));
+        }
    };

    struct GroupGuideRates {
@@ -79,6 +85,14 @@ namespace Opm { namespace data {
            return this->production == other.production
                && this->injection  == other.injection;
        }
+
+        void init_json(Json::JsonObject& json_data) const {
+            auto json_prod = json_data.add_object("production");
+            this->production.init_json(json_prod);
+
+            auto json_inj = json_data.add_object("injection");
+            this->injection.init_json(json_inj);
+        }
    };

    struct GroupData {
@@ -104,6 +118,15 @@ namespace Opm { namespace data {
            return this->currentControl == other.currentControl
                && this->guideRates     == other.guideRates;
        }
+
+
+        void init_json(Json::JsonObject& json_data) const {
+            auto json_constraints = json_data.add_object("constraints");
+            this->currentControl.init_json(json_constraints);
+
+            auto json_gr = json_data.add_object("guide_rate");
+            this->guideRates.init_json(json_gr);
+        }
    };

    struct NodeData {
@@ -125,6 +148,10 @@ namespace Opm { namespace data {
        {
            return this->pressure == other.pressure;
        }
+
+        void init_json(Json::JsonObject& json_data) const {
+            json_data.add_item("pressure", this->pressure);
+        }
    };

    class GroupAndNetworkValues {
@@ -158,6 +185,26 @@ namespace Opm { namespace data {
            this->nodeData.clear();
        }

+        void init_json(Json::JsonObject& json_data) const {
+            auto group_data = json_data.add_object("group_data");
+            for (const auto& [gname, gdata] : this->groupData) {
+                auto group_json_data = group_data.add_object(gname);
+                gdata.init_json( group_json_data );
+            }
+
+            auto node_data = json_data.add_object("node_data");
+            for (const auto& [gname, ndata] : this->nodeData) {
+                auto node_json_data = node_data.add_object(gname);
+                ndata.init_json( node_json_data );
+            }
+        }
+
+        Json::JsonObject json() const {
+            Json::JsonObject json_data;
+            this->init_json(json_data);
+            return json_data;
+        }
+
    private:
        template <class MessageBufferType, class ValueType>
        void writeMap(const std::map<std::string, ValueType>& map,
--- a/opm/output/data/GuideRateValue.hpp
+++ b/opm/output/data/GuideRateValue.hpp
@@ -25,6 +25,7 @@
 #include <cstddef>
 #include <stdexcept>
 #include <string>
+#include <opm/json/JsonObject.hpp>

 namespace Opm { namespace data {

@@ -124,6 +125,14 @@ namespace Opm { namespace data {
            }
        }

+        void init_json(Json::JsonObject& json_data) const {
+            for (const auto& item : {Item::Oil, Item::Gas, Item::Water, Item::ResV}) {
+                if (this->has(item))
+                    json_data.add_item(this->itemName(item), this->get(item));
+            }
+        }
+
+
    private:
        enum { Size = static_cast<std::size_t>(Item::NumItems) };

--- a/Show More
+++ b/Show More