Merge pull request #1529 from akva2/internalize_tlmixpar

internalize TLMIXPAR

.clang-format

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

.gitignore

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

CMakeLists.txt

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

CMakeLists_files.cmake

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

CopyHeaders.cmake

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

ExtraTests.cmake

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

GenerateKeywords.cmake

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

changelog.md

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

cmake/Modules/ConfigVars.cmake

@@ -78,7 +78,17 @@ function (configure_vars obj syntax filename verb)
 	  # write a CMake statements that warns if the value has changed
 	  if ("${syntax}" STREQUAL "CMAKE")
 		set (_db "\${") # to avoid parsing problems
-		file (APPEND "${filename}" "if (DEFINED ${_var} AND NOT \"${_db}${_var}}\" STREQUAL \"${${_var}}\")\n")
+		# special case: if we have a truth variable HAVE_ and this is
+		# either just defined (as is), or set to 1 explicitly, then both
+		# of these count as "true", so put in a check that also accepts
+		# both of these values.
+		if (("${_var}" MATCHES "^HAVE_.*") AND
+			 (("${${_var}}" STREQUAL "") OR ("${${_var}}" STREQUAL "1")))
+		  set (_cond "(\"${_db}${_var}}\" STREQUAL \"\") OR (\"${_db}${_var}}\" STREQUAL \"1\")")
+		else ()
+		  set (_cond "\"${_db}${_var}}\" STREQUAL \"${${_var}}\"")
+		endif ()
+		file (APPEND "${filename}" "if (DEFINED ${_var} AND NOT (${_cond}))\n")
 		file (APPEND "${filename}" "\tmessage (WARNING \"Incompatible value \\\"${_db}${_var}}\\\" of variable \\\"${_var}\\\"\")\n")
 		file (APPEND "${filename}" "endif ()\n")
 	  endif ()

cmake/Modules/FindAlberta.cmake

@@ -0,0 +1,46 @@
+find_library(ALBERTA_LTDL_LIB
+  NAMES ltdl
+  PATH_SUFFIXES lib lib32 lib64
+)
+find_path(ALBERTA_INCLUDE_DIR
+  NAMES alberta/alberta.h
+  PATHS ${ALBERTA_ROOT}
+  PATH_SUFFIXES alberta include NO_DEFAULT_PATH
+  DOC "Include path of Alberta")
+find_path(ALBERTA_INCLUDE_DIR
+  NAMES
+  alberta/alberta.h
+  PATHS /usr/local /opt
+  PATH_SUFFIXES alberta)
+#look for libraries
+find_library(ALBERTA_UTIL_LIB
+  NAMES alberta_util alberta_utilities
+  PATHS ${ALBERTA_ROOT}
+  PATH_SUFFIXES lib lib32 lib64
+  NO_DEFAULT_PATH)
+find_library(ALBERTA_UTIL_LIB
+  NAMES alberta_util alberta_utilities
+  PATH_SUFFIXES lib lib32 lib64)
+
+foreach(dim RANGE 1 9)
+  find_library(ALBERTA_${dim}D_LIB alberta_${dim}d
+    PATHS ${ALBERTA_ROOT}
+    PATH_SUFFIXES lib lib32 lib64
+    Cache FILEPATH DOC "Alberta lib for ${dim}D" NO_DEFAULT_PATH)
+  find_library(ALBERTA_${dim}D_LIB alberta_${dim}d  PATH_SUFFIXES lib lib32 lib64)
+  if(ALBERTA_${dim}D_LIB)
+    set(ALBERTA_LIBRARIES ${ALBERTA_LIBRARIES} ${ALBERTA_${dim}D_LIB})
+  endif()
+endforeach(dim RANGE 1 9)
+
+if(ALBERTA_LIBRARIES AND ALBERTA_INCLUDE_DIR)
+  set(ALBERTA_INCLUDE_DIRS ${ALBERTA_INCLUDE_DIR})
+  set(ALBERTA_LIBRARIES ${ALBERTA_LIBRARIES} ${ALBERTA_UTIL_LIB} ${ALBERTA_LTDL_LIB})
+  set(ALBERTA_FOUND ON)
+  set(Alberta_FOUND ON)
+  set(HAVE_ALBERTA 1)
+  set(DUNE_ALBERTA_VERSION 0x300)
+else()
+  set(ALBERTA_FOUND OFF)
+  set(Alberta_FOUND OFF)
+endif()

cmake/Modules/FindCXX11Features.cmake

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

cmake/Modules/FindERT.cmake

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

cmake/Modules/FindERTPython.cmake

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

cmake/Modules/Finddune-alugrid.cmake

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

cmake/Modules/Finddune-common.cmake

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

cmake/Modules/Finddune-fem.cmake

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

cmake/Modules/Finddune-geometry.cmake

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

cmake/Modules/Finddune-grid.cmake

@@ -22,12 +22,12 @@ find_opm_package (
   # TODO: we should probe for all the HAVE_* values listed below;
   # however, we don't actually use them in our implementation, so
   # we just include them to forward here in case anyone else does
-  "CXX11Features REQUIRED;
-  dune-common REQUIRED;
+  "dune-common REQUIRED;
   dune-geometry REQUIRED;
   dune-uggrid;
   MPI;
-  UG
+  UG;
+  Alberta
   "
   # header to search for
   "dune/grid/onedgrid.hh"
@@ -55,7 +55,8 @@ int main (void) {
    HAVE_AMIRAMESH;
    HAVE_ALBERTA;
    HAVE_STDINT_H;
-   DUNE_GRID_EXPERIMENTAL_GRID_EXTENSIONS
+   DUNE_GRID_EXPERIMENTAL_GRID_EXTENSIONS;
+   DUNE_ALBERTA_VERSION
   ")
 
 #debug_find_vars ("dune-grid")

cmake/Modules/Finddune-uggrid.cmake

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

cmake/Modules/OpmBashCompletion.cmake

@@ -0,0 +1,6 @@
+# Installs bash tab completion for a product
+macro(opm_add_bash_completion binary)
+  set(PRODUCT ${binary})
+  configure_file(${OPM_MACROS_ROOT}/etc/opm_bash_completion.sh.in ${binary}_bash_completion.sh @ONLY)
+  install(FILES ${PROJECT_BINARY_DIR}/${binary}_bash_completion.sh DESTINATION ${CMAKE_INSTALL_SYSCONFDIR}/bash_completion.d)
+endmacro()

cmake/Modules/OpmCompilerChecks.cmake

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

cmake/Modules/OpmDefaults.cmake

@@ -47,7 +47,7 @@ macro (opm_defaults opm)
   endif(NOT PRECOMPILE_HEADERS)
 
   # Use of OpenMP is considered experimental
-  set (USE_OPENMP_DEFAULT OFF)
+  set (USE_OPENMP_DEFAULT ON)
 
   # if we are on a system where CMake 2.6 is the default (Hi RHEL 6!),
   # the configuration files for Boost will trip up the library paths

cmake/Modules/OpmFind.cmake

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

cmake/Modules/OpmLibMain.cmake

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

cmake/Modules/OpmPackage.cmake

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

cmake/Modules/OpmSatellites.cmake

@@ -1,8 +1,5 @@
 # - Build satellites that are dependent of main library
 
-option(ADD_DISABLED_CTESTS "Add the tests which are disabled due to failed preconditions to the ctest output (this makes ctest return an error if such a test is present)" ON)
-mark_as_advanced(ADD_DISABLED_CTESTS)
-
 #
 # Enumerate all source code in a "satellite" directory such as tests/,
 # compile each of them and optionally set them as a test for CTest to
@@ -11,144 +8,139 @@ mark_as_advanced(ADD_DISABLED_CTESTS)
 # The following suffices must be defined for the opm prefix passed as
 # parameter:
 #
-#	_LINKER_FLAGS   Necessary flags to link with this library
-#	_TARGET         CMake target which creates the library
-#	_LIBRARIES      Other dependencies that must also be linked
+#  _LINKER_FLAGS   Necessary flags to link with this library
+#  _TARGET         CMake target which creates the library
+#  _LIBRARIES      Other dependencies that must also be linked
 
 # Synopsis:
-#	opm_compile_satellites (opm satellite excl_all test_regexp)
+#  opm_compile_satellites (opm satellite excl_all test_regexp)
 #
 # Parameters:
-#	opm             Prefix of the variable which contain information
-#	                about the library these satellites depends on, e.g.
-#	                pass "opm-core" if opm-core_TARGET is the name of
-#	                the target the builds this library. Variables with
-#	                suffixes _TARGET and _LIBRARIES must exist.
+#  opm             Prefix of the variable which contain information
+#                  about the library these satellites depends on, e.g.
+#                  pass "opm-core" if opm-core_TARGET is the name of
+#                  the target the builds this library. Variables with
+#                  suffixes _TARGET and _LIBRARIES must exist.
 #
-#	satellite       Prefix of variable which contain the names of the
-#	                files, e.g. pass "tests" if the files are in the
-#	                variable tests_SOURCES. Variables with suffixes
-#	                _DATAFILES, _SOURCES and _DIR should exist. This
-#	                name is also used as name of the target that builds
-#	                all these files.
+#  satellite       Prefix of variable which contain the names of the
+#                  files, e.g. pass "tests" if the files are in the
+#                  variable tests_SOURCES. Variables with suffixes
+#                  _DATAFILES, _SOURCES and _DIR should exist. This
+#                  name is also used as name of the target that builds
+#                  all these files.
 #
-#	excl_all        EXCLUDE_FROM_ALL if these targets should not be built by
-#	                default, otherwise empty string.
+#  excl_all        EXCLUDE_FROM_ALL if these targets should not be built by
+#                  default, otherwise empty string.
 #
-#	test_regexp     Regular expression which picks the name of a test
-#	                out of the filename, or blank if no test should be
-#	                setup.
+#  test_regexp     Regular expression which picks the name of a test
+#                  out of the filename, or blank if no test should be
+#                  setup.
 #
 # Example:
-#	opm_compile_satellites (opm-core test "" "^test_([^/]*)$")
+#  opm_compile_satellites (opm-core test "" "^test_([^/]*)$")
 #
 macro (opm_compile_satellites opm satellite excl_all test_regexp)
   # if we are going to build the tests always, then make sure that
   # the datafiles are present too
   if (NOT (${excl_all} MATCHES "EXCLUDE_FROM_ALL"))
-	set (_incl_all "ALL")
+    set (_incl_all "ALL")
   else (NOT (${excl_all} MATCHES "EXCLUDE_FROM_ALL"))
-	set (_incl_all "")
+    set (_incl_all "")
   endif (NOT (${excl_all} MATCHES "EXCLUDE_FROM_ALL"))
 
   # if a set of datafiles has been setup, pull those in
   add_custom_target (${satellite} ${_incl_all})
   if (${satellite}_DATAFILES)
-	add_dependencies (${satellite} ${${satellite}_DATAFILES})
+    add_dependencies (${satellite} ${${satellite}_DATAFILES})
   endif (${satellite}_DATAFILES)
 
   # compile each of these separately
   foreach (_sat_FILE IN LISTS ${satellite}_SOURCES)
-	get_filename_component (_sat_NAME "${_sat_FILE}" NAME_WE)
-	add_executable (${_sat_NAME} ${excl_all} ${_sat_FILE})
-	add_dependencies (${satellite} ${_sat_NAME})
-	set_target_properties (${_sat_NAME} PROPERTIES
-	  LINK_FLAGS "${${opm}_LINKER_FLAGS_STR}"
-	  )
-        if(HAVE_DYNAMIC_BOOST_TEST AND NOT (${opm} STREQUAL "opm-parser" AND NOT BUILD_SHARED_LIBS))
-	  set_target_properties (${_sat_NAME} PROPERTIES
-		  COMPILE_DEFINITIONS BOOST_TEST_DYN_LINK
-	  )
-	endif()
-	# are we building a test? luckily, the testing framework doesn't
-	# require anything else, so we don't have to figure out where it
-	# should go in the library list
-	if (NOT "${test_regexp}" STREQUAL "")
-	  set (_test_lib "${Boost_UNIT_TEST_FRAMEWORK_LIBRARY}")
-	else (NOT "${test_regexp}" STREQUAL "")
-	  set (_test_lib "")
-	  add_static_analysis_tests(_sat_FILE ${opm}_INCLUDE_DIRS)
-	endif (NOT "${test_regexp}" STREQUAL "")
-	target_link_libraries (${_sat_NAME} ${${opm}_TARGET} ${${opm}_LIBRARIES} ${_test_lib})
-        if (STRIP_DEBUGGING_SYMBOLS)
-	  strip_debug_symbols (${_sat_NAME} _sat_DEBUG)
-	  list (APPEND ${satellite}_DEBUG ${_sat_DEBUG})
+    if (NOT "${test_regexp}" STREQUAL "" AND NOT Boost_UNIT_TEST_FRAMEWORK_FOUND)
+        continue()
+    endif()
+    get_filename_component (_sat_NAME "${_sat_FILE}" NAME_WE)
+    add_executable (${_sat_NAME} ${excl_all} ${_sat_FILE})
+    add_dependencies (${satellite} ${_sat_NAME})
+    set_target_properties (${_sat_NAME} PROPERTIES
+                                        LINK_FLAGS "${${opm}_LINKER_FLAGS_STR}")
+    if(HAVE_DYNAMIC_BOOST_TEST)
+      set_target_properties (${_sat_NAME} PROPERTIES
+                             COMPILE_DEFINITIONS BOOST_TEST_DYN_LINK)
+    endif()
+    # are we building a test? luckily, the testing framework doesn't
+    # require anything else, so we don't have to figure out where it
+    # should go in the library list
+    if (NOT "${test_regexp}" STREQUAL "")
+      set (_test_lib "${Boost_UNIT_TEST_FRAMEWORK_LIBRARY}")
+    else (NOT "${test_regexp}" STREQUAL "")
+      set (_test_lib "")
+      add_static_analysis_tests(_sat_FILE ${opm}_INCLUDE_DIRS)
+    endif (NOT "${test_regexp}" STREQUAL "")
+    target_link_libraries (${_sat_NAME} ${${opm}_TARGET} ${${opm}_LIBRARIES} ${_test_lib})
+    if (STRIP_DEBUGGING_SYMBOLS)
+      strip_debug_symbols (${_sat_NAME} _sat_DEBUG)
+      list (APPEND ${satellite}_DEBUG ${_sat_DEBUG})
+    endif()
+
+    # variable with regular expression doubles as a flag for
+    # whether tests should be setup or not
+    set(_sat_FANCY)
+    if (NOT "${test_regexp}" STREQUAL "")
+      foreach (_regexp IN ITEMS ${test_regexp})
+        if ("${_sat_NAME}" MATCHES "${_regexp}")
+          string (REGEX REPLACE "${_regexp}" "\\1" _sat_FANCY "${_sat_NAME}")
+        elseif(NOT _sat_FANCY)
+          set(_sat_FANCY ${_sat_NAME})
         endif()
+      endforeach (_regexp)
+      get_target_property (_sat_LOC ${_sat_NAME} LOCATION)
+      # Run tests through mpi-run. Ubuntu 14.04 provided mpi libs will crash
+      # in the MPI_Finalize() call otherwise.
+      if(MPI_FOUND)
+        set(_sat_LOC ${MPIEXEC} ${MPIEXEC_NUMPROC_FLAG} 1 ${_sat_LOC})
+      endif()
+      if (CMAKE_VERSION VERSION_LESS "2.8.4")
+        add_test (NAME ${_sat_FANCY}
+                  COMMAND ${CMAKE_COMMAND} -E chdir "${PROJECT_BINARY_DIR}/${${satellite}_DIR}" ${_sat_LOC})
+      else (CMAKE_VERSION VERSION_LESS "2.8.4")
+      add_test (${_sat_FANCY} ${_sat_LOC})
+      # run the test in the directory where the data files are
+      set_tests_properties (${_sat_FANCY} PROPERTIES
+                            WORKING_DIRECTORY ${PROJECT_BINARY_DIR}/${${satellite}_DIR})
+      endif (CMAKE_VERSION VERSION_LESS "2.8.4")
+      if(NOT TARGET test-suite)
+        add_custom_target(test-suite)
+      endif()
+      add_dependencies(test-suite "${_sat_NAME}")
+    endif(NOT "${test_regexp}" STREQUAL "")
 
-	# variable with regular expression doubles as a flag for
-	# whether tests should be setup or not
-	set(_sat_FANCY)
-	if (NOT "${test_regexp}" STREQUAL "")
-	  foreach (_regexp IN ITEMS ${test_regexp})
-		if ("${_sat_NAME}" MATCHES "${_regexp}")
-		  string (REGEX REPLACE "${_regexp}" "\\1" _sat_FANCY "${_sat_NAME}")
-		elseif(NOT _sat_FANCY)
-		  set(_sat_FANCY ${_sat_NAME})
-		endif()
-	  endforeach (_regexp)
-	  get_target_property (_sat_LOC ${_sat_NAME} LOCATION)
-          # Run tests through mpi-run. Ubuntu 14.04 provided mpi libs will crash
-          # in the MPI_Finalize() call otherwise.
-          if(MPI_FOUND)
-            set(_sat_LOC ${MPIEXEC} ${MPIEXEC_NUMPROC_FLAG} 1 ${_sat_LOC})
-          endif()
-	  if (CMAKE_VERSION VERSION_LESS "2.8.4")
-		add_test (
-		  NAME ${_sat_FANCY}
-		  COMMAND ${CMAKE_COMMAND} -E chdir "${PROJECT_BINARY_DIR}/${${satellite}_DIR}" ${_sat_LOC}
-		  )
-	  else (CMAKE_VERSION VERSION_LESS "2.8.4")
-		add_test (${_sat_FANCY} ${_sat_LOC})
-		# run the test in the directory where the data files are
-		set_tests_properties (${_sat_FANCY} PROPERTIES
-		  WORKING_DIRECTORY ${PROJECT_BINARY_DIR}/${${satellite}_DIR}
-		  )
-	  endif (CMAKE_VERSION VERSION_LESS "2.8.4")
-          if(NOT TARGET test-suite)
-            add_custom_target(test-suite)
-          endif()
-          add_dependencies(test-suite "${_sat_NAME}")
-	endif(NOT "${test_regexp}" STREQUAL "")
-
-	# if this program on the list of files that should be distributed?
-	# we check by the name of the source file
-	list (FIND ${satellite}_SOURCES_DIST "${_sat_FILE}" _is_util)
-	if (NOT (_is_util EQUAL -1))
-	  install (TARGETS ${_sat_NAME} RUNTIME
-		DESTINATION bin${${opm}_VER_DIR}/
-		)
-	endif (NOT (_is_util EQUAL -1))
+    # if this program on the list of files that should be distributed?
+    # we check by the name of the source file
+    list (FIND ${satellite}_SOURCES_DIST "${_sat_FILE}" _is_util)
+    if (NOT (_is_util EQUAL -1))
+      install (TARGETS ${_sat_NAME} RUNTIME
+               DESTINATION bin${${opm}_VER_DIR}/)
+    endif (NOT (_is_util EQUAL -1))
   endforeach (_sat_FILE)
 endmacro (opm_compile_satellites opm prefix)
 
 # Synopsis:
-#	opm_data (satellite target dirname files)
+#  opm_data (satellite target dirname files)
 #
 # provides these output variables:
 #
-#	${satellite}_INPUT_FILES   List of all files that are copied
-#	${satellite}_DATAFILES     Name of target which copies these files
+#  ${satellite}_INPUT_FILES   List of all files that are copied
+#  ${satellite}_DATAFILES     Name of target which copies these files
 #
 # Example:
 #
-#	opm_data (tests datafiles "tests/")
+#  opm_data (tests datafiles "tests/")
 #
 macro (opm_data satellite target dirname)
   # even if there are no datafiles, create the directory so the
   # satellite programs have a homedir to run in
-  execute_process (
-	COMMAND ${CMAKE_COMMAND} -E make_directory ${PROJECT_BINARY_DIR}/${dirname}
-	)
+  execute_process (COMMAND ${CMAKE_COMMAND} -E make_directory ${PROJECT_BINARY_DIR}/${dirname})
 
   # if ever huge test datafiles are necessary, then change this
   # into "create_symlink" (on UNIX only, apparently)
@@ -158,26 +150,27 @@ macro (opm_data satellite target dirname)
   # to a tests/ directory in the output tree (if different)
   set (${satellite}_INPUT_FILES)
   if (NOT PROJECT_SOURCE_DIR STREQUAL PROJECT_BINARY_DIR)
-	foreach (input_datafile IN LISTS ${satellite}_DATA)
-	  file (RELATIVE_PATH rel_datafile "${PROJECT_SOURCE_DIR}" ${input_datafile})
-	  set (output_datafile "${PROJECT_BINARY_DIR}/${rel_datafile}")
-	  add_custom_command (
-		OUTPUT ${output_datafile}
-		COMMAND ${CMAKE_COMMAND}
-		ARGS -E ${make_avail} ${input_datafile} ${output_datafile}
-		DEPENDS ${input_datafile}
-		VERBATIM
-		)
-	  list (APPEND ${satellite}_INPUT_FILES "${output_datafile}")
-	endforeach (input_datafile)
+    foreach (input_datafile IN LISTS ${satellite}_DATA)
+      if (IS_ABSOLUTE ${input_datafile})
+        file (RELATIVE_PATH rel_datafile "${PROJECT_SOURCE_DIR}" ${input_datafile})
+      else()
+        set(rel_datafile ${input_datafile})
+      endif()
+      set (output_datafile "${PROJECT_BINARY_DIR}/${rel_datafile}")
+      add_custom_command (OUTPUT ${output_datafile}
+                          COMMAND ${CMAKE_COMMAND}
+                          ARGS -E ${make_avail} ${input_datafile} ${output_datafile}
+                          DEPENDS ${input_datafile}
+                          VERBATIM)
+      list (APPEND ${satellite}_INPUT_FILES "${output_datafile}")
+    endforeach (input_datafile)
   endif(NOT PROJECT_SOURCE_DIR STREQUAL PROJECT_BINARY_DIR)
 
   # setup a target which does all the copying
   set (${satellite}_DATAFILES "${target}")
   add_custom_target (${${satellite}_DATAFILES}
-	DEPENDS ${${satellite}_INPUT_FILES}
-	COMMENT "Making \"${satellite}\" data available in output tree"
-	)
+                     DEPENDS ${${satellite}_INPUT_FILES}
+                     COMMENT "Making \"${satellite}\" data available in output tree")
   if(NOT TARGET test-suite)
     add_custom_target(test-suite)
   endif()
@@ -192,6 +185,7 @@ endmacro (opm_data satellite target dirname files)
 # Parameters:
 #       TestName           Name of test
 #       ONLY_COMPILE       Only build test but do not run it (optional)
+#       DEFAULT_ENABLE_IF  Only enable by default if a given condition is true (optional)
 #       ALWAYS_ENABLE      Force enabling test even if -DBUILD_TESTING=OFF was set (optional)
 #       EXE_NAME           Name of test executable (optional, default: ./bin/${TestName})
 #       CONDITION          Condition to enable test (optional, cmake code)
@@ -218,7 +212,7 @@ macro(opm_add_test TestName)
   cmake_parse_arguments(CURTEST
                         "NO_COMPILE;ONLY_COMPILE;ALWAYS_ENABLE" # flags
                         "EXE_NAME;PROCESSORS;WORKING_DIRECTORY" # one value args
-                        "CONDITION;TEST_DEPENDS;DRIVER;DRIVER_ARGS;DEPENDS;TEST_ARGS;SOURCES;LIBRARIES" # multi-value args
+                        "CONDITION;DEFAULT_ENABLE_IF;TEST_DEPENDS;DRIVER;DRIVER_ARGS;DEPENDS;TEST_ARGS;SOURCES;LIBRARIES" # multi-value args
                         ${ARGN})
 
   set(BUILD_TESTING "${BUILD_TESTING}")
@@ -228,6 +222,13 @@ macro(opm_add_test TestName)
     set(CURTEST_EXE_NAME ${TestName})
   endif()
 
+  # Strip test_ prefix from name
+  if ("${TestName}" MATCHES "^test_([^/]*)$")
+    string (REGEX REPLACE "^test_([^/]*)$" "\\1" _FANCY "${TestName}")
+  else()
+    set(_FANCY ${TestName})
+  endif()
+
   # try to auto-detect the name of the source file if SOURCES are not
   # explicitly specified.
   if (NOT CURTEST_SOURCES)
@@ -259,6 +260,11 @@ macro(opm_add_test TestName)
   # case. They can still be build using 'make test-suite' and they can
   # be build and run using 'make check'
   set(CURTEST_EXCLUDE_FROM_ALL "")
+  if (NOT "AND OR ${CURTEST_DEFAULT_ENABLE_IF}" STREQUAL "AND OR ")
+    if (NOT ${CURTEST_DEFAULT_ENABLE_IF})
+      set(CURTEST_EXCLUDE_FROM_ALL "EXCLUDE_FROM_ALL")
+    endif()
+  endif()
   if (NOT BUILD_TESTING AND NOT CURTEST_ALWAYS_ENABLE)
     set(CURTEST_EXCLUDE_FROM_ALL "EXCLUDE_FROM_ALL")
   endif()
@@ -296,6 +302,8 @@ macro(opm_add_test TestName)
       # only compile the binary but do not run it as a test
       add_executable("${CURTEST_EXE_NAME}" ${CURTEST_EXCLUDE_FROM_ALL} ${CURTEST_SOURCES})
       target_link_libraries (${CURTEST_EXE_NAME} ${CURTEST_LIBRARIES})
+      get_property(dirs DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR} PROPERTY INCLUDE_DIRECTORIES)
+      add_static_analysis_tests(CURTEST_SOURCES dirs)
 
       if(TARGET ${project}_prepare)
         add_dependencies("${CURTEST_EXE_NAME}" ${project}_prepare)
@@ -309,7 +317,13 @@ macro(opm_add_test TestName)
         # run-only case occurs if the binary is already compiled by an
         # earlier test.)
         add_executable("${CURTEST_EXE_NAME}" ${CURTEST_EXCLUDE_FROM_ALL} ${CURTEST_SOURCES})
+        if(HAVE_DYNAMIC_BOOST_TEST)
+          set_target_properties (${CURTEST_EXE_NAME} PROPERTIES
+                                 COMPILE_DEFINITIONS BOOST_TEST_DYN_LINK)
+        endif()
         target_link_libraries (${CURTEST_EXE_NAME} ${CURTEST_LIBRARIES})
+        get_property(dirs DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR} PROPERTY INCLUDE_DIRECTORIES)
+        add_static_analysis_tests(CURTEST_SOURCES dirs)
 
         if(CURTEST_DEPENDS)
           add_dependencies("${CURTEST_EXE_NAME}" ${CURTEST_DEPENDS})
@@ -331,18 +345,18 @@ macro(opm_add_test TestName)
         endif()
       endif()
 
-      add_test(NAME ${TestName}
+      add_test(NAME ${_FANCY}
                WORKING_DIRECTORY "${CURTEST_WORKING_DIRECTORY}"
                COMMAND ${CURTEST_COMMAND})
 
       # specify the dependencies between the tests
       if (CURTEST_TEST_DEPENDS)
-        set_tests_properties(${TestName} PROPERTIES DEPENDS "${CURTEST_TEST_DEPENDS}")
+        set_tests_properties(${_FANCY} PROPERTIES DEPENDS "${CURTEST_TEST_DEPENDS}")
       endif()
 
       # tell ctest how many cores it should reserve to run the test
       if (CURTEST_PROCESSORS)
-        set_tests_properties(${TestName} PROPERTIES PROCESSORS "${CURTEST_PROCESSORS}")
+        set_tests_properties(${_FANCY} PROPERTIES PROCESSORS "${CURTEST_PROCESSORS}")
       endif()
     endif()
 
@@ -352,15 +366,6 @@ macro(opm_add_test TestName)
       endif()
       add_dependencies(test-suite "${CURTEST_EXE_NAME}")
     endif()
-
-  else() # test is skipped
-
-    # the following causes the test to appear as 'skipped' in the
-    # CDash dashboard. it this is removed, the test is just silently
-    # ignored.
-    if (NOT CURTEST_ONLY_COMPILE AND ADD_DISABLED_CTESTS)
-      add_test(${TestName} skip_test_dummy)
-    endif()
   endif()
 endmacro()
 

cmake/Modules/OpmSiblingSearch.cmake

@@ -9,12 +9,7 @@ macro(create_module_dir_var module)
     get_filename_component(_parent_dir_name ${_parent_full_dir} NAME)
     #Try if <module-name>/<build-dir> is used
     get_filename_component(_modules_dir ${_parent_full_dir} DIRECTORY)
-    if ("${module}" STREQUAL "ecl")
-      #use clone directory libecl
-      set(_clone_dir "libecl")
-    else()
-      set(_clone_dir "${module}")
-    endif()
+    set(_clone_dir "${module}")
     if(IS_DIRECTORY ${_modules_dir}/${_clone_dir}/${_leaf_dir_name})
       set(${module}_DIR ${_modules_dir}/${_clone_dir}/${_leaf_dir_name})
     else()
@@ -23,7 +18,8 @@ macro(create_module_dir_var module)
           AND IS_DIRECTORY ${_parent_full_dir}/${_module_leaf})
         # We are using build directories named <prefix><module-name><postfix>
         set(${module}_DIR ${_parent_full_dir}/${_module_leaf})
-      elseif(IS_DIRECTORY ${_parent_full_dir}/${_clone_dir})
+      elseif(IS_DIRECTORY ${_parent_full_dir}/${_clone_dir} AND
+          EXISTS ${_parent_full_dir}/${_clone_dir}/CMakeCache.txt)
         # All modules are in a common build dir
         set(${module}_DIR "${_parent_full_dir}/${_clone_dir}")
       endif()

cmake/Modules/UseOptimization.cmake

@@ -21,10 +21,28 @@ if (CXX_COMPAT_GCC)
   # disabled due to widespread bugs in the linker plugin
   option (WHOLE_PROG_OPTIM "Whole program optimization (lto)" OFF)
   if (WHOLE_PROG_OPTIM)
-	check_cxx_accepts_flag ("-flto" HAVE_LINK_OPTS)
-	if (HAVE_LINK_OPTS)
-	  list (APPEND _opt_flags "-flto")
-	endif (HAVE_LINK_OPTS)
+    check_cxx_accepts_flag ("-flto" HAVE_LINK_OPTS)
+    check_cxx_accepts_flag ("-fuse-linker-plugin" HAVE_LINK_PLUGIN)
+    if (HAVE_LINK_OPTS)
+      list (APPEND _opt_flags "-flto")
+    endif (HAVE_LINK_OPTS)
+    if (HAVE_LINK_PLUGIN)
+      list (APPEND _opt_flags "-fuse-linker-plugin")
+    endif (HAVE_LINK_PLUGIN)
+    if(HAVE_LINK_OPTS AND CMAKE_CXX_COMPILER_ID STREQUAL "GNU")
+      string(REPLACE "." ";" VERSION_LIST "${CMAKE_C_COMPILER_VERSION}")
+      list(GET VERSION_LIST 0 VER_MAJOR)
+      find_program(LTO_AR_COMMAND NAMES ${CMAKE_C_COMPILER}-ar gcc-ar-${VER_MAJOR} gcc-ar)
+      find_program(LTO_RANLIB_COMMAND NAMES ${CMAKE_C_COMPILER}-ranlib gcc-ranlib-${VER_MAJOR} gcc-ranlib)
+      if(LTO_AR_COMMAND)
+        set(CMAKE_AR ${LTO_AR_COMMAND})
+        message(STATUS "Using LTO-enabled ar: ${CMAKE_AR}")
+      endif()
+      if(LTO_RANLIB_COMMAND)
+        set(CMAKE_RANLIB ${LTO_RANLIB_COMMAND})
+        message(STATUS "Using LTO-enabled ranlib: ${CMAKE_RANLIB}")
+      endif()
+    endif()
   endif (WHOLE_PROG_OPTIM)
 
   # native instruction set tuning

cmake/Modules/UseStaticAnalysis.cmake

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

cmake/Modules/UseWarnings.cmake

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

cmake/Scripts/CheckCommits.cmake

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

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

@@ -29,11 +29,34 @@ if(NOT @opm-project_NAME@_FOUND)
   set (@opm-project_NAME@_LIBRARY_DIRS "@opm-project_LIBRARY_DIRS@" "@CMAKE_LIBRARY_OUTPUT_DIRECTORY@")
   set (@opm-project_NAME@_LINKER_FLAGS "@opm-project_LINKER_FLAGS@")
   set (@opm-project_NAME@_CONFIG_VARS "@opm-project_CONFIG_VARS@")
-  set (HAVE_@opm-project_NAME_UC@ 1)
 
   # libraries come from the build tree where this file was generated
   set (@opm-project_NAME@_LIBRARY "@opm-project_LIBRARY@")
   set (@opm-project_NAME@_LIBRARIES ${@opm-project_NAME@_LIBRARY} "@opm-project_LIBRARIES@")
+
+  # The purpose of this string replacement operation is to enable use of the
+  # generated opm-project-config.cmake file also in the situation where 'make
+  # install' has been invoked with the DESTDIR option:
+  #
+  # opm-common/build> cmake .. -DCMAKE_INSTALL_PREFIX=/real/prefix
+  # opm-common/budil> make install DESTDIR=/tmp/prefix
+  #
+  # downstream/build> cmake .. -DDEST_PREFIX=/tmp/prefix -DCMAKE_PREFIX_PATH=/tmp/prefix
+  # downstream/build> make install
+  #
+  # That way the downstream dependency can still use find_package( opm-common )
+  # even though the opm-common-config.cmake file is not internally consistent
+  # with it's own location in the filesystem.
+
+  if(DEST_PREFIX)
+    set(DEST_PREFIX "${DEST_PREFIX}${@opm-project_NAME@_PREFIX}")
+    string(REPLACE ${@opm-project_NAME@_PREFIX} ${DEST_PREFIX} @opm-project_NAME@_INCLUDE_DIRS "${@opm-project_NAME@_INCLUDE_DIRS}")
+    string(REPLACE ${@opm-project_NAME@_PREFIX} ${DEST_PREFIX} @opm-project_NAME@_LIBRARY_DIRS "${@opm-project_NAME@_LIBRARY_DIRS}")
+    string(REPLACE ${@opm-project_NAME@_PREFIX} ${DEST_PREFIX} @opm-project_NAME@_LIBRARY      "${@opm-project_NAME@_LIBRARY}")
+  endif()
+
+
+  set (HAVE_@opm-project_NAME_UC@ 1)
   mark_as_advanced (@opm-project_NAME@_LIBRARY)
 
   # not all projects have targets; conditionally add this part
@@ -46,12 +69,6 @@ if(NOT @opm-project_NAME@_FOUND)
     endif()
   endif (NOT "@opm-project_TARGET@" STREQUAL "")
 
-  # ensure that we build with support for C++11 to preserve ABI
-  string (REPLACE "@CXX_STD0X_FLAGS@" "" CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS}")
-  string (REPLACE "@CXX_STDLIB_FLAGS@" "" CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS}")
-  string (STRIP "${CMAKE_CXX_FLAGS}" CMAKE_CXX_FLAGS)
-  set (CMAKE_CXX_FLAGS "@CXX_STD0X_FLAGS@@CXX_SPACE@@CXX_STDLIB_FLAGS@ ${CMAKE_CXX_FLAGS}")
-
   # same as above, but for C99
   string (REPLACE "@C_STD99_FLAGS@" "" CMAKE_C_FLAGS "${CMAKE_C_FLAGS}")
   string (STRIP "${CMAKE_C_FLAGS}" CMAKE_C_FLAGS)
@@ -71,12 +88,17 @@ if(NOT @opm-project_NAME@_FOUND)
 
   # this is the contents of config.h as far as our probes can tell:
 
-  # extra code from variable OPM_PROJECT_EXTRA_CODE
-  @OPM_PROJECT_EXTRA_CODE@
-  # end extra code
 
-  # This call is at the bottom as we need to include
-  # the OpmPackage Macros.
-  set(CMAKE_MODULE_PATH "${CMAKE_MODULE_PATH}" @PREREQ_LOCATION@)
-  include(@opm-project_NAME@-prereqs)
+  # The settings in this block do not mix well with the DEST_PREFIX
+  # setting.
+  if (NOT DEST_PREFIX)
+    # This is required to include OpmPackage
+    set(CMAKE_MODULE_PATH "${CMAKE_MODULE_PATH}" @PREREQ_LOCATION@)
+
+    # extra code from variable OPM_PROJECT_EXTRA_CODE
+    @OPM_PROJECT_EXTRA_CODE@
+    # end extra code
+
+    include(@opm-project_NAME@-prereqs)
+  endif()
 endif()

debian/changelog

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

debian/control

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

debian/libopm-common1-bin.install

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

debian/python3-opm-common.install

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

debian/rules

@@ -10,7 +10,7 @@
 #export DH_VERBOSE=1
 
 %:
-	dh $@
+	dh $@ --parallel
 
 override_dh_auto_clean:
 	dh_auto_clean --buildsystem=cmake
@@ -20,7 +20,7 @@ override_dh_auto_build:
 
 # consider using -DUSE_VERSIONED_DIR=ON if backporting
 override_dh_auto_configure:
-	dh_auto_configure --buildsystem=cmake -- -DCMAKE_BUILD_TYPE=RelWithDebInfo -DSTRIP_DEBUGGING_SYMBOLS=ON -DBUILD_SHARED_LIBS=1 -DCMAKE_INSTALL_DOCDIR=share/doc/libopm-common1 -DWHOLE_PROG_OPTIM=ON -DUSE_RUNPATH=OFF -DWITH_NATIVE=OFF
+	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
 
 override_dh_auto_install:
 	dh_auto_install -- install-html

docs/keywords.txt

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

dune.module

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

etc/opm_bash_completion.sh.in

@@ -0,0 +1,60 @@
+# this snippet enables parameter completion via the tabulator key
+# for bash for opm products.
+
+# this is a bash readline completer for the case where a binary is
+# already known to be an eWoms simulator.
+_ewoms_parameter_completor()
+{
+    if test "$COMP_WORDS" == ""; then
+        return 0
+    fi
+
+    cmd="${COMP_WORDS[0]}"
+    cur="${COMP_WORDS[COMP_CWORD]}"
+    fullcmd="$(which "$cmd" 2> /dev/null)"
+    ALL_OPTS=$("$fullcmd" --help 2> /dev/null | grep '^ *--' | sed 's/ *\(--[a-zA-Z0-9\-]*\)=.*/\1=/')
+    ALL_OPTS=$(echo "$ALL_OPTS" | sed 's/^ *--help.*/--help/')
+    COMPREPLY=( $(compgen -A file -W "$ALL_OPTS" -- "${cur}") )
+}
+
+# this is a bash readline default completer which attempts to find out
+# if a given binary is an eWoms simulation. this needs to be set as a
+# default completer because the name of eWoms binaries cannot be known
+# a-priori.
+_ewoms_generic_parameter_completor()
+{
+    if test "$COMP_WORDS" == ""; then
+        return 0
+    fi
+
+    COMPREPLY=()
+    local cmd cur ALL_OPTS
+    cmd="${COMP_WORDS[0]}"
+    cur="${COMP_WORDS[COMP_CWORD]}"
+
+    fullcmd="$(which "$cmd" 2> /dev/null)"
+    if test -z "$fullcmd" || \
+       ! test -x "$fullcmd" || \
+       (! test -f "$fullcmd" && ! test -h "$fullcmd" ) || \
+       ! test -r "$fullcmd" || \
+       ! grep -q "Ewoms[a-zA-Z0-9]*Simulator[a-zA-Z0-0]" "$fullcmd"
+    then
+        if test -n "$DEFAULT_COMPLETION_LOADER"; then
+            "$DEFAULT_COMPLETION_LOADER" $@
+        elif type -t _completion_loader 2>&1 > /dev/null; then
+            # the default DEFAULT_COMPLETION_LOADER variable has not
+            # been set and the _completion_loader function exists, so
+            # we use _completion_loader as the default completer.
+            _completion_loader $@
+        else
+            return 1
+        fi
+
+        return $?
+    fi
+
+    _ewoms_parameter_completor $@
+    return 0
+}
+
+complete -o nospace -F _ewoms_parameter_completor @PRODUCT@

examples/msim.cpp

@@ -0,0 +1,53 @@
+/*
+  Copyright 2013 Statoil ASA.
+
+  This file is part of the Open Porous Media project (OPM).
+
+  OPM is free software: you can redistribute it and/or modify
+  it under the terms of the GNU General Public License as published by
+  the Free Software Foundation, either version 3 of the License, or
+  (at your option) any later version.
+
+  OPM is distributed in the hope that it will be useful,
+  but WITHOUT ANY WARRANTY; without even the implied warranty of
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  GNU General Public License for more details.
+
+  You should have received a copy of the GNU General Public License
+  along with OPM.  If not, see <http://www.gnu.org/licenses/>.
+*/
+
+#include <opm/output/eclipse/EclipseIO.hpp>
+
+#include <opm/parser/eclipse/Parser/Parser.hpp>
+#include <opm/parser/eclipse/Parser/ParseContext.hpp>
+#include <opm/parser/eclipse/Parser/ErrorGuard.hpp>
+
+#include <opm/parser/eclipse/EclipseState/EclipseState.hpp>
+#include <opm/parser/eclipse/EclipseState/Schedule/Schedule.hpp>
+#include <opm/parser/eclipse/EclipseState/SummaryConfig/SummaryConfig.hpp>
+
+#include <opm/msim/msim.hpp>
+
+
+int main(int /* argc */, char** argv) {
+    std::string deck_file = argv[1];
+    Opm::Parser parser;
+    Opm::ParseContext parse_context;
+    Opm::ErrorGuard error_guard;
+
+    Opm::Deck deck = parser.parseFile(deck_file, parse_context, error_guard);
+    Opm::EclipseState state(deck);
+    Opm::Schedule schedule(deck, state, parse_context, error_guard);
+    Opm::SummaryConfig summary_config(deck, schedule, state.getTableManager(), parse_context, error_guard);
+
+    if (error_guard) {
+        error_guard.dump();
+        error_guard.terminate();
+    }
+
+    Opm::msim msim(state);
+    Opm::EclipseIO io(state, state.getInputGrid(), schedule, summary_config);
+    msim.run(schedule, io, false);
+}
+

examples/opmhash.cpp

@@ -0,0 +1,159 @@
+/*
+  Copyright 2019 Equinor ASA.
+
+  This file is part of the Open Porous Media project (OPM).
+
+  OPM is free software: you can redistribute it and/or modify
+  it under the terms of the GNU General Public License as published by
+  the Free Software Foundation, either version 3 of the License, or
+  (at your option) any later version.
+
+  OPM is distributed in the hope that it will be useful,
+  but WITHOUT ANY WARRANTY; without even the implied warranty of
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  GNU General Public License for more details.
+
+  You should have received a copy of the GNU General Public License
+  along with OPM.  If not, see <http://www.gnu.org/licenses/>.
+*/
+#include <getopt.h>
+
+#include <iostream>
+#include <iomanip>
+#include <vector>
+
+#include <opm/parser/eclipse/Parser/Parser.hpp>
+#include <opm/parser/eclipse/Parser/ParseContext.hpp>
+#include <opm/parser/eclipse/Parser/ErrorGuard.hpp>
+#include <opm/parser/eclipse/Deck/Deck.hpp>
+#include <opm/parser/eclipse/EclipseState/EclipseState.hpp>
+#include <opm/parser/eclipse/EclipseState/EclipseState.hpp>
+#include <opm/parser/eclipse/EclipseState/SummaryConfig/SummaryConfig.hpp>
+#include <opm/parser/eclipse/EclipseState/Schedule/Schedule.hpp>
+
+
+struct keyword {
+    keyword(const std::string& name_arg, const std::string& filename_arg,
+            std::size_t line_number_arg, std::size_t content_hash_arg) :
+        name(name_arg),
+        filename(filename_arg),
+        line_number(line_number_arg),
+        content_hash(content_hash_arg)
+    {}
+
+
+    std::string name;
+    std::string filename;
+    std::size_t line_number;
+    std::size_t content_hash;
+};
+
+
+std::vector<keyword> load_deck(const char * deck_file) {
+    Opm::ParseContext parseContext;
+    Opm::ErrorGuard errors;
+    Opm::Parser parser;
+    std::vector<keyword> keywords;
+
+    /* Use the same default ParseContext as flow. */
+    parseContext.update(Opm::ParseContext::PARSE_RANDOM_SLASH, Opm::InputError::IGNORE);
+    parseContext.update(Opm::ParseContext::PARSE_MISSING_DIMS_KEYWORD, Opm::InputError::WARN);
+    parseContext.update(Opm::ParseContext::SUMMARY_UNKNOWN_WELL, Opm::InputError::WARN);
+    parseContext.update(Opm::ParseContext::SUMMARY_UNKNOWN_GROUP, Opm::InputError::WARN);
+
+    auto deck = parser.parseFile(deck_file, parseContext, errors);
+    for (const auto& kw : deck) {
+        std::stringstream ss;
+        const auto& location = kw.location();
+        ss << kw;
+
+        keywords.emplace_back(kw.name(), location.filename, location.lineno, std::hash<std::string>{}(ss.str()));
+    }
+    return keywords;
+}
+
+
+std::size_t deck_hash(const std::vector<keyword>& keywords) {
+    std::stringstream ss;
+    for (const auto& kw : keywords)
+        ss << kw.content_hash;
+
+    return std::hash<std::string>{}(ss.str());
+}
+
+
+void print_keywords(const std::vector<keyword>& keywords, bool location_info) {
+    for (const auto& kw : keywords) {
+        if (location_info)
+            std::cout << std::setw(8) << std::left << kw.name << " : " << kw.filename << ":" << kw.line_number << " " << kw.content_hash << std::endl;
+        else
+            std::cout << std::setw(8) << std::left << kw.name << " : " << kw.content_hash << std::endl;
+    }
+    std::cout << std::endl;
+    std::cout << std::setw(8) << std::left << "Total" << " : " << deck_hash(keywords) << std::endl;
+}
+
+
+void print_help_and_exit() {
+    const char * help_text = R"(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:
+
+  RUNSPEC  : 13167205945009276792
+  TITLE    : 16047371705964514902
+  DIMENS   : 1264233216877515756
+  NONNC    : 10052807539267647959
+  OIL      : 6013609912232720008
+  WATER    : 14106203893673265964
+
+  Total    : 7362809723723482303
+
+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.
+
+Options:
+
+ -l : Add filename and linenumber information to each keyword.
+ -s : Short form - only print the hash of the complete deck.
+
+)";
+    std::cerr << help_text << std::endl;
+    exit(1);
+}
+
+
+int main(int argc, char** argv) {
+    int arg_offset = 1;
+    bool location_info = false;
+    bool short_form = false;
+
+    while (true) {
+        int c;
+        c = getopt(argc, argv, "ls");
+        if (c == -1)
+            break;
+
+        switch(c) {
+        case 'l':
+            location_info = true;
+            break;
+        case 's':
+            short_form = true;
+            break;
+        }
+    }
+    arg_offset = optind;
+    if (arg_offset >= argc)
+        print_help_and_exit();
+
+    auto keywords = load_deck(argv[arg_offset]);
+    if (short_form)
+        std::cout << deck_hash(keywords) << std::endl;
+    else
+        print_keywords(keywords, location_info);
+}
+

examples/opmi.cpp

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

examples/opmpack.cpp

@@ -0,0 +1,167 @@
+/*
+  Copyright 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/>.
+*/
+
+#include <fstream>
+#include <iostream>
+#include <getopt.h>
+
+#include <opm/common/utility/FileSystem.hpp>
+#include <opm/parser/eclipse/Parser/ParserKeywords/G.hpp>
+#include <opm/parser/eclipse/Parser/Parser.hpp>
+#include <opm/parser/eclipse/Parser/ErrorGuard.hpp>
+#include <opm/parser/eclipse/Parser/ParseContext.hpp>
+#include <opm/parser/eclipse/Parser/InputErrorAction.hpp>
+#include <opm/parser/eclipse/Deck/Deck.hpp>
+
+namespace fs = Opm::filesystem;
+
+Opm::Deck pack_deck( const char * deck_file, std::ostream& os) {
+    Opm::ParseContext parseContext(Opm::InputError::WARN);
+    Opm::ErrorGuard errors;
+    Opm::Parser parser;
+
+    auto deck = parser.parseFile(deck_file, parseContext, errors);
+    os << deck;
+
+    return deck;
+}
+
+
+void print_help_and_exit() {
+    const char * help_text = R"(
+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.
+
+By passing the option -o you can redirect the output to a file
+or a directory.
+
+Print on stdout:
+
+   opmpack  /path/to/case/CASE.DATA
+
+
+Print MY_CASE.DATA in /tmp:
+
+    opmpack -o /tmp /path/to/MY_CASE.DATA
+
+
+Print NEW_CASE in cwd:
+
+    opmpack -o NEW_CASE.DATA path/to/MY_CASE.DATA
+
+As an alternative to the -o option you can use -c; that is equivalent to -o -
+but restart and import files referred to in the deck are also copied. The -o and
+-c options are mutually exclusive. )";
+    std::cerr << help_text << std::endl;
+    exit(1);
+}
+
+
+void copy_file(const fs::path& source_dir, fs::path fname, const fs::path& target_dir) {
+    if (fname.is_absolute()) {
+        // change when moving to gcc8+
+        // fname = fs::relative(fname, source_dir);
+        auto prefix_len = fs::canonical(source_dir).string().size();
+        fname = fs::canonical(fname);
+        fname = fs::path( fname.string().substr(prefix_len + 1) );
+    }
+
+    auto source_file = source_dir / fname;
+    auto target_file = target_dir / fname;
+
+    if (!fs::is_directory(target_file.parent_path()))
+        fs::create_directories(target_file.parent_path());
+
+    fs::copy_file(source_file, target_file, fs::copy_options::overwrite_existing);
+    std::cerr << "Copying file " << source_file.string() << " -> " << target_file.string() << std::endl;
+}
+
+
+
+int main(int argc, char** argv) {
+    int arg_offset = 1;
+    bool stdout_output = true;
+    bool copy_binary = false;
+    const char * coutput_arg;
+
+    while (true) {
+        int c;
+        c = getopt(argc, argv, "c:o:");
+        if (c == -1)
+            break;
+
+        switch(c) {
+        case 'o':
+            stdout_output = false;
+            coutput_arg = optarg;
+            break;
+        case 'c':
+            stdout_output = false;
+            copy_binary = true;
+            coutput_arg = optarg;
+            break;
+        }
+    }
+    arg_offset = optind;
+    if (arg_offset >= argc)
+        print_help_and_exit();
+
+    if (stdout_output)
+        pack_deck(argv[arg_offset], std::cout);
+    else {
+        std::ofstream os;
+        fs::path input_arg(argv[arg_offset]);
+        fs::path output_arg(coutput_arg);
+        fs::path output_dir(coutput_arg);
+
+        if (fs::is_directory(output_arg)) {
+            fs::path output_path = output_arg / input_arg.filename();
+            os.open(output_path.string());
+        } else {
+            os.open(output_arg.string());
+            output_dir = output_arg.parent_path();
+        }
+
+
+        const auto& deck = pack_deck(argv[arg_offset], os);
+        if (copy_binary) {
+            Opm::InitConfig init_config(deck);
+            if (init_config.restartRequested()) {
+                Opm::IOConfig io_config(deck);
+                fs::path restart_file(io_config.getRestartFileName( init_config.getRestartRootName(), init_config.getRestartStep(), false ));
+                copy_file(input_arg.parent_path(), restart_file, output_dir);
+            }
+
+            for (std::size_t import_index = 0; import_index < deck.count("IMPORT"); import_index++) {
+                const auto& import_keyword = deck.getKeyword("IMPORT", import_index);
+                const auto& fname = import_keyword.getRecord(0).getItem("FILE").get<std::string>(0);
+                copy_file(input_arg.parent_path(), fname, output_dir);
+            }
+
+            using GDFILE = Opm::ParserKeywords::GDFILE;
+            if (deck.hasKeyword<GDFILE>()) {
+                const auto& gdfile_keyword = deck.getKeyword<GDFILE>();
+                const auto& fname = gdfile_keyword.getRecord(0).getItem<GDFILE::filename>().get<std::string>(0);
+                copy_file(input_arg.parent_path(), fname, output_dir);
+            }
+        }
+    }
+}
+

examples/test_util/compareECL.cpp

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

examples/test_util/compareSummary.cpp

@@ -1,223 +0,0 @@
-/*
-   Copyright 2016 Statoil ASA.
-
-   This file is part of the Open Porous Media project (OPM).
-
-   OPM is free software: you can redistribute it and/or modify it under the terms
-   of the GNU General Public License as published by
-   the Free Software Foundation, either version 3 of the License, or
-   (at your option) any later version.
-
-   OPM is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
-
-   You should have received a copy of the GNU General Public License
-   along with OPM.  If not, see <http://www.gnu.org/licenses/>.
-   */
-
-
-#include <opm/test_util/summaryRegressionTest.hpp>
-#include <opm/test_util/summaryIntegrationTest.hpp>
-#include <string>
-#include <algorithm>
-#include <stdexcept>
-#include <getopt.h>
-
-void printHelp(){
-    std::cout << "\n\nThe program can handle both unified and non-unified summary files."<< std::endl;
-    std::cout <<"In the case of non-unified summary files all the files must be located in the same directory. Only the basename (full path without extension) is needed as input." << std::endl << std::endl;
-    std::cout << "\nThe program takes four arguments"          << std::endl;
-    std::cout << "1) <path to file1>/<base_name>, basename without extension"            << std::endl;
-    std::cout << "2) <path to file2>/<base_name>, basename without extension"            << std::endl;
-    std::cout << "3) absolute tolerance"                     << std::endl;
-    std::cout << "4) relative tolerance (between 0 and 1)"   << std::endl;
-    std::cout << "The program will only throw an exception when both the absolute and relative tolerance are exceeded." << std::endl;
-    std::cout << "The program is capable of performing both a regression test and an integration test, \nhowever only one type of test at a time. ";
-    std::cout << "By default the program will run a regression test."<< std::endl;
-    std::cout << "\nThe program have command line options:" << std::endl;
-    std::cout << "-h \t\tPrint help message." << std::endl << std::endl;
-    std::cout << "For the regression test: " << std::endl;
-    std::cout << "-r \t\tChoosing regression test (this is default)."<< std::endl;
-    std::cout << "-k keyword \tSpecify a specific keyword to compare, for example - k WOPR:PRODU1."<< std::endl;
-    std::cout << "-p \t\tWill print the keywords of the files." << std::endl;
-    std::cout << "-R \t\tWill allow comparison between a restarted simulation and a normal simulation. The files must end at the same time." << std::endl << std::endl;
-    std::cout << "For the integration test:"<< std::endl;
-    std::cout << "-i \t\tChoosing integration test." << std::endl;
-    std::cout << "-d \t\tThe program will not throw an exception when the volume error ratio exceeds the limit." << std::endl;
-    std::cout << "-g \t\tWill print the vector with the greatest error ratio." << std::endl;
-    std::cout << "-k keyword \tSpecify a specific keyword to compare, for example - k WOPR:PRODU1."<< std::endl;
-    std::cout << "-K \t\tWill not allow different amount of keywords in the two files. Throws an exception if the amount are different." << std::endl;
-    std::cout << "-m mainVar \tWill calculate the error ratio for one main variable. Valid input is WOPR, WWPR, WGPR or WBHP." << std::endl;
-    std::cout << "-n \tDo not throw on errors." << std::endl;
-    std::cout << "-p \t\tWill print the keywords of the files." << std::endl;
-    std::cout << "-P keyword \tWill print the summary vectors of a specified kewyord, for example -P WOPR:B-3H." << std::endl;
-    std::cout << "-s int \t\tSets the number of spikes that are allowed for each keyword, for example: -s 5." << std::endl;
-    std::cout << "-v \t\tFor the rate keywords WOPR, WGPR, WWPR and WBHP. Calculates the error volume of \n\t\tthe two summary files. This is printed to screen." << std::endl;
-    std::cout << "-V keyword \tWill calculate the error rate for a specific keyword." << std::endl << std::endl;
-    std::cout << "Suggested combination of command line options:"<< std::endl;
-    std::cout << " -i -g -m mainVariable, will print the vector which have the greatest error ratio of the main variable of interest.\n"<< std::endl;
-}
-
-//---------------------------------------------------
-
-
-int main (int argc, char ** argv){
-
-    //------------------------------------------------
-    //Defines some constants
-    bool specificKeyword = false;
-    bool allowSpikes = false;
-    bool findVolumeError = false;
-    bool integrationTest = false;
-    bool regressionTest = true;
-    bool allowDifferentAmountOfKeywords = true;
-    bool printKeywords = false;
-    bool printSpecificKeyword = false;
-    bool findVectorWithGreatestErrorRatio = false;
-    bool oneOfTheMainVariables = false;
-    bool throwExceptionForTooGreatErrorRatio = true;
-    bool isRestartFile = false;
-    bool throwOnError = true;
-    const char* keyword  = nullptr;
-    const char* mainVariable = nullptr;
-    int c = 0;
-    int limit = -1;
-    //------------------------------------------------
-
-    //------------------------------------------------
-    //For setting the options selected
-    while ((c = getopt(argc, argv, "dghik:Km:npP:rRs:vV:")) != -1) {
-        switch (c) {
-            case 'd':
-                throwExceptionForTooGreatErrorRatio = false;
-                break;
-            case 'g':
-                findVectorWithGreatestErrorRatio = true;
-                throwExceptionForTooGreatErrorRatio = false;
-                break;
-            case 'h':
-                printHelp();
-                return 0;
-            case 'i':
-                integrationTest = true;
-                regressionTest = false;
-                break;
-            case 'k':
-                specificKeyword = true;
-                keyword = optarg;
-                break;
-            case 'K':
-                allowDifferentAmountOfKeywords = false;
-                break;
-            case 'm':
-                oneOfTheMainVariables = true;
-                mainVariable = optarg;
-                break;
-            case 'n':
-                throwOnError = false;
-                break;
-            case 'p':
-                printKeywords = true;
-                break;
-            case 'P':
-                specificKeyword = true;
-                printSpecificKeyword = true;
-                keyword = optarg;
-                break;
-            case 'r':
-                integrationTest = false;
-                regressionTest = true;
-                break;
-            case 'R':
-                isRestartFile = true;
-                break;
-            case 's':
-                allowSpikes = true;
-                limit = atof(optarg);
-                break;
-            case 'v':
-                findVolumeError = true;
-                break;
-            case 'V':
-                findVolumeError = true;
-                specificKeyword = true;
-                keyword = optarg;
-                break;
-            case '?':
-                if (optopt == 'k' || optopt == 'm' || optopt == 'P'
-                    || optopt == 's' || optopt == 'V') {
-                    std::cout << "Option -"<<optopt<<" requires an keyword." << std::endl;
-                    return EXIT_FAILURE;
-                }
-                else {
-                    std::cout << "Unknown option." << std::endl;
-                    return EXIT_FAILURE;
-                }
-            default:
-                return EXIT_FAILURE;
-        }
-    }
-    //------------------------------------------------
-
-    int argOffset = optind;
-    if (argc != argOffset + 4) {
-        printHelp();
-        return EXIT_FAILURE;
-    }
-    const char * basename1   = argv[argOffset];
-    const char * basename2   = argv[argOffset+1];
-    double absoluteTolerance = strtod(argv[argOffset+2], nullptr);
-    double relativeTolerance = strtod(argv[argOffset+3], nullptr);
-
-    std::cout << "Comparing '" << basename1 << "' to '" << basename2 << "'." << std::endl;
-
-    try {
-        if(regressionTest){
-            RegressionTest compare(basename1,basename2, absoluteTolerance, relativeTolerance);
-            compare.throwOnErrors(throwOnError);
-            if(printKeywords){compare.setPrintKeywords(true);}
-            if(isRestartFile){compare.setIsRestartFile(true);}
-            if(specificKeyword){
-                compare.getRegressionTest(keyword);
-            }
-            else{
-                if(printKeywords){compare.setPrintKeywords(true);}
-                compare.getRegressionTest();
-            }
-        }
-        if(integrationTest){
-            IntegrationTest compare(basename1,basename2, absoluteTolerance, relativeTolerance);
-            compare.throwOnErrors(throwOnError);
-            if(findVectorWithGreatestErrorRatio){compare.setFindVectorWithGreatestErrorRatio(true);}
-            if(allowSpikes){compare.setAllowSpikes(true);}
-            if(oneOfTheMainVariables){
-                compare.setOneOfTheMainVariables(true);
-                std::string str(mainVariable);
-                std::transform(str.begin(), str.end(),str.begin(), ::toupper);
-                if(str == "WOPR" ||str=="WWPR" ||str=="WGPR" || str == "WBHP"){
-                    compare.setMainVariable(str);
-                }else{
-                    throw std::invalid_argument("The input is not a main variable. -m option requires a valid main variable.");
-                }
-            }
-            if(findVolumeError){compare.setFindVolumeError(true);}
-            if(limit != -1){compare.setSpikeLimit(limit);}
-            if(!allowDifferentAmountOfKeywords){compare.setAllowDifferentAmountOfKeywords(false);}
-            if(printKeywords){compare.setPrintKeywords(true);}
-            if(!throwExceptionForTooGreatErrorRatio){compare.setThrowExceptionForTooGreatErrorRatio(false);}
-            if(specificKeyword){
-                if(printSpecificKeyword){compare.setPrintSpecificKeyword(true);}
-                compare.getIntegrationTest(keyword);
-                return 0;
-            }
-            compare.getIntegrationTest();
-        }
-    }
-    catch(const std::exception& e) {
-        std::cerr << "Program threw an exception: " << e.what() << std::endl;
-        return EXIT_FAILURE;
-    }
-    return 0;
-}

external/cjson/README.opm

@@ -1,4 +1,2 @@
-This directory contains the cJSON package downloaded unchanged from:
-http://sourceforge.net/projects/cjson/. The cJSON package is plain C,
-the JsonObject class provides a minimal C++ wrapping of this.
+This directory contains the the 1.7.10 version of the cJSON package from https://github.com/DaveGamble/cJSON 
 

external/cjson/cJSON.h

@@ -1,16 +1,16 @@
 /*
-  Copyright (c) 2009 Dave Gamble
- 
+  Copyright (c) 2009-2017 Dave Gamble and cJSON contributors
+
   Permission is hereby granted, free of charge, to any person obtaining a copy
   of this software and associated documentation files (the "Software"), to deal
   in the Software without restriction, including without limitation the rights
   to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
   copies of the Software, and to permit persons to whom the Software is
   furnished to do so, subject to the following conditions:
- 
+
   The above copyright notice and this permission notice shall be included in
   all copies or substantial portions of the Software.
- 
+
   THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
   IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
   FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
@@ -23,118 +23,260 @@
 #ifndef cJSON__h
 #define cJSON__h
 
-#include <stdlib.h>
-
 #ifdef __cplusplus
 extern "C"
 {
 #endif
 
+#if !defined(__WINDOWS__) && (defined(WIN32) || defined(WIN64) || defined(_MSC_VER) || defined(_WIN32))
+#define __WINDOWS__
+#endif
+
+#ifdef __WINDOWS__
+
+/* When compiling for windows, we specify a specific calling convention to avoid issues where we are being called from a project with a different default calling convention.  For windows you have 3 define options:
+
+CJSON_HIDE_SYMBOLS - Define this in the case where you don't want to ever dllexport symbols
+CJSON_EXPORT_SYMBOLS - Define this on library build when you want to dllexport symbols (default)
+CJSON_IMPORT_SYMBOLS - Define this if you want to dllimport symbol
+
+For *nix builds that support visibility attribute, you can define similar behavior by
+
+setting default visibility to hidden by adding
+-fvisibility=hidden (for gcc)
+or
+-xldscope=hidden (for sun cc)
+to CFLAGS
+
+then using the CJSON_API_VISIBILITY flag to "export" the same symbols the way CJSON_EXPORT_SYMBOLS does
+
+*/
+
+#define CJSON_CDECL __cdecl
+#define CJSON_STDCALL __stdcall
+
+/* export symbols by default, this is necessary for copy pasting the C and header file */
+#if !defined(CJSON_HIDE_SYMBOLS) && !defined(CJSON_IMPORT_SYMBOLS) && !defined(CJSON_EXPORT_SYMBOLS)
+#define CJSON_EXPORT_SYMBOLS
+#endif
+
+#if defined(CJSON_HIDE_SYMBOLS)
+#define CJSON_PUBLIC(type)   type CJSON_STDCALL
+#elif defined(CJSON_EXPORT_SYMBOLS)
+#define CJSON_PUBLIC(type)   __declspec(dllexport) type CJSON_STDCALL
+#elif defined(CJSON_IMPORT_SYMBOLS)
+#define CJSON_PUBLIC(type)   __declspec(dllimport) type CJSON_STDCALL
+#endif
+#else /* !__WINDOWS__ */
+#define CJSON_CDECL
+#define CJSON_STDCALL
+
+#if (defined(__GNUC__) || defined(__SUNPRO_CC) || defined (__SUNPRO_C)) && defined(CJSON_API_VISIBILITY)
+#define CJSON_PUBLIC(type)   __attribute__((visibility("default"))) type
+#else
+#define CJSON_PUBLIC(type) type
+#endif
+#endif
+
+/* project version */
+#define CJSON_VERSION_MAJOR 1
+#define CJSON_VERSION_MINOR 7
+#define CJSON_VERSION_PATCH 10
+
+#include <stddef.h>
+
 /* cJSON Types: */
-#define cJSON_False 0
-#define cJSON_True 1
-#define cJSON_NULL 2
-#define cJSON_Number 3
-#define cJSON_String 4
-#define cJSON_Array 5
-#define cJSON_Object 6
-	
+#define cJSON_Invalid (0)
+#define cJSON_False  (1 << 0)
+#define cJSON_True   (1 << 1)
+#define cJSON_NULL   (1 << 2)
+#define cJSON_Number (1 << 3)
+#define cJSON_String (1 << 4)
+#define cJSON_Array  (1 << 5)
+#define cJSON_Object (1 << 6)
+#define cJSON_Raw    (1 << 7) /* raw json */
+
 #define cJSON_IsReference 256
+#define cJSON_StringIsConst 512
 
 /* The cJSON structure: */
-typedef struct cJSON {
-	struct cJSON *next,*prev;	/* next/prev allow you to walk array/object chains. Alternatively, use GetArraySize/GetArrayItem/GetObjectItem */
-	struct cJSON *child;		/* An array or object item will have a child pointer pointing to a chain of the items in the array/object. */
+typedef struct cJSON
+{
+    /* next/prev allow you to walk array/object chains. Alternatively, use GetArraySize/GetArrayItem/GetObjectItem */
+    struct cJSON *next;
+    struct cJSON *prev;
+    /* An array or object item will have a child pointer pointing to a chain of the items in the array/object. */
+    struct cJSON *child;
 
-	int type;					/* The type of the item, as above. */
+    /* The type of the item, as above. */
+    int type;
 
-	char *valuestring;			/* The item's string, if type==cJSON_String */
-	int valueint;				/* The item's number, if type==cJSON_Number */
-	double valuedouble;			/* The item's number, if type==cJSON_Number */
+    /* The item's string, if type==cJSON_String  and type == cJSON_Raw */
+    char *valuestring;
+    /* writing to valueint is DEPRECATED, use cJSON_SetNumberValue instead */
+    int valueint;
+    /* The item's number, if type==cJSON_Number */
+    double valuedouble;
 
-	char *string;				/* The item's name string, if this item is the child of, or is in the list of subitems of an object. */
+    /* The item's name string, if this item is the child of, or is in the list of subitems of an object. */
+    char *string;
 } cJSON;
 
-typedef struct cJSON_Hooks {
-      void *(*malloc_fn)(size_t sz);
-      void (*free_fn)(void *ptr);
+typedef struct cJSON_Hooks
+{
+      /* malloc/free are CDECL on Windows regardless of the default calling convention of the compiler, so ensure the hooks allow passing those functions directly. */
+      void *(CJSON_CDECL *malloc_fn)(size_t sz);
+      void (CJSON_CDECL *free_fn)(void *ptr);
 } cJSON_Hooks;
 
+typedef int cJSON_bool;
+
+/* Limits how deeply nested arrays/objects can be before cJSON rejects to parse them.
+ * This is to prevent stack overflows. */
+#ifndef CJSON_NESTING_LIMIT
+#define CJSON_NESTING_LIMIT 1000
+#endif
+
+/* returns the version of cJSON as a string */
+CJSON_PUBLIC(const char*) cJSON_Version(void);
+
 /* Supply malloc, realloc and free functions to cJSON */
-extern void cJSON_InitHooks(cJSON_Hooks* hooks);
+CJSON_PUBLIC(void) cJSON_InitHooks(cJSON_Hooks* hooks);
 
+/* Memory Management: the caller is always responsible to free the results from all variants of cJSON_Parse (with cJSON_Delete) and cJSON_Print (with stdlib free, cJSON_Hooks.free_fn, or cJSON_free as appropriate). The exception is cJSON_PrintPreallocated, where the caller has full responsibility of the buffer. */
+/* Supply a block of JSON, and this returns a cJSON object you can interrogate. */
+CJSON_PUBLIC(cJSON *) cJSON_Parse(const char *value);
+/* ParseWithOpts allows you to require (and check) that the JSON is null terminated, and to retrieve the pointer to the final byte parsed. */
+/* If you supply a ptr in return_parse_end and parsing fails, then return_parse_end will contain a pointer to the error so will match cJSON_GetErrorPtr(). */
+CJSON_PUBLIC(cJSON *) cJSON_ParseWithOpts(const char *value, const char **return_parse_end, cJSON_bool require_null_terminated);
 
-/* Supply a block of JSON, and this returns a cJSON object you can interrogate. Call cJSON_Delete when finished. */
-extern cJSON *cJSON_Parse(const char *value);
-/* Render a cJSON entity to text for transfer/storage. Free the char* when finished. */
-extern char  *cJSON_Print(cJSON *item);
-/* Render a cJSON entity to text for transfer/storage without any formatting. Free the char* when finished. */
-extern char  *cJSON_PrintUnformatted(cJSON *item);
+/* Render a cJSON entity to text for transfer/storage. */
+CJSON_PUBLIC(char *) cJSON_Print(const cJSON *item);
+/* Render a cJSON entity to text for transfer/storage without any formatting. */
+CJSON_PUBLIC(char *) cJSON_PrintUnformatted(const cJSON *item);
+/* Render a cJSON entity to text using a buffered strategy. prebuffer is a guess at the final size. guessing well reduces reallocation. fmt=0 gives unformatted, =1 gives formatted */
+CJSON_PUBLIC(char *) cJSON_PrintBuffered(const cJSON *item, int prebuffer, cJSON_bool fmt);
+/* Render a cJSON entity to text using a buffer already allocated in memory with given length. Returns 1 on success and 0 on failure. */
+/* NOTE: cJSON is not always 100% accurate in estimating how much memory it will use, so to be safe allocate 5 bytes more than you actually need */
+CJSON_PUBLIC(cJSON_bool) cJSON_PrintPreallocated(cJSON *item, char *buffer, const int length, const cJSON_bool format);
 /* Delete a cJSON entity and all subentities. */
-extern void   cJSON_Delete(cJSON *c);
+CJSON_PUBLIC(void) cJSON_Delete(cJSON *c);
 
 /* Returns the number of items in an array (or object). */
-extern int	  cJSON_GetArraySize(cJSON *array);
-/* Retrieve item number "item" from array "array". Returns NULL if unsuccessful. */
-extern cJSON *cJSON_GetArrayItem(cJSON *array,int item);
+CJSON_PUBLIC(int) cJSON_GetArraySize(const cJSON *array);
+/* Retrieve item number "index" from array "array". Returns NULL if unsuccessful. */
+CJSON_PUBLIC(cJSON *) cJSON_GetArrayItem(const cJSON *array, int index);
 /* Get item "string" from object. Case insensitive. */
-extern cJSON *cJSON_GetObjectItem(cJSON *object,const char *string);
-
+CJSON_PUBLIC(cJSON *) cJSON_GetObjectItem(const cJSON * const object, const char * const string);
+CJSON_PUBLIC(cJSON *) cJSON_GetObjectItemCaseSensitive(const cJSON * const object, const char * const string);
+CJSON_PUBLIC(cJSON_bool) cJSON_HasObjectItem(const cJSON *object, const char *string);
 /* For analysing failed parses. This returns a pointer to the parse error. You'll probably need to look a few chars back to make sense of it. Defined when cJSON_Parse() returns 0. 0 when cJSON_Parse() succeeds. */
-extern const char *cJSON_GetErrorPtr(void);
-	
+CJSON_PUBLIC(const char *) cJSON_GetErrorPtr(void);
+
+/* Check if the item is a string and return its valuestring */
+CJSON_PUBLIC(char *) cJSON_GetStringValue(cJSON *item);
+
+/* These functions check the type of an item */
+CJSON_PUBLIC(cJSON_bool) cJSON_IsInvalid(const cJSON * const item);
+CJSON_PUBLIC(cJSON_bool) cJSON_IsFalse(const cJSON * const item);
+CJSON_PUBLIC(cJSON_bool) cJSON_IsTrue(const cJSON * const item);
+CJSON_PUBLIC(cJSON_bool) cJSON_IsBool(const cJSON * const item);
+CJSON_PUBLIC(cJSON_bool) cJSON_IsNull(const cJSON * const item);
+CJSON_PUBLIC(cJSON_bool) cJSON_IsNumber(const cJSON * const item);
+CJSON_PUBLIC(cJSON_bool) cJSON_IsString(const cJSON * const item);
+CJSON_PUBLIC(cJSON_bool) cJSON_IsArray(const cJSON * const item);
+CJSON_PUBLIC(cJSON_bool) cJSON_IsObject(const cJSON * const item);
+CJSON_PUBLIC(cJSON_bool) cJSON_IsRaw(const cJSON * const item);
+
 /* These calls create a cJSON item of the appropriate type. */
-extern cJSON *cJSON_CreateNull(void);
-extern cJSON *cJSON_CreateTrue(void);
-extern cJSON *cJSON_CreateFalse(void);
-extern cJSON *cJSON_CreateBool(int b);
-extern cJSON *cJSON_CreateNumber(double num);
-extern cJSON *cJSON_CreateString(const char *string);
-extern cJSON *cJSON_CreateArray(void);
-extern cJSON *cJSON_CreateObject(void);
+CJSON_PUBLIC(cJSON *) cJSON_CreateNull(void);
+CJSON_PUBLIC(cJSON *) cJSON_CreateTrue(void);
+CJSON_PUBLIC(cJSON *) cJSON_CreateFalse(void);
+CJSON_PUBLIC(cJSON *) cJSON_CreateBool(cJSON_bool boolean);
+CJSON_PUBLIC(cJSON *) cJSON_CreateNumber(double num);
+CJSON_PUBLIC(cJSON *) cJSON_CreateString(const char *string);
+/* raw json */
+CJSON_PUBLIC(cJSON *) cJSON_CreateRaw(const char *raw);
+CJSON_PUBLIC(cJSON *) cJSON_CreateArray(void);
+CJSON_PUBLIC(cJSON *) cJSON_CreateObject(void);
+
+/* Create a string where valuestring references a string so
+ * it will not be freed by cJSON_Delete */
+CJSON_PUBLIC(cJSON *) cJSON_CreateStringReference(const char *string);
+/* Create an object/arrray that only references it's elements so
+ * they will not be freed by cJSON_Delete */
+CJSON_PUBLIC(cJSON *) cJSON_CreateObjectReference(const cJSON *child);
+CJSON_PUBLIC(cJSON *) cJSON_CreateArrayReference(const cJSON *child);
 
 /* These utilities create an Array of count items. */
-extern cJSON *cJSON_CreateIntArray(int *numbers,int count);
-extern cJSON *cJSON_CreateFloatArray(float *numbers,int count);
-extern cJSON *cJSON_CreateDoubleArray(double *numbers,int count);
-extern cJSON *cJSON_CreateStringArray(const char **strings,int count);
+CJSON_PUBLIC(cJSON *) cJSON_CreateIntArray(const int *numbers, int count);
+CJSON_PUBLIC(cJSON *) cJSON_CreateFloatArray(const float *numbers, int count);
+CJSON_PUBLIC(cJSON *) cJSON_CreateDoubleArray(const double *numbers, int count);
+CJSON_PUBLIC(cJSON *) cJSON_CreateStringArray(const char **strings, int count);
 
 /* Append item to the specified array/object. */
-extern void cJSON_AddItemToArray(cJSON *array, cJSON *item);
-extern void	cJSON_AddItemToObject(cJSON *object,const char *string,cJSON *item);
+CJSON_PUBLIC(void) cJSON_AddItemToArray(cJSON *array, cJSON *item);
+CJSON_PUBLIC(void) cJSON_AddItemToObject(cJSON *object, const char *string, cJSON *item);
+/* Use this when string is definitely const (i.e. a literal, or as good as), and will definitely survive the cJSON object.
+ * WARNING: When this function was used, make sure to always check that (item->type & cJSON_StringIsConst) is zero before
+ * writing to `item->string` */
+CJSON_PUBLIC(void) cJSON_AddItemToObjectCS(cJSON *object, const char *string, cJSON *item);
 /* Append reference to item to the specified array/object. Use this when you want to add an existing cJSON to a new cJSON, but don't want to corrupt your existing cJSON. */
-extern void cJSON_AddItemReferenceToArray(cJSON *array, cJSON *item);
-extern void	cJSON_AddItemReferenceToObject(cJSON *object,const char *string,cJSON *item);
+CJSON_PUBLIC(void) cJSON_AddItemReferenceToArray(cJSON *array, cJSON *item);
+CJSON_PUBLIC(void) cJSON_AddItemReferenceToObject(cJSON *object, const char *string, cJSON *item);
 
 /* Remove/Detatch items from Arrays/Objects. */
-extern cJSON *cJSON_DetachItemFromArray(cJSON *array,int which);
-extern void   cJSON_DeleteItemFromArray(cJSON *array,int which);
-extern cJSON *cJSON_DetachItemFromObject(cJSON *object,const char *string);
-extern void   cJSON_DeleteItemFromObject(cJSON *object,const char *string);
-	
+CJSON_PUBLIC(cJSON *) cJSON_DetachItemViaPointer(cJSON *parent, cJSON * const item);
+CJSON_PUBLIC(cJSON *) cJSON_DetachItemFromArray(cJSON *array, int which);
+CJSON_PUBLIC(void) cJSON_DeleteItemFromArray(cJSON *array, int which);
+CJSON_PUBLIC(cJSON *) cJSON_DetachItemFromObject(cJSON *object, const char *string);
+CJSON_PUBLIC(cJSON *) cJSON_DetachItemFromObjectCaseSensitive(cJSON *object, const char *string);
+CJSON_PUBLIC(void) cJSON_DeleteItemFromObject(cJSON *object, const char *string);
+CJSON_PUBLIC(void) cJSON_DeleteItemFromObjectCaseSensitive(cJSON *object, const char *string);
+
 /* Update array items. */
-extern void cJSON_ReplaceItemInArray(cJSON *array,int which,cJSON *newitem);
-extern void cJSON_ReplaceItemInObject(cJSON *object,const char *string,cJSON *newitem);
+CJSON_PUBLIC(void) cJSON_InsertItemInArray(cJSON *array, int which, cJSON *newitem); /* Shifts pre-existing items to the right. */
+CJSON_PUBLIC(cJSON_bool) cJSON_ReplaceItemViaPointer(cJSON * const parent, cJSON * const item, cJSON * replacement);
+CJSON_PUBLIC(void) cJSON_ReplaceItemInArray(cJSON *array, int which, cJSON *newitem);
+CJSON_PUBLIC(void) cJSON_ReplaceItemInObject(cJSON *object,const char *string,cJSON *newitem);
+CJSON_PUBLIC(void) cJSON_ReplaceItemInObjectCaseSensitive(cJSON *object,const char *string,cJSON *newitem);
 
 /* Duplicate a cJSON item */
-extern cJSON *cJSON_Duplicate(cJSON *item,int recurse);
+CJSON_PUBLIC(cJSON *) cJSON_Duplicate(const cJSON *item, cJSON_bool recurse);
 /* Duplicate will create a new, identical cJSON item to the one you pass, in new memory that will
 need to be released. With recurse!=0, it will duplicate any children connected to the item.
 The item->next and ->prev pointers are always zero on return from Duplicate. */
+/* Recursively compare two cJSON items for equality. If either a or b is NULL or invalid, they will be considered unequal.
+ * case_sensitive determines if object keys are treated case sensitive (1) or case insensitive (0) */
+CJSON_PUBLIC(cJSON_bool) cJSON_Compare(const cJSON * const a, const cJSON * const b, const cJSON_bool case_sensitive);
 
-/* ParseWithOpts allows you to require (and check) that the JSON is null terminated, and to retrieve the pointer to the final byte parsed. */
-extern cJSON *cJSON_ParseWithOpts(const char *value,const char **return_parse_end,int require_null_terminated);
 
-/* Macros for creating things quickly. */
-#define cJSON_AddNullToObject(object,name)		cJSON_AddItemToObject(object, name, cJSON_CreateNull())
-#define cJSON_AddTrueToObject(object,name)		cJSON_AddItemToObject(object, name, cJSON_CreateTrue())
-#define cJSON_AddFalseToObject(object,name)		cJSON_AddItemToObject(object, name, cJSON_CreateFalse())
-#define cJSON_AddBoolToObject(object,name,b)	cJSON_AddItemToObject(object, name, cJSON_CreateBool(b))
-#define cJSON_AddNumberToObject(object,name,n)	cJSON_AddItemToObject(object, name, cJSON_CreateNumber(n))
-#define cJSON_AddStringToObject(object,name,s)	cJSON_AddItemToObject(object, name, cJSON_CreateString(s))
+CJSON_PUBLIC(void) cJSON_Minify(char *json);
+
+/* Helper functions for creating and adding items to an object at the same time.
+ * They return the added item or NULL on failure. */
+CJSON_PUBLIC(cJSON*) cJSON_AddNullToObject(cJSON * const object, const char * const name);
+CJSON_PUBLIC(cJSON*) cJSON_AddTrueToObject(cJSON * const object, const char * const name);
+CJSON_PUBLIC(cJSON*) cJSON_AddFalseToObject(cJSON * const object, const char * const name);
+CJSON_PUBLIC(cJSON*) cJSON_AddBoolToObject(cJSON * const object, const char * const name, const cJSON_bool boolean);
+CJSON_PUBLIC(cJSON*) cJSON_AddNumberToObject(cJSON * const object, const char * const name, const double number);
+CJSON_PUBLIC(cJSON*) cJSON_AddStringToObject(cJSON * const object, const char * const name, const char * const string);
+CJSON_PUBLIC(cJSON*) cJSON_AddRawToObject(cJSON * const object, const char * const name, const char * const raw);
+CJSON_PUBLIC(cJSON*) cJSON_AddObjectToObject(cJSON * const object, const char * const name);
+CJSON_PUBLIC(cJSON*) cJSON_AddArrayToObject(cJSON * const object, const char * const name);
 
 /* When assigning an integer value, it needs to be propagated to valuedouble too. */
-#define cJSON_SetIntValue(object,val)			((object)?(object)->valueint=(object)->valuedouble=(val):(val))
+#define cJSON_SetIntValue(object, number) ((object) ? (object)->valueint = (object)->valuedouble = (number) : (number))
+/* helper for the cJSON_SetNumberValue macro */
+CJSON_PUBLIC(double) cJSON_SetNumberHelper(cJSON *object, double number);
+#define cJSON_SetNumberValue(object, number) ((object != NULL) ? cJSON_SetNumberHelper(object, (double)number) : (number))
+
+/* Macro for iterating over an array or object */
+#define cJSON_ArrayForEach(element, array) for(element = (array != NULL) ? (array)->child : NULL; element != NULL; element = element->next)
+
+/* malloc/free objects using the malloc/free functions that have been set with cJSON_InitHooks */
+CJSON_PUBLIC(void *) cJSON_malloc(size_t size);
+CJSON_PUBLIC(void) cJSON_free(void *object);
 
 #ifdef __cplusplus
 }

jenkins/build-opm-module.sh

@@ -2,6 +2,10 @@
 
 declare -A configurations
 
+declare -A EXTRA_MODULE_FLAGS
+EXTRA_MODULE_FLAGS[opm-simulators]="-DBUILD_EBOS_EXTENSIONS=ON -DBUILD_EBOS_DEBUG_EXTENSIONS=ON -DBUILD_FLOW_VARIANTS=ON"
+EXTRA_MODULE_FLAGS[opm-common]="-DOPM_ENABLE_PYTHON=ON -DOPM_ENABLE_EMBEDDED_PYTHON=ON -DOPM_INSTALL_PYTHON=ON"
+
 # Parse revisions from trigger comment and setup arrays
 # Depends on: 'upstreams', upstreamRev',
 #             'downstreams', 'downstreamRev',
@@ -79,10 +83,26 @@ function printHeader {
 # $2 = 0 to build and install module, 1 to build and test module
 # $3 = Source root of module to build
 function build_module {
-  cmake $3 -DCMAKE_BUILD_TYPE=Release -DBUILD_TESTING=$2 -DCMAKE_TOOLCHAIN_FILE=${configurations[$configuration]} $1
+  CMAKE_PARAMS="$1"
+  DO_TEST_FLAG="$2"
+  MOD_SRC_DIR="$3"
+  cmake "$MOD_SRC_DIR" -DCMAKE_BUILD_TYPE=Release -DBUILD_TESTING=$DO_TEST_FLAG -DCMAKE_TOOLCHAIN_FILE=${configurations[$configuration]} $CMAKE_PARAMS
   test $? -eq 0 || exit 1
-  if test $2 -eq 1
+  if test $DO_TEST_FLAG -eq 1
   then
+
+    pushd "$CWD"
+    cd "$MOD_SRC_DIR"
+    if test -x "./jenkins/pre-build.sh"; then
+        echo "Running pre-build script"
+        if ! "./jenkins/pre-build.sh"; then
+            exit 1
+        fi
+    else
+        echo "No pre-build script detected"
+    fi
+    popd
+
     if [ ! -z $BUILDTHREADS ]
     then
       cmake --build . -- -j$BUILDTHREADS
@@ -90,11 +110,12 @@ function build_module {
       cmake --build .
     fi
     test $? -eq 0 || exit 2
+    TESTTHREADS=${TESTTHREADS:-1}
     if test -z "$CTEST_CONFIGURATION"
     then
-      ctest -T Test --no-compress-output
+      ctest -T Test --no-compress-output -j$TESTTHREADS
     else
-      ctest -C $CTEST_CONFIGURATION --timeout 5000 -T Test --no-compress-output
+      ctest -j$TESTTHREADS -C $CTEST_CONFIGURATION --timeout 5000 -T Test --no-compress-output
     fi
 
     # Convert to junit format
@@ -112,6 +133,7 @@ function build_module {
     else
       cmake --build . --target install
     fi
+    test $? -eq 0 || exit 3
   fi
 }
 
@@ -124,12 +146,7 @@ function clone_module {
   mkdir -p $WORKSPACE/deps/$1
   cd $WORKSPACE/deps/$1
   git init .
-  if [ "$1" == "libecl" ]
-  then
-    git remote add origin https://github.com/Statoil/$1
-  else
-    git remote add origin https://github.com/OPM/$1
-  fi
+  git remote add origin https://github.com/OPM/$1
   git fetch --depth 1 origin $2:branch_to_build
   git checkout branch_to_build
   git log HEAD -1 | cat
@@ -163,7 +180,7 @@ function build_upstreams {
   do
     echo "Building upstream $upstream=${upstreamRev[$upstream]} configuration=$configuration"
     # Build upstream and execute installation
-    clone_and_build_module $upstream "-DCMAKE_PREFIX_PATH=$WORKSPACE/$configuration/install -DCMAKE_INSTALL_PREFIX=$WORKSPACE/$configuration/install" ${upstreamRev[$upstream]} $WORKSPACE/$configuration
+    clone_and_build_module $upstream "-DCMAKE_PREFIX_PATH=$WORKSPACE/$configuration/install -DCMAKE_INSTALL_PREFIX=$WORKSPACE/$configuration/install ${EXTRA_MODULE_FLAGS[$upstream]}" ${upstreamRev[$upstream]} $WORKSPACE/$configuration
     test $? -eq 0 || exit 1
   done
   test $? -eq 0 || exit 1
@@ -178,7 +195,7 @@ function build_downstreams {
   do
     echo "Building downstream $downstream=${downstreamRev[$downstream]} configuration=$configuration"
     # Build downstream and execute installation
-    clone_and_build_module $downstream "-DCMAKE_PREFIX_PATH=$WORKSPACE/$configuration/install -DCMAKE_INSTALL_PREFIX=$WORKSPACE/$configuration/install -DOPM_TESTS_ROOT=$OPM_TESTS_ROOT" ${downstreamRev[$downstream]} $WORKSPACE/$configuration 1
+    clone_and_build_module $downstream "-DCMAKE_PREFIX_PATH=$WORKSPACE/$configuration/install -DCMAKE_INSTALL_PREFIX=$WORKSPACE/$configuration/install -DOPM_TESTS_ROOT=$OPM_TESTS_ROOT ${EXTRA_MODULE_FLAGS[$downstream]}" ${downstreamRev[$downstream]} $WORKSPACE/$configuration 1
     test $? -eq 0 || exit 1
 
     # Installation for downstream
@@ -215,7 +232,7 @@ function build_module_full {
     mkdir -p $configuration/build-$1
     cd $configuration/build-$1
     echo "Building main module $1=$sha1 configuration=$configuration"
-    build_module "-DCMAKE_INSTALL_PREFIX=$WORKSPACE/$configuration/install -DOPM_TESTS_ROOT=$OPM_TESTS_ROOT" 1 $WORKSPACE
+    build_module "-DCMAKE_INSTALL_PREFIX=$WORKSPACE/$configuration/install -DOPM_TESTS_ROOT=$OPM_TESTS_ROOT ${EXTRA_MODULE_FLAGS[$1]}" 1 $WORKSPACE
     test $? -eq 0 || exit 1
     cmake --build . --target install
     test $? -eq 0 || exit 1

jenkins/build.sh

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

jenkins/setup-opm-tests.sh

@@ -16,9 +16,14 @@ then
       cp $OPM_TESTS_ROOT_PREDEFINED $WORKSPACE/deps/opm-tests -R
     fi
   else
-    # Specified in trigger, download it
-    source $WORKSPACE/deps/opm-common/jenkins/build-opm-module.sh
-    clone_module opm-tests $OPM_TESTS_REVISION
+    # We need a full repo checkout
+    cp $OPM_TESTS_ROOT_PREDEFINED $WORKSPACE/deps/opm-tests -R
+    pushd $WORKSPACE/deps/opm-tests
+    # Then we fetch the PR branch
+    git remote add PR https://github.com/OPM/opm-tests
+    git fetch --depth 1 PR $OPM_TESTS_REVISION:branch_to_build
+    git checkout branch_to_build
+    popd
   fi
 else
   if ! test -d $WORKSPACE/deps/opm-tests

jenkins/update-opm-tests.sh

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

msim/include/opm/msim/msim.hpp

@@ -0,0 +1,51 @@
+#ifndef ISIM_MAIN_HPP
+#define ISIM_MAIN_HPP
+
+#include <functional>
+#include <string>
+#include <map>
+
+#include <opm/parser/eclipse/Parser/ErrorGuard.hpp>
+#include <opm/parser/eclipse/Deck/Deck.hpp>
+#include <opm/parser/eclipse/EclipseState/EclipseState.hpp>
+#include <opm/parser/eclipse/EclipseState/EclipseState.hpp>
+#include <opm/parser/eclipse/EclipseState/SummaryConfig/SummaryConfig.hpp>
+#include <opm/parser/eclipse/EclipseState/Schedule/Schedule.hpp>
+
+#include <opm/output/data/Solution.hpp>
+#include <opm/output/data/Wells.hpp>
+
+
+namespace Opm {
+
+class EclipseIO;
+class ParseContext;
+class Parser;
+class SummaryState;
+class msim {
+
+public:
+    using well_rate_function = double(const EclipseState&, const Schedule&, const SummaryState& st, const data::Solution&, size_t report_step, double seconds_elapsed);
+    using solution_function = void(const EclipseState&, const Schedule&, data::Solution&, size_t report_step, double seconds_elapsed);
+
+    msim(const EclipseState& state);
+
+    void well_rate(const std::string& well, data::Rates::opt rate, std::function<well_rate_function> func);
+    void solution(const std::string& field, std::function<solution_function> func);
+    void run(Schedule& schedule, EclipseIO& io, bool report_only);
+    void post_step(Schedule& schedule, const SummaryState& st, data::Solution& sol, data::Wells& well_data, size_t report_step) const;
+private:
+
+    void run_step(const Schedule& schedule, SummaryState& st, data::Solution& sol, data::Wells& well_data, size_t report_step, EclipseIO& io) const;
+    void run_step(const Schedule& schedule, SummaryState& st, data::Solution& sol, data::Wells& well_data, size_t report_step, double dt, EclipseIO& io) const;
+    void output(SummaryState& st, size_t report_step, bool substep, double seconds_elapsed, const data::Solution& sol, const data::Wells& well_data, EclipseIO& io) const;
+    void simulate(const Schedule& schedule, const SummaryState& st, data::Solution& sol, data::Wells& well_data, size_t report_step, double seconds_elapsed, double time_step) const;
+
+    EclipseState state;
+    std::map<std::string, std::map<data::Rates::opt, std::function<well_rate_function>>> well_rates;
+    std::map<std::string, std::function<solution_function>> solutions;
+};
+}
+
+
+#endif

msim/src/msim.cpp

@@ -0,0 +1,161 @@
+/*
+  Copyright 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/>.
+*/
+
+#include <iostream>
+
+#include <opm/output/eclipse/EclipseIO.hpp>
+#include <opm/output/eclipse/RestartValue.hpp>
+#include <opm/output/eclipse/Summary.hpp>
+#include <opm/output/data/Solution.hpp>
+#include <opm/output/data/Wells.hpp>
+
+#include <opm/parser/eclipse/EclipseState/Schedule/SummaryState.hpp>
+#include <opm/parser/eclipse/EclipseState/Schedule/Action/ActionContext.hpp>
+#include <opm/parser/eclipse/Parser/Parser.hpp>
+#include <opm/parser/eclipse/Parser/ParseContext.hpp>
+#include <opm/parser/eclipse/Parser/ErrorGuard.hpp>
+#include <opm/msim/msim.hpp>
+
+namespace Opm {
+
+msim::msim(const EclipseState& state_arg) :
+    state(state_arg)
+{}
+
+void msim::run(Schedule& schedule, EclipseIO& io, bool report_only) {
+    const double week = 7 * 86400;
+    data::Solution sol;
+    data::Wells well_data;
+    SummaryState st(std::chrono::system_clock::from_time_t(schedule.getStartTime()));
+
+    io.writeInitial();
+    for (size_t report_step = 1; report_step < schedule.size(); report_step++) {
+        if (report_only)
+            run_step(schedule, st, sol, well_data, report_step, io);
+        else {
+            double time_step = std::min(week, 0.5*schedule.stepLength(report_step - 1));
+            run_step(schedule, st, sol, well_data, report_step, time_step, io);
+        }
+        post_step(schedule, st, sol, well_data, report_step);
+    }
+}
+
+
+void msim::post_step(Schedule& schedule, const SummaryState& st, data::Solution& /* sol */, data::Wells& /* well_data */, size_t report_step) const {
+    const auto& actions = schedule.actions(report_step);
+    if (actions.empty())
+        return;
+
+    Action::Context context( st );
+
+    auto sim_time = schedule.simTime(report_step);
+    for (const auto& action : actions.pending(sim_time)) {
+        auto result = action->eval(sim_time, context);
+        if (result)
+            schedule.applyAction(report_step, *action, result);
+    }
+}
+
+
+
+void msim::run_step(const Schedule& schedule, SummaryState& st, data::Solution& sol, data::Wells& well_data, size_t report_step, EclipseIO& io) const {
+    this->run_step(schedule, st, sol, well_data, report_step, schedule.stepLength(report_step - 1), io);
+}
+
+
+void msim::run_step(const Schedule& schedule, SummaryState& st, data::Solution& sol, data::Wells& well_data, size_t report_step, double dt, EclipseIO& io) const {
+    double start_time = schedule.seconds(report_step - 1);
+    double end_time = schedule.seconds(report_step);
+    double seconds_elapsed = start_time;
+
+    while (seconds_elapsed < end_time) {
+        double time_step = dt;
+        if ((seconds_elapsed + time_step) > end_time)
+            time_step = end_time - seconds_elapsed;
+
+        this->simulate(schedule, st, sol, well_data, report_step, seconds_elapsed, time_step);
+
+        seconds_elapsed += time_step;
+
+        io.summary().eval(st,
+                          report_step,
+                          seconds_elapsed,
+                          this->state,
+                          schedule,
+                          well_data,
+                          {});
+
+        this->output(st,
+                     report_step,
+                     (seconds_elapsed < end_time),
+                     seconds_elapsed,
+                     sol,
+                     well_data,
+                     io);
+    }
+}
+
+
+
+void msim::output(SummaryState& st, size_t report_step, bool /* substep */, double seconds_elapsed, const data::Solution& sol, const data::Wells& well_data, EclipseIO& io) const {
+    RestartValue value(sol, well_data);
+    io.writeTimeStep(st,
+                     report_step,
+                     false,
+                     seconds_elapsed,
+                     value);
+}
+
+
+void msim::simulate(const Schedule& schedule, const SummaryState& st, data::Solution& sol, data::Wells& well_data, size_t report_step, double seconds_elapsed, double time_step) const {
+    for (const auto& sol_pair : this->solutions) {
+        auto func = sol_pair.second;
+        func(this->state, schedule, sol, report_step, seconds_elapsed + time_step);
+    }
+
+    for (const auto& well_pair : this->well_rates) {
+        const std::string& well_name = well_pair.first;
+        data::Well& well = well_data[well_name];
+        for (const auto& rate_pair : well_pair.second) {
+            auto rate = rate_pair.first;
+            auto func = rate_pair.second;
+
+            well.rates.set(rate, func(this->state, schedule, st, sol, report_step, seconds_elapsed + time_step));
+        }
+
+        // This is complete bogus; a temporary fix to pass an assert() in the
+        // the restart output.
+        well.connections.resize(100);
+    }
+}
+
+
+void msim::well_rate(const std::string& well, data::Rates::opt rate, std::function<well_rate_function> func) {
+    this->well_rates[well][rate] = func;
+}
+
+
+void msim::solution(const std::string& field, std::function<solution_function> func) {
+    this->solutions[field] = func;
+}
+
+
+}
+
+

opm-common-prereqs.cmake

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

opm/common/OpmLog/Location.hpp

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

opm/common/OpmLog/LogUtil.hpp

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

opm/common/utility/ActiveGridCells.hpp

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

opm/common/utility/FileSystem.hpp

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

opm/common/utility/TimeService.hpp

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

opm/common/utility/numeric/RootFinders.hpp

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

opm/common/utility/numeric/calculateCellVol.hpp

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

opm/common/utility/platform_dependent/disable_warnings.h

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

opm/io/eclipse/EGrid.hpp

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

opm/io/eclipse/ERft.hpp

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

opm/io/eclipse/ERst.hpp

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

opm/io/eclipse/ESmry.hpp

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

opm/io/eclipse/EclFile.hpp

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

opm/io/eclipse/EclIOdata.hpp

@@ -0,0 +1,69 @@
+/*
+  Copyright 2019 Equinor ASA.
+
+  This file is part of the Open Porous Media project (OPM).
+
+  OPM is free software: you can redistribute it and/or modify
+  it under the terms of the GNU General Public License as published by
+  the Free Software Foundation, either version 3 of the License, or
+  (at your option) any later version.
+
+  OPM is distributed in the hope that it will be useful,
+  but WITHOUT ANY WARRANTY; without even the implied warranty of
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  GNU General Public License for more details.
+
+  You should have received a copy of the GNU General Public License
+  along with OPM.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#ifndef OPM_IO_ECLIODATA_HPP
+#define OPM_IO_ECLIODATA_HPP
+
+#include <tuple>
+
+namespace Opm { namespace EclIO {
+
+    // type MESS have no assisiated data 
+    enum eclArrType {
+        INTE, REAL, DOUB, CHAR, LOGI, MESS
+    };
+
+    // named constants related to binary file format
+    const unsigned int true_value = 0xffffffff;
+    const unsigned int false_value = 0x00000000;
+
+    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      
+
+    // named constants related to formatted file file format
+    const int MaxNumBlockInte = 1000;    // maximum number of Inte values in block => hard line shift
+    const int MaxNumBlockReal = 1000;    // maximum number of Real values in block => hard line shift
+    const int MaxNumBlockDoub = 1000;    // maximum number of Doub values in block => hard line shift
+    const int MaxNumBlockLogi = 1000;    // maximum number of Logi values in block => hard line shift
+    const int MaxNumBlockChar =  105;    // maximum number of Char values in block => hard line shift
+
+    const int numColumnsInte = 6;        // number of columns for Inte values  
+    const int numColumnsReal = 4;        // number of columns for Real values  
+    const int numColumnsDoub = 3;        // number of columns for Doub values  
+    const int numColumnsLogi = 25;       // number of columns for Logi values  
+    const int numColumnsChar = 7;        // number of columns for Char values  
+
+    const int columnWidthInte = 12;      // number of characters fore each Inte Element 
+    const int columnWidthReal = 17;      // number of characters fore each Inte Element 
+    const int columnWidthDoub = 23;      // number of characters fore each Inte Element 
+    const int columnWidthLogi = 3;       // number of characters fore each Inte Element 
+    const int columnWidthChar = 11;      // number of characters fore each Inte Element 
+
+}} // namespace Opm::EclIO
+
+#endif // OPM_IO_ECLIODATA_HPP

opm/io/eclipse/EclOutput.hpp

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

opm/io/eclipse/EclUtil.hpp

@@ -0,0 +1,40 @@
+/*
+   Copyright 2019 Equinor ASA.
+
+   This file is part of the Open Porous Media project (OPM).
+
+   OPM is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by
+   the Free Software Foundation, either version 3 of the License, or
+   (at your option) any later version.
+
+   OPM is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with OPM.  If not, see <http://www.gnu.org/licenses/>.
+   */
+
+#ifndef OPM_IO_ECLUTIL_HPP
+#define OPM_IO_ECLUTIL_HPP
+
+#include <opm/io/eclipse/EclIOdata.hpp>
+
+#include <string>
+#include <tuple>
+
+namespace Opm { namespace EclIO {
+
+    int flipEndianInt(int num);
+    float flipEndianFloat(float num);
+    double flipEndianDouble(double num);
+
+    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);
+
+}} // namespace Opm::EclIO
+
+#endif // OPM_IO_ECLUTIL_HPP

opm/io/eclipse/OutputStream.hpp

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

opm/io/eclipse/PaddedOutputString.hpp

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

opm/io/eclipse/rst/connection.hpp

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

opm/io/eclipse/rst/group.hpp

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

opm/io/eclipse/rst/header.hpp

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

opm/io/eclipse/rst/segment.hpp

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

opm/io/eclipse/rst/state.hpp

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

opm/io/eclipse/rst/well.hpp

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

opm/json/JsonObject.hpp

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

opm/output/data/Aquifer.hpp

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

opm/output/data/Cells.hpp

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

opm/output/data/Wells.hpp

@@ -20,14 +20,18 @@
 #ifndef OPM_OUTPUT_WELLS_HPP
 #define OPM_OUTPUT_WELLS_HPP
 
+#include <algorithm>
+#include <cstddef>
 #include <initializer_list>
 #include <map>
-#include <algorithm>
 #include <stdexcept>
 #include <string>
 #include <type_traits>
+#include <unordered_map>
 #include <vector>
 
+#include <opm/parser/eclipse/EclipseState/Schedule/Well/Well.hpp>
+
 namespace Opm {
 
     namespace data {
@@ -56,6 +60,12 @@ namespace Opm {
                 reservoir_water   = (1 << 8),
                 reservoir_oil     = (1 << 9),
                 reservoir_gas     = (1 << 10),
+                productivity_index_water = (1 << 11),
+                productivity_index_oil   = (1 << 12),
+                productivity_index_gas   = (1 << 13),
+                well_potential_water   = (1 << 14),
+                well_potential_oil     = (1 << 15),
+                well_potential_gas     = (1 << 16),
             };
 
             using enum_size = std::underlying_type< opt >::type;
@@ -74,14 +84,16 @@ namespace Opm {
             /// chaining.
             inline Rates& set( opt m, double value );
 
-            /// true if any option is set; false otherwise
-            inline bool any() const noexcept;
+            /// Returns true if any of the rates oil, gas, water is nonzero
+            inline bool flowing() const;
 
             template <class MessageBufferType>
             void write(MessageBufferType& buffer) const;
             template <class MessageBufferType>
             void read(MessageBufferType& buffer);
 
+            bool operator==(const Rates& rat2) const;
+
         private:
             double& get_ref( opt );
             const double& get_ref( opt ) const;
@@ -99,11 +111,17 @@ namespace Opm {
             double reservoir_water = 0.0;
             double reservoir_oil = 0.0;
             double reservoir_gas = 0.0;
+            double productivity_index_water = 0.0;
+            double productivity_index_oil = 0.0;
+            double productivity_index_gas = 0.0;
+            double well_potential_water = 0.0;
+            double well_potential_oil = 0.0;
+            double well_potential_gas = 0.0;
     };
 
     struct Connection {
         using global_index = size_t;
-        static const constexpr int restart_size = 2;
+        static const constexpr int restart_size = 6;
 
         global_index index;
         Rates rates;
@@ -114,12 +132,68 @@ namespace Opm {
         double cell_saturation_gas;
         double effective_Kh;
 
+        bool operator==(const Connection& conn2) const
+        {
+            return index == conn2.index &&
+                   rates == conn2.rates &&
+                   pressure == conn2.pressure &&
+                   reservoir_rate == conn2.reservoir_rate &&
+                   cell_pressure == conn2.cell_pressure &&
+                   cell_saturation_water == conn2.cell_saturation_water &&
+                   cell_saturation_gas == conn2.cell_saturation_gas &&
+                   effective_Kh == conn2.effective_Kh;
+        }
+
         template <class MessageBufferType>
         void write(MessageBufferType& buffer) const;
         template <class MessageBufferType>
         void read(MessageBufferType& buffer);
     };
 
+    struct Segment {
+        Rates rates;
+        double pressure;
+        std::size_t segNumber;
+
+        bool operator==(const Segment& seg2) const
+        {
+          return rates == seg2.rates &&
+                 pressure == seg2.pressure &&
+                 segNumber == seg2.segNumber;
+        }
+
+        template <class MessageBufferType>
+        void write(MessageBufferType& buffer) const;
+
+        template <class MessageBufferType>
+        void read(MessageBufferType& buffer);
+    };
+
+    struct CurrentControl {
+        bool isProducer{true};
+
+        ::Opm::Well::ProducerCMode prod {
+            ::Opm::Well::ProducerCMode::CMODE_UNDEFINED
+        };
+
+        ::Opm::Well::InjectorCMode inj {
+            ::Opm::Well::InjectorCMode::CMODE_UNDEFINED
+        };
+
+        bool operator==(const CurrentControl& rhs) const
+        {
+            return (this->isProducer == rhs.isProducer)
+                && ((this->isProducer && (this->prod == rhs.prod)) ||
+                    (!this->isProducer && (this->inj == rhs.inj)));
+        }
+
+        template <class MessageBufferType>
+        void write(MessageBufferType& buffer) const;
+
+        template <class MessageBufferType>
+        void read(MessageBufferType& buffer);
+    };
+
     struct Well {
         Rates rates;
         double bhp;
@@ -127,12 +201,26 @@ namespace Opm {
         double temperature;
         int control;
         std::vector< Connection > connections;
+        std::unordered_map<std::size_t, Segment> segments;
+        CurrentControl current_control;
 
         inline bool flowing() const noexcept;
         template <class MessageBufferType>
         void write(MessageBufferType& buffer) const;
         template <class MessageBufferType>
         void read(MessageBufferType& buffer);
+
+        bool operator==(const Well& well2) const
+        {
+          return rates == well2.rates &&
+                 bhp == well2.bhp &&
+                 thp == well2.thp &&
+                 temperature == well2.temperature &&
+                 control == well2.control &&
+                 connections == well2.connections &&
+                 segments == well2.segments &&
+                 current_control == well2.current_control;
+        }
     };
 
 
@@ -187,10 +275,9 @@ namespace Opm {
                 this->emplace(name, well);
             }
         }
-
     };
 
-    using Wells = WellRates;    
+    using Wells = WellRates;
 
 
     /* IMPLEMENTATIONS */
@@ -226,6 +313,28 @@ namespace Opm {
         return *this;
     }
 
+    inline bool Rates::operator==(const Rates& rate) const
+    {
+      return mask == rate.mask &&
+             wat == rate.wat &&
+             oil == rate.oil &&
+             gas == rate.gas &&
+             polymer == rate.polymer &&
+             solvent == rate.solvent &&
+             energy == rate.energy &&
+             dissolved_gas == rate.dissolved_gas &&
+             vaporized_oil == rate.vaporized_oil &&
+             reservoir_water == rate.reservoir_water &&
+             reservoir_oil == rate.reservoir_oil &&
+             reservoir_gas == rate.reservoir_gas &&
+             productivity_index_water == rate.productivity_index_water &&
+             productivity_index_gas == rate.productivity_index_gas &&
+             productivity_index_oil == rate.productivity_index_oil &&
+             well_potential_water == rate.well_potential_water &&
+             well_potential_oil == rate.well_potential_oil &&
+             well_potential_gas == rate.well_potential_gas;
+    }
+
 
     /*
      * To avoid error-prone and repetitve work when extending rates with new
@@ -249,6 +358,12 @@ namespace Opm {
             case opt::reservoir_water: return this->reservoir_water;
             case opt::reservoir_oil: return this->reservoir_oil;
             case opt::reservoir_gas: return this->reservoir_gas;
+            case opt::productivity_index_water: return this->productivity_index_water;
+            case opt::productivity_index_oil: return this->productivity_index_oil;
+            case opt::productivity_index_gas: return this->productivity_index_gas;
+            case opt::well_potential_water: return this->well_potential_water;
+            case opt::well_potential_oil: return this->well_potential_oil;
+            case opt::well_potential_gas: return this->well_potential_gas;
         }
 
         throw std::invalid_argument(
@@ -264,12 +379,15 @@ namespace Opm {
                 );
     }
 
-    inline bool Rates::any() const noexcept {
-        return static_cast< enum_size >( this->mask ) != 0;
+
+    bool inline Rates::flowing() const {
+        return ((this->wat != 0) ||
+                (this->oil != 0) ||
+                (this->gas != 0));
     }
 
     inline bool Well::flowing() const noexcept {
-        return this->rates.any();
+        return this->rates.flowing();
     }
 
     template <class MessageBufferType>
@@ -286,6 +404,12 @@ namespace Opm {
             buffer.write(this->reservoir_water);
             buffer.write(this->reservoir_oil);
             buffer.write(this->reservoir_gas);
+            buffer.write(this->productivity_index_water);
+            buffer.write(this->productivity_index_oil);
+            buffer.write(this->productivity_index_gas);
+            buffer.write(this->well_potential_water);
+            buffer.write(this->well_potential_oil);
+            buffer.write(this->well_potential_gas);
     }
 
     template <class MessageBufferType>
@@ -300,6 +424,25 @@ namespace Opm {
             buffer.write(this->effective_Kh);
     }
 
+    template <class MessageBufferType>
+    void Segment::write(MessageBufferType& buffer) const {
+        buffer.write(this->segNumber);
+        this->rates.write(buffer);
+        buffer.write(this->pressure);
+    }
+
+    template <class MessageBufferType>
+    void CurrentControl::write(MessageBufferType& buffer) const
+    {
+        buffer.write(this->isProducer);
+        if (this->isProducer) {
+            buffer.write(this->prod);
+        }
+        else {
+            buffer.write(this->inj);
+        }
+    }
+
     template <class MessageBufferType>
     void Well::write(MessageBufferType& buffer) const {
         this->rates.write(buffer);
@@ -311,6 +454,18 @@ namespace Opm {
         buffer.write(size);
         for (const Connection& comp : this->connections)
             comp.write(buffer);
+
+        {
+            const auto nSeg =
+                static_cast<unsigned int>(this->segments.size());
+            buffer.write(nSeg);
+
+            for (const auto& seg : this->segments) {
+                seg.second.write(buffer);
+            }
+        }
+
+        this->current_control.write(buffer);
     }
 
     template <class MessageBufferType>
@@ -327,6 +482,12 @@ namespace Opm {
             buffer.read(this->reservoir_water);
             buffer.read(this->reservoir_oil);
             buffer.read(this->reservoir_gas);
+            buffer.read(this->productivity_index_water);
+            buffer.read(this->productivity_index_oil);
+            buffer.read(this->productivity_index_gas);
+            buffer.read(this->well_potential_water);
+            buffer.read(this->well_potential_oil);
+            buffer.read(this->well_potential_gas);
     }
 
   template <class MessageBufferType>
@@ -341,6 +502,25 @@ namespace Opm {
             buffer.read(this->effective_Kh);
    }
 
+    template <class MessageBufferType>
+    void Segment::read(MessageBufferType& buffer) {
+        buffer.read(this->segNumber);
+        this->rates.read(buffer);
+        buffer.read(this->pressure);
+    }
+
+    template <class MessageBufferType>
+    void CurrentControl::read(MessageBufferType& buffer)
+    {
+        buffer.read(this->isProducer);
+        if (this->isProducer) {
+            buffer.read(this->prod);
+        }
+        else {
+            buffer.read(this->inj);
+        }
+    }
+
     template <class MessageBufferType>
     void Well::read(MessageBufferType& buffer) {
         this->rates.read(buffer);
@@ -348,6 +528,8 @@ namespace Opm {
         buffer.read(this->thp);
         buffer.read(this->temperature);
         buffer.read(this->control);
+
+        // Connection information
         unsigned int size = 0.0; //this->connections.size();
         buffer.read(size);
         this->connections.resize(size);
@@ -356,9 +538,27 @@ namespace Opm {
             auto& comp = this->connections[ i ];
             comp.read(buffer);
         }
+
+        // Segment information (if applicable)
+        const auto nSeg = [&buffer]() -> unsigned int
+        {
+            auto n = 0u;
+            buffer.read(n);
+
+            return n;
+        }();
+
+        for (auto segID = 0*nSeg; segID < nSeg; ++segID) {
+            auto seg = Segment{};
+            seg.read(buffer);
+
+            const auto segNumber = seg.segNumber;
+            this->segments.emplace(segNumber, std::move(seg));
+        }
+
+        this->current_control.read(buffer);
     }
 
-}
-}
+}} // Opm::data
 
 #endif //OPM_OUTPUT_WELLS_HPP

opm/output/eclipse/AggregateActionxData.hpp

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

opm/output/eclipse/AggregateConnectionData.hpp

@@ -0,0 +1,75 @@
+/*
+  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_AGGREGATE_CONNECTION_DATA_HPP
+#define OPM_AGGREGATE_CONNECTION_DATA_HPP
+
+#include <opm/output/eclipse/WindowedArray.hpp>
+
+#include <cstddef>
+#include <string>
+#include <vector>
+
+namespace Opm {
+    class EclipseGrid;
+    class Schedule;
+    class UnitSystem;
+} // Opm
+
+namespace Opm { namespace data {
+    class WellRates;
+}}
+
+namespace Opm { namespace RestartIO { namespace Helpers {
+
+    class AggregateConnectionData
+    {
+    public:
+        explicit AggregateConnectionData(const std::vector<int>& inteHead);
+
+        void captureDeclaredConnData(const Opm::Schedule&        sched,
+                                     const Opm::EclipseGrid&     grid,
+                                     const Opm::UnitSystem&      units,
+                                     const Opm::data::WellRates& xw,
+                                     const std::size_t           sim_step);
+
+        const std::vector<int>& getIConn() const
+        {
+            return this->iConn_.data();
+        }
+
+        const std::vector<float>& getSConn() const
+        {
+            return this->sConn_.data();
+        }
+
+        const std::vector<double>& getXConn() const
+        {
+            return this->xConn_.data();
+        }
+
+    private:
+        WindowedMatrix<int> iConn_;
+        WindowedMatrix<float> sConn_;
+        WindowedMatrix<double> xConn_;
+    };
+
+}}} // Opm::RestartIO::Helpers
+
+#endif // OPM_AGGREGATE_CONNECTION_DATA_HPP

opm/output/eclipse/AggregateGroupData.hpp

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

opm/output/eclipse/AggregateMSWData.hpp

@@ -0,0 +1,115 @@
+/*
+  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_MSW_DATA_HPP
+#define OPM_AGGREGATE_MSW_DATA_HPP
+
+#include <opm/output/data/Wells.hpp>
+#include <opm/output/eclipse/WindowedArray.hpp>
+
+#include <string>
+#include <vector>
+
+namespace Opm {
+    class Phases;
+    class Schedule;
+    class EclipseGrid;
+    class UnitSystem;
+    class SummaryState;
+} // Opm
+
+namespace Opm { namespace RestartIO { namespace Helpers {
+
+    struct BranchSegmentPar {
+      int outletS;
+      int noSegInBranch;
+      int firstSeg;
+      int lastSeg;
+      int branch;
+    };
+
+    struct SegmentSetSourceSinkTerms {
+      std::vector<double> qosc;
+      std::vector<double> qwsc;
+      std::vector<double> qgsc;
+    };
+
+    struct SegmentSetFlowRates {
+      std::vector<double> sofr;
+      std::vector<double> swfr;
+      std::vector<double> sgfr;
+    };
+
+    class AggregateMSWData
+    {
+    public:
+        explicit AggregateMSWData(const std::vector<int>& inteHead);
+
+        void captureDeclaredMSWData(const Opm::Schedule& sched,
+                                     const std::size_t    rptStep,
+				     const Opm::UnitSystem& units,
+				     const std::vector<int>& inteHead,
+				     const Opm::EclipseGrid&  grid,
+				     const Opm::SummaryState& smry,
+				     const Opm::data::WellRates&  wr
+				   );
+
+        /// Retrieve Integer Multisegment well data Array.
+        const std::vector<int>& getISeg() const
+        {
+            return this->iSeg_.data();
+        }
+
+        /// Retrieve Double precision segment data Array.
+        const std::vector<double>& getRSeg() const
+        {
+            return this->rSeg_.data();
+        }
+
+        /// Retrieve Integer multisegment well data Array for lateral branches  (ILBS)
+        const std::vector<int>& getILBs() const
+        {
+            return this->iLBS_.data();
+        }
+
+        /// Retrieve Integer multisegment well data Array for lateral branches (ILBR)
+        const std::vector<int>& getILBr() const
+        {
+            return this->iLBR_.data();
+        }
+
+
+    private:
+        /// Aggregate 'ISEG' array (Integer) for all multisegment wells
+        WindowedArray<int> iSeg_;
+
+        /// Aggregate 'RSEG' array (Double) for all multisegment wells
+        WindowedArray<double> rSeg_;
+
+        /// Aggregate 'ILBS' array (Integer) for all multisegment wells
+        WindowedArray<int> iLBS_;
+
+        /// Aggregate 'ILBR' array (Integer) for all multisegment wells
+        WindowedArray<int> iLBR_;
+
+    };
+
+}}} // Opm::RestartIO::Helpers
+
+#endif // OPM_AGGREGATE_WELL_DATA_HPP

opm/output/eclipse/AggregateUDQData.hpp

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

opm/output/eclipse/AggregateWellData.hpp

@@ -20,9 +20,11 @@
 #ifndef OPM_AGGREGATE_WELL_DATA_HPP
 #define OPM_AGGREGATE_WELL_DATA_HPP
 
-#include <opm/output/eclipse/CharArrayNullTerm.hpp>
 #include <opm/output/eclipse/WindowedArray.hpp>
 
+#include <opm/io/eclipse/PaddedOutputString.hpp>
+#include <opm/parser/eclipse/EclipseState/Schedule/Action/ActionResult.hpp>
+
 #include <cstddef>
 #include <string>
 #include <vector>
@@ -38,15 +40,22 @@ namespace Opm { namespace data {
 }} // Opm::data
 
 namespace Opm { namespace RestartIO { namespace Helpers {
+    
+    struct ActionResStatus {
+        std::vector<Opm::Action::Result> result;
+        std::vector<std::string> name;
+    };
 
     class AggregateWellData
     {
     public:
         explicit AggregateWellData(const std::vector<int>& inteHead);
 
-        void captureDeclaredWellData(const Opm::Schedule&   sched,
-                                     const Opm::UnitSystem& units,
-                                     const std::size_t      sim_step);
+	void captureDeclaredWellData(const Schedule&   	sched,
+                        const UnitSystem& 		units,
+                        const std::size_t 		sim_step,
+			const ::Opm::SummaryState&  	smry,
+			const std::vector<int>& 	inteHead);
 
         void captureDynamicWellData(const Opm::Schedule&        sched,
                                     const std::size_t           sim_step,
@@ -72,11 +81,13 @@ namespace Opm { namespace RestartIO { namespace Helpers {
         }
 
         /// Retrieve Character Well Data Array.
-        const std::vector<CharArrayNullTerm<8>>& getZWell() const
+        const std::vector<EclIO::PaddedOutputString<8>>& getZWell() const
         {
             return this->zWell_.data();
         }
 
+        
+        
     private:
         /// Aggregate 'IWEL' array (Integer) for all wells.
         WindowedArray<int> iWell_;
@@ -88,7 +99,7 @@ namespace Opm { namespace RestartIO { namespace Helpers {
         WindowedArray<double> xWell_;
 
         /// Aggregate 'ZWEL' array (Character) for all wells.
-        WindowedArray<CharArrayNullTerm<8>> zWell_;
+        WindowedArray<EclIO::PaddedOutputString<8>> zWell_;
 
         /// Maximum number of groups in model.
         int nWGMax_;

opm/output/eclipse/DoubHEAD.hpp

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

opm/output/eclipse/EclipseIO.hpp

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

opm/output/eclipse/InteHEAD.hpp

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

opm/output/eclipse/LinearisedOutputTable.hpp

@@ -1,4 +1,5 @@
 /*
+  Copyright 2019 Equinor.
   Copyright 2017 Statoil ASA.
 
   This file is part of the Open Porous Media project (OPM).
@@ -35,6 +36,8 @@ namespace Opm {
     public:
         /// Constructor.
         ///
+        /// Padded table entries set to +1.0e+20.
+        ///
         /// \param[in] numTables Number of tables managed by internal
         ///    buffer.  Typically corresponds to maximum value of a region
         ///    ID vector such as SATNUM, IMBNUM, or PVTNUM.
@@ -57,6 +60,33 @@ namespace Opm {
                               const std::size_t numRows,
                               const std::size_t numCols);
 
+        /// Constructor.
+        ///
+        /// \param[in] numTables Number of tables managed by internal
+        ///    buffer.  Typically corresponds to maximum value of a region
+        ///    ID vector such as SATNUM, IMBNUM, or PVTNUM.
+        ///
+        /// \param[in] numPrimary Number of primary look-up keys for the
+        ///    tabular data managed by the internal buffer.  Mostly relevant
+        ///    (i.e., greater than one) for miscible oil ("PVTO") or
+        ///    miscible gas ("PVTG") tables and typically corresponds to the
+        ///    number of Rs/Rv entries from the TABDIMS keyword.
+        ///
+        /// \param[in] numRows Number of rows in each sub-table
+        ///    corresponding to a single primary look-up key.  Typically the
+        ///    number of nodes (e.g., NSSFUN or NPPVT) of the corresponding
+        ///    input keyword.
+        ///
+        /// \param[in] numCols Number of columns in each sub-table (and main
+        ///    table).  Typically 5.
+        ///
+        /// \param[in] fillValue Data element value for padded table entries.
+        LinearisedOutputTable(const std::size_t numTables,
+                              const std::size_t numPrimary,
+                              const std::size_t numRows,
+                              const std::size_t numCols,
+                              const double      fillValue);
+
         /// Retrieve iterator to start of \c numRows (contiguous) column
         /// elements of a particular sub-table of a particular main table.
         ///

opm/output/eclipse/LogiHEAD.hpp

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

opm/output/eclipse/RegionCache.hpp

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

opm/output/eclipse/RestartIO.hpp

@@ -1,4 +1,5 @@
 /*
+  Copyright (c) 2018 Equinor ASA
   Copyright (c) 2016 Statoil ASA
   Copyright (c) 2013-2015 Andreas Lauser
   Copyright (c) 2013 SINTEF ICT, Applied Mathematics.
@@ -23,35 +24,30 @@
 #ifndef RESTART_IO_HPP
 #define RESTART_IO_HPP
 
-#include <vector>
-#include <map>
-
-#include <opm/parser/eclipse/Units/UnitSystem.hpp>
-#include <opm/parser/eclipse/EclipseState/Runspec.hpp>
-#include <opm/parser/eclipse/EclipseState/Schedule/Well.hpp>
-
-#include <opm/output/data/Cells.hpp>
-#include <opm/output/data/Solution.hpp>
-#include <opm/output/data/Wells.hpp>
 #include <opm/output/eclipse/RestartValue.hpp>
 
-#include <ert/ecl/EclKW.hpp>
-#include <ert/ecl/ecl_rsthead.h>
-#include <ert/ecl/ecl_rst_file.h>
-#include <ert/util/util.h>
+#include <opm/parser/eclipse/EclipseState/Schedule/SummaryState.hpp>
+
+#include <string>
+#include <utility>
+#include <vector>
 
 namespace Opm {
 
-class EclipseGrid;
-class EclipseState;
-class Phases;
-class Schedule;
+    class EclipseGrid;
+    class EclipseState;
+    class Schedule;
 
-namespace RestartIO {
+} // namespace Opm
 
+namespace Opm { namespace EclIO { namespace OutputStream {
+
+    class Restart;
+
+}}}
 
 /*
-  The two loose functions RestartIO::save() and RestartIO::load() can
+  The two free functions RestartIO::save() and RestartIO::load() can
   be used to save and load reservoir and well state from restart
   files. Observe that these functions 'just do it', i.e. the checking
   of which report step to load from, if output is enabled at all and
@@ -68,28 +64,31 @@ namespace RestartIO {
      load("CASE.X0010" , 99 , ...)
      save("CASE.X0010" , 99 , ...)
 
-   will read and write to the file "CASE.X0010" - completely ignoring
+   will read from and write to the file "CASE.X0010" - completely ignoring
    the report step argument '99'.
 */
+namespace Opm { namespace RestartIO {
 
-void save(const std::string& filename,
-          int report_step,
-          double seconds_elapsed,
-          RestartValue value,
-          const EclipseState& es,
-          const EclipseGrid& grid,
-          const Schedule& schedule,
-          bool write_double = false);
+    void save(EclIO::OutputStream::Restart& rstFile,
+              int                           report_step,
+              double                        seconds_elapsed,
+              RestartValue                  value,
+              const EclipseState&           es,
+              const EclipseGrid&            grid,
+              const Schedule&               schedule,
+              const SummaryState&           sumState,
+              bool                          write_double = false);
 
 
-RestartValue load( const std::string& filename,
-                   int report_step,
-                   const std::vector<RestartKey>& solution_keys,
-                   const EclipseState& es,
-                   const EclipseGrid& grid,
-                   const Schedule& schedule,
-                   const std::vector<RestartKey>& extra_keys = {});
+    RestartValue load(const std::string&             filename,
+                      int                            report_step,
+                      SummaryState&                  summary_state,
+                      const std::vector<RestartKey>& solution_keys,
+                      const EclipseState&            es,
+                      const EclipseGrid&             grid,
+                      const Schedule&                schedule,
+                      const std::vector<RestartKey>& extra_keys = {});
 
-}
-}
-#endif
+}} // namespace Opm::RestartIO
+
+#endif  // RESTART_IO_HPP

opm/output/eclipse/RestartValue.hpp

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

opm/output/eclipse/Summary.hpp

@@ -20,62 +20,59 @@
 #ifndef OPM_OUTPUT_SUMMARY_HPP
 #define OPM_OUTPUT_SUMMARY_HPP
 
+#include <map>
+#include <memory>
 #include <string>
+#include <utility>
 #include <vector>
-#include <unordered_map>
-
-#include <ert/ecl/ecl_sum.h>
-#include <ert/ecl/Smspec.hpp>
-
-#include <opm/parser/eclipse/EclipseState/Grid/EclipseGrid.hpp>
-
-#include <opm/output/eclipse/SummaryState.hpp>
-#include <opm/output/data/Wells.hpp>
-#include <opm/output/eclipse/RegionCache.hpp>
 
 namespace Opm {
-
+    class EclipseGrid;
     class EclipseState;
     class Schedule;
     class SummaryConfig;
-    class EclipseGrid;
-    class Schedule;
+    class SummaryState;
+} // namespace Opm
 
-namespace out {
+namespace Opm { namespace data {
+    class WellRates;
+}} // namespace Opm::data
+
+namespace Opm { namespace out {
 
 class Summary {
-    public:
-        Summary( const EclipseState&, const SummaryConfig&, const EclipseGrid&, const Schedule& );
-        Summary( const EclipseState&, const SummaryConfig&, const EclipseGrid&, const Schedule&, const std::string& );
-        Summary( const EclipseState&, const SummaryConfig&, const EclipseGrid&, const Schedule&, const char* basename );
+public:
+    using GlobalProcessParameters = std::map<std::string, double>;
+    using RegionParameters = std::map<std::string, std::vector<double>>;
+    using BlockValues = std::map<std::pair<std::string, int>, double>;
 
-        void add_timestep(int report_step,
-                           double secs_elapsed,
-                           const EclipseState& es,
-                           const Schedule& schedule,
-                           const data::Wells&,
-                           const std::map<std::string, double>& single_values,
-                           const std::map<std::string, std::vector<double>>& region_values = {},
-                           const std::map<std::pair<std::string, int>, double>& block_values = {});
+    Summary(const EclipseState&  es,
+            const SummaryConfig& sumcfg,
+            const EclipseGrid&   grid,
+            const Schedule&      sched,
+            const std::string&   basename = "");
 
-        void write();
+    ~Summary();
 
-        ~Summary();
+    void add_timestep(const SummaryState& st, const int report_step);
 
-        const SummaryState& get_restart_vectors() const;
+    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 GlobalProcessParameters& single_values,
+              const RegionParameters&        region_values = {},
+              const BlockValues&             block_values  = {}) const;
 
-    private:
-        class keyword_handlers;
+    void write() const;
 
-        const EclipseGrid& grid;
-        out::RegionCache regionCache;
-        ERT::ert_unique_ptr< ecl_sum_type, ecl_sum_free > ecl_sum;
-        std::unique_ptr< keyword_handlers > handlers;
-        double prev_time_elapsed = 0;
-        SummaryState prev_state;
+private:
+    class SummaryImplementation;
+    std::unique_ptr<SummaryImplementation> pImpl_;
 };
 
-}
-}
+}} // namespace Opm::out
 
 #endif //OPM_OUTPUT_SUMMARY_HPP