bump to final

if deck has no rockcomp keyword, variable is not written

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)
@@ -64,6 +64,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 +89,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}
@@ -118,6 +129,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 +162,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 +242,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 +262,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,7 +300,7 @@ 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)
     opm_add_test(${test} CONDITION ENABLE_ECL_INPUT AND Boost_UNIT_TEST_FRAMEWORK_FOUND
                          LIBRARIES ${_libs}
                          WORKING_DIRECTORY ${PROJECT_BINARY_DIR}/tests)
@@ -238,7 +308,7 @@ if(ENABLE_ECL_INPUT)
 endif()
 
 # Install build system files
-install(DIRECTORY cmake DESTINATION share/opm)
+install(DIRECTORY cmake DESTINATION share/opm USE_SOURCE_PERMISSIONS)
 
 # Install tab completion skeleton
 install(FILES etc/opm_bash_completion.sh.in DESTINATION share/opm/etc)
@@ -291,19 +361,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 +413,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 +421,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 +454,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")

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
@@ -50,18 +52,23 @@ if(ENABLE_ECL_INPUT)
     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
@@ -83,7 +90,6 @@ if(ENABLE_ECL_INPUT)
     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/Schedule/Action/ActionAST.cpp
@@ -124,14 +130,22 @@ if(ENABLE_ECL_INPUT)
     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/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
@@ -251,6 +265,7 @@ 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
@@ -264,9 +279,11 @@ if(ENABLE_ECL_OUTPUT)
           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/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
@@ -283,6 +300,7 @@ 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/RegionCache.cpp
@@ -324,8 +342,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,6 +353,7 @@ 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/MessageLimitTests.cpp
@@ -348,6 +365,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 +375,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
@@ -377,6 +396,7 @@ if(ENABLE_ECL_INPUT)
     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
@@ -385,9 +405,11 @@ if(ENABLE_ECL_INPUT)
 endif()
 if(ENABLE_ECL_OUTPUT)
   list (APPEND TEST_SOURCE_FILES
+          tests/test_ActiveIndexByColumns.cpp
           tests/test_AggregateActionxData.cpp
           tests/test_AggregateWellData.cpp
           tests/test_AggregateGroupData.cpp
+          tests/test_AggregateNetworkData.cpp
           tests/test_AggregateMSWData.cpp
           tests/test_AggregateConnectionData.cpp
           tests/test_AggregateUDQData.cpp
@@ -398,6 +420,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 +429,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
@@ -440,6 +464,7 @@ if(ENABLE_ECL_OUTPUT)
           tests/UDQ_TEST_WCONPROD_IUAD-2.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
@@ -450,6 +475,8 @@ if(ENABLE_ECL_OUTPUT)
           tests/SPE1CASE2.X0060
           tests/PYACTION.DATA
           tests/0A4_GRCTRL_LRAT_LRAT_GGR_BASE_MODEL2_MSW_ALL.DATA
+          tests/2_WLIFT_MODEL5_NOINC.DATA
+          tests/TEST_NETWORK_ALL.DATA
           tests/act1.py
           tests/MSW.DATA
           tests/EXIT_TEST.DATA
@@ -460,7 +487,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 +496,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
@@ -515,6 +549,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 +605,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
@@ -658,6 +692,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 +708,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
@@ -699,8 +738,13 @@ if(ENABLE_ECL_INPUT)
        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
@@ -712,11 +756,13 @@ if(ENABLE_ECL_INPUT)
        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/Group/GPMaint.hpp
@@ -730,7 +776,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 +787,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,6 +801,7 @@ 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
@@ -766,6 +811,7 @@ if(ENABLE_ECL_INPUT)
        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,6 +823,7 @@ 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
@@ -799,13 +846,16 @@ if(ENABLE_ECL_OUTPUT)
         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/AggregateGroupData.hpp
+        opm/output/eclipse/AggregateNetworkData.hpp
         opm/output/eclipse/AggregateConnectionData.hpp
         opm/output/eclipse/AggregateMSWData.hpp
         opm/output/eclipse/AggregateUDQData.hpp
@@ -820,6 +870,7 @@ 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/WindowedArray.hpp

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)
 

ExtraTests.cmake

@@ -44,11 +44,9 @@ list(APPEND EXTRA_TESTS EclipseStateTests)
 foreach (test BoxTest
               CheckDeckValidity
               EclipseGridCreateFromDeck
-              EDITNNCTests
               IncludeTest
               IntegrationTests
               IOConfigIntegrationTest
-              NNCTests
               ParseKEYWORD
               Polymer
               ScheduleCreateFromDeck

GenerateKeywords.cmake

@@ -41,7 +41,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 +75,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 +107,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)

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)

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

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

cmake/Modules/Finddune-common.cmake

@@ -28,7 +28,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>

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

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 

cmake/Modules/OpmFind.cmake

@@ -163,7 +163,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

cmake/Modules/OpmInit.cmake

@@ -135,6 +135,18 @@ 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
+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()
+
 # 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)

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)
 

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

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

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)

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)

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)

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

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

debian/changelog

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

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

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.

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.

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.

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.

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.

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.04
+Label: 2021.04
 Maintainer: opm@opm-project.org
 MaintainerName: OPM community
 Url: http://opm-project.org

examples/make_lodsmry.cpp

@@ -25,7 +25,7 @@
 
 #include "config.h"
 
-#if HAVE_OPENMP
+#if _OPENMP
 #include <omp.h>
 #endif
 
@@ -69,7 +69,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)

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

examples/opmhash.cpp

@@ -19,7 +19,7 @@
 #include <getopt.h>
 
 #include <vector>
-
+#include <iostream>
 #include <fmt/format.h>
 
 #include <opm/parser/eclipse/Parser/Parser.hpp>

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;

examples/wellgraph.cpp

@@ -45,7 +45,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);

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

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>
@@ -44,7 +45,7 @@ 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;

msim/src/msim.cpp

@@ -19,6 +19,7 @@
 
 #include <iostream>
 
+#include <opm/output/eclipse/Inplace.hpp>
 #include <opm/output/eclipse/EclipseIO.hpp>
 #include <opm/output/eclipse/RestartValue.hpp>
 #include <opm/output/eclipse/Summary.hpp>
@@ -46,7 +47,7 @@ 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());
     Action::State action_state;
     Python python;
@@ -61,7 +62,8 @@ void msim::run(Schedule& schedule, EclipseIO& io, bool report_only) {
             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);
         }
-        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 +75,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())
@@ -115,13 +116,14 @@ void msim::run_step(const Schedule& schedule, Action::State& action_state, Summa
         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,
                      st,

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)

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

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

opm/common/utility/Serializer.hpp

@@ -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++) {

opm/common/utility/TimeService.hpp

@@ -22,9 +22,25 @@
 
 #include <chrono>
 #include <ctime>
+#include <string>
+#include <unordered_map>
+
 
 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();
+    bool valid_month(const std::string& month_name);
+    }
+
     class TimeStampUTC
     {
     public:

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)

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
 

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,54 @@ 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);
 
     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; }
+
 private:
+    Opm::filesystem::path inputFileName, initFileName;
+    std::string m_grid_name;
+    bool m_radial;
+
     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;
 };
 
 }} // namespace Opm::EclIO

opm/io/eclipse/EInit.hpp

@@ -0,0 +1,102 @@
+/*
+   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")
+    {
+        int arr_ind = get_array_index(name, grid_name);
+
+        if constexpr (std::is_same_v<T, int>)
+            return getImpl(arr_ind, INTE, inte_array, "integer");
+
+        if constexpr (std::is_same_v<T, float>)
+            return getImpl(arr_ind, REAL, real_array, "float");
+
+        if constexpr (std::is_same_v<T, double>)
+            return getImpl(arr_ind, DOUB, doub_array, "double");
+
+        if constexpr (std::is_same_v<T, bool>)
+            return getImpl(arr_ind, LOGI, logi_array, "bool");
+
+        if constexpr (std::is_same_v<T, std::string>)
+        {
+            if (array_type[arr_ind] == Opm::EclIO::CHAR)
+                return getImpl(arr_ind, array_type[arr_ind], char_array, "char");
+
+            if (array_type[arr_ind] == Opm::EclIO::C0NN)
+                return getImpl(arr_ind, array_type[arr_ind], char_array, "c0nn");
+
+            OPM_THROW(std::runtime_error, "Array not of type CHAR or C0nn");
+        }
+
+        OPM_THROW(std::runtime_error, "type not supported");
+    }
+
+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

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,73 @@ 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(const std::string& name, int reportStepNumber, const std::string& lgr_name);
+
+    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(int index, int reportStepNumber, const std::string& lgr_name)
+    {
+        auto indRange = this->getIndexRange(reportStepNumber);
+
+        if ((std::get<0>(indRange) + index) > std::get<1>(indRange))
+            OPM_THROW(std::invalid_argument, "getRestartData, index out of range");
+
+        int start_ind = get_start_index_lgrname(reportStepNumber, lgr_name);
+        return  this->get<T>(index + start_ind);
+    }
+
+    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

opm/io/eclipse/ESmry.hpp

@@ -28,6 +28,7 @@
 #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 {
@@ -48,18 +49,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();
 
-    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;
@@ -101,7 +102,7 @@ private:
     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;
 

opm/io/eclipse/EclFile.hpp

@@ -35,8 +35,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 +60,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 +73,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 +88,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;
 
@@ -110,7 +119,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

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
 

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

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

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
         {

opm/io/eclipse/SummaryNode.hpp

@@ -48,6 +48,7 @@ struct SummaryNode {
         Pressure,
         Count,
         Mode,
+        ProdIndex,
         Undefined,
     };
 
@@ -56,7 +57,8 @@ struct SummaryNode {
     Type        type;
     std::string wgname;
     int         number;
-    std::string fip_region;
+
+    std::optional<std::string> fip_region;
 
     constexpr static int default_number { std::numeric_limits<int>::min() };
 

opm/io/eclipse/rst/group.hpp

@@ -44,6 +44,7 @@ struct RstGroup {
     int prod_cmode;
     int winj_cmode;
     int ginj_cmode;
+    int guide_rate_def;
 
     float oil_rate_limit;
     float water_rate_limit;

opm/io/eclipse/rst/header.hpp

@@ -84,9 +84,6 @@ struct RstHeader {
     int nilbrz;
     int ntfip ;
     int nmfipr;
-    int nrfreg;
-    int ntfreg;
-    int nplmix;
     int ngroup;
     int nwgmax;
 

opm/io/eclipse/rst/well.hpp

@@ -69,12 +69,13 @@ 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;
 
     float orat_target;
     float wrat_target;

opm/output/data/Aquifer.hpp

@@ -22,9 +22,7 @@
 
 #include <map>
 #include <memory>
-#include <vector>
-
-#include <opm/parser/eclipse/Units/UnitSystem.hpp>
+#include <string>
 
 namespace Opm { namespace data {
 
@@ -34,43 +32,128 @@ namespace Opm { namespace data {
      */
     enum class AquiferType
     {
-        Fetkovich, CarterTracey,
+        Fetkovich, CarterTracy, Numerical,
     };
 
-    struct FetkovichData {
+    struct FetkovichData
+    {
         double initVolume;
         double prodIndex;
         double timeConstant;
     };
 
-    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 dimensionless_time;
+        double dimensionless_pressure;
+    };
+
+    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
 
         AquiferType type;
         std::shared_ptr<FetkovichData> aquFet;
+        std::shared_ptr<CarterTracyData> aquCT;
 
-        double get(const std::string& key) const
-        {
-            if ( key == "AAQR" ) {
-                return this->fluxRate;
-            } else if ( key == "AAQT" ) {
-                return this->volume;
-            } else if ( key == "AAQP" ) {
-                return this->pressure;
-            }
-            return 0.;
-        }
+        double get(const std::string& key) 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);
     };
 
     // TODO: not sure what extension we will need
     using Aquifers = std::map<int, AquiferData>;
 
+    inline double AquiferData::get(const std::string& key) const
+    {
+        if ((key == "AAQR") || (key == "ANQR")) {
+            return this->fluxRate;
+        }
+        else if ((key == "AAQT") || (key == "ANQT")) {
+            return this->volume;
+        }
+        else if ((key == "AAQP") || (key == "ANQP")) {
+            return this->pressure;
+        }
+        else if ((key == "AAQTD") && (this->aquCT != nullptr)) {
+            return this->aquCT->dimensionless_time;
+        }
+        else if ((key == "AAQPD") && (this->aquCT != nullptr)) {
+            return this->aquCT->dimensionless_pressure;
+        }
+
+        return 0.0;
+    }
+
+    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);
+
+        const int aqu = (this->aquFet != nullptr) + 2*(this->aquCT != nullptr);
+        buffer.write(aqu);
+
+        if (this->aquFet != nullptr) {
+            buffer.write(this->aquFet->initVolume);
+            buffer.write(this->aquFet->prodIndex);
+            buffer.write(this->aquFet->timeConstant);
+        }
+        else if (this->aquCT != nullptr) {
+            buffer.write(this->aquCT->dimensionless_time);
+            buffer.write(this->aquCT->dimensionless_pressure);
+        }
+    }
+
+    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);
+
+        int aqu;
+        buffer.read(aqu);
+        if (aqu == 1) {
+            this->type = AquiferType::Fetkovich;
+
+            if (this->aquFet == nullptr) {
+                this->aquFet = std::make_shared<FetkovichData>();
+            }
+
+            buffer.read(this->aquFet->initVolume);
+            buffer.read(this->aquFet->prodIndex);
+            buffer.read(this->aquFet->timeConstant);
+        }
+        else if (aqu == 2) {
+            this->type = AquiferType::CarterTracy;
+
+            if (this->aquCT == nullptr) {
+                this->aquCT = std::make_shared<CarterTracyData>();
+            }
+
+            buffer.read(this->aquCT->dimensionless_time);
+            buffer.read(this->aquCT->dimensionless_pressure);
+        }
+    }
 }} // Opm::data
 
 #endif // OPM_OUTPUT_AQUIFER_HPP

opm/output/data/Wells.hpp

@@ -197,7 +197,7 @@ namespace Opm {
     private:
         constexpr static std::size_t numvals = 5;
 
-        std::array<double, numvals> values_;
+        std::array<double, numvals> values_ = {0};
 
         std::size_t index(const Value ix) const
         {
@@ -255,6 +255,9 @@ namespace Opm {
         double thp;
         double temperature;
         int control;
+
+        ::Opm::Well::Status dynamicStatus { Opm::Well::Status::OPEN };
+
         std::vector< Connection > connections;
         std::unordered_map<std::size_t, Segment> segments;
         CurrentControl current_control;
@@ -538,6 +541,12 @@ namespace Opm {
         buffer.write(this->thp);
         buffer.write(this->temperature);
         buffer.write(this->control);
+
+        {
+            const auto status = ::Opm::Well::Status2String(this->dynamicStatus);
+            buffer.write(status);
+        }
+
         unsigned int size = this->connections.size();
         buffer.write(size);
         for (const Connection& comp : this->connections)
@@ -621,6 +630,12 @@ namespace Opm {
         buffer.read(this->temperature);
         buffer.read(this->control);
 
+        {
+            auto status = std::string{};
+            buffer.read(status);
+            this->dynamicStatus = ::Opm::Well::StatusFromString(status);
+        }
+
         // Connection information
         unsigned int size = 0.0; //this->connections.size();
         buffer.read(size);

opm/output/eclipse/ActiveIndexByColumns.hpp

@@ -0,0 +1,75 @@
+/*
+  Copyright (c) 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_ACTIVE_INDEX_BY_COLUMNS_HPP
+#define OPM_ACTIVE_INDEX_BY_COLUMNS_HPP
+
+#include <array>
+#include <cassert>
+#include <cstddef>
+#include <functional>
+#include <vector>
+
+namespace Opm {
+    class EclipseGrid;
+}
+
+namespace Opm {
+
+/// Special purpose mapping facility to handle the output code's need to
+/// enumerate the active cells by columns (layer ID (K) cycling fastest,
+/// followed by J, followed by I) for aquifer connections.
+class ActiveIndexByColumns
+{
+public:
+    bool operator==(const ActiveIndexByColumns& rhs) const;
+
+    /// Create natural->columnar active cell index mapping.
+    ///
+    /// \param[in] numActive Number of active cells in model.
+    /// \param[in] cartDims Model's Cartesian dimensions.
+    /// \param[in] getIJK Call-back routine for retrieving the Cartesian
+    ///    (I,J,K) tuple of an active cell index.
+    explicit ActiveIndexByColumns(const std::size_t                                           numActive,
+                                  const std::array<int, 3>&                                   cartDims,
+                                  const std::function<std::array<int, 3>(const std::size_t)>& getIJK);
+
+    /// Map active index in natural order to active index in columnar order.
+    ///
+    /// The output code needs return type \c int here, so use that instead
+    /// of \code std::size_t \endcode.
+    int getColumnarActiveIndex(const std::size_t naturalActiveIndex) const
+    {
+        assert ((naturalActiveIndex < this->natural2columnar_.size())
+                && "Natural active cell index out of bounds");
+
+        return this->natural2columnar_[naturalActiveIndex];
+    }
+
+private:
+    std::vector<int> natural2columnar_;
+};
+
+/// Build natural->columnar active cell index mapping from an EclipseGrid instance.
+ActiveIndexByColumns buildColumnarActiveIndexMappingTables(const EclipseGrid& grid);
+
+} // namespace Opm
+
+
+#endif // OPM_ACTIVE_INDEX_BY_COLUMNS_HPP

opm/output/eclipse/AggregateConnectionData.hpp

@@ -30,6 +30,7 @@ namespace Opm {
     class EclipseGrid;
     class Schedule;
     class UnitSystem;
+    class SummaryState;
 } // Opm
 
 namespace Opm { namespace data {
@@ -47,6 +48,7 @@ namespace Opm { namespace RestartIO { namespace Helpers {
                                      const Opm::EclipseGrid&     grid,
                                      const Opm::UnitSystem&      units,
                                      const Opm::data::WellRates& xw,
+                                     const Opm::SummaryState&    summary_state,
                                      const std::size_t           sim_step);
 
         const std::vector<int>& getIConn() const

opm/output/eclipse/AggregateNetworkData.hpp

@@ -0,0 +1,116 @@
+/*
+  Copyright (c) 2018 Statoil ASA
+
+  This file is part of the Open Porous Media project (OPM).
+
+  OPM is free software: you can redistribute it and/or modify
+  it under the terms of the GNU General Public License as published by
+  the Free Software Foundation, either version 3 of the License, or
+  (at your option) any later version.
+
+  OPM is distributed in the hope that it will be useful,
+  but WITHOUT ANY WARRANTY; without even the implied warranty of
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  GNU General Public License for more details.
+
+  You should have received a copy of the GNU General Public License
+  along with OPM.  If not, see <http://www.gnu.org/licenses/>.
+*/
+
+#ifndef OPM_AGGREGATE_NETWORK_DATA_HPP
+#define OPM_AGGREGATE_NETWORK_DATA_HPP
+
+#include <opm/output/eclipse/WindowedArray.hpp>
+
+#include <opm/io/eclipse/PaddedOutputString.hpp>
+#include <opm/parser/eclipse/EclipseState/Schedule/Group/Group.hpp>
+#include <opm/parser/eclipse/EclipseState/Schedule/Network/ExtNetwork.hpp>
+#include <cstddef>
+#include <string>
+#include <vector>
+#include <map>
+
+namespace Opm {
+    class EclipseState;
+    class Schedule;
+    class SummaryState;
+    //class Group;
+    class UnitSystem;
+} // Opm
+
+namespace Opm { namespace RestartIO { namespace Helpers {
+
+class AggregateNetworkData
+{
+public:
+    explicit AggregateNetworkData(const std::vector<int>& inteHead);
+
+    void captureDeclaredNetworkData(const Opm::EclipseState&             es,
+                                    const Opm::Schedule&                 sched,
+                                    const Opm::UnitSystem&               units,
+                                    const std::size_t                    lookup_step,
+                                    const Opm::SummaryState&             sumState,
+                                    const std::vector<int>&              inteHead);
+
+    const std::vector<int>& getINode() const
+    {
+        return this->iNode_.data();
+    }
+
+    const std::vector<int>& getIBran() const
+    {
+        return this->iBran_.data();
+    }
+
+    const std::vector<int>& getINobr() const
+    {
+        return this->iNobr_.data();
+    }
+
+
+    const std::vector<double>& getRNode() const
+    {
+        return this->rNode_.data();
+    }
+
+    const std::vector<double>& getRBran() const
+    {
+        return this->rBran_.data();
+    }
+
+
+    const std::vector<EclIO::PaddedOutputString<8>>& getZNode() const
+    {
+        return this->zNode_.data();
+    }
+
+
+private:
+    /// Aggregate 'INODE' array (Integer) for all nodes
+    WindowedArray<int> iNode_;
+
+    /// Aggregate 'IBRAN' array (Integer) for all branches
+    WindowedArray<int> iBran_;
+
+    /// Aggregate 'INOBR' array (Integer) for all nodes
+    WindowedArray<int> iNobr_;
+
+    /// Aggregate 'RNODE' array (Real) for all nodes.
+    WindowedArray<double> rNode_;
+
+    /// Aggregate 'RBRAN' array (Real) for all branches.
+    WindowedArray<double> rBran_;
+
+    /// Aggregate 'ZNODE' array (Character) for all wells.
+    WindowedArray<EclIO::PaddedOutputString<8>> zNode_;
+
+    /// Maximum number of wells in a group.
+    //int nWGMax_;
+
+    /// Maximum number of groups
+    //int nGMaxz_;
+};
+
+}}} // Opm::RestartIO::Helpers
+
+#endif // OPM_AGGREGATE_NETWORK_DATA_HPP

opm/output/eclipse/DoubHEAD.hpp

@@ -51,6 +51,12 @@ namespace Opm { namespace RestartIO {
             double damping_fact;
         };
 
+        struct liftOptPar {
+            double min_int;
+            double incr;
+            double min_ec_grad;
+        };
+
         DoubHEAD();
 
         ~DoubHEAD() = default;
@@ -72,6 +78,7 @@ namespace Opm { namespace RestartIO {
 
         DoubHEAD& udq_param(const UDQParams& udqPar);
         DoubHEAD& guide_rate_param(const guideRate& guide_rp);
+        DoubHEAD& lift_opt_param(const liftOptPar& lo_par);
 
         const std::vector<double>& data() const
         {

opm/output/eclipse/EclipseIO.hpp

@@ -112,7 +112,7 @@ public:
   *     are not yet written to disk.
   */
 
-    void writeInitial( data::Solution simProps = data::Solution(), std::map<std::string, std::vector<int> > int_data = {}, const NNC& nnc = NNC());
+    void writeInitial( data::Solution simProps = data::Solution(), std::map<std::string, std::vector<int> > int_data = {}, const std::vector<NNCdata>& nnc = {});
 
     /**
      * \brief Overwrite the initial OIP values.

opm/output/eclipse/Inplace.hpp

@@ -0,0 +1,89 @@
+/*
+  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 ORIGINAL_OIP
+#define ORIGINAL_OIP
+
+#include <string>
+#include <unordered_map>
+#include <vector>
+
+namespace Opm {
+
+
+class Inplace {
+public:
+
+    enum class Phase {
+        WATER = 0,
+        OIL = 1,
+        GAS = 2,
+        OilInLiquidPhase = 3,
+        OilInGasPhase = 4,
+        GasInLiquidPhase = 5,
+        GasInGasPhase = 6,
+        PoreVolume = 7,
+        // The Inplace class is implemented in close relation to the
+        // ecloutputblackoilmodule in opm-simulators, ane there are certainly
+        // idiosyncracies here due to that coupling. For instance the three enum
+        // values PressurePV, HydroCarbonPV and PressureHydroCarbonPV are *not*
+        // included in the return value from phases().
+        PressurePV = 8,
+        HydroCarbonPV = 9,
+        PressureHydroCarbonPV = 10
+    };
+
+    /*
+      The purpose of this class is to transport inplace values from the
+      simulator code to the summary output code. The code is written very much
+      to fit in with the current implementation in the simulator. The functions
+      which don't accept region_name & region_number arguments should be called
+      for totals, i.e. field properties.
+    */
+
+
+    void add(const std::string& region, Phase phase, std::size_t region_number, double value);
+    void add(Phase phase, double value);
+
+    double get(const std::string& region, Phase phase, std::size_t region_number) const;
+    double get(Phase phase) const;
+
+    bool has(const std::string& region, Phase phase, std::size_t region_number) const;
+    bool has(Phase phase) const;
+
+    std::size_t max_region() const;
+    std::size_t max_region(const std::string& region_name) const;
+
+    /*
+      The get_vector functions return a vector length max_region() which
+      contains the values added with the add() function and indexed with
+      (region_number - 1). This is an incarnation of id <-> index confusion and
+      should be replaced with a std::map instead.
+    */
+    std::vector<double> get_vector(const std::string& region, Phase phase) const;
+
+    static const std::vector<Phase>& phases();
+private:
+    std::unordered_map<std::string, std::unordered_map<Phase, std::unordered_map<std::size_t, double>>> phase_values;
+};
+
+
+}
+
+#endif

opm/output/eclipse/InteHEAD.hpp

@@ -41,6 +41,8 @@ namespace RestartIO {
             int maxWellInGroup;
             int maxGroupInField;
             int maxWellsInField;
+            int mxwlstprwel;
+            int mxdynwlst;
         };
 
         struct WellSegDims {
@@ -61,6 +63,10 @@ namespace RestartIO {
             int nplmix;
         };
 
+        struct RockOpts {
+            int ttyp;
+        };
+
         struct TimePoint {
             int year;
             int month;          // 1..12
@@ -112,6 +118,20 @@ namespace RestartIO {
      struct GuideRateNominatedPhase {
       int   nominated_phase;
      };
+
+     struct NetworkDims {
+            int noactnod;
+            int noactbr;
+            int nodmax;
+            int nbrmax;
+            int nibran;
+            int nrbran;
+            int ninode;
+            int nrnode;
+            int nznode;
+            int ninobr;
+        };
+
      
         InteHEAD();
         ~InteHEAD() = default;
@@ -139,13 +159,16 @@ namespace RestartIO {
         InteHEAD& tuningParam(const TuningPar& tunpar);
         InteHEAD& variousParam(const int version, const int iprog);
         InteHEAD& wellSegDimensions(const WellSegDims& wsdim);
+        InteHEAD& networkDimensions(const NetworkDims& nwdim);
         InteHEAD& regionDimensions(const RegDims& rdim);
+        InteHEAD& rockOpts(const RockOpts& rckop);
         InteHEAD& ngroups(const Group& gr);
         InteHEAD& udqParam_1(const UdqParam& udqpar);
         InteHEAD& actionParam(const ActionParam& act_par);
         InteHEAD& variousUDQ_ACTIONXParam();
         InteHEAD& nominatedPhaseGuideRate(GuideRateNominatedPhase nphase);
         InteHEAD& whistControlMode(int mode);
+        InteHEAD& liftOptParam(int in_enc);
 
         const std::vector<int>& data() const
         {

opm/output/eclipse/LogiHEAD.hpp

@@ -106,6 +106,9 @@ namespace Opm { namespace RestartIO {
             return this->data_;
         }
 
+        /// Logical switch to indicate that the network option is used
+        ///
+        LogiHEAD& network(const int maxNoNodes);
     private:
         std::vector<bool> data_;
     };

opm/output/eclipse/RegionCache.hpp

@@ -36,9 +36,12 @@ namespace out {
         RegionCache(const std::set<std::string>& fip_regions, const FieldPropsManager& fp, const EclipseGrid& grid, const Schedule& schedule);
         const std::vector<std::pair<std::string,size_t>>& connections( const std::string& region_name, int region_id ) const;
 
+        // A well is assigned to the region_id where the first connection is
+        std::vector<std::string> wells(const std::string& region_name, int region_id) const;
     private:
         std::vector<std::pair<std::string,size_t>> connections_empty;
         std::map<std::pair<std::string, int> , std::vector<std::pair<std::string,size_t>>> connection_map;
+        std::map<std::pair<std::string, int>, std::vector<std::string>> well_map;
     };
 }
 }

opm/output/eclipse/Summary.hpp

@@ -20,12 +20,14 @@
 #ifndef OPM_OUTPUT_SUMMARY_HPP
 #define OPM_OUTPUT_SUMMARY_HPP
 
+#include <opm/parser/eclipse/EclipseState/Schedule/Well/PAvgCalculatorCollection.hpp>
 #include <opm/parser/eclipse/EclipseState/Schedule/Group/Group.hpp>
 #include <opm/output/data/Aquifer.hpp>
 
 #include <map>
 #include <memory>
 #include <string>
+#include <unordered_map>
 #include <utility>
 #include <vector>
 
@@ -35,6 +37,7 @@ namespace Opm {
     class Schedule;
     class SummaryConfig;
     class SummaryState;
+    class Inplace;
 } // namespace Opm
 
 namespace Opm { namespace data {
@@ -63,17 +66,19 @@ public:
     void eval(SummaryState&                      summary_state,
               const int                          report_step,
               const double                       secs_elapsed,
-              const EclipseState&                es,
-              const Schedule&                    schedule,
               const data::WellRates&             well_solution,
               const data::GroupAndNetworkValues& group_and_nwrk_solution,
               GlobalProcessParameters            single_values,
+              const Inplace&                     initial_inplace,
+              const Inplace&                     inplace,
+              const PAvgCalculatorCollection&    ,
               const RegionParameters&            region_values = {},
               const BlockValues&                 block_values  = {},
               const data::Aquifers&              aquifers_values = {}) const;
 
     void write() const;
 
+    PAvgCalculatorCollection wbp_calculators(std::size_t report_step) const;
 
 private:
     class SummaryImplementation;

opm/output/eclipse/VectorItems/connection.hpp

@@ -67,6 +67,10 @@ namespace Opm { namespace RestartIO { namespace Helpers { namespace VectorItems
             WaterRate  =  1,  // Surface flow rate (water)
             GasRate    =  2,  // Surface Flow rate (gas)
 
+            OilRate_Copy    =  17,  // Surface flow rate (oil)
+            WaterRate_Copy  =  18,  // Surface flow rate (water)
+            GasRate_Copy    =  19,  // Surface Flow rate (gas)
+
             Pressure   = 34,  // Connection pressure value
 
             ResVRate   = 49,  // Reservoir voidage rate

opm/output/eclipse/VectorItems/doubhead.hpp

@@ -53,6 +53,9 @@ namespace Opm { namespace RestartIO { namespace Helpers { namespace VectorItems
         GRpar_d = 90,     // Guiderate parameter D
         GRpar_e = 91,     // Guiderate parameter E
         GRpar_f = 92,     // Guiderate parameter F
+        LOminInt = 93,     // LIFTOP - Minimum interval between gas lift optimizations
+        LOincrsz   = 95,     // LIFTOPT - Increment size for lift gas injection rate
+        LOminEcGrad = 96,  // LIFTOPT - Minimum economic gradient
         GRpar_int = 97,     // Guiderate parameter delay interval
         ThrUPT  =  99,
         XxxDPR  = 100,

opm/output/eclipse/VectorItems/group.hpp

@@ -27,6 +27,7 @@ namespace Opm { namespace RestartIO { namespace Helpers { namespace VectorItems
 
         namespace SGroup {
         enum prod_index : std::vector<float>::size_type {
+            GuideRate     =  2,
             OilRateLimit  =  6, // Group's oil production target/limit
             WatRateLimit  =  7, // Group's water production target/limit
             GasRateLimit  =  8, // Group's gas production target/limit
@@ -52,12 +53,40 @@ namespace Opm { namespace RestartIO { namespace Helpers { namespace VectorItems
 
 
     namespace IGroup {
+    // Observe that these value should not be used as ordinary indices into
+    // the the IGRP vector, they should all be used as IGRP[NWGMAX + $index]
     enum index : std::vector<int>::size_type {
-        ProdCMode = 1,
+        ProdActiveCMode = 1,
+        GuideRateDef = 6,
+        ExceedAction = 7,
         WInjCMode = 16,
+        GConProdCMode = 10,
         GInjCMode = 21,
+        GroupType = 26,
+        GroupLevel = 27,
         ParentGroup = 28,
+        FlowingWells = 33,
     };
+
+    namespace Value {
+    enum GuideRateMode : int {
+        None = 0,
+        Oil = 1,
+        Water = 2,
+        Gas = 3,
+        Liquid = 4,
+        Potn = 7,
+        Form = 8,
+        Comb = 9,
+    };
+
+    enum GroupType : int {
+        WellGroup = 0,
+        TreeGroup = 1,
+    };
+
+    }
+
     }
 
 

opm/output/eclipse/VectorItems/intehead.hpp

@@ -57,6 +57,8 @@ namespace Opm { namespace RestartIO { namespace Helpers { namespace VectorItems
         NXWELZ = 26, //  Number of delements per well in XWEL array
         NZWELZ = 27, //  Number of 8-character words per well in ZWEL array
 
+        MXWLSTPRWELL = 30, //  Maximum number of well lists pr well
+
         NICONZ = 32, //  Number of data elements per completion
                      //  in ICON array (default 19)
         NSCONZ = 33, //  Number of data elements per completion in SCON array
@@ -80,6 +82,8 @@ namespace Opm { namespace RestartIO { namespace Helpers { namespace VectorItems
         NGCTRL = 51, //  Index indicating if group control is used or not (1 - if group control, 0 if not)
 
         NGRNPH = 58, //  Index indicating if group control is used or not (1 - if group control, 0 if not)
+        EACHNCITS = 59, //  Index indicating if lift gas distribution optimized each of the NUPCOL first iterations or not
+                       // 1 - optimized only first newton iteration, 2 - optimized each of NUPCOL newton iterations
 
         DAY = 64, //  Calendar day of report step (1..31)
         MONTH = 65, //  Calendar month of report step (1..12)
@@ -101,6 +105,20 @@ namespace Opm { namespace RestartIO { namespace Helpers { namespace VectorItems
         IPROG = 94, //  IPROG = simulation program identifier:  100 - ECLIPSE 100, 300 - ECLIPSE 300, 500 - ECLIPSE 300
                     //  (thermal option), negative - Other simulator,
         NMFIPR = 99, // REGDIMS item2
+
+        ROCKOPTS_TABTYP = 103, // ROCKOPTS item3 (PVTNUM=1 - default)
+
+        NOACTNOD     =      129       ,              //  NOACTNOD = Number of active/defined nodes in the network
+        NOACTBR      =      130       ,              //  NOACTBR = Number of active/defined branches in the network
+        NODMAX       =      131       ,              //  NODMAX = maximum number of nodes in extended network option
+        NBRMAX       =      132       ,              //  NBRMAX = maximum number of branches in extended network option
+        NIBRAN       =      133       ,              //  NIBRAN = number of entries per branch in the IBRAN array
+        NRBRAN       =      134       ,              //  NRBRAN = number of tries per branch in the RBRAN array
+        NINODE       =      135       ,              //  NINODE = number of entries per node in the INODE array
+        NRNODE       =      136       ,              //  NRNODE = number of entries per node in the RNODE array
+        NZNODE       =      137       ,              //  NZNODE = number of entries per node in the ZNODE array
+        NINOBR       =      138       ,              //  NINOBR = size of the INOBR array
+
         NOOFACTIONS = 156, //  The number of actions in the dataset
         MAXNOLINES = 157, //  Maximum number of lines of schedule data for ACTION keyword - including ENDACTIO
         MAXNOSTRPRLINE = 158, //  Maximum number of 8-chars strings pr input line of Action data (rounded up from input)
@@ -131,6 +149,9 @@ namespace Opm { namespace RestartIO { namespace Helpers { namespace VectorItems
         NO_IUADS = 290, //  No IUADs
         NO_IUAPS = 291, //  No IUAPs
         RSEED = 296,
+
+        MAXDYNWELLST = 302, //  Maximum number of dynamic well lists (default = 1)
+
         ISECND = 410 //  ISECND = current simulation time HH:MM:SS - number of seconds (SS), reported in microseconds
                      //  (0-59,999,999)
     };

opm/output/eclipse/VectorItems/logihead.hpp

@@ -40,6 +40,7 @@ namespace Opm { namespace RestartIO { namespace Helpers { namespace VectorItems
         DirEPS     = 17,    // Directional end-point scaling
         RevEPS     = 18,    // Reversible end-point scaling
         AltEPS     = 19,    // Alternative (3-pt) end-point scaling
+        HasNetwork = 37,     // Indicates Network option used
         ConstCo    = 38,    // Constant oil compressibility (PVCDO)
         HasMSWells = 75,    // Whether or not model has MS Wells.
     };

opm/output/eclipse/VectorItems/msw.hpp

@@ -25,6 +25,7 @@
 namespace Opm { namespace RestartIO { namespace Helpers { namespace VectorItems {
 
     namespace ISeg {
+
         enum index : std::vector<int>::size_type {
             SegNo          = 0, // Segment number (one-based)
             OutSeg         = 1, // Outlet segment (one-based)
@@ -66,24 +67,30 @@ namespace Opm { namespace RestartIO { namespace Helpers { namespace VectorItems
 
             DeviceBaseStrength = 86,
 
+            ScalingFactor = 87,
+
             CalibrFluidDensity   = 88,
             CalibrFluidViscosity = 89,
 
             CriticalWaterFraction = 90,
             TransitionRegWidth    = 91,
             MaxEmulsionRatio      = 92,
+
+            FlowRateExponent      = 95,
+            ViscFuncExponent      = 96,
+
             MaxValidFlowRate      = 97,
 
             ICDLength = 102,
 
             ValveAreaFraction  = 103,
 
-            item106 = 105,      // Unknown
-            item107 = 106,      // Unknown
-            item108 = 107,      // Unknown
-            item109 = 108,      // Unknown
-            item110 = 109,      // Unknown
-            item111 = 110,      // Unknown
+            flowFractionOilDensityExponent      = 105,
+            flowFractionWaterDensityExponent    = 106,
+            flowFractionGasDensityExponent      = 107,
+            flowFractionOilViscosityExponent    = 108,
+            flowFractionWaterViscosityExponent  = 109,
+            flowFractionGasViscosityExponent    = 110,
         };
     } // RSeg
 

opm/output/eclipse/VectorItems/network.hpp

@@ -0,0 +1,66 @@
+/*
+  Copyright (c) 2018 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_OUTPUT_ECLIPSE_VECTOR_NETWORK_HPP
+#define OPM_OUTPUT_ECLIPSE_VECTOR_NETWORK_HPP
+
+#include <vector>
+
+namespace Opm { namespace RestartIO { namespace Helpers { namespace VectorItems {
+
+
+
+    namespace INode {
+    enum index : std::vector<int>::size_type {
+        NoBranchesConnToNode = 0,
+        CumNoBranchesConnToNode = 1,
+        Group = 2,
+        FixedPresNode = 3,
+    };
+    }
+
+    namespace IBran {
+    enum index : std::vector<int>::size_type {
+        DownTreeNode = 0,
+        UpTreeNode = 1,
+        VfpTableNo = 2,
+    };
+    }
+
+    namespace RNode {
+    enum index : std::vector<double>::size_type {
+        NodePres = 0,
+        FixedPresNode  = 1,
+        PressureLimit = 2,
+    };
+    }
+
+    namespace RBran {
+    enum index : std::vector<double>::size_type {
+        OilProdRate = 0,
+        WaterProdRate = 1,
+        GasProdRate = 2,
+        OilDensity = 8,
+        GasDensity = 9
+    };
+    }
+
+}}}} // Opm::RestartIO::Helpers::VectorItems
+
+#endif // OPM_OUTPUT_ECLIPSE_VECTOR_NETWORK_HPP

opm/output/eclipse/VectorItems/well.hpp

@@ -39,8 +39,7 @@ namespace Opm { namespace RestartIO { namespace Helpers { namespace VectorItems
             Status   = 10, // Well status
             VFPTab   = 11, // ID (one-based) of well's current VFP table.
 
-            PredReqWCtrl = 15, // Well's requested control mode from
-                               // simulation deck (WCONINJE, WCONPROD).
+            PreferredPhase = 15, // Well's preferred phase (from WELSPECS)
 
             item18 = 17, // Unknown
             XFlow  = 22,
@@ -51,6 +50,8 @@ namespace Opm { namespace RestartIO { namespace Helpers { namespace VectorItems
             HistReqWCtrl = 49, // Well's requested control mode from
                                // simulation deck (WCONHIST, WCONINJH)
 
+            LiftOpt = 53, // Well's lift gas injection to be calculated by optimisation or not
+
             MsWID  = 70, // Multisegment well ID
                          //   Value 0 for regular wells
                          //   Value 1..#MS wells for MS wells
@@ -111,6 +112,13 @@ namespace Opm { namespace RestartIO { namespace Helpers { namespace VectorItems
                            // COMPDAT keyword.
             };
 
+            enum Preferred_Phase : int {
+                Oil    = 1,
+                Water  = 2,
+                Gas    = 3,
+                Liquid = 4,
+            };
+
             enum PLossMod : int {
                 HFA = 0, // Components of pressure loss in MSW model for well (WELSEGS item 6)
                          // Hydrostatic, Friction, Acceleration
@@ -162,6 +170,11 @@ namespace Opm { namespace RestartIO { namespace Helpers { namespace VectorItems
 
             HistBHPTarget     = 55, // Well's historical/observed bottom
                                     // hole pressure target/limit
+
+            LOmaxRate         = 56, // Well's maximum lift gas rate
+            LOweightFac       = 57, // Well's wighting factor for preferential allocation of lift gas
+            LOminRate         = 67, // Well's mimimum lift gas rate
+
         };
     } // SWell
 

opm/output/eclipse/WriteInit.hpp

@@ -24,6 +24,8 @@
 #include <string>
 #include <vector>
 
+#include <opm/parser/eclipse/EclipseState/Grid/NNC.hpp>
+
 namespace Opm {
 
     class EclipseGrid;
@@ -52,7 +54,7 @@ namespace Opm { namespace InitIO {
                const ::Opm::Schedule&                  schedule,
                const ::Opm::data::Solution&            simProps,
                std::map<std::string, std::vector<int>> int_data,
-               const ::Opm::NNC&                       nnc,
+               const std::vector<::Opm::NNCdata>&      nnc,
                ::Opm::EclIO::OutputStream::Init&       initFile);
 
 }} // namespace Opm::InitIO

opm/parser/eclipse/Deck/DeckItem.hpp

@@ -135,6 +135,7 @@ namespace Opm {
             serializer(dval);
             serializer(ival);
             serializer(sval);
+            serializer.vector(rsval);
             serializer.vector(uval);
             serializer(type);
             serializer(item_name);

opm/parser/eclipse/Deck/DeckKeyword.hpp

@@ -44,9 +44,9 @@ namespace Opm {
         DeckKeyword();
         explicit DeckKeyword(const ParserKeyword& parserKeyword);
         DeckKeyword(const KeywordLocation& location, const std::string& keywordName);
-        DeckKeyword(const ParserKeyword& parserKeyword, const std::vector<std::vector<DeckValue>>& record_list, UnitSystem& system_active, UnitSystem& system_default);
+        DeckKeyword(const ParserKeyword& parserKeyword, const std::vector<std::vector<DeckValue>>& record_list, const UnitSystem& system_active, const UnitSystem& system_default);
         DeckKeyword(const ParserKeyword& parserKeyword, const std::vector<int>& data);
-        DeckKeyword(const ParserKeyword& parserKeyword, const std::vector<double>& data, UnitSystem& system_active, UnitSystem& system_default);
+        DeckKeyword(const ParserKeyword& parserKeyword, const std::vector<double>& data, const UnitSystem& system_active, const UnitSystem& system_default);
 
         static DeckKeyword serializeObject();
 

opm/parser/eclipse/Deck/ImportContainer.hpp

@@ -0,0 +1,42 @@
+/*
+  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/>.
+*/
+
+#define IMPORT_CONTAINER_HPP
+
+#include <vector>
+
+#include <opm/parser/eclipse/Deck/DeckKeyword.hpp>
+
+
+namespace Opm {
+
+class Parser;
+
+class ImportContainer {
+public:
+    ImportContainer(const Parser& parser, const UnitSystem& unit_system, const std::string& fname, bool formatted, std::size_t deck_size);
+
+    std::vector<DeckKeyword>::iterator begin() { return this->keywords.begin(); }
+    std::vector<DeckKeyword>::iterator end() { return this->keywords.end(); }
+private:
+    std::vector<DeckKeyword> keywords;
+};
+
+
+}

opm/parser/eclipse/Deck/UDAValue.hpp

@@ -38,6 +38,19 @@ public:
     UDAValue(double data, const Dimension& dim);
     UDAValue(const std::string& data, const Dimension& dim);
 
+    /*
+      The assignment operators have been explicitly deleted, that is to prevent
+      people from adding them at a later stage. It seems very tempting/natural
+      to implement these assignment operators, but the problem is that the
+      resulting UDA object will typically have the wrong dimension member, and
+      subtle dimension related bugs will arise.
+    */
+    UDAValue& operator=(double value) = delete;
+    UDAValue& operator=(const std::string& value) = delete;
+    void update(double d);
+    void update(const std::string& s);
+    void update_value(const UDAValue& other);
+
     static UDAValue serializeObject();
 
     /*
@@ -66,9 +79,6 @@ public:
 
     bool operator==(const UDAValue& other) const;
     bool operator!=(const UDAValue& other) const;
-    UDAValue& operator=(double value);
-    UDAValue& operator=(const std::string& value);
-    void update_value(const UDAValue& other);
 
     bool is_numeric() { return numeric_value; }
 

opm/parser/eclipse/EclipseState/Aquifer/Aquancon.hpp

@@ -26,15 +26,16 @@
   implement the analytical aquifer models in OPM Flow.
 */
 
-#include <unordered_map>
-
-#include <opm/parser/eclipse/EclipseState/Grid/EclipseGrid.hpp>
 #include <opm/parser/eclipse/EclipseState/Grid/FaceDir.hpp>
-#include <opm/parser/eclipse/Parser/ParserKeywords/A.hpp>
-#include <opm/parser/eclipse/Deck/Deck.hpp>
-#include <opm/parser/eclipse/Deck/DeckItem.hpp>
-#include <opm/parser/eclipse/Deck/DeckRecord.hpp>
-#include <opm/parser/eclipse/Deck/DeckKeyword.hpp>
+
+#include <cstddef>
+#include <unordered_map>
+#include <vector>
+
+namespace Opm {
+    class EclipseGrid;
+    class Deck;
+}
 
 namespace Opm {
 
@@ -44,36 +45,40 @@ namespace Opm {
         struct AquancCell {
             int aquiferID;
             std::size_t global_index;
-            std::pair<bool, double> influx_coeff;
-            double influx_mult;
+            double influx_coeff;
+            double effective_facearea; // Needed for restart output only.
             FaceDir::DirEnum face_dir;
 
-            AquancCell(int aquiferID_arg, std::size_t gi, const std::pair<bool, double>& ic, double im, FaceDir::DirEnum fd) :
-                aquiferID(aquiferID_arg),
-                global_index(gi),
-                influx_coeff(ic),
-                influx_mult(im),
-                face_dir(fd)
+            AquancCell(const int aquiferID_arg,
+                       const std::size_t gi,
+                       const double ic,
+                       const double eff_faceArea,
+                       const FaceDir::DirEnum fd)
+                : aquiferID(aquiferID_arg)
+                , global_index(gi)
+                , influx_coeff(ic)
+                , effective_facearea(eff_faceArea)
+                , face_dir(fd)
             {}
 
             AquancCell() = default;
 
             bool operator==(const AquancCell& other) const {
-                return this->aquiferID == other.aquiferID &&
-                       this->global_index == other.global_index &&
-                       this->influx_coeff == other.influx_coeff &&
-                       this->influx_mult == other.influx_mult &&
-                       this->face_dir == other.face_dir;
+                return (this->aquiferID == other.aquiferID)
+                    && (this->global_index == other.global_index)
+                    && (this->influx_coeff == other.influx_coeff)
+                    && (this->effective_facearea == other.effective_facearea)
+                    && (this->face_dir == other.face_dir);
             }
 
             template<class Serializer>
             void serializeOp(Serializer& serializer)
             {
-                serializer(aquiferID);
-                serializer(global_index);
-                serializer(influx_coeff);
-                serializer(influx_mult);
-                serializer(face_dir);
+                serializer(this->aquiferID);
+                serializer(this->global_index);
+                serializer(this->influx_coeff);
+                serializer(this->effective_facearea);
+                serializer(this->face_dir);
             }
         };
 
@@ -88,19 +93,15 @@ namespace Opm {
             bool operator==(const Aquancon& other) const;
             bool active() const;
 
-            const std::vector<Aquancon::AquancCell> operator[](int aquiferID) const;
+            const std::vector<Aquancon::AquancCell>& operator[](int aquiferID) const;
 
             template<class Serializer>
             void serializeOp(Serializer& serializer)
             {
-                serializer.map(cells);
+                serializer.map(this->cells);
             }
 
         private:
-            static bool cellInsideReservoirAndActive(const EclipseGrid& grid, int i, int j, int k);
-            static bool neighborCellInsideReservoirAndActive(const EclipseGrid& grid, int i, int j, int k, FaceDir::DirEnum faceDir);
-
-
             std::unordered_map<int, std::vector<Aquancon::AquancCell>> cells;
     };
 }

opm/parser/eclipse/EclipseState/Aquifer/AquiferCT.hpp

@@ -62,8 +62,7 @@ namespace Opm {
                        double c2_,
                        const std::pair<bool, double>& p0_,
                        const std::vector<double>& td_,
-                       const std::vector<double>& pi_,
-                       const std::vector<int>& cell_id_);
+                       const std::vector<double>& pi_);
 
             int aquiferID;
             int inftableID, pvttableID;
@@ -80,7 +79,6 @@ namespace Opm {
 
             std::pair<bool, double> p0; //Initial aquifer pressure at datum depth, d0
             std::vector<double> td, pi;
-            std::vector<int> cell_id;
 
             bool operator==(const AQUCT_data& other) const;
 
@@ -102,7 +100,6 @@ namespace Opm {
                 serializer(p0);
                 serializer(td);
                 serializer(pi);
-                serializer(cell_id);
             }
         };
 

opm/parser/eclipse/EclipseState/Aquifer/AquiferConfig.hpp

@@ -20,21 +20,26 @@
 #ifndef OPM_AUQIFER_CONFIG_HPP
 #define OPM_AUQIFER_CONFIG_HPP
 
-#include <opm/parser/eclipse/EclipseState/Aquancon.hpp>
-#include <opm/parser/eclipse/EclipseState/Aquifetp.hpp>
-#include <opm/parser/eclipse/EclipseState/AquiferCT.hpp>
+#include <opm/parser/eclipse/EclipseState/Aquifer/Aquancon.hpp>
+#include <opm/parser/eclipse/EclipseState/Aquifer/Aquifetp.hpp>
+#include <opm/parser/eclipse/EclipseState/Aquifer/AquiferCT.hpp>
+#include <opm/parser/eclipse/EclipseState/Aquifer/NumericalAquifer/NumericalAquifers.hpp>
 
 namespace Opm {
 
 class TableManager;
 class EclipseGrid;
 class Deck;
+class FieldPropsManager;
 
 class AquiferConfig {
 public:
     AquiferConfig() = default;
-    AquiferConfig(const TableManager& tables, const EclipseGrid& grid, const Deck& deck);
+    AquiferConfig(const TableManager& tables, const EclipseGrid& grid,
+                  const Deck& deck, const FieldPropsManager& field_props);
     AquiferConfig(const Aquifetp& fetp, const AquiferCT& ct, const Aquancon& conn);
+    void load_connections(const Deck& deck, const EclipseGrid& grid);
+
 
     static AquiferConfig serializeObject();
 
@@ -42,20 +47,26 @@ public:
     const AquiferCT& ct() const;
     const Aquifetp& fetp() const;
     const Aquancon& connections() const;
-    bool operator==(const AquiferConfig& other);
+    bool operator==(const AquiferConfig& other) const;
     bool hasAquifer(const int aquID) const;
 
+    bool hasNumericalAquifer() const;
+    bool hasAnalyticalAquifer() const;
+    const NumericalAquifers& numericalAquifers() const;
+
     template<class Serializer>
     void serializeOp(Serializer& serializer)
     {
         aquifetp.serializeOp(serializer);
         aquiferct.serializeOp(serializer);
         aqconn.serializeOp(serializer);
+        numerical_aquifers.serializeOp(serializer);
     }
 
 private:
     Aquifetp aquifetp;
     AquiferCT aquiferct;
+    NumericalAquifers numerical_aquifers;
     Aquancon aqconn;
 };
 

opm/parser/eclipse/EclipseState/Aquifer/NumericalAquifer/NumericalAquiferCell.hpp

@@ -0,0 +1,69 @@
+/*
+  Copyright (C) 2020 SINTEF Digital
+
+  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_NUMERICALAQUIFERCELL_HPP
+#define OPM_NUMERICALAQUIFERCELL_HPP
+
+#include <optional>
+
+namespace Opm {
+    class DeckRecord;
+    class EclipseGrid;
+    class FieldPropsManager;
+
+    struct NumericalAquiferCell {
+        NumericalAquiferCell(const DeckRecord&, const EclipseGrid&, const FieldPropsManager&);
+        NumericalAquiferCell() = default;
+        size_t aquifer_id;
+        size_t I, J, K;
+        double area;
+        double length;
+        double porosity;
+        double permeability;
+        double depth;
+        std::optional<double> init_pressure;
+        int pvttable;
+        int sattable;
+        size_t global_index;
+
+        double cellVolume() const;
+        double poreVolume() const;
+        double transmissiblity() const;
+        bool operator == (const NumericalAquiferCell& other) const;
+
+        template<class Serializer>
+        void serializeOp(Serializer& serializer) {
+            serializer(this->aquifer_id);
+            serializer(this->I);
+            serializer(this->J);
+            serializer(this->K);
+            serializer(this->area);
+            serializer(this->length);
+            serializer(this->porosity);
+            serializer(this->permeability);
+            serializer(this->depth);
+            serializer(this->init_pressure);
+            serializer(this->pvttable);
+            serializer(this->sattable);
+            serializer(this->global_index);
+        }
+    };
+}
+
+#endif //OPM_NUMERICALAQUIFERCELL_HPP

opm/parser/eclipse/EclipseState/Aquifer/NumericalAquifer/NumericalAquiferConnection.hpp

@@ -0,0 +1,74 @@
+/*
+  Copyright (C) 2020 SINTEF Digital
+
+  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_NUMERICALAQUIFERCONNECTION_HPP
+#define OPM_NUMERICALAQUIFERCONNECTION_HPP
+
+#include <opm/parser/eclipse/EclipseState/Grid/FaceDir.hpp>
+#include <map>
+#include <array>
+#include <vector>
+
+namespace Opm {
+
+    class EclipseGrid;
+    class Deck;
+    class DeckRecord;
+
+    struct NumericalAquiferConnection {
+        // TODO: I do not think we need all the values here
+        size_t aquifer_id;
+        size_t I, J, K;
+        size_t global_index;
+        FaceDir::DirEnum face_dir;
+        double trans_multipler;
+        int trans_option;
+        bool connect_active_cell;
+
+        // The following are options related to VE simulation
+        double ve_frac_relperm;
+        double ve_frac_cappress;
+
+        NumericalAquiferConnection(size_t i, size_t j, size_t k, size_t global_index, bool allow_connect_active, const DeckRecord& record);
+        NumericalAquiferConnection() = default;
+
+        bool operator==(const NumericalAquiferConnection& other) const;
+
+        template<class Serializer>
+        void serializeOp(Serializer& serializer) {
+            serializer(this->aquifer_id);
+            serializer(this->I);
+            serializer(this->J);
+            serializer(this->K);
+            serializer(this->global_index);
+            serializer(this->face_dir);
+            serializer(this->trans_multipler);
+            serializer(this->trans_option);
+            serializer(this->connect_active_cell);
+            serializer(this->ve_frac_relperm);
+            serializer(this->ve_frac_cappress);
+        }
+
+        static std::map<size_t, std::map<size_t, NumericalAquiferConnection>> generateConnections(const Deck& deck, const EclipseGrid& grid);
+    private:
+        static std::vector<NumericalAquiferConnection> connectionsFromSingleRecord(const EclipseGrid& grid, const DeckRecord& record);
+    };
+}
+
+#endif //OPM_NUMERICALAQUIFERCONNECTION_HPP

opm/parser/eclipse/EclipseState/Aquifer/NumericalAquifer/NumericalAquifers.hpp

@@ -0,0 +1,68 @@
+/*
+  Copyright (C) 2020 SINTEF Digital
+
+  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_NUMERICALAQUIFERS_HPP
+#define OPM_NUMERICALAQUIFERS_HPP
+
+#include <unordered_map>
+#include <map>
+
+#include <opm/parser/eclipse/EclipseState/Aquifer/NumericalAquifer/SingleNumericalAquifer.hpp>
+
+namespace Opm {
+    class Deck;
+    class EclipseGrid;
+    class FieldPropsManager;
+    struct NumericalAquiferCell;
+
+    class NumericalAquifers {
+    public:
+        NumericalAquifers() = default;
+        NumericalAquifers(const Deck& deck, const EclipseGrid& grid, const FieldPropsManager& field_props);
+
+        size_t size() const;
+        bool hasAquifer(size_t aquifer_id) const;
+        const SingleNumericalAquifer& getAquifer(size_t aquifer_id) const;
+        const std::map<size_t, SingleNumericalAquifer>& aquifers() const;
+        bool operator==(const NumericalAquifers& other) const;
+
+        std::unordered_map<size_t, const NumericalAquiferCell*> allAquiferCells() const;
+
+        std::unordered_map<size_t, double> aquiferCellVolumes() const;
+
+        std::vector<NNCdata> aquiferNNCs(const EclipseGrid& grid, const FieldPropsManager& fp) const;
+
+        std::unordered_map<size_t, AquiferCellProps> aquiferCellProps() const;
+
+        static NumericalAquifers serializeObject();
+        template <class Serializer>
+        void serializeOp(Serializer& serializer)
+        {
+            serializer.map(this->m_aquifers);
+        }
+
+    private:
+        std::map<size_t, SingleNumericalAquifer> m_aquifers;
+
+        void addAquiferCell(const NumericalAquiferCell& aqu_cell);
+        void addAquiferConnections(const Deck &deck, const EclipseGrid &grid);
+    };
+}
+
+#endif //OPM_NUMERICALAQUIFERS_HPP

opm/parser/eclipse/EclipseState/Aquifer/NumericalAquifer/SingleNumericalAquifer.hpp

@@ -0,0 +1,87 @@
+/*
+  Copyright (C) 2020 SINTEF Digital
+
+  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_SINGLENUMERICALAQUIFER_HPP
+#define OPM_SINGLENUMERICALAQUIFER_HPP
+
+#include <vector>
+#include <set>
+
+#include <opm/parser/eclipse/EclipseState/Aquifer/NumericalAquifer/NumericalAquiferConnection.hpp>
+#include <opm/parser/eclipse/EclipseState/Aquifer/NumericalAquifer/NumericalAquiferCell.hpp>
+
+namespace Opm {
+    class NNC;
+    struct NNCdata;
+    class FieldPropsManager;
+
+    struct AquiferCellProps {
+        double volume;
+        double pore_volume;
+        double depth;
+        double porosity;
+        int satnum;
+        int pvtnum;
+    };
+
+    class SingleNumericalAquifer {
+    public:
+        explicit SingleNumericalAquifer(const size_t aqu_id);
+        SingleNumericalAquifer() = default;
+
+        void addAquiferCell(const NumericalAquiferCell& aqu_cell);
+        void addAquiferConnection(const NumericalAquiferConnection& aqu_con);
+
+        // TODO: the following two can be made one function. Let us see
+        // how we use them at the end
+        size_t numCells() const;
+        size_t id() const;
+        size_t numConnections() const;
+        const NumericalAquiferCell* getCellPrt(size_t index) const;
+
+        std::unordered_map<size_t, AquiferCellProps> aquiferCellProps() const;
+
+        std::vector<NNCdata> aquiferNNCs(const EclipseGrid& grid, const FieldPropsManager& fp) const;
+        const std::vector<NumericalAquiferConnection>& connections() const;
+
+        bool operator==(const SingleNumericalAquifer& other) const;
+
+        template<class Serializer>
+        void serializeOp(Serializer& serializer) {
+            serializer(this->id_);
+            serializer.vector(this->cells_);
+            serializer.vector(this->connections_);
+        }
+
+        private:
+            // Maybe this id_ is not necessary
+            // Because if it is a map, the id will be there
+            // Then adding aquifer cells will be much easier with the
+            // default constructor
+            size_t id_;
+            std::vector<NumericalAquiferCell> cells_;
+            std::vector<NumericalAquiferConnection> connections_;
+
+            std::vector<NNCdata> aquiferCellNNCs() const;
+            std::vector<NNCdata> aquiferConnectionNNCs(const EclipseGrid &grid, const FieldPropsManager &fp) const;
+        };
+}
+
+
+#endif //OPM_SINGLENUMERICALAQUIFER_HPP

opm/parser/eclipse/EclipseState/EclipseConfig.hpp

@@ -42,10 +42,9 @@ namespace Opm {
         IOConfig& io();
         const IOConfig& io() const;
         const InitConfig& init() const;
-        const InitConfig& getInitConfig() const;
 
         bool operator==(const EclipseConfig& data) const;
-
+        static bool rst_cmp(const EclipseConfig& full_config, const EclipseConfig& rst_config);
         template<class Serializer>
         void serializeOp(Serializer& serializer)
         {

opm/parser/eclipse/EclipseState/EclipseState.hpp

@@ -24,10 +24,9 @@
 #include <vector>
 
 #include <opm/parser/eclipse/Parser/ParseContext.hpp>
-#include <opm/parser/eclipse/EclipseState/AquiferConfig.hpp>
+#include <opm/parser/eclipse/EclipseState/Aquifer/AquiferConfig.hpp>
 #include <opm/parser/eclipse/EclipseState/EclipseConfig.hpp>
 #include <opm/parser/eclipse/EclipseState/TracerConfig.hpp>
-#include <opm/parser/eclipse/EclipseState/Edit/EDITNNC.hpp>
 #include <opm/parser/eclipse/EclipseState/Grid/FieldPropsManager.hpp>
 #include <opm/parser/eclipse/EclipseState/Grid/EclipseGrid.hpp>
 #include <opm/parser/eclipse/EclipseState/Grid/FaultCollection.hpp>
@@ -78,7 +77,7 @@ namespace Opm {
 
         const InitConfig& getInitConfig() const;
         InitConfig& getInitConfig();
-        
+
         const SimulationConfig& getSimulationConfig() const;
         virtual const EclipseGrid& getInputGrid() const;
 
@@ -90,11 +89,6 @@ namespace Opm {
         const NNC& getInputNNC() const;
         bool hasInputNNC() const;
 
-        /// editing non-neighboring connections
-        /// the non-standard adjacencies as specified in input deck
-        const EDITNNC& getInputEDITNNC() const;
-        bool hasInputEDITNNC() const;
-
         // The potentially parallelized field properties
         virtual const FieldPropsManager& fieldProps() const;
         // Always the non-parallel field properties
@@ -112,7 +106,7 @@ namespace Opm {
 
         std::string getTitle() const;
 
-        void applyModifierDeck(const Deck& deck);
+        void apply_geo_keywords(const std::vector<DeckKeyword>& keywords);
 
         const Runspec& runspec() const;
         const AquiferConfig& aquifer() const;
@@ -127,16 +121,18 @@ namespace Opm {
             m_eclipseConfig.serializeOp(serializer);
             m_deckUnitSystem.serializeOp(serializer);
             m_inputNnc.serializeOp(serializer);
-            m_inputEditNnc.serializeOp(serializer);
             m_gridDims.serializeOp(serializer);
+            aquifer_config.serializeOp(serializer);
             m_simulationConfig.serializeOp(serializer);
             m_transMult.serializeOp(serializer);
             m_faults.serializeOp(serializer);
             serializer(m_title);
-            aquifer_config.serializeOp(serializer);
             tracer_config.serializeOp(serializer);
         }
 
+        static bool rst_cmp(const EclipseState& full_state, const EclipseState& rst_state);
+
+
     private:
         void initIOConfigPostSchedule(const Deck& deck);
         void initTransMult();
@@ -152,17 +148,16 @@ namespace Opm {
         Runspec m_runspec;
         EclipseConfig m_eclipseConfig;
         UnitSystem m_deckUnitSystem;
-        NNC m_inputNnc;
-        EDITNNC m_inputEditNnc;
         EclipseGrid m_inputGrid;
+        NNC m_inputNnc;
         GridDims m_gridDims;
         FieldPropsManager field_props;
+        AquiferConfig aquifer_config;
         SimulationConfig m_simulationConfig;
         TransMult m_transMult;
 
         FaultCollection m_faults;
         std::string m_title;
-        AquiferConfig aquifer_config;
         TracerConfig tracer_config;
     };
 }

opm/parser/eclipse/EclipseState/Edit/EDITNNC.hpp

@@ -1,60 +0,0 @@
-/*
-  Copyright 2018 Equinor AS
-
-  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_COMMON_EDITNNC_HPP
-#define OPM_COMMON_EDITNNC_HPP
-
-#include <opm/parser/eclipse/EclipseState/Grid/NNC.hpp>
-namespace Opm
-{
-
-/// Represents edit information for non-neighboring connections (NNCs, faults, etc.)
-class EDITNNC
-{
-public:
-    EDITNNC() = default;
-
-    /// Construct from input deck
-    explicit EDITNNC(const Deck& deck);
-
-    /// Returns an instance used for serialization test
-    static EDITNNC serializeObject();
-
-    /// \brief Get an ordered set of EDITNNC
-    const std::vector<NNCdata>& data() const
-    {
-        return m_editnnc;
-    }
-    /// \brief Get the number of entries
-    size_t size() const;
-    /// \brief Whether EDITNNC was empty.
-    bool empty() const;
-
-    bool operator==(const EDITNNC& data) const;
-
-    template<class Serializer>
-    void serializeOp(Serializer& serializer)
-    {
-        serializer.vector(m_editnnc);
-    }
-
-private:
-    std::vector<NNCdata> m_editnnc;
-};
-}
-#endif // OPM_COMMON_EDITNNC_HPP

opm/parser/eclipse/EclipseState/Grid/EclipseGrid.hpp

@@ -33,6 +33,7 @@
 #include <memory>
 #include <optional>
 #include <vector>
+#include <unordered_set>
 
 namespace Opm {
 
@@ -67,7 +68,7 @@ namespace Opm {
         EclipseGrid(size_t nx, size_t ny, size_t nz,
                     double dx = 1.0, double dy = 1.0, double dz = 1.0);
 
-        EclipseGrid(std::array<int, 3>& dims ,
+        EclipseGrid(const std::array<int, 3>& dims ,
                     const std::vector<double>& coord ,
                     const std::vector<double>& zcorn ,
                     const int * actnum = nullptr,
@@ -88,7 +89,7 @@ namespace Opm {
         size_t activeIndex(size_t i, size_t j, size_t k) const;
         size_t activeIndex(size_t globalIndex) const;
 
-        void save(const std::string& filename, bool formatted, const Opm::NNC& nnc, const Opm::UnitSystem& units) const;
+        void save(const std::string& filename, bool formatted, const std::vector<Opm::NNCdata>& nnc, const Opm::UnitSystem& units) const;
         /*
           Observe that the there is a getGlobalIndex(i,j,k)
           implementation in the base class. This method - translating
@@ -155,7 +156,7 @@ namespace Opm {
         std::array<double, 3> getCellCenter(size_t i,size_t j, size_t k) const;
         std::array<double, 3> getCellCenter(size_t globalIndex) const;
         std::array<double, 3> getCornerPos(size_t i,size_t j, size_t k, size_t corner_index) const;
-        std::vector<double> activeVolume() const;
+        const std::vector<double>& activeVolume() const;
         double getCellVolume(size_t globalIndex) const;
         double getCellVolume(size_t i , size_t j , size_t k) const;
         double getCellThickness(size_t globalIndex) const;
@@ -199,6 +200,8 @@ namespace Opm {
         PinchMode::ModeEnum m_multzMode;
         PinchMode::ModeEnum m_pinchGapMode;
 
+        mutable std::optional<std::vector<double>> active_volume;
+
         bool m_circle = false;
 
         size_t zcorn_fixed = 0;
@@ -215,6 +218,14 @@ namespace Opm {
         int m_nactive;
         std::vector<int> m_active_to_global;
         std::vector<int> m_global_to_active;
+        // Numerical aquifer cells, needs to be active
+        std::unordered_set<size_t> m_aquifer_cells;
+
+        // Radial grids need this for volume calculations.
+        std::optional<std::vector<double>> m_thetav;
+        std::optional<std::vector<double>> m_rv;
+
+        void updateNumericalAquiferCells(const Deck&);
 
         void initGridFromEGridFile(Opm::EclIO::EclFile& egridfile, std::string fileName);
         void resetACTNUM( const int* actnum);
@@ -229,6 +240,8 @@ namespace Opm {
         bool keywInputBeforeGdfile(const Deck& deck, const std::string keyword) const;
 
         void initCylindricalGrid(const Deck&);
+        void initSpiderwebGrid(const Deck&);
+        void initSpiderwebOrCylindricalGrid(const Deck&, const bool);
         void initCartesianGrid(const Deck&);
         void initDTOPSGrid(const Deck&);
         void initDVDEPTHZGrid(const Deck&);

opm/parser/eclipse/EclipseState/Grid/FieldData.hpp

@@ -25,11 +25,12 @@
 #include <opm/parser/eclipse/EclipseState/Grid/FieldData.hpp>
 #include <opm/parser/eclipse/Deck/value_status.hpp>
 
-#include<string>
-#include<vector>
-#include<optional>
-#include<array>
-#include<algorithm>
+#include <string>
+#include <vector>
+#include <optional>
+#include <array>
+#include <algorithm>
+#include <stdexcept>
 
 namespace Opm
 {
@@ -60,6 +61,15 @@ namespace Fieldprops
         std::optional<std::vector<value::status>> global_value_status;
         mutable bool all_set;
 
+        bool operator==(const FieldData& other) const {
+            return this->data == other.data &&
+                   this->value_status == other.value_status &&
+                   this->kw_info == other.kw_info &&
+                   this->global_data == other.global_data &&
+                   this->global_value_status == other.global_value_status;
+        }
+
+
         FieldData() = default;
 
         FieldData(const keywords::keyword_info<T>& info, std::size_t active_size, std::size_t global_size) :
@@ -93,6 +103,11 @@ namespace Fieldprops
             return this->all_set;
         }
 
+        bool valid_default() const {
+            return std::all_of( this->value_status.begin(), this->value_status.end(), [] (const value::status& status) {return status == value::status::valid_default; });
+        }
+
+
         void compress(const std::vector<bool>& active_map) {
             Fieldprops::compress(this->data, active_map);
             Fieldprops::compress(this->value_status, active_map);

opm/parser/eclipse/EclipseState/Grid/FieldPropsManager.hpp

@@ -32,6 +32,7 @@ class Deck;
 class FieldProps;
 class Phases;
 class TableManager;
+class NumericalAquifers;
 
 class FieldPropsManager {
 
@@ -54,7 +55,8 @@ public:
     */
     std::size_t active_size() const;
 
-
+    bool operator==(const FieldPropsManager& other) const;
+    static bool rst_cmp(const FieldPropsManager& full_arg, const FieldPropsManager& rst_arg);
     /*
       Because the FieldProps class can autocreate properties the semantics of
       get() and has() is slightly non intuitve:
@@ -217,6 +219,9 @@ public:
     */
     virtual void apply_tran(const std::string& keyword, std::vector<double>& tran_data) const;
 
+    void apply_numerical_aquifers(const NumericalAquifers& aquifers);
+
+
     /*
       When using MPI the FieldPropsManager is typically only assembled on the
       root node and then distributed to the other nodes afterwards. These

opm/parser/eclipse/EclipseState/Grid/Keywords.hpp

@@ -36,6 +36,15 @@ struct keyword_info {
     bool top = false;
     bool global = false;
 
+    bool operator==(const keyword_info& other) const {
+        return this->unit == other.unit &&
+               this->scalar_init == other.scalar_init &&
+               this->multiplier == other.multiplier &&
+               this->top == other.top &&
+               this->global == other.global;
+    }
+
+
     keyword_info<T>& init(T init_value) {
         this->scalar_init = init_value;
         return *this;

opm/parser/eclipse/EclipseState/Grid/NNC.hpp

@@ -1,18 +1,18 @@
 /*
   Copyright 2015 IRIS
-  
+
   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/>.
 */
@@ -22,11 +22,17 @@
 
 #include <cstddef>
 #include <memory>
+#include <optional>
+#include <tuple>
 #include <vector>
 
+#include <opm/common/OpmLog/KeywordLocation.hpp>
+
 namespace Opm
 {
 
+class GridDims;
+
 struct NNCdata {
     NNCdata(size_t c1, size_t c2, double t)
         : cell1(c1), cell2(c2), trans(t)
@@ -48,41 +54,89 @@ struct NNCdata {
         serializer(trans);
     }
 
+    // Observe that the operator< is only for cell ordering and does not consider the
+    // trans member
+    bool operator<(const NNCdata& other) const
+    {
+        return std::tie(this->cell1, this->cell2) < std::tie(other.cell1, other.cell2);
+    }
+
     size_t cell1;
     size_t cell2;
     double trans;
 };
 
-class Deck;
 
-/// Represents non-neighboring connections (non-standard adjacencies).
-/// This class is essentially a directed weighted graph.
+
+class Deck;
+class EclipseGrid;
+
+/*
+  This class is an internalization of the NNC and EDITNNC keywords. Because the
+  opm-common codebase does not itself manage the simulation grid the purpose of
+  the NNC class is mainly to hold on to the NNC/EDITNNC input and pass it on to
+  the grid construction proper.
+
+  The EDITNNC keywords can operate on two different types of NNCs.
+
+    1. NNCs which have been explicitly entered using the NNC keyword.
+    2. NNCs which are inderectly inferred from the grid - e.g. due to faults.
+
+  When processing the EDITNNC keyword the class will search through the NNCs
+  configured explicitly with the NNC keyword and apply the edit transformation
+  on those NNCs, EDITNNCs which affect NNCs which are not configured explicitly
+  are stored for later use by the simulator.
+
+  The class guarantees the following ordering:
+
+    1. For all NNC / EDITNNC records we will have cell1 <= cell2
+    2. The vectors NNC::input() and NNC::edit() will be ordered in ascending
+       order.
+
+  While constructing from a deck NNCs connected to inactive cells will be
+  silently ignored. Do observe though that the addNNC() function does not check
+  the arguments and alas there is no guarantee that only active cells are
+  involved.
+*/
+
 class NNC
 {
 public:
     NNC() = default;
-
     /// Construct from input deck.
-    explicit NNC(const Deck& deck);
+    NNC(const EclipseGrid& grid, const Deck& deck);
 
     static NNC serializeObject();
 
-    void addNNC(const size_t cell1, const size_t cell2, const double trans);
-    const std::vector<NNCdata>& data() const { return m_nnc; }
-    size_t numNNC() const;
-    bool hasNNC() const;
+    bool addNNC(const size_t cell1, const size_t cell2, const double trans);
+    const std::vector<NNCdata>& input() const { return m_input; }
+    const std::vector<NNCdata>& edit() const { return m_edit; }
+    KeywordLocation input_location(const NNCdata& nnc) const;
+    KeywordLocation edit_location(const NNCdata& nnc) const;
+
 
     bool operator==(const NNC& data) const;
 
     template<class Serializer>
     void serializeOp(Serializer& serializer)
     {
-        serializer.vector(m_nnc);
+        serializer.vector(m_input);
+        serializer.vector(m_edit);
+        serializer(m_nnc_location);
+        serializer(m_edit_location);
     }
 
 private:
 
-    std::vector<NNCdata> m_nnc;
+    void load_input(const EclipseGrid& grid, const Deck& deck);
+    void load_edit(const EclipseGrid& grid, const Deck& deck);
+    void add_edit(const NNCdata& edit_node);
+    bool update_nnc(std::size_t global_index1, std::size_t global_index2, double tran_mult);
+
+    std::vector<NNCdata> m_input;
+    std::vector<NNCdata> m_edit;
+    std::optional<KeywordLocation> m_nnc_location;
+    std::optional<KeywordLocation> m_edit_location;
 };
 
 

opm/parser/eclipse/EclipseState/Grid/SatfuncPropertyInitializers.hpp

@@ -76,6 +76,15 @@ namespace Opm { namespace satfunc {
             /// region  All zero values unless gas is an active phase.
             std::vector<double> water;
         } maximum;
+
+        bool operator==(const RawTableEndPoints& other) const {
+            return this->connate.gas == other.connate.gas &&
+                   this->connate.water == other.connate.water &&
+                   this->critical.gas == other.critical.gas &&
+                   this->critical.water == other.critical.water &&
+                   this->maximum.gas == other.maximum.gas &&
+                   this->maximum.water == other.maximum.water;
+        }
     };
 
     /// Collection of unscaled/raw saturation function value range endpoints
@@ -142,12 +151,12 @@ namespace Opm { namespace satfunc {
         } pc;
     };
 
-    std::shared_ptr<RawTableEndPoints>
+    RawTableEndPoints
     getRawTableEndpoints(const Opm::TableManager& tm,
                          const Opm::Phases&       phases,
                          const double             tolcrit);
 
-    std::shared_ptr<RawFunctionValues>
+    RawFunctionValues
     getRawFunctionValues(const Opm::TableManager& tm,
                          const Opm::Phases&       phases,
                          const RawTableEndPoints& ep);

opm/parser/eclipse/EclipseState/Grid/TranCalculator.hpp

@@ -45,6 +45,11 @@ public:
     struct TranAction {
         ScalarOperation op;
         std::string field;
+
+        bool operator==(const TranAction& other) const {
+            return this->op == other.op &&
+                   this->field == other.field;
+        }
     };
 
 
@@ -97,6 +102,12 @@ public:
         }
         return kw_info;
     }
+
+    bool operator==(const TranCalculator& other) const {
+        return this->m_name == other.m_name &&
+               this->actions == other.actions;
+    }
+
 private:
     std::string m_name;
     std::vector<TranAction> actions;