bump version to 2018.04

.clang-format

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

.gitignore

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

CMakeLists.txt

@@ -7,10 +7,6 @@ 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_ENABLE_EMBEDDED_PYTHON "Enable python bindings?" OFF)
-
 
 # Output implies input
 if(ENABLE_ECL_OUTPUT)
@@ -22,31 +18,24 @@ 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)
 
 # We need to define this variable in the installed cmake config file.
-set(OPM_PROJECT_EXTRA_CODE_INSTALLED  "#ENABLE_ECL_INPUT is needed by opm-common-prereq.cmake
-                                       set(ENABLE_ECL_INPUT ${ENABLE_ECL_INPUT})
-                                       set(OPM_MACROS_ROOT ${CMAKE_INSTALL_PREFIX}/share/opm)
-                                       list(APPEND CMAKE_MODULE_PATH \${OPM_MACROS_ROOT}/cmake/Modules)
-                                       include(OpmPackage) #Make macros availabe after find_package(opm-common)")
+set(OPM_PROJECT_EXTRA_CODE_INSTALLED  "set(OPM_MACROS_ROOT ${CMAKE_INSTALL_PREFIX}/share/opm)
+                                       list(APPEND CMAKE_MODULE_PATH \${OPM_MACROS_ROOT}/cmake/Modules)")
 
-set(OPM_PROJECT_EXTRA_CODE_INTREE "#ENABLE_ECL_INPUT is needed by opm-common-prereq.cmake
-                                   set(ENABLE_ECL_INPUT ${ENABLE_ECL_INPUT})
-                                   set(OPM_MACROS_ROOT ${OPM_MACROS_ROOT})
-                                   list(APPEND CMAKE_MODULE_PATH \${OPM_MACROS_ROOT}/cmake/Modules)
-                                   include(OpmPackage) #Make macros availabe after find_package(opm-common)")
+set(OPM_PROJECT_EXTRA_CODE_INTREE  "set(OPM_MACROS_ROOT ${OPM_MACROS_ROOT})
+                                    list(APPEND CMAKE_MODULE_PATH \${OPM_MACROS_ROOT}/cmake/Modules)")
 if(ENABLE_ECL_OUTPUT)
   set(OPM_PROJECT_EXTRA_CODE_INSTALLED "${OPM_PROJECT_EXTRA_CODE_INSTALLED}
-                                        set(COMPARE_ECL_COMMAND ${CMAKE_INSTALL_PREFIX}/bin${${name}_VER_DIR}/compareECL)
-                                        set(OPM_PACK_COMMAND ${CMAKE_INSTALL_PREFIX}/bin${${name}_VER_DIR}/opmpack)")
+                                        set(COMPARE_SUMMARY_COMMAND ${CMAKE_INSTALL_PREFIX}/bin${${name}_VER_DIR}/compareSummary)
+                                        set(COMPARE_ECL_COMMAND ${CMAKE_INSTALL_PREFIX}/bin${${name}_VER_DIR}/compareECL)")
 
   set(OPM_PROJECT_EXTRA_CODE_INTREE "${OPM_PROJECT_EXTRA_CODE_INTREE}
-                                     set(COMPARE_ECL_COMMAND ${PROJECT_BINARY_DIR}/bin/compareECL)
-                                     set(OPM_PACK_COMMAND ${PROJECT_BINARY_DIR}/bin/opmpack)")
+                                     set(COMPARE_SUMMARY_COMMAND ${PROJECT_BINARY_DIR}/bin/compareSummary)
+                                     set(COMPARE_ECL_COMMAND ${PROJECT_BINARY_DIR}/bin/compareECL)")
 endif()
 
 # project information is in dune.module. Read this file and set variables.
@@ -112,8 +101,6 @@ macro (sources_hook)
     # Append generated sources
     list(APPEND opm-common_SOURCES ${PROJECT_BINARY_DIR}/ParserKeywords.cpp)
   endif()
-  set_source_files_properties(src/opm/parser/eclipse/Python/Python.cpp
-                              PROPERTIES COMPILE_FLAGS -Wno-shadow)
 endmacro (sources_hook)
 
 macro (fortran_hook)
@@ -137,169 +124,5 @@ endmacro (install_hook)
 # 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)
-  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
-    )
-
-  foreach(target compareECL convertECL)
-    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
-    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
-    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
-                         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
-  find_package(PythonInterp REQUIRED)
-  include(FindPythonInterp)
-
-  make_directory(${CMAKE_BINARY_DIR}/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")
-
-  get_target_property(_ecl_include_dirs ecl INTERFACE_INCLUDE_DIRECTORIES)
-  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}")
-
-  get_target_property(_ecl_lib ecl LOCATION)
-  get_filename_component(_ecl_lib_dir ${_ecl_lib} DIRECTORY)
-  set(_opmcommon_lib_dirs ${_ecl_lib_dir} ${CMAKE_BINARY_DIR}/lib ${CMAKE_PREFIX_PATH}/lib)
-  string(REPLACE ";" ":" _setup_lib_dirs "${_opmcommon_lib_dirs}")
-
-  add_custom_command(OUTPUT python/python/opm/libopmcommon_python.so
-                     DEPENDS
-                     python/cxx/connection.cpp
-                     python/cxx/converters.hpp
-                     python/cxx/deck.cpp
-                     python/cxx/deck_keyword.cpp
-                     python/cxx/eclipse_3d_properties.cpp
-                     python/cxx/eclipse_config.cpp
-                     python/cxx/eclipse_grid.cpp
-                     python/cxx/eclipse_state.cpp
-                     python/cxx/group.cpp
-                     python/cxx/log.cpp
-                     python/cxx/parsecontext.cpp
-                     python/cxx/parser.cpp
-                     python/cxx/schedule.cpp
-                     python/cxx/export.cpp
-                     python/cxx/export.hpp
-                     python/cxx/common_state.cpp
-                     python/cxx/common_state.hpp
-                     python/cxx/table_manager.cpp
-                     python/cxx/well.cpp
-                     COMMAND ${CMAKE_COMMAND} -E copy_directory ${CMAKE_SOURCE_DIR}/python/ ${CMAKE_BINARY_DIR}/python
-                     COMMAND ${PYTHON_EXECUTABLE} ${CMAKE_BINARY_DIR}/python/setup.py
-                                                      build
-                                                      build_ext
-                                                      --build-lib=${CMAKE_BINARY_DIR}/python/python/opm
-                                                      --library-dirs=${_setup_lib_dirs}
-                                                      --include-dirs=${_setup_include_dirs}
-                     WORKING_DIRECTORY ${CMAKE_BINARY_DIR}/python
-                     COMMENT "Building python bindings")
-  add_custom_target(opmcommon_python ALL DEPENDS python/python/opm/libopmcommon_python.so)
-  add_dependencies(opmcommon_python opmcommon)
-
-  install( CODE "execute_process(COMMAND mkdir -p ${CMAKE_INSTALL_PREFIX}/${PYTHON_INSTALL_PREFIX}  )" )
-  install( CODE "execute_process(COMMAND ${PYTHON_EXECUTABLE} python/setup.py build_ext --dry-run install --prefix=${CMAKE_INSTALL_PREFIX}  )" )
-
-  add_test(NAME python_tests
-            WORKING_DIRECTORY ${CMAKE_BINARY_DIR}/python
-            COMMAND ${PYTHON_EXECUTABLE} setup.py build_ext --dry-run --build-lib ${CMAKE_BINARY_DIR}/python/python/opm test
-           )
-
-  set_target_properties(opmcommon PROPERTIES POSITION_INDEPENDENT_CODE ON)
-  set_directory_properties(PROPERTIES ADDITIONAL_MAKE_CLEAN_FILES ${CMAKE_BINARY_DIR}/python/python)
-
-  # -------------------------------------------------------------------------
-  # Let cmake configure some small shell scripts which can be used to simplify
-  # building and testing 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/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.
@@ -41,22 +41,17 @@ if(ENABLE_ECL_INPUT)
     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/UDAValue.cpp
-    src/opm/parser/eclipse/Python/Python.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/Box.cpp
     src/opm/parser/eclipse/EclipseState/Grid/BoxManager.cpp
     src/opm/parser/eclipse/EclipseState/Grid/EclipseGrid.cpp
@@ -74,54 +69,30 @@ if(ENABLE_ECL_INPUT)
     src/opm/parser/eclipse/EclipseState/Grid/setKeywordBox.cpp
     src/opm/parser/eclipse/EclipseState/Grid/TransMult.cpp
     src/opm/parser/eclipse/EclipseState/InitConfig/Equil.cpp
-    src/opm/parser/eclipse/EclipseState/InitConfig/FoamConfig.cpp
     src/opm/parser/eclipse/EclipseState/InitConfig/InitConfig.cpp
     src/opm/parser/eclipse/EclipseState/IOConfig/IOConfig.cpp
     src/opm/parser/eclipse/EclipseState/IOConfig/RestartConfig.cpp
     src/opm/parser/eclipse/EclipseState/Runspec.cpp
-    src/opm/parser/eclipse/EclipseState/Schedule/Action/ActionAST.cpp
-    src/opm/parser/eclipse/EclipseState/Schedule/Action/ActionContext.cpp
-    src/opm/parser/eclipse/EclipseState/Schedule/Action/ActionResult.cpp
-    src/opm/parser/eclipse/EclipseState/Schedule/Action/Actdims.cpp
-    src/opm/parser/eclipse/EclipseState/Schedule/Action/Actions.cpp
-    src/opm/parser/eclipse/EclipseState/Schedule/Action/ActionX.cpp
-    src/opm/parser/eclipse/EclipseState/Schedule/Action/ActionParser.cpp
-    src/opm/parser/eclipse/EclipseState/Schedule/Action/ActionValue.cpp
-    src/opm/parser/eclipse/EclipseState/Schedule/Action/ASTNode.cpp
-    src/opm/parser/eclipse/EclipseState/Schedule/Action/Condition.cpp
-    src/opm/parser/eclipse/EclipseState/Schedule/ArrayDimChecker.cpp
+    src/opm/parser/eclipse/EclipseState/Schedule/Completion.cpp
+    src/opm/parser/eclipse/EclipseState/Schedule/CompletionSet.cpp
     src/opm/parser/eclipse/EclipseState/Schedule/Events.cpp
-    src/opm/parser/eclipse/EclipseState/Schedule/Group/Group2.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/GTNode.cpp
-    src/opm/parser/eclipse/EclipseState/Schedule/Well/injection.cpp
+    src/opm/parser/eclipse/EclipseState/Schedule/Group.cpp
+    src/opm/parser/eclipse/EclipseState/Schedule/GroupTree.cpp
     src/opm/parser/eclipse/EclipseState/Schedule/MessageLimits.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/SegmentSet.cpp
+    src/opm/parser/eclipse/EclipseState/Schedule/MSW/updatingCompletionsWithSegments.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/SummaryState.cpp
+    src/opm/parser/eclipse/EclipseState/Schedule/ScheduleEnums.cpp
     src/opm/parser/eclipse/EclipseState/Schedule/TimeMap.cpp
     src/opm/parser/eclipse/EclipseState/Schedule/Tuning.cpp
-    src/opm/parser/eclipse/EclipseState/Schedule/Well/Connection.cpp
-    src/opm/parser/eclipse/EclipseState/Schedule/eval_uda.cpp
-    src/opm/parser/eclipse/EclipseState/Schedule/Well/Well2.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/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/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/SimulationConfig/SimulationConfig.cpp
     src/opm/parser/eclipse/EclipseState/SimulationConfig/ThresholdPressure.cpp
     src/opm/parser/eclipse/EclipseState/SummaryConfig/SummaryConfig.cpp
@@ -129,109 +100,49 @@ if(ENABLE_ECL_INPUT)
     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/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/Tables/Rock2dTable.cpp
-    src/opm/parser/eclipse/EclipseState/Tables/Rock2dtrTable.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/UDQConfig.cpp
+    src/opm/parser/eclipse/EclipseState/Schedule/UDQ.cpp
+    src/opm/parser/eclipse/EclipseState/Schedule/UDQExpression.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/Parser/raw/RawKeyword.cpp
-    src/opm/parser/eclipse/Parser/raw/RawRecord.cpp
-    src/opm/parser/eclipse/Parser/raw/StarToken.cpp
+    src/opm/parser/eclipse/RawDeck/RawKeyword.cpp
+    src/opm/parser/eclipse/RawDeck/RawRecord.cpp
+    src/opm/parser/eclipse/RawDeck/StarToken.cpp
     src/opm/parser/eclipse/Units/Dimension.cpp
     src/opm/parser/eclipse/Units/UnitSystem.cpp
     src/opm/parser/eclipse/Utility/Functional.cpp
     src/opm/parser/eclipse/Utility/Stringview.cpp
   )
 
-  if (OPM_ENABLE_EMBEDDED_PYTHON)
-    list( APPEND PYTHON_SOURCE_FILES
-          src/opm/parser/eclipse/Python/PythonInterp.cpp
-          python/cxx/connection.cpp
-          python/cxx/deck.cpp
-          python/cxx/deck_keyword.cpp
-          python/cxx/eclipse_3d_properties.cpp
-          python/cxx/eclipse_config.cpp
-          python/cxx/eclipse_grid.cpp
-          python/cxx/eclipse_state.cpp
-          python/cxx/group.cpp
-          python/cxx/parsecontext.cpp
-          python/cxx/parser.cpp
-          python/cxx/schedule.cpp
-          python/cxx/export.cpp
-          python/cxx/common_state.cpp
-          python/cxx/table_manager.cpp
-          python/cxx/well.cpp
-          python/cxx/log.cpp
-          )
-    set_source_files_properties(${PYTHON_SOURCE_FILES} PROPERTIES COMPILE_FLAGS -Wno-shadow)
-    list( APPEND MAIN_SOURCE_FILES ${PYTHON_SOURCE_FILES})
-  endif()
-
-
-
   if(NOT cjson_FOUND)
     list(APPEND MAIN_SOURCE_FILES external/cjson/cJSON.c)
   endif()
 endif()
 if(ENABLE_ECL_OUTPUT)
   list( APPEND MAIN_SOURCE_FILES
-          src/opm/io/eclipse/EclFile.cpp
-          src/opm/io/eclipse/EclOutput.cpp
-          src/opm/io/eclipse/EclUtil.cpp
-          src/opm/io/eclipse/EGrid.cpp
-          src/opm/io/eclipse/ERft.cpp
-          src/opm/io/eclipse/ERst.cpp
-          src/opm/io/eclipse/ESmry.cpp
-          src/opm/io/eclipse/OutputStream.cpp
-          src/opm/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/CreateDoubHead.cpp
-          src/opm/output/eclipse/CreateInteHead.cpp
-          src/opm/output/eclipse/CreateLogiHead.cpp
-          src/opm/output/eclipse/CreateUdqDims.cpp
-          src/opm/output/eclipse/DoubHEAD.cpp
+          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/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/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()
@@ -250,29 +161,24 @@ list (APPEND TEST_SOURCE_FILES
 )
 if(ENABLE_ECL_INPUT)
   list(APPEND TEST_SOURCE_FILES
-    tests/parser/ACTIONX.cpp
     tests/parser/ADDREGTests.cpp
     tests/parser/AquiferCTTests.cpp
-    tests/parser/AquifetpTests.cpp
     tests/parser/AqudimsTests.cpp
     tests/parser/AquanconTests.cpp
     tests/parser/BoxTests.cpp
     tests/parser/ColumnSchemaTests.cpp
-    tests/parser/ConnectionTests.cpp
+    tests/parser/CompletionTests.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/FoamTests.cpp
     tests/parser/FunctionalTests.cpp
     tests/parser/GeomodifierTests.cpp
     tests/parser/GridPropertyTests.cpp
@@ -285,14 +191,9 @@ if(ENABLE_ECL_INPUT)
     tests/parser/MULTREGTScannerTests.cpp
     tests/parser/OrderedMapTests.cpp
     tests/parser/ParseContextTests.cpp
-    tests/parser/ParseContext_EXIT1.cpp
-    tests/parser/ParseDATAWithDefault.cpp
-    tests/parser/PYACTION.cpp
     tests/parser/PORVTests.cpp
     tests/parser/RawKeywordTests.cpp
-    tests/parser/ResinsightTest.cpp
     tests/parser/RestartConfigTests.cpp
-    tests/parser/RockTableTests.cpp
     tests/parser/RunspecTests.cpp
     tests/parser/SatfuncPropertyInitializersTests.cpp
     tests/parser/ScheduleTests.cpp
@@ -315,35 +216,22 @@ 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)
+    tests/parser/WellTests.cpp)
 endif()
 if(ENABLE_ECL_OUTPUT)
   list (APPEND TEST_SOURCE_FILES
-          tests/test_AggregateWellData.cpp
-          tests/test_AggregateGroupData.cpp
-          tests/test_AggregateMSWData.cpp
-          tests/test_AggregateConnectionData.cpp
-          tests/test_AggregateUDQData.cpp
-          tests/test_ArrayDimChecker.cpp
+          tests/test_compareSummary.cpp
+          tests/test_EclFilesComparator.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_Solution.cpp
           tests/test_Summary.cpp
           tests/test_Tables.cpp
           tests/test_Wells.cpp
-          tests/test_WindowedArray.cpp
-          tests/test_restartwellinfo.cpp
+          tests/test_writenumwells.cpp
+          tests/test_Solution.cpp
+          tests/test_regionCache.cpp
       )
 endif()
 
@@ -352,10 +240,7 @@ list (APPEND TEST_DATA_FILES
 )
 if(ENABLE_ECL_OUTPUT)
   list (APPEND TEST_DATA_FILES
-          tests/expect-wdims.chldg.err.out
-          tests/expect-wdims.err.out
           tests/FIRST_SIM.DATA
-          tests/FIRST_SIM_THPRES.DATA
           tests/summary_deck.DATA
           tests/group_group.DATA
           tests/testblackoilstate3.DATA
@@ -363,38 +248,22 @@ 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
       )
 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
   )
 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
@@ -403,10 +272,14 @@ 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
@@ -454,7 +327,6 @@ 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
@@ -465,12 +337,9 @@ 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
@@ -490,7 +359,6 @@ if(ENABLE_ECL_INPUT)
        opm/parser/eclipse/EclipseState/Eclipse3DProperties.hpp
        opm/parser/eclipse/EclipseState/EndpointScaling.hpp
        opm/parser/eclipse/EclipseState/Tables/SimpleTable.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
@@ -500,11 +368,8 @@ if(ENABLE_ECL_INPUT)
        opm/parser/eclipse/EclipseState/Tables/Eqldims.hpp
        opm/parser/eclipse/EclipseState/Tables/SpecrockTable.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
@@ -529,8 +394,6 @@ if(ENABLE_ECL_INPUT)
        opm/parser/eclipse/EclipseState/Tables/TableContainer.hpp
        opm/parser/eclipse/EclipseState/Tables/AqutabTable.hpp
        opm/parser/eclipse/EclipseState/Tables/PlyadsTable.hpp
-       opm/parser/eclipse/EclipseState/Tables/FoamadsTable.hpp
-       opm/parser/eclipse/EclipseState/Tables/FoammobTable.hpp
        opm/parser/eclipse/EclipseState/Tables/PbvdTable.hpp
        opm/parser/eclipse/EclipseState/Tables/SorwmisTable.hpp
        opm/parser/eclipse/EclipseState/Tables/PlymaxTable.hpp
@@ -544,10 +407,6 @@ 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
@@ -560,120 +419,69 @@ if(ENABLE_ECL_INPUT)
        opm/parser/eclipse/EclipseState/EclipseConfig.hpp
        opm/parser/eclipse/EclipseState/Aquancon.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/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/ArrayDimChecker.hpp
        opm/parser/eclipse/EclipseState/Schedule/TimeMap.hpp
        opm/parser/eclipse/EclipseState/Schedule/VFPInjTable.hpp
        opm/parser/eclipse/EclipseState/Schedule/VFPProdTable.hpp
-       opm/parser/eclipse/EclipseState/Schedule/Well/Connection.hpp
-       opm/parser/eclipse/EclipseState/Schedule/Well/ProductionControls.hpp
-       opm/parser/eclipse/EclipseState/Schedule/Well/InjectionControls.hpp
-       opm/parser/eclipse/EclipseState/Schedule/Well/Well2.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/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/Well.hpp
+       opm/parser/eclipse/EclipseState/Schedule/WellInjectionProperties.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/Tuning.hpp
-       opm/parser/eclipse/EclipseState/Schedule/Group/GTNode.hpp
-       opm/parser/eclipse/EclipseState/Schedule/Group/Group2.hpp
-       opm/parser/eclipse/EclipseState/Schedule/Group/GuideRate.hpp
-       opm/parser/eclipse/EclipseState/Schedule/Group/GuideRateConfig.hpp
-       opm/parser/eclipse/EclipseState/Schedule/Group/GuideRateModel.hpp
+       opm/parser/eclipse/EclipseState/Schedule/Group.hpp
        opm/parser/eclipse/EclipseState/Schedule/MessageLimits.hpp
        opm/parser/eclipse/EclipseState/Schedule/Events.hpp
+       opm/parser/eclipse/EclipseState/Schedule/ScheduleEnums.hpp
        opm/parser/eclipse/EclipseState/Schedule/OilVaporizationProperties.hpp
+       opm/parser/eclipse/EclipseState/Schedule/GroupTree.hpp
+       opm/parser/eclipse/EclipseState/Schedule/Completion.hpp
        opm/parser/eclipse/EclipseState/Schedule/DynamicState.hpp
        opm/parser/eclipse/EclipseState/Schedule/MSW/Segment.hpp
-       opm/parser/eclipse/EclipseState/Schedule/MSW/WellSegments.hpp
-       opm/parser/eclipse/EclipseState/Schedule/MSW/updatingConnectionsWithSegments.hpp
+       opm/parser/eclipse/EclipseState/Schedule/MSW/SegmentSet.hpp
+       opm/parser/eclipse/EclipseState/Schedule/MSW/updatingCompletionsWithSegments.hpp
+       opm/parser/eclipse/EclipseState/Schedule/WellProductionProperties.hpp
+       opm/parser/eclipse/EclipseState/Schedule/CompletionSet.hpp
        opm/parser/eclipse/EclipseState/SimulationConfig/ThresholdPressure.hpp
        opm/parser/eclipse/EclipseState/SimulationConfig/SimulationConfig.hpp
        opm/parser/eclipse/EclipseState/IOConfig/RestartConfig.hpp
        opm/parser/eclipse/EclipseState/IOConfig/IOConfig.hpp
        opm/parser/eclipse/EclipseState/checkDeck.hpp
        opm/parser/eclipse/EclipseState/Runspec.hpp
-       opm/parser/eclipse/EclipseState/Schedule/UDQ/UDQAssign.hpp
-       opm/parser/eclipse/EclipseState/Schedule/UDQ/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/EclipseState/Schedule/UDQ.hpp
+       opm/parser/eclipse/EclipseState/UDQConfig.hpp
+       opm/parser/eclipse/EclipseState/Schedule/UDQExpression.hpp
        opm/parser/eclipse/Deck/DeckItem.hpp
        opm/parser/eclipse/Deck/Deck.hpp
        opm/parser/eclipse/Deck/Section.hpp
        opm/parser/eclipse/Deck/DeckOutput.hpp
-       opm/parser/eclipse/Deck/DeckValue.hpp
        opm/parser/eclipse/Deck/DeckKeyword.hpp
        opm/parser/eclipse/Deck/DeckRecord.hpp
-       opm/parser/eclipse/Deck/UDAValue.hpp
-       opm/parser/eclipse/Python/Python.hpp)
+       opm/parser/eclipse/RawDeck/StarToken.hpp
+       opm/parser/eclipse/RawDeck/RawEnums.hpp
+       opm/parser/eclipse/RawDeck/RawRecord.hpp
+       opm/parser/eclipse/RawDeck/RawKeyword.hpp
+       opm/parser/eclipse/RawDeck/RawConsts.hpp)
 endif()
 if(ENABLE_ECL_OUTPUT)
   list(APPEND PUBLIC_HEADER_FILES
-        opm/io/eclipse/EclFile.hpp
-        opm/io/eclipse/EclIOdata.hpp
-        opm/io/eclipse/EclOutput.hpp
-        opm/io/eclipse/EclUtil.hpp
-        opm/io/eclipse/EGrid.hpp
-        opm/io/eclipse/ERft.hpp
-        opm/io/eclipse/ERst.hpp
-        opm/io/eclipse/ESmry.hpp
-        opm/io/eclipse/PaddedOutputString.hpp
-        opm/io/eclipse/OutputStream.hpp
-        opm/output/data/Cells.hpp
-        opm/output/data/Solution.hpp
+        opm/output/OutputWriter.hpp
         opm/output/data/Wells.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/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/DoubHEAD.hpp
+        opm/output/data/Cells.hpp
+        opm/test_util/summaryRegressionTest.hpp
+        opm/test_util/summaryIntegrationTest.hpp
+        opm/test_util/summaryComparator.hpp
         opm/output/eclipse/EclipseGridInspector.hpp
-        opm/output/eclipse/EclipseIO.hpp
         opm/output/eclipse/EclipseIOUtil.hpp
-        opm/output/eclipse/InteHEAD.hpp
+        opm/output/eclipse/EclipseIO.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/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/output/eclipse/RegionCache.hpp
+        opm/output/data/Solution.hpp
+        opm/test_util/EclFilesComparator.hpp
+        opm/test_util/summaryRegressionTest.hpp
+        opm/test_util/summaryComparator.hpp)
 endif()

CopyHeaders.cmake

@@ -1,21 +0,0 @@
-execute_process(COMMAND ${CMAKE_COMMAND} -E copy_if_different
-                        ${BASE_DIR}/tmp_gen/ParserKeywords.cpp
-                        ${BASE_DIR}/ParserKeywords.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)
-
-
-file(GLOB HDRS ${BASE_DIR}/tmp_gen/include/opm/parser/eclipse/Parser/ParserKeywords/*.hpp)
-
-foreach(HDR ${HDRS})
-  file(RELATIVE_PATH hdr ${BASE_DIR}/tmp_gen/include/opm/parser/eclipse/Parser/ParserKeywords ${HDR})
-  execute_process(COMMAND ${CMAKE_COMMAND} -E copy_if_different
-                          ${HDR}
-                          ${BASE_DIR}/include/opm/parser/eclipse/Parser/ParserKeywords/${hdr})
-endforeach()

ExtraTests.cmake

@@ -48,14 +48,16 @@ list(APPEND EXTRA_TESTS EclipseStateTests)
 
 foreach (test BoxTest
               CheckDeckValidity
+              CompletionsFromDeck
               EclipseGridCreateFromDeck
-              EDITNNCTests
               IncludeTest
               IntegrationTests
               IOConfigIntegrationTest
               NNCTests
               ParseKEYWORD
+              ParseDATAWithDefault
               Polymer
+              ResinsightTest
               ScheduleCreateFromDeck
               TransMultIntegrationTests)
 
@@ -85,8 +87,6 @@ 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
@@ -96,7 +96,6 @@ if(HAVE_OPM_TESTS)
                    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")
 endif()

GenerateKeywords.cmake

@@ -1,7 +1,5 @@
 set(genkw_SOURCES src/opm/json/JsonObject.cpp
                   src/opm/parser/eclipse/Parser/createDefaultKeywordList.cpp
-                  src/opm/parser/eclipse/Deck/UDAValue.cpp
-                  src/opm/parser/eclipse/Deck/DeckValue.cpp
                   src/opm/parser/eclipse/Deck/Deck.cpp
                   src/opm/parser/eclipse/Deck/DeckItem.cpp
                   src/opm/parser/eclipse/Deck/DeckKeyword.cpp
@@ -9,15 +7,14 @@ 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/Parser/raw/RawKeyword.cpp
-                  src/opm/parser/eclipse/Parser/raw/RawRecord.cpp
-                  src/opm/parser/eclipse/Parser/raw/StarToken.cpp
+                  src/opm/parser/eclipse/RawDeck/RawKeyword.cpp
+                  src/opm/parser/eclipse/RawDeck/RawRecord.cpp
+                  src/opm/parser/eclipse/RawDeck/StarToken.cpp
                   src/opm/parser/eclipse/Units/Dimension.cpp
                   src/opm/parser/eclipse/Units/UnitSystem.cpp
                   src/opm/parser/eclipse/Utility/Stringview.cpp
@@ -41,17 +38,11 @@ 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
+    OUTPUT  ${PROJECT_BINARY_DIR}/ParserKeywords.cpp ${PROJECT_BINARY_DIR}/inlinekw.cpp
     COMMAND genkw keyword_list.argv
-                  ${PROJECT_BINARY_DIR}/tmp_gen/ParserKeywords.cpp
-                  ${PROJECT_BINARY_DIR}/tmp_gen/include/
+                  ${PROJECT_BINARY_DIR}/ParserKeywords.cpp
+                  ${PROJECT_BINARY_DIR}/include/
                   opm/parser/eclipse/Parser/ParserKeywords
-                  ${PROJECT_BINARY_DIR}/tmp_gen/inlinekw.cpp
+                  ${PROJECT_BINARY_DIR}/inlinekw.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
-                   COMMAND ${CMAKE_COMMAND} -DBASE_DIR=${PROJECT_BINARY_DIR}
-                                            -P ${PROJECT_SOURCE_DIR}/CopyHeaders.cmake)

cmake/Modules/ConfigVars.cmake

@@ -78,17 +78,7 @@ 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
-		# 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}" "if (DEFINED ${_var} AND NOT \"${_db}${_var}}\" STREQUAL \"${${_var}}\")\n")
 		file (APPEND "${filename}" "\tmessage (WARNING \"Incompatible value \\\"${_db}${_var}}\\\" of variable \\\"${_var}\\\"\")\n")
 		file (APPEND "${filename}" "endif ()\n")
 	  endif ()

cmake/Modules/FindAlberta.cmake

@@ -1,46 +0,0 @@
-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/Finddune-grid.cmake

@@ -27,8 +27,7 @@ find_opm_package (
   dune-geometry REQUIRED;
   dune-uggrid;
   MPI;
-  UG;
-  Alberta
+  UG
   "
   # header to search for
   "dune/grid/onedgrid.hh"
@@ -56,8 +55,7 @@ int main (void) {
    HAVE_AMIRAMESH;
    HAVE_ALBERTA;
    HAVE_STDINT_H;
-   DUNE_GRID_EXPERIMENTAL_GRID_EXTENSIONS;
-   DUNE_ALBERTA_VERSION
+   DUNE_GRID_EXPERIMENTAL_GRID_EXTENSIONS
   ")
 
 #debug_find_vars ("dune-grid")

cmake/Modules/Finddune-istl.cmake

@@ -52,7 +52,6 @@ int main (void) {
   HAVE_PARMETIS;
   HAVE_SUPERLU;
   HAVE_UMFPACK;
-  HAVE_SUITESPARSE_UMFPACK;
   SUPERLU_INT_TYPE;
   HAVE_SLU_CDEFS_H;
   HAVE_SLU_DDEFS_H;

cmake/Modules/LibtoolArchives.cmake

@@ -123,7 +123,7 @@ function (configure_la name target)
 	mark_as_advanced (libtool_MAIN)
 	# notify the user if it not found after we explicitly searched
 	if (NOT libtool_MAIN)
-	  message (STATUS "Not generating libtool archive (.la) since libtool was not found")
+	  message (STATUS "Libtool not found!")	  
 	endif (NOT libtool_MAIN)
   endif (NOT libtool_MAIN)
   if (libtool_MAIN)

cmake/Modules/OpmBashCompletion.cmake

@@ -1,6 +0,0 @@
-# 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/OpmDefaults.cmake

@@ -47,7 +47,7 @@ macro (opm_defaults opm)
   endif(NOT PRECOMPILE_HEADERS)
 
   # Use of OpenMP is considered experimental
-  set (USE_OPENMP_DEFAULT ON)
+  set (USE_OPENMP_DEFAULT OFF)
 
   # 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,6 +66,10 @@ set (_opm_proj_exemptions
   dune-fem
   )
 
+# although a DUNE module, it is delivered in the OPM suite
+set (opm-core_SUITE "opm")
+set (ewoms_SUITE "opm")
+
 # insert this boilerplate whenever we are going to find a new package
 macro (find_and_append_package_to prefix name)
   # special handling for Boost to avoid inadvertedly picking up system
@@ -135,12 +139,6 @@ macro (find_and_append_package_to prefix name)
 	set (${name}_FOUND FALSE)
 	set (${NAME}_FOUND FALSE)
   else ()
-    # List of components might differ for every module. Therefore we will
-    # need to research for a library multiple times. _search_components
-    # will hold the index of the string COMPONENTS in the list
-    set(_ARGN_LIST ${ARGN}) # Create a real list to use with list commands
-    list(FIND _ARGN_LIST "COMPONENTS" _search_components)
-
     # using config mode is better than using module (aka. find) mode
     # because then the package has already done all its probes and
     # stored them in the config file for us
@@ -149,9 +147,12 @@ macro (find_and_append_package_to prefix name)
     # We even need to repeat the search for opm-common once as this is done
     # in the top most CMakeLists.txt without querying defines, setting dependencies
     # and the likes which is only done via opm_find_package
-    if ( (NOT DEFINED ${name}_FOUND AND NOT DEFINED ${NAME}_FOUND )
-         OR _search_components GREATER -1)
+    if (NOT DEFINED ${name}_FOUND AND NOT DEFINED ${NAME}_FOUND
+        OR ("${name}" STREQUAL "opm-common" AND NOT _opm_common_deps_processed))
       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.
@@ -163,8 +164,11 @@ macro (find_and_append_package_to prefix name)
         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)
+          get_target_property(ecl_INCLUDE_DIRS ecl INTERFACE_INCLUDE_DIRECTORIES)
+          get_target_property(ecl_LIBRARIES ecl INTERFACE_LINK_LIBRARIES)
+          get_target_property(ecl_lib ecl LOCATION)
+          set(ecl_LIBRARIES ecl ${ecl_lib} ${ecl_LIBRARIES})
+          set(ecl_FOUND 1)
           set(HAVE_ERT 1)
         endif()
       elseif(_${name}_exempted LESS 0 AND NOT _is_opm)
@@ -193,6 +197,10 @@ macro (find_and_append_package_to prefix name)
     if (NOT DEFINED ${NAME}_FOUND)
       set (${NAME}_FOUND "${${name}_FOUND}")
     endif ()
+
+    if("${name}" STREQUAL "opm-common")
+      set(_opm_common_deps_processed ON)
+    endif()
   endif ()
 
   # the variable "NAME" may be replaced during find_package (as this is

cmake/Modules/OpmLibMain.cmake

@@ -20,7 +20,6 @@
 #   - CMP0026 to allow access to the LOCATION target property
 #   - CMP0048 to indicate that we want to deal with the *VERSION*
 #     variables ourselves
-#   - CMP0064 to indicate that we want TEST if conditions to be evaluated
 if (POLICY CMP0026)
 	cmake_policy(SET CMP0026 OLD)
 endif()
@@ -29,10 +28,6 @@ if (POLICY CMP0048)
 	cmake_policy(SET CMP0048 OLD)
 endif()
 
-if(POLICY CMP0064)
-  cmake_policy(SET CMP0064 NEW)
-endif()
-
 # set the behavior of the policy 0054 to NEW. (i.e. do not implicitly
 # expand variables in if statements)
 if (POLICY CMP0054)
@@ -261,13 +256,9 @@ macro (cond_disable_test name)
 	endif ((NOT DEFINED HAVE_${name}) OR (NOT HAVE_${name}))
 endmacro (cond_disable_test name)
 
-# use this target to run all tests, with parallel execution
-cmake_host_system_information(RESULT TESTJOBS QUERY NUMBER_OF_PHYSICAL_CORES)
-if(TESTJOBS EQUAL 0)
-	set(TESTJOBS 1)
-endif()
+# use this target to run all tests
 add_custom_target (check
-	COMMAND ${CMAKE_CTEST_COMMAND} -j${TESTJOBS}
+	COMMAND ${CMAKE_CTEST_COMMAND}
 	DEPENDS test-suite
 	COMMENT "Checking if library is functional"
 	VERBATIM

cmake/Modules/OpmPackage.cmake

@@ -59,7 +59,11 @@ macro (find_opm_package module deps header lib defs prog conf)
   # top most CMakeLists.txt but we still need to search for its
   # dependencies
   if (${MODULE}_FOUND OR ${module}_FOUND)
+    if (${module} STREQUAL "opm-common" AND NOT _opm_common_deps_processed)
+      set(_opm_common_deps_processed ON)
+    else()
       return ()
+    endif()
   endif ()
 
   # variables to pass on to other packages
@@ -80,11 +84,31 @@ macro (find_opm_package module deps header lib defs prog conf)
   # ${module}_CONFIG_VARS for dune modules.
   find_package(${module} ${_${module}_quiet} ${_${module}_required} CONFIG)
 
-  if(NOT ${module}_DEPS)
-    # set the dependencies used in find_package_deps
-    set(${module}_DEPS "${deps}")
-  endif()
-  find_package_deps(${module})
+
+  # period because it should be something that evaluates to true
+  # in find_package_handle_standard_args
+  set (${module}_ALL_PREREQS ".")
+  foreach (_dep IN ITEMS ${deps})
+	separate_arguments (_${module}_args UNIX_COMMAND ${_dep})
+	if (_${module}_args)
+	  # keep REQUIRED in the arguments only if we were required ourself
+	  # "required-ness" is not transitive as far as CMake is concerned
+	  # (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}")
+	  find_and_append_package_to (${module} ${_args_req} ${_${module}_quiet})
+	  list (GET _${module}_args 0 _name_only)
+	  string (TOUPPER "${_name_only}" _NAME_ONLY)
+	  string (REPLACE "-" "_" _NAME_ONLY "${_NAME_ONLY}")
+	  # check manually if it was found if REQUIRED; otherwise poison the
+	  # dependency list which is checked later (so that it will fail)
+	  if (("${_${module}_args}" MATCHES "REQUIRED") AND NOT (${_name_only}_FOUND OR ${_NAME_ONLY}_FOUND))
+		list (APPEND ${module}_ALL_PREREQS "${_name_only}-NOTFOUND")
+	  endif ()
+	else ()
+	  message (WARNING "Empty dependency in find module for ${module} (check for trailing semi-colon)")
+	endif ()
+  endforeach (_dep)
 
   # since find_and_append_package_to is a macro, this variable have
   # probably been overwritten (due to its common name); it is now
@@ -157,12 +181,7 @@ macro (find_package_deps module)
   foreach (_dep IN ITEMS ${${module}_DEPS})
 	separate_arguments (_${module}_args UNIX_COMMAND "${_dep}")
 	if (_${module}_args)
-          # keep REQUIRED in the arguments only if we were required ourself
-          # "required-ness" is not transitive as far as CMake is concerned
-          # (i.e. if an optional package requests a package to be required,
-          # the build will fail if it's not found)
-	  string (REPLACE "REQUIRED" "${_${module}_required}" _args_req "${_${module}_args}")
-          if(_dep MATCHES "opm-")
+          if(_dep MATCHES "opm-" OR _dep MATCHES "ewoms")
             set(deplist ${_dep})
             string(STRIP "${_dep}" _dep)
             string(REPLACE " " ";" deplist "${_dep}")

cmake/Modules/OpmProject.cmake

@@ -76,7 +76,6 @@ function (opm_cmake_config name)
   set (template_dir "${OPM_MACROS_ROOT}/cmake/Templates")
 
   # write configuration file to locate library
-  set(DUNE_PREFIX ${PROJECT_SOURCE_DIR})
   set(OPM_PROJECT_EXTRA_CODE ${OPM_PROJECT_EXTRA_CODE_INTREE})
   set(PREREQ_LOCATION "${PROJECT_SOURCE_DIR}")
   configure_cmake_file (${name} "config" "")
@@ -124,7 +123,6 @@ function (opm_cmake_config name)
   # of the build directory (using the same input template)
   set(OPM_PROJECT_EXTRA_CODE ${OPM_PROJECT_EXTRA_CODE_INSTALLED})
   set(PREREQ_LOCATION "${CMAKE_INSTALL_PREFIX}/share/opm/cmake/Modules")
-  set(DUNE_PREFIX ${CMAKE_INSTALL_PREFIX})
   configure_cmake_file (${name} "install" "")
   configure_vars (
 	FILE CMAKE "${PROJECT_BINARY_DIR}/${${name}_NAME}-install.cmake"

cmake/Modules/OpmSatellites.cmake

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

cmake/Modules/UseOptimization.cmake

@@ -21,28 +21,10 @@ 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)
-    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()
+	check_cxx_accepts_flag ("-flto" HAVE_LINK_OPTS)
+	if (HAVE_LINK_OPTS)
+	  list (APPEND _opt_flags "-flto")
+	endif (HAVE_LINK_OPTS)
   endif (WHOLE_PROG_OPTIM)
 
   # native instruction set tuning

cmake/Modules/UseStaticAnalysis.cmake

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

cmake/Modules/UseWarnings.cmake

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

cmake/Scripts/CheckCommits.cmake

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

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

@@ -21,42 +21,20 @@
 
 # Prevent multiple inclusions
 if(NOT @opm-project_NAME@_FOUND)
+  set(CMAKE_MODULE_PATH "${CMAKE_MODULE_PATH}" @PREREQ_LOCATION@)
+  include(@opm-project_NAME@-prereqs)
   # propagate these properties from one build system to the other
-  set (@opm-project_NAME@_PREFIX "@DUNE_PREFIX@")
   set (@opm-project_NAME@_VERSION "@opm-project_VERSION@")
   set (@opm-project_NAME@_DEFINITIONS "@opm-project_DEFINITIONS@")
   set (@opm-project_NAME@_INCLUDE_DIRS "@opm-project_INCLUDE_DIRS@")
   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
@@ -94,17 +72,6 @@ if(NOT @opm-project_NAME@_FOUND)
 
   # this is the contents of config.h as far as our probes can tell:
 
-
-  # 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()
+  # extra code
+  @OPM_PROJECT_EXTRA_CODE@
 endif()

debian/changelog

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

dune.module

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

etc/opm_bash_completion.sh.in

@@ -1,60 +0,0 @@
-# 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

@@ -1,53 +0,0 @@
-/*
-  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, parse_context, error_guard);
-    Opm::Schedule schedule(deck, state.getInputGrid(), state.get3DProperties(), state.runspec(), parse_context, error_guard);
-    Opm::SummaryConfig summary_config(deck, schedule, state.getTableManager(), parse_context, error_guard);
-
-    if (error_guard) {
-        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

@@ -1,158 +0,0 @@
-/*
-  Copyright 2019 Equinor ASA.
-
-  This file is part of the Open Porous Media project (OPM).
-
-  OPM is free software: you can redistribute it and/or modify
-  it under the terms of the GNU General Public License as published by
-  the Free Software Foundation, either version 3 of the License, or
-  (at your option) any later version.
-
-  OPM is distributed in the hope that it will be useful,
-  but WITHOUT ANY WARRANTY; without even the implied warranty of
-  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-  GNU General Public License for more details.
-
-  You should have received a copy of the GNU General Public License
-  along with OPM.  If not, see <http://www.gnu.org/licenses/>.
-*/
-#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;
-        ss << kw;
-
-        keywords.emplace_back(kw.name(), kw.getFileName(), kw.getLineNumber(), 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

@@ -21,40 +21,29 @@
 
 #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, errors);
+    auto deck = parser.parseFile(deck_file, parseContext);
     std::cout << "parse complete - creating EclipseState .... ";  std::cout.flush();
-    Opm::EclipseState state( deck, parseContext, errors );
-    Opm::Schedule schedule( deck, state.getInputGrid(), state.get3DProperties(), state.runspec(), parseContext, errors);
-    Opm::SummaryConfig summary( deck, schedule, state.getTableManager( ), parseContext, errors );
+    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;
+
 }
 
 
 int main(int argc, char** argv) {
-    initLogging();
     for (int iarg = 1; iarg < argc; iarg++)
         loadDeck( argv[iarg] );
 }

examples/opmpack.cpp

@@ -1,110 +0,0 @@
-/*
-  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 <iostream>
-#include <getopt.h>
-#include <boost/filesystem.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>
-
-
-inline void 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;
-
-}
-
-
-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
-
-
-)";
-    std::cerr << help_text << std::endl;
-    exit(1);
-}
-
-
-int main(int argc, char** argv) {
-    int arg_offset = 1;
-    bool stdout_output = true;
-    const char * coutput_arg;
-
-    while (true) {
-        int c;
-        c = getopt(argc, argv, "o:");
-        if (c == -1)
-            break;
-
-        switch(c) {
-        case 'o':
-            stdout_output = false;
-            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;
-        using path = boost::filesystem::path;
-        path input_arg(argv[arg_offset]);
-        path output_arg(coutput_arg);
-        if (boost::filesystem::is_directory(output_arg)) {
-            path output_path = output_arg / input_arg.filename();
-            os.open(output_path.string());
-        } else
-            os.open(output_arg.string());
-
-        pack_deck(argv[arg_offset], os);
-    }
-}
-

examples/test_util/compareECL.cpp

@@ -0,0 +1,273 @@
+/*
+   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;
+    char* keyword                = nullptr;
+    char* fileTypeCstr           = nullptr;
+    int c                        = 0;
+
+    while ((c = getopt(argc, argv, "hiIk:lnpPt:")) != -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 '?':
+                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();
+                comparator.resultsForKeyword(keyword);
+            }
+            else {
+                comparator.gridCompare();
+                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

@@ -0,0 +1,223 @@
+/*
+   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,2 +1,4 @@
-This directory contains the the 1.7.10 version of the cJSON package from https://github.com/DaveGamble/cJSON 
+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.
 

external/cjson/cJSON.h

@@ -1,16 +1,16 @@
 /*
-  Copyright (c) 2009-2017 Dave Gamble and cJSON contributors
-
+  Copyright (c) 2009 Dave Gamble
+ 
   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,260 +23,118 @@
 #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_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_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_IsReference 256
-#define cJSON_StringIsConst 512
 
 /* The cJSON structure: */
-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;
+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. */
 
-    /* The type of the item, as above. */
-    int type;
+	int type;					/* The type of the item, as above. */
 
-    /* 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 *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 name string, if this item is the child of, or is in the list of subitems of an object. */
-    char *string;
+	char *string;				/* The item's name string, if this item is the child of, or is in the list of subitems of an object. */
 } cJSON;
 
-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);
+typedef struct cJSON_Hooks {
+      void *(*malloc_fn)(size_t sz);
+      void (*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 */
-CJSON_PUBLIC(void) cJSON_InitHooks(cJSON_Hooks* hooks);
+extern 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);
 
-/* 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);
+/* 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);
 /* Delete a cJSON entity and all subentities. */
-CJSON_PUBLIC(void) cJSON_Delete(cJSON *c);
+extern void   cJSON_Delete(cJSON *c);
 
 /* Returns the number of items in an array (or object). */
-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);
+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);
 /* Get item "string" from object. Case insensitive. */
-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);
+extern cJSON *cJSON_GetObjectItem(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. */
-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);
-
+extern const char *cJSON_GetErrorPtr(void);
+	
 /* These calls create a cJSON item of the appropriate type. */
-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);
+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);
 
 /* These utilities create an Array of count items. */
-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);
+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);
 
 /* Append item to the specified array/object. */
-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);
+extern void cJSON_AddItemToArray(cJSON *array, cJSON *item);
+extern void	cJSON_AddItemToObject(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. */
-CJSON_PUBLIC(void) cJSON_AddItemReferenceToArray(cJSON *array, cJSON *item);
-CJSON_PUBLIC(void) cJSON_AddItemReferenceToObject(cJSON *object, const char *string, cJSON *item);
+extern void cJSON_AddItemReferenceToArray(cJSON *array, cJSON *item);
+extern void	cJSON_AddItemReferenceToObject(cJSON *object,const char *string,cJSON *item);
 
 /* Remove/Detatch items from Arrays/Objects. */
-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);
-
+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);
+	
 /* Update array items. */
-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);
+extern void cJSON_ReplaceItemInArray(cJSON *array,int which,cJSON *newitem);
+extern void cJSON_ReplaceItemInObject(cJSON *object,const char *string,cJSON *newitem);
 
 /* Duplicate a cJSON item */
-CJSON_PUBLIC(cJSON *) cJSON_Duplicate(const cJSON *item, cJSON_bool recurse);
+extern cJSON *cJSON_Duplicate(cJSON *item,int 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);
 
-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);
+/* 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))
 
 /* When assigning an integer value, it needs to be propagated to valuedouble too. */
-#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);
+#define cJSON_SetIntValue(object,val)			((object)?(object)->valueint=(object)->valuedouble=(val):(val))
 
 #ifdef __cplusplus
 }

jenkins/build-opm-module.sh

@@ -2,18 +2,12 @@
 
 declare -A configurations
 
-declare -A EXTRA_MODULE_FLAGS
-EXTRA_MODULE_FLAGS[opm-simulators]="-DBUILD_EBOS_EXTENSIONS=ON -DBUILD_EBOS_DEBUG_EXTENSIONS=ON"
-EXTRA_MODULE_FLAGS[opm-common]="-DOPM_ENABLE_PYTHON=ON -DOPM_ENABLE_EMBEDDED_PYTHON=ON"
-EXTRA_MODULE_FLAGS[libecl]="-DCMAKE_POSITION_INDEPENDENT_CODE=1"
-
 # Parse revisions from trigger comment and setup arrays
 # Depends on: 'upstreams', upstreamRev',
 #             'downstreams', 'downstreamRev',
 #             'ghprbCommentBody',
 #             'CONFIGURATIONS', 'TOOLCHAINS'
 function parseRevisions {
-  # Set default for libecl to be last known good commit.
   for upstream in ${upstreams[*]}
   do
     if grep -qi "$upstream=" <<< $ghprbCommentBody
@@ -85,26 +79,10 @@ 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_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
+  cmake $3 -DCMAKE_BUILD_TYPE=Release -DBUILD_TESTING=$2 -DCMAKE_TOOLCHAIN_FILE=${configurations[$configuration]} $1
   test $? -eq 0 || exit 1
-  if test $DO_TEST_FLAG -eq 1
+  if test $2 -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
@@ -112,12 +90,11 @@ function build_module {
       cmake --build .
     fi
     test $? -eq 0 || exit 2
-    TESTTHREADS=${TESTTHREADS:-1}
     if test -z "$CTEST_CONFIGURATION"
     then
-      ctest -T Test --no-compress-output -j$TESTTHREADS
+      ctest -T Test --no-compress-output
     else
-      ctest -j$TESTTHREADS -C $CTEST_CONFIGURATION --timeout 5000 -T Test --no-compress-output
+      ctest -C $CTEST_CONFIGURATION --timeout 5000 -T Test --no-compress-output
     fi
 
     # Convert to junit format
@@ -135,7 +112,6 @@ function build_module {
     else
       cmake --build . --target install
     fi
-    test $? -eq 0 || exit 3
   fi
 }
 
@@ -150,7 +126,7 @@ function clone_module {
   git init .
   if [ "$1" == "libecl" ]
   then
-    git remote add origin https://github.com/equinor/$1
+    git remote add origin https://github.com/Statoil/$1
   else
     git remote add origin https://github.com/OPM/$1
   fi
@@ -187,7 +163,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 ${EXTRA_MODULE_FLAGS[$upstream]}" ${upstreamRev[$upstream]} $WORKSPACE/$configuration
+    clone_and_build_module $upstream "-DCMAKE_PREFIX_PATH=$WORKSPACE/$configuration/install -DCMAKE_INSTALL_PREFIX=$WORKSPACE/$configuration/install" ${upstreamRev[$upstream]} $WORKSPACE/$configuration
     test $? -eq 0 || exit 1
   done
   test $? -eq 0 || exit 1
@@ -202,7 +178,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 ${EXTRA_MODULE_FLAGS[$downstream]}" ${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" ${downstreamRev[$downstream]} $WORKSPACE/$configuration 1
     test $? -eq 0 || exit 1
 
     # Installation for downstream
@@ -239,7 +215,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 ${EXTRA_MODULE_FLAGS[$1]}" 1 $WORKSPACE
+    build_module "-DCMAKE_INSTALL_PREFIX=$WORKSPACE/$configuration/install -DOPM_TESTS_ROOT=$OPM_TESTS_ROOT" 1 $WORKSPACE
     test $? -eq 0 || exit 1
     cmake --build . --target install
     test $? -eq 0 || exit 1

jenkins/build.sh

@@ -16,7 +16,7 @@ upstreamRev[libecl]=master
 declare -a downstreams
 downstreams=(opm-material
              opm-grid
-             opm-models
+             ewoms
              opm-simulators
              opm-upscaling
              )
@@ -24,7 +24,7 @@ downstreams=(opm-material
 declare -A downstreamRev
 downstreamRev[opm-material]=master
 downstreamRev[opm-grid]=master
-downstreamRev[opm-models]=master
+downstreamRev[ewoms]=master
 downstreamRev[opm-simulators]=master
 downstreamRev[opm-upscaling]=master
 

jenkins/setup-opm-tests.sh

@@ -16,14 +16,9 @@ then
       cp $OPM_TESTS_ROOT_PREDEFINED $WORKSPACE/deps/opm-tests -R
     fi
   else
-    # 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
+    # Specified in trigger, download it
+    source $WORKSPACE/deps/opm-common/jenkins/build-opm-module.sh
+    clone_module opm-tests $OPM_TESTS_REVISION
   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
-           opm-models
+           ewoms
            opm-simulators
            opm-upscaling
           )
@@ -19,7 +19,7 @@ upstreamRev[libecl]=master
 upstreamRev[opm-common]=master
 upstreamRev[opm-material]=master
 upstreamRev[opm-grid]=master
-upstreamRev[opm-models]=master
+upstreamRev[ewoms]=master
 upstreamRev[opm-simulators]=master
 upstreamRev[opm-upscaling]=master
 
@@ -81,7 +81,7 @@ 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
-  curl -d "{ \"body\": \"Existing PR https://github.com/OPM/opm-tests/pull/$DATA_PR was updated\" }" -X POST https://api.github.com/repos/OPM/$MAIN_REPO/issues/$PRNUMBER/comments?access_token=$GH_TOKEN
+  curl -d "{ \"body\": \"Existing PR https://github.com/OPM/opm-data/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
 fi

msim/include/opm/msim/msim.hpp

@@ -1,51 +0,0 @@
-#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

@@ -1,161 +0,0 @@
-/*
-  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

@@ -25,7 +25,3 @@ else()
         "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/utility/numeric/calculateCellVol.hpp

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

opm/io/eclipse/EGrid.hpp

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

opm/io/eclipse/ERft.hpp

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

opm/io/eclipse/ERst.hpp

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

opm/io/eclipse/ESmry.hpp

@@ -1,61 +0,0 @@
-/*
-   Copyright 2019 Equinor ASA.
-
-   This file is part of the Open Porous Media project (OPM).
-
-   OPM is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by
-   the Free Software Foundation, either version 3 of the License, or
-   (at your option) any later version.
-
-   OPM is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
-
-   You should have received a copy of the GNU General Public License
-   along with OPM.  If not, see <http://www.gnu.org/licenses/>.
-   */
-
-#ifndef OPM_IO_ESMRY_HPP
-#define OPM_IO_ESMRY_HPP
-
-#include <string>
-#include <vector>
-
-namespace Opm { namespace EclIO {
-
-class ESmry
-{
-public:
-    explicit ESmry(const std::string& filename, bool loadBaseRunData=false);   // filename (smspec file) or file root name
-
-    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; }
-
-private:
-    int nVect, nI, nJ, nK;
-    std::string path="";
-
-    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;
-
-    void getRstString(const std::vector<std::string> &restartArray, std::string &path, std::string &rootN) const;
-    void updatePathAndRootName(std::string &path, std::string &rootN) const;
-
-    std::string makeKeyString(const std::string& keyword, const std::string& wgname, int num) const;
-};
-
-}} // namespace Opm::EclIO
-
-#endif // OPM_IO_ESMRY_HPP

opm/io/eclipse/EclFile.hpp

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

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

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

opm/io/eclipse/EclUtil.hpp

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

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

opm/io/eclipse/PaddedOutputString.hpp

@@ -1,103 +0,0 @@
-/*
-  Copyright (c) 2018 Statoil ASA
-
-  This file is part of the Open Porous Media project (OPM).
-
-  OPM is free software: you can redistribute it and/or modify
-  it under the terms of the GNU General Public License as published by
-  the Free Software Foundation, either version 3 of the License, or
-  (at your option) any later version.
-
-  OPM is distributed in the hope that it will be useful,
-  but WITHOUT ANY WARRANTY; without even the implied warranty of
-  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-  GNU General Public License for more details.
-
-  You should have received a copy of the GNU General Public License
-  along with OPM.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#ifndef OPM_PADDEDOUTPUTSTRING_HEADER_HPP
-#define OPM_PADDEDOUTPUTSTRING_HEADER_HPP
-
-#include <algorithm>
-#include <array>
-#include <cstring>
-#include <cstddef>
-#include <string>
-
-namespace Opm { namespace EclIO {
-
-    /// Null-terminated, left adjusted, space padded array of N characters.
-    ///
-    /// Simple container of character data.  Exists solely for purpose of
-    /// outputting std::string (or types convertible to std::string) as
-    /// Fortran-style \code character (len=N) \endcode values.
-    ///
-    /// \tparam N Number of characters.
-    template <std::size_t N>
-    class PaddedOutputString
-    {
-    public:
-        PaddedOutputString()
-        {
-            this->clear();
-        }
-
-        explicit PaddedOutputString(const std::string& s)
-            : PaddedOutputString()
-        {
-            this->copy_in(s.c_str(), s.size());
-        }
-
-        ~PaddedOutputString() = default;
-
-        PaddedOutputString(const PaddedOutputString& rhs) = default;
-        PaddedOutputString(PaddedOutputString&& rhs) = default;
-
-        PaddedOutputString& operator=(const PaddedOutputString& rhs) = default;
-        PaddedOutputString& operator=(PaddedOutputString&& rhs) = default;
-
-        /// Assign from \code std::string \endcode.
-        PaddedOutputString& operator=(const std::string& s)
-        {
-            this->clear();
-            this->copy_in(s.data(), s.size());
-
-            return *this;
-        }
-
-        const char* c_str() const
-        {
-            return this->s_.data();
-        }
-
-    private:
-        enum : typename std::array<char, N + 1>::size_type { NChar = N };
-
-        std::array<char, NChar + 1> s_;
-
-        /// Clear contents of internal array (fill with ' ').
-        void clear()
-        {
-            this->s_.fill(' ');
-            this->s_[NChar] = '\0';
-        }
-
-        /// Assign new value to internal array (left adjusted, space padded
-        /// and null-terminated).
-        void copy_in(const char*                                           s,
-                     const typename std::array<char, NChar + 1>::size_type len)
-        {
-            const auto ncpy = std::min(len, static_cast<decltype(len)>(NChar));
-
-            // Note: Not strcpy() or strncpy() here.  The former has no bounds
-            // checking, the latter writes a null-terminator at position 'ncpy'
-            // (s_[ncpy]) which violates the post condition if ncpy < NChar.
-            std::memcpy(this->s_.data(), s,
-                        ncpy * sizeof *this->s_.data());
-        }
-    };
-
-}} // Opm::EclIO
-#endif // OPM_PADDEDOUTPUTSTRING_HEADER_HPP

opm/output/data/Wells.hpp

@@ -20,14 +20,12 @@
 #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>
 
 namespace Opm {
@@ -58,12 +56,6 @@ 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;
@@ -107,15 +99,9 @@ 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 {
+    struct Completion {
         using global_index = size_t;
         static const constexpr int restart_size = 2;
 
@@ -126,7 +112,6 @@ namespace Opm {
         double cell_pressure;
         double cell_saturation_water;
         double cell_saturation_gas;
-        double effective_Kh;
 
         template <class MessageBufferType>
         void write(MessageBufferType& buffer) const;
@@ -134,26 +119,14 @@ namespace Opm {
         void read(MessageBufferType& buffer);
     };
 
-    struct Segment {
-        Rates rates;
-        double pressure;
-        std::size_t segNumber;
-
-        template <class MessageBufferType>
-        void write(MessageBufferType& buffer) const;
-
-        template <class MessageBufferType>
-        void read(MessageBufferType& buffer);
-    };
-
     struct Well {
         Rates rates;
         double bhp;
         double thp;
         double temperature;
         int control;
-        std::vector< Connection > connections;
-        std::unordered_map<std::size_t, Segment> segments;
+        std::vector< Completion > completions;
+
         inline bool flowing() const noexcept;
         template <class MessageBufferType>
         void write(MessageBufferType& buffer) const;
@@ -173,20 +146,20 @@ namespace Opm {
         }
 
 
-        double get(const std::string& well_name , Connection::global_index connection_grid_index, Rates::opt m) const {
+        double get(const std::string& well_name , Completion::global_index completion_grid_index, Rates::opt m) const {
             const auto& witr = this->find( well_name );
             if( witr == this->end() ) return 0.0;
 
             const auto& well = witr->second;
-            const auto& connection = std::find_if( well.connections.begin() ,
-                                                   well.connections.end() ,
-                                                   [=]( const Connection& c ) {
-                                                        return c.index == connection_grid_index; });
+            const auto& completion = std::find_if( well.completions.begin() ,
+                                                   well.completions.end() ,
+                                                   [=]( const Completion& c ) {
+                                                        return c.index == completion_grid_index; });
 
-            if( connection == well.connections.end() )
+            if( completion == well.completions.end() )
                 return 0.0;
 
-            return connection->rates.get( m, 0.0 );
+            return completion->rates.get( m, 0.0 );
         }
 
         template <class MessageBufferType>
@@ -275,12 +248,6 @@ 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(
@@ -318,16 +285,10 @@ 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>
-    void Connection::write(MessageBufferType& buffer) const {
+    void Completion::write(MessageBufferType& buffer) const {
             buffer.write(this->index);
             this->rates.write(buffer);
             buffer.write(this->pressure);
@@ -335,14 +296,6 @@ namespace Opm {
             buffer.write(this->cell_pressure);
             buffer.write(this->cell_saturation_water);
             buffer.write(this->cell_saturation_gas);
-            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>
@@ -352,20 +305,10 @@ namespace Opm {
         buffer.write(this->thp);
         buffer.write(this->temperature);
         buffer.write(this->control);
-        unsigned int size = this->connections.size();
+        unsigned int size = this->completions.size();
         buffer.write(size);
-        for (const Connection& comp : this->connections)
+        for (const Completion& comp : this->completions)
             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);
-            }
-        }
     }
 
     template <class MessageBufferType>
@@ -382,16 +325,10 @@ 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>
-   void Connection::read(MessageBufferType& buffer) {
+   void Completion::read(MessageBufferType& buffer) {
             buffer.read(this->index);
             this->rates.read(buffer);
             buffer.read(this->pressure);
@@ -399,16 +336,8 @@ namespace Opm {
             buffer.read(this->cell_pressure);
             buffer.read(this->cell_saturation_water);
             buffer.read(this->cell_saturation_gas);
-            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 Well::read(MessageBufferType& buffer) {
         this->rates.read(buffer);
@@ -416,35 +345,17 @@ namespace Opm {
         buffer.read(this->thp);
         buffer.read(this->temperature);
         buffer.read(this->control);
-
-        // Connection information
-        unsigned int size = 0.0; //this->connections.size();
+        unsigned int size = 0.0; //this->completions.size();
         buffer.read(size);
-        this->connections.resize(size);
+        this->completions.resize(size);
         for (size_t i = 0;  i < size; ++i)
         {
-            auto& comp = this->connections[ i ];
+            auto& comp = this->completions[ 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));
-        }
     }
 
-}} // Opm::data
+}
+}
 
 #endif //OPM_OUTPUT_WELLS_HPP

opm/output/eclipse/AggregateConnectionData.hpp

@@ -1,75 +0,0 @@
-/*
-  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

@@ -1,154 +0,0 @@
-/*
-  Copyright (c) 2018 Statoil ASA
-
-  This file is part of the Open Porous Media project (OPM).
-
-  OPM is free software: you can redistribute it and/or modify
-  it under the terms of the GNU General Public License as published by
-  the Free Software Foundation, either version 3 of the License, or
-  (at your option) any later version.
-
-  OPM is distributed in the hope that it will be useful,
-  but WITHOUT ANY WARRANTY; without even the implied warranty of
-  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-  GNU General Public License for more details.
-
-  You should have received a copy of the GNU General Public License
-  along with OPM.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#ifndef OPM_AGGREGATE_GROUP_DATA_HPP
-#define OPM_AGGREGATE_GROUP_DATA_HPP
-
-#include <opm/output/eclipse/WindowedArray.hpp>
-
-#include <opm/io/eclipse/PaddedOutputString.hpp>
-
-#include <cstddef>
-#include <string>
-#include <vector>
-#include <map>
-
-namespace Opm {
-class Schedule;
-class SummaryState;
-class Group2;
-} // Opm
-
-namespace Opm { namespace RestartIO { namespace Helpers {
-
-class AggregateGroupData
-{
-public:
-    explicit AggregateGroupData(const std::vector<int>& inteHead);
-
-    void captureDeclaredGroupData(const Opm::Schedule&                 sched,
-                                  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},
-    };
-
-    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

@@ -1,115 +0,0 @@
-/*
-  Copyright (c) 2018 Statoil ASA
-
-  This file is part of the Open Porous Media project (OPM).
-
-  OPM is free software: you can redistribute it and/or modify
-  it under the terms of the GNU General Public License as published by
-  the Free Software Foundation, either version 3 of the License, or
-  (at your option) any later version.
-
-  OPM is distributed in the hope that it will be useful,
-  but WITHOUT ANY WARRANTY; without even the implied warranty of
-  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-  GNU General Public License for more details.
-
-  You should have received a copy of the GNU General Public License
-  along with OPM.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#ifndef OPM_AGGREGATE_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

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

opm/output/eclipse/AggregateWellData.hpp

@@ -1,104 +0,0 @@
-/*
-  Copyright (c) 2018 Statoil ASA
-
-  This file is part of the Open Porous Media project (OPM).
-
-  OPM is free software: you can redistribute it and/or modify
-  it under the terms of the GNU General Public License as published by
-  the Free Software Foundation, either version 3 of the License, or
-  (at your option) any later version.
-
-  OPM is distributed in the hope that it will be useful,
-  but WITHOUT ANY WARRANTY; without even the implied warranty of
-  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-  GNU General Public License for more details.
-
-  You should have received a copy of the GNU General Public License
-  along with OPM.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#ifndef OPM_AGGREGATE_WELL_DATA_HPP
-#define OPM_AGGREGATE_WELL_DATA_HPP
-
-#include <opm/output/eclipse/WindowedArray.hpp>
-
-#include <opm/io/eclipse/PaddedOutputString.hpp>
-
-#include <cstddef>
-#include <string>
-#include <vector>
-
-namespace Opm {
-    class Schedule;
-    class SummaryState;
-    class UnitSystem;
-} // Opm
-
-namespace Opm { namespace data {
-    class WellRates;
-}} // Opm::data
-
-namespace Opm { namespace RestartIO { namespace Helpers {
-
-    class AggregateWellData
-    {
-    public:
-        explicit AggregateWellData(const std::vector<int>& inteHead);
-
-	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,
-                                    const Opm::data::WellRates& xw,
-                                    const Opm::SummaryState&    smry);
-
-        /// Retrieve Integer Well Data Array.
-        const std::vector<int>& getIWell() const
-        {
-            return this->iWell_.data();
-        }
-
-        /// Retrieve Floating-Point (Real) Well Data Array.
-        const std::vector<float>& getSWell() const
-        {
-            return this->sWell_.data();
-        }
-
-        /// Retrieve Floating-Point (Double Precision) Well Data Array.
-        const std::vector<double>& getXWell() const
-        {
-            return this->xWell_.data();
-        }
-
-        /// Retrieve Character Well Data Array.
-        const std::vector<EclIO::PaddedOutputString<8>>& getZWell() const
-        {
-            return this->zWell_.data();
-        }
-
-        
-        
-    private:
-        /// Aggregate 'IWEL' array (Integer) for all wells.
-        WindowedArray<int> iWell_;
-
-        /// Aggregate 'SWEL' array (Real) for all wells.
-        WindowedArray<float> sWell_;
-
-        /// Aggregate 'XWEL' array (Double Precision) for all wells.
-        WindowedArray<double> xWell_;
-
-        /// Aggregate 'ZWEL' array (Character) for all wells.
-        WindowedArray<EclIO::PaddedOutputString<8>> zWell_;
-
-        /// Maximum number of groups in model.
-        int nWGMax_;
-    };
-
-}}} // Opm::RestartIO::Helpers
-
-#endif // OPM_AGGREGATE_WELL_DATA_HPP

opm/output/eclipse/DoubHEAD.hpp

@@ -1,76 +0,0 @@
-/*
-  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/>.
-*/
-
-#ifndef OPM_DOUBHEAD_HEADER_INCLUDED
-#define OPM_DOUBHEAD_HEADER_INCLUDED
-
-#include <chrono>
-#include <cstddef>
-#include <vector>
-
-namespace Opm {
-    class Tuning;
-    class Schedule;
-    class UDQParams;
-}
-
-namespace Opm { namespace RestartIO {
-
-    class DoubHEAD
-    {
-    public:
-        struct TimeStamp {
-            std::chrono::time_point<std::chrono::system_clock>          start;
-            std::chrono::duration<double, std::chrono::seconds::period> elapsed;
-        };
-        
-        DoubHEAD();
-
-        ~DoubHEAD() = default;
-        DoubHEAD(const DoubHEAD& rhs) = default;
-        DoubHEAD(DoubHEAD&& rhs) = default;
-
-        DoubHEAD& operator=(const DoubHEAD& rhs) = default;
-        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 double      cnvT);
-	
-        DoubHEAD& udq_param(const UDQParams& udqPar);
-
-        const std::vector<double>& data() const
-        {
-            return this->data_;
-        }
-
-    private:
-        std::vector<double> data_;
-    };
-
-}} // Opm::RestartIO
-
-#endif  // OPM_DOUBHEAD_HEADER_INCLUDED

opm/output/eclipse/EclipseIO.hpp

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

opm/output/eclipse/InteHEAD.hpp

@@ -1,143 +0,0 @@
-/*
-  Copyright 2016, 2017, 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_INTEHEAD_HEADER_INCLUDED
-#define OPM_INTEHEAD_HEADER_INCLUDED
-
-#include <array>
-#include <ctime>
-#include <memory>
-#include <vector>
-
-namespace Opm { namespace RestartIO {
-
-    class InteHEAD
-    {
-    public:
-        enum class UnitSystem {
-            Metric, Field, Lab, PVT_M
-        };
-
-        struct WellTableDim {
-            int numWells;
-            int maxPerf;
-            int maxWellInGroup;
-            int maxGroupInField;
-            int maxWellsInField;
-        };
-
-        struct WellSegDims {
-            int nsegwl;
-            int nswlmx;
-            int nsegmx;
-            int nlbrmx;
-            int nisegz;
-            int nrsegz;
-            int nilbrz;
-        };
-
-        struct RegDims {
-            int ntfip;
-            int nmfipr;
-            int nrfreg;
-            int ntfreg;
-            int nplmix;
-        };
-
-        struct TimePoint {
-            int year;
-            int month;          // 1..12
-            int day;            // 1..31
-
-            int hour;           // 0..23
-            int minute;         // 0..59
-            int second;         // 0..59
-
-            int microseconds;   // 0..999999
-        };
-
-        struct Phases {
-            int oil;
-            int water;
-            int gas;
-        };
-
-        struct TuningPar {
-            int newtmx;
-            int newtmn;
-            int litmax;
-            int litmin;
-            int mxwsit;
-            int mxwpit;
-        };
-	
-	struct Group {
-	  int ngroups;
-	};
-	
-	struct UdqParam {
-	  int    udqParam_1;
-	};
-
-        InteHEAD();
-        ~InteHEAD() = default;
-
-        InteHEAD(const InteHEAD& rhs) = default;
-        InteHEAD(InteHEAD&& rhs) = default;
-
-        InteHEAD& operator=(const InteHEAD& rhs) = default;
-        InteHEAD& operator=(InteHEAD&& rhs) = default;
-
-        InteHEAD& dimensions(const int nx, const int ny, const int nz);
-        InteHEAD& dimensions(const std::array<int,3>& cartDims);
-        InteHEAD& numActive(const int nactive);
-
-        InteHEAD& unitConventions(const UnitSystem& usys);
-        InteHEAD& wellTableDimensions(const WellTableDim& wtdim);
-        InteHEAD& calendarDate(const TimePoint& date);
-        InteHEAD& activePhases(const Phases& phases);
-        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_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);
-
-        const std::vector<int>& data() const
-        {
-            return this->data_;
-        }
-
-    private:
-        std::vector<int> data_;
-    };
-
-    std::time_t makeUTCTime(const std::tm& timePoint);
-
-    InteHEAD::TimePoint
-    getSimulationTimePoint(const std::time_t start,
-                           const double      elapsed);
-}} // Opm::RestartIO
-
-#endif // OPM_INTEHEAD_HEADER_INCLUDED

opm/output/eclipse/LinearisedOutputTable.hpp

@@ -1,5 +1,4 @@
 /*
-  Copyright 2019 Equinor.
   Copyright 2017 Statoil ASA.
 
   This file is part of the Open Porous Media project (OPM).
@@ -36,8 +35,6 @@ 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.
@@ -60,33 +57,6 @@ 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,115 +0,0 @@
-/*
-  Copyright 2019 Equinor ASA.
-  Copyright 2016, 2017 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_LOGIHEAD_HEADER_INCLUDED
-#define OPM_LOGIHEAD_HEADER_INCLUDED
-
-#include <vector>
-
-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;
-
-        LogiHEAD(const LogiHEAD& rhs) = default;
-        LogiHEAD(LogiHEAD&& rhs) = default;
-
-        LogiHEAD& operator=(const LogiHEAD& rhs) = default;
-        LogiHEAD& operator=(LogiHEAD&& rhs) = default;
-
-        LogiHEAD& variousParam(const bool e300_radial,
-                               const bool e100_radial,
-                               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
-        {
-            return this->data_;
-        }
-
-    private:
-        std::vector<bool> data_;
-    };
-
-}} // Opm::RestartIO
-
-#endif // OPM_LOGIHEAD_HEADER_INCLUDED

opm/output/eclipse/RegionCache.hpp

@@ -32,12 +32,12 @@ namespace out {
     public:
         RegionCache() = default;
         RegionCache(const Eclipse3DProperties& properties, const EclipseGrid& grid, const Schedule& schedule);
-        const std::vector<std::pair<std::string,size_t>>& connections( int region_id ) const;
+        const std::vector<std::pair<std::string,size_t>>& completions( int region_id ) const;
 
     private:
-        std::vector<std::pair<std::string,size_t>> connections_empty;
+        std::vector<std::pair<std::string,size_t>> completions_empty;
 
-        std::map<int , std::vector<std::pair<std::string,size_t>>> connection_map;
+        std::map<int , std::vector<std::pair<std::string,size_t>>> completion_map;
     };
 }
 }

opm/output/eclipse/RestartIO.hpp

@@ -1,5 +1,4 @@
 /*
-  Copyright (c) 2018 Equinor ASA
   Copyright (c) 2016 Statoil ASA
   Copyright (c) 2013-2015 Andreas Lauser
   Copyright (c) 2013 SINTEF ICT, Applied Mathematics.
@@ -24,30 +23,35 @@
 #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 <opm/parser/eclipse/EclipseState/Schedule/SummaryState.hpp>
-
-#include <string>
-#include <utility>
-#include <vector>
+#include <ert/ecl/EclKW.hpp>
+#include <ert/ecl/ecl_rsthead.h>
+#include <ert/ecl/ecl_rst_file.h>
+#include <ert/util/util.h>
 
 namespace Opm {
 
-    class EclipseGrid;
-    class EclipseState;
-    class Schedule;
+class EclipseGrid;
+class EclipseState;
+class Phases;
+class Schedule;
 
-} // namespace Opm
+namespace RestartIO {
 
-namespace Opm { namespace EclIO { namespace OutputStream {
-
-    class Restart;
-
-}}}
 
 /*
-  The two free functions RestartIO::save() and RestartIO::load() can
+  The two loose 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
@@ -64,31 +68,30 @@ namespace Opm { namespace EclIO { namespace OutputStream {
      load("CASE.X0010" , 99 , ...)
      save("CASE.X0010" , 99 , ...)
 
-   will read from and write to the file "CASE.X0010" - completely ignoring
+   will read and write to the file "CASE.X0010" - completely ignoring
    the report step argument '99'.
 */
-namespace Opm { namespace RestartIO {
 
-    void save(EclIO::OutputStream::Restart& rstFile,
-              int                           report_step,
-              double                        seconds_elapsed,
-              RestartValue                  value,
-              const EclipseState&           es,
-              const EclipseGrid&            grid,
-              const Schedule&               schedule,
-              const SummaryState&           sumState,
-              bool                          write_double = false);
+void save(const std::string& filename,
+          int report_step,
+          double seconds_elapsed,
+          data::Solution cells,
+          data::Wells wells,
+          const EclipseState& es,
+          const EclipseGrid& grid,
+          const Schedule& schedule,
+          std::map<std::string, std::vector<double>> extra_data = {},
+	  bool write_double = false);
 
 
-    RestartValue load(const std::string&             filename,
-                      int                            report_step,
-                      SummaryState&                  summary_state,
-                      const std::vector<RestartKey>& solution_keys,
-                      const EclipseState&            es,
-                      const EclipseGrid&             grid,
-                      const Schedule&                schedule,
-                      const std::vector<RestartKey>& extra_keys = {});
+RestartValue load( const std::string& filename,
+                   int report_step,
+                   const std::map<std::string, RestartKey>& keys,
+                   const EclipseState& es,
+                   const EclipseGrid& grid,
+                   const Schedule& schedule,
+                   const std::map<std::string, bool>& extra_keys = {});
 
-}} // namespace Opm::RestartIO
-
-#endif  // RESTART_IO_HPP
+}
+}
+#endif

opm/output/eclipse/RestartValue.hpp

@@ -22,30 +22,39 @@
 #include <map>
 #include <vector>
 
-#include <opm/parser/eclipse/Units/UnitSystem.hpp>
-#include <opm/output/data/Solution.hpp>
-#include <opm/output/data/Wells.hpp>
-
 namespace Opm {
 
 
+    /*
+      Small convenience class used in the map passed to the
+      RestartIO::load( ) function. A class instance can be constructed
+      from a UnitSystem::measure value, which will default to a
+      required key, but it can also be constructed from a
+      two-parameter constructor, and then the required/not required
+      can controlled explicitly:
+
+
+         RestartIO::load(..., {{"PRESSURE" , UnitSystem::measure::pressure},
+                               {"MAX_SWAT" , {UnitSystem::measure::identity, false}} )
+
+     The RestartKey( ) for pressure is implicitly created from
+     UnitSystem::measure::pressure and will be required, whereas the
+     MAX_SWAT keyword is optional.
+
+    */
     class RestartKey {
     public:
 
-        std::string key;
         UnitSystem::measure dim;
-        bool required;
+        bool required = true;
 
-        RestartKey( const std::string& _key, UnitSystem::measure _dim)
-            : key(_key),
-              dim(_dim),
-              required(true)
+        explicit RestartKey( UnitSystem::measure _dim)
+            : dim(_dim)
         {}
 
 
-        RestartKey( const std::string& _key, UnitSystem::measure _dim, bool _required)
-            : key(_key),
-              dim(_dim),
+        RestartKey( UnitSystem::measure _dim, bool _required)
+            : dim(_dim),
               required(_required)
         {}
 
@@ -53,27 +62,32 @@ namespace Opm {
 
 
     /*
-      A simple class used to communicate values between the simulator and the
-      RestartIO function.
+      A simple struct - the only purpose is to facilitate return by value from the
+      RestartIO::load( ) function.
     */
 
 
-    class RestartValue {
-    public:
-        using ExtraVector = std::vector<std::pair<RestartKey, std::vector<double>>>;
+    struct RestartValue {
+
         data::Solution solution;
         data::Wells wells;
-        ExtraVector extra;
+        std::map<std::string,std::vector<double>> extra = {};
 
-        RestartValue(data::Solution sol, data::Wells wells_arg);
 
-        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;
+        RestartValue(data::Solution sol, data::Wells wells_arg, std::map<std::string, std::vector<double>> extra_arg) :
+            solution(std::move(sol)),
+            wells(std::move(wells_arg)),
+            extra(std::move(extra_arg))
+        {
+        }
+
+
+        RestartValue(data::Solution sol, data::Wells wells_arg) :
+            solution(std::move(sol)),
+            wells(std::move(wells_arg))
+        {
+        }
 
-        void convertFromSI(const UnitSystem& units);
-        void convertToSI(const UnitSystem& units);
     };
 
 }

opm/output/eclipse/Summary.hpp

@@ -20,15 +20,14 @@
 #ifndef OPM_OUTPUT_SUMMARY_HPP
 #define OPM_OUTPUT_SUMMARY_HPP
 
-#include <map>
 #include <string>
 #include <vector>
+#include <unordered_map>
 
 #include <ert/ecl/ecl_sum.h>
-#include <ert/util/ert_unique_ptr.hpp>
+#include <ert/ecl/Smspec.hpp>
 
 #include <opm/parser/eclipse/EclipseState/Grid/EclipseGrid.hpp>
-#include <opm/parser/eclipse/EclipseState/Schedule/SummaryState.hpp>
 
 #include <opm/output/data/Wells.hpp>
 #include <opm/output/eclipse/RegionCache.hpp>
@@ -44,40 +43,33 @@ 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:
+        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 );
 
-    void add_timestep(const SummaryState& st,
-                      int report_step);
+        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 = {});
 
+        void write();
 
-    void eval(SummaryState& summary_state,
-              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 = {}) const;
+        ~Summary();
 
+    private:
+        class keyword_handlers;
 
-
-    ~Summary();
-    void write() const;
-
-private:
-    void internal_store(const SummaryState& summary_state, int report_step);
-
-
-    class keyword_handlers;
-
-    const EclipseGrid& grid;
-    out::RegionCache regionCache;
-    ERT::ert_unique_ptr< ecl_sum_type, ecl_sum_free > ecl_sum;
-    std::unique_ptr< keyword_handlers > handlers;
+        const EclipseGrid& grid;
+        out::RegionCache regionCache;
+        ERT::ert_unique_ptr< ecl_sum_type, ecl_sum_free > ecl_sum;
+        std::unique_ptr< keyword_handlers > handlers;
+        const ecl_sum_tstep_type* prev_tstep = nullptr;
+        double prev_time_elapsed = 0;
 };
 
 }

opm/output/eclipse/Tables.hpp

@@ -1,6 +1,4 @@
 /*
-  Copyright 2019 Equinor.
-  Copyright 2017 Statoil ASA.
   Copyright 2016 Statoil ASA.
 
   This file is part of the Open Porous Media project (OPM).
@@ -24,6 +22,11 @@
 
 #include <vector>
 
+#include <ert/ecl/FortIO.hpp>
+#include <ert/ecl/EclKW.hpp>
+
+#include <opm/parser/eclipse/EclipseState/Tables/PvtoTable.hpp>
+#include <opm/parser/eclipse/EclipseState/Tables/PvtgTable.hpp>
 #include <opm/parser/eclipse/EclipseState/Tables/FlatTable.hpp>
 
 namespace Opm {
@@ -34,17 +37,11 @@ namespace Opm {
     public:
         explicit Tables( const UnitSystem& units);
 
+        void addPVTO(const std::vector<PvtoTable>& pvtoTables);
+        void addPVTG(const std::vector<PvtgTable>& pvtgTables);
+        void addPVTW(const PvtwTable& pvtwTable);
         void addDensity(const DensityTable& density);
 
-        /// Add normalised PVT function tables to INIT file's TAB vector.
-        ///
-        /// \param[in] es Valid \c EclipseState object with accurate RUNSPEC
-        ///    information on active phases and table dimensions ("TABDIMS").
-        ///
-        /// \param[in] logihead Flag specifications identifying which tables
-        ///    to output.
-        void addPVTTables(const EclipseState& es);
-
         /// Add normalised saturation function tables to INIT file's TAB
         /// vector.
         ///
@@ -104,31 +101,21 @@ namespace Opm {
                                   const bool          gas,
                                   const bool          oil,
                                   const bool          wat);
-
-        /// Add gas PVT tables (keywords PVDG and PVTG) to the tabular data
-        /// (TABDIMS and TAB vectors).
-        ///
-        /// \param[in] es Valid \c EclipseState object with accurate table
-        ///    dimensions ("TABDIMS" keyword) and an initialised \c
-        ///    TableManager sub-object.
-        void addGasPVTTables(const EclipseState& es);
-
-        /// Add oil PVT tables (keywords PVCDO, PVDO and PVTO) to the
-        /// tabular data (TABDIMS and TAB vectors).
-        ///
-        /// \param[in] es Valid \c EclipseState object with accurate table
-        ///    dimensions ("TABDIMS" keyword) and an initialised \c
-        ///    TableManager sub-object.
-        void addOilPVTTables(const EclipseState& es);
-
-        /// Add water PVT tables (keyword PVTW) to the tabular data (TABDIMS
-        /// and TAB vectors).
-        ///
-        /// \param[in] es Valid \c EclipseState object with accurate table
-        ///    dimensions ("TABDIMS" keyword) and an initialised \c
-        ///    TableManager sub-object.
-        void addWaterPVTTables(const EclipseState& es);
     };
+
+    /// Emit normalised tabular information (TABDIMS and TAB vectors) to
+    /// ECL-like result set file (typically INIT file).
+    ///
+    /// \param[in] tables Collection of normalised tables.  Its \code
+    ///    tabdims() \endcode and \code tab() \endcode vectors will be
+    ///    emitted to \p fortio as ECL keywords "TABDIMS" and "TAB",
+    ///    respectively.
+    ///
+    /// \param[in,out] fortio ECL-like result set file.  Typically
+    ///    corresponds to a preopened stream attached to the INIT file.
+    void fwrite(const Tables& tables,
+                ERT::FortIO&  fortio);
 }
 
-#endif // OUTPUT_TABLES_HPP
+
+#endif

opm/output/eclipse/VectorItems/connection.hpp

@@ -1,76 +0,0 @@
-/*
-  Copyright (c) 2018 Equinor ASA
-
-  This file is part of the Open Porous Media project (OPM).
-
-  OPM is free software: you can redistribute it and/or modify
-  it under the terms of the GNU General Public License as published by
-  the Free Software Foundation, either version 3 of the License, or
-  (at your option) any later version.
-
-  OPM is distributed in the hope that it will be useful,
-  but WITHOUT ANY WARRANTY; without even the implied warranty of
-  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-  GNU General Public License for more details.
-
-  You should have received a copy of the GNU General Public License
-  along with OPM.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#ifndef OPM_OUTPUT_ECLIPSE_VECTOR_CONNECTION_HPP
-#define OPM_OUTPUT_ECLIPSE_VECTOR_CONNECTION_HPP
-
-#include <vector>
-
-namespace Opm { namespace RestartIO { namespace Helpers { namespace VectorItems {
-    namespace IConn {
-        enum index : std::vector<int>::size_type {
-            SeqIndex   =  0, // Connection sequence index
-            CellI      =  1, // I-location (1-based cell index) of connection
-            CellJ      =  2, // J-location (1-based cell index) of connection
-            CellK      =  3, // K-location (1-based cell index) of connection
-            ConnStat   =  5, // Connection status.
-                             //    > 0 => open, shut otherwise
-
-            Drainage   =  6, // Saturation function (table ID) for drainage
-            Imbibition =  9, // Saturation function (table ID) for imbibition
-
-            ComplNum   = 12, // Completion ID (1-based)
-            ConnDir    = 13, // Penetration direction (1:X, 2:Y, 3:Z)
-            Segment    = 14, // Segment ID of connection
-                             //   0 for regular connections, > 0 for MSW.
-        };
-    } // IConn
-
-    namespace SConn {
-        enum index : std::vector<float>::size_type {
-            ConnTrans    =  0, // Connection transmissibility factor
-            Depth        =  1, // Connection centre depth
-            Diameter     =  2, // Connection diameter
-
-            EffectiveKH  =  3, // Effective Kh product of connection
-
-            item12       = 11, // Connection transmissibility factor
-
-            SegDistEnd   = 20, // Distance to end of connection in segment
-            SegDistStart = 21, // Distance to start of connection in segment
-
-            item30       = 29, // Unknown
-            item31       = 30, // Unknown
-        };
-    } // SConn
-
-    namespace XConn {
-        enum index : std::vector<double>::size_type {
-            OilRate    =  0,  // Surface flow rate (oil)
-            WaterRate  =  1,  // Surface flow rate (water)
-            GasRate    =  2,  // Surface Flow rate (gas)
-
-            Pressure   = 34,  // Connection pressure value
-
-            ResVRate   = 49,  // Reservoir voidage rate
-        };
-    } // XConn
-}}}} // Opm::RestartIO::Helpers::VectorItems
-
-#endif // OPM_OUTPUT_ECLIPSE_VECTOR_CONNECTION_HPP

opm/output/eclipse/VectorItems/doubhead.hpp

@@ -1,40 +0,0 @@
-/*
-  Copyright (c) 2018 Equinor ASA
-
-  This file is part of the Open Porous Media project (OPM).
-
-  OPM is free software: you can redistribute it and/or modify
-  it under the terms of the GNU General Public License as published by
-  the Free Software Foundation, either version 3 of the License, or
-  (at your option) any later version.
-
-  OPM is distributed in the hope that it will be useful,
-  but WITHOUT ANY WARRANTY; without even the implied warranty of
-  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-  GNU General Public License for more details.
-
-  You should have received a copy of the GNU General Public License
-  along with OPM.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#ifndef OPM_OUTPUT_ECLIPSE_VECTOR_DOUBHEAD_HPP
-#define OPM_OUTPUT_ECLIPSE_VECTOR_DOUBHEAD_HPP
-
-#include <vector>
-
-namespace Opm { namespace RestartIO { namespace Helpers { namespace VectorItems {
-
-    // This is a subset of the items in src/opm/output/eclipse/DoubHEAD.cpp .
-    // Promote items from that list to this in order to make them public.
-    enum doubhead : std::vector<double>::size_type {
-        TsInit = 1,             // Maximum Length of Next Timestep
-        TsMaxz = 2,             // Maximum Length of Timestep After Next
-        TsMinz = 3,             // Minumum Length of All Timesteps
-	UdqPar_2 = 212,		// UDQPARAM item number 2 (Permitted range (+/-) of user-defined quantities)
-	UdqPar_3 = 213,		// UDQPARAM item number 3 (Value given to undefined elements when outputting data)
-	UdqPar_4 = 214,		// UDQPARAM item number 4 (fractional equality tolerance used in ==, <= etc. functions)
-    };
-
-}}}} // Opm::RestartIO::Helpers::VectorItems
-
-#endif // OPM_OUTPUT_ECLIPSE_VECTOR_DOUBHEAD_HPP

opm/output/eclipse/VectorItems/group.hpp

@@ -1,67 +0,0 @@
-/*
-  Copyright (c) 2018 Equinor ASA
-
-  This file is part of the Open Porous Media project (OPM).
-
-  OPM is free software: you can redistribute it and/or modify
-  it under the terms of the GNU General Public License as published by
-  the Free Software Foundation, either version 3 of the License, or
-  (at your option) any later version.
-
-  OPM is distributed in the hope that it will be useful,
-  but WITHOUT ANY WARRANTY; without even the implied warranty of
-  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-  GNU General Public License for more details.
-
-  You should have received a copy of the GNU General Public License
-  along with OPM.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#ifndef OPM_OUTPUT_ECLIPSE_VECTOR_GROUP_HPP
-#define OPM_OUTPUT_ECLIPSE_VECTOR_GROUP_HPP
-
-#include <vector>
-
-namespace Opm { namespace RestartIO { namespace Helpers { namespace VectorItems {
-
-    namespace XGroup {
-        enum index : std::vector<double>::size_type {
-            OilPrRate  =  0, // Group's oil production rate
-            WatPrRate  =  1, // Group's water production rate
-            GasPrRate  =  2, // Group's gas production rate
-            LiqPrRate  =  3, // Group's liquid production rate
-
-            WatInjRate =  5, // Group's water injection rate
-            GasInjRate =  6, // Group's gas injection rate
-
-            WatCut     =  8, // Group's producing water cut
-            GORatio    =  9, // Group's producing gas/oil ratio
-
-            OilPrTotal  = 10, // Group's total cumulative oil production
-            WatPrTotal  = 11, // Group's total cumulative water production
-            GasPrTotal  = 12, // Group's total cumulative gas production
-            VoidPrTotal = 13, // Group's total cumulative reservoir
-                              // voidage production
-
-            WatInjTotal = 15, // Group's total cumulative water injection
-            GasInjTotal = 16, // Group's total cumulative gas injection
-
-            OilPrPot = 22, // Group's oil production potential
-            WatPrPot = 23, // Group's water production potential
-
-            HistOilPrTotal  = 135, // Group's total cumulative oil
-                                   // production (observed/historical rates)
-            HistWatPrTotal  = 139, // Group's total cumulative water
-                                   // production (observed/historical rates)
-            HistWatInjTotal = 140, // Group's total cumulative water
-                                   // injection (observed/historical rates)
-            HistGasPrTotal  = 143, // Group's total cumulative gas
-                                   // production (observed/historical rates)
-            HistGasInjTotal = 144, // Group's total cumulative gas injection
-                                   // (observed/historical rates)
-        };
-    } // XGroup
-
-}}}} // Opm::RestartIO::Helpers::VectorItems
-
-#endif // OPM_OUTPUT_ECLIPSE_VECTOR_GROUP_HPP

opm/output/eclipse/VectorItems/intehead.hpp

@@ -1,93 +0,0 @@
-/*
-  Copyright (c) 2018 Equinor ASA
-
-  This file is part of the Open Porous Media project (OPM).
-
-  OPM is free software: you can redistribute it and/or modify
-  it under the terms of the GNU General Public License as published by
-  the Free Software Foundation, either version 3 of the License, or
-  (at your option) any later version.
-
-  OPM is distributed in the hope that it will be useful,
-  but WITHOUT ANY WARRANTY; without even the implied warranty of
-  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-  GNU General Public License for more details.
-
-  You should have received a copy of the GNU General Public License
-  along with OPM.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#ifndef OPM_OUTPUT_ECLIPSE_VECTOR_INTEHEAD_HPP
-#define OPM_OUTPUT_ECLIPSE_VECTOR_INTEHEAD_HPP
-
-#include <vector>
-
-namespace Opm { namespace RestartIO { namespace Helpers { namespace VectorItems {
-
-    // This is a subset of the items in src/opm/output/eclipse/InteHEAD.cpp .
-    // Promote items from that list to this in order to make them public.
-    enum intehead : std::vector<int>::size_type {
-        ISNUM   =   0,      //  An encoded integer corresponding to the
-                            //  time the file was created.  For files not
-                            //  originating from ECLIPSE, this value may
-                            //  be set to zero.
-
-        VERSION =   1,      //  Simulator version
-        UNIT    =   2,      //  Units convention
-                            //     1: METRIC, 2: FIELD, 3: LAB, 4: PVT-M
-
-        NX      =   8,      //  #cells in X direction (Cartesian)
-        NY      =   9,      //  #cells in Y direction (Cartesian)
-        NZ      =  10,      //  #cells in Z direction (Cartesian)
-        NACTIV  =  11,      //  Number of active cells
-
-        PHASE   =  14,      //  Phase indicator:
-                            //     1: oil, 2: water, 3: O/W, 4: gas,
-                            //     5: G/O, 6: G/W, 7: O/G/W
-
-        NWELLS  =  16,      //  Number of wells
-        NCWMAX  =  17,      //  Maximum number of completions per well
-        NWGMAX  =  19,      //  Maximum number of wells in any well group
-        NGMAXZ  =  20,      //  Maximum number of groups in field
-
-        NIWELZ  =  24,      //  Number of data elements per well in IWEL array
-                            //  (default 97 for ECLIPSE, 94 for ECLIPSE 300).
-        NSWELZ  =  25,      //  Number of data elements per well in SWEL array
-        NXWELZ  =  26,      //  Number of delements per well in XWEL array
-        NZWELZ  =  27,      //  Number of 8-character words per well in ZWEL array
-
-        NICONZ  =  32,      //  Number of data elements per completion
-                            //  in ICON array (default 19)
-        NSCONZ  =  33,      //  Number of data elements per completion in SCON array
-        NXCONZ  =  34,      //  Number of data elements per completion in XCON array
-
-        NIGRPZ  =  36,      //  Number of data elements per group in IGRP array
-        NSGRPZ  =  37,      //  Number of data elements per group in SGRP array
-        NXGRPZ  =  38,      //  Number of data elements per group in XGRP array
-        NZGRPZ  =  39,      //  Number of data elements per group in ZGRP array
-
-        NCAMAX  =  41,      //  Maximum number of analytic aquifer connections
-
-        NIAAQZ  =  42,      //  Number of data elements per aquifer in IAAQ array
-        NSAAQZ  =  43,      //  Number of data elements per aquifer in SAAQ array
-        NXAAQZ  =  44,      //  Number of data elements per aquifer in XAAQ array
-
-        NICAQZ  =  45,      //  Number of data elements per aquifer connection in ICAQ array
-        NSCAQZ  =  46,      //  Number of data elements per aquifer connection in SCAQ array
-        NACAQZ  =  47,      //  Number of data elements per aquifer connection in ACAQ array
-
-        NWMAXZ  = 163,      //  Maximum number of wells in the model
-        
-        NSEGWL  = 174,      //  Number of multisegment wells defined with WELSEG
-        NSWLMX  = 175,      //  Maximum number of segmented wells (item 1 ofWSEGDIMS)
-        NSEGMX  = 176,      //  Maximum number of segments per well (item 2 of WSEGDIMS)
-        NLBRMX  = 177,      //  Maximum number of lateral branches (item 3 of WSEGDIMS)
-
-        NISEGZ  = 178,      //  Number of entries per segment in ISEG array
-        NRSEGZ  = 179,      //  Number of entries per segment in RSEG array
-        NILBRZ  = 180,      //  Number of entries per segment in ILBR array
-        UDQPAR_1 = 267,      //  Integer seed value for the RAND /  
-    };
-}}}} // Opm::RestartIO::Helpers::VectorItems
-
-#endif // OPM_OUTPUT_ECLIPSE_VECTOR_INTEHEAD_HPP

opm/output/eclipse/VectorItems/logihead.hpp

@@ -1,48 +0,0 @@
-/*
-  Copyright (c) 2019 Equinor ASA
-
-  This file is part of the Open Porous Media project (OPM).
-
-  OPM is free software: you can redistribute it and/or modify
-  it under the terms of the GNU General Public License as published by
-  the Free Software Foundation, either version 3 of the License, or
-  (at your option) any later version.
-
-  OPM is distributed in the hope that it will be useful,
-  but WITHOUT ANY WARRANTY; without even the implied warranty of
-  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-  GNU General Public License for more details.
-
-  You should have received a copy of the GNU General Public License
-  along with OPM.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#ifndef OPM_OUTPUT_ECLIPSE_VECTOR_LOGIHEAD_HPP
-#define OPM_OUTPUT_ECLIPSE_VECTOR_LOGIHEAD_HPP
-
-#include <vector>
-
-namespace Opm { namespace RestartIO { namespace Helpers { namespace VectorItems {
-
-    // This is a subset of the items in src/opm/output/eclipse/LogiHEAD.cpp .
-    // Promote items from that list to this in order to make them public.
-    enum logihead : std::vector<bool>::size_type {
-        IsLiveOil  =  0,    // Oil phase w/dissolved gas
-        IsWetGas   =  1,    // Gas phase w/vaporised oil
-        DirKr      =  2,    // Directional relative permeability
-        E100RevKr  =  3,    // Reversible rel. perm. (E100)
-        E100Radial =  4,    // Radial model (E100)
-        E300Radial =  3,    // Radial model (E300, others)
-        E300RevKr  =  4,    // Reversible rel. perm. (E300, others)
-        Hyster     =  6,    // Enable hysteresis
-        DualPoro   = 14,    // Enable dual porosity
-        EndScale   = 16,    // Enable end-point scaling
-        DirEPS     = 17,    // Directional end-point scaling
-        RevEPS     = 18,    // Reversible end-point scaling
-        AltEPS     = 19,    // Alternative (3-pt) end-point scaling
-        ConstCo    = 38,    // Constant oil compressibility (PVCDO)
-        HasMSWells = 75,    // Whether or not model has MS Wells.
-    };
-}}}} // Opm::RestartIO::Helpers::VectorItems
-
-#endif // OPM_OUTPUT_ECLIPSE_VECTOR_LOGIHEAD_HPP

opm/output/eclipse/VectorItems/msw.hpp

@@ -1,64 +0,0 @@
-/*
-  Copyright (c) 2018 Equinor ASA
-
-  This file is part of the Open Porous Media project (OPM).
-
-  OPM is free software: you can redistribute it and/or modify
-  it under the terms of the GNU General Public License as published by
-  the Free Software Foundation, either version 3 of the License, or
-  (at your option) any later version.
-
-  OPM is distributed in the hope that it will be useful,
-  but WITHOUT ANY WARRANTY; without even the implied warranty of
-  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-  GNU General Public License for more details.
-
-  You should have received a copy of the GNU General Public License
-  along with OPM.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#ifndef OPM_OUTPUT_ECLIPSE_VECTOR_MSW_HPP
-#define OPM_OUTPUT_ECLIPSE_VECTOR_MSW_HPP
-
-#include <vector>
-
-namespace Opm { namespace RestartIO { namespace Helpers { namespace VectorItems {
-
-    namespace ISeg {
-        enum index : std::vector<int>::size_type {
-            SegNo          = 0, // Segment number (one-based)
-            OutSeg         = 1, // Outlet segment (one-based)
-            InSegCurBranch = 2, // Inflow segment current branch (one-based)
-            BranchNo       = 3, // Branch number (one-based)
-        };
-    } // ISeg
-
-    namespace RSeg {
-        enum index : std::vector<double>::size_type {
-            DistOutlet      = 0, // Segment's distance to outlet
-            OutletDepthDiff = 1, // Segment's depth differential to outlet
-            SegDiam         = 2, // Internal diameter of segment
-            SegRough        = 3, // Roughness parameter of segment
-            SegArea         = 4, // Cross-sectional area of segment
-            SegVolume       = 5, // Physical volume of segment
-            DistBHPRef      = 6, // Segment's distance to BHP reference node
-            DepthBHPRef     = 7, // Segment's depth differential to BHP ref. node
-
-            TotFlowRate  =  8,  // Normalised total segment flow rate
-            WatFlowFract =  9,  // Normalised Water flow rate fraction
-            GasFlowFract = 10,  // Normalised Gas flow rate fraction
-            Pressure     = 11,  // Segment pressure
-
-            item40  =  39,      // Unknown
-            item106 = 105,      // Unknown
-            item107 = 106,      // Unknown
-            item108 = 107,      // Unknown
-            item109 = 108,      // Unknown
-            item110 = 109,      // Unknown
-            item111 = 110,      // Unknown
-        };
-    } // RSeg
-
-}}}} // Opm::RestartIO::Helpers::VectorItems
-
-#endif // OPM_OUTPUT_ECLIPSE_VECTOR_MSW_HPP

opm/output/eclipse/VectorItems/tabdims.hpp

@@ -1,76 +0,0 @@
-/*
-  Copyright (c) 2019 Equinor ASA
-
-  This file is part of the Open Porous Media project (OPM).
-
-  OPM is free software: you can redistribute it and/or modify
-  it under the terms of the GNU General Public License as published by
-  the Free Software Foundation, either version 3 of the License, or
-  (at your option) any later version.
-
-  OPM is distributed in the hope that it will be useful,
-  but WITHOUT ANY WARRANTY; without even the implied warranty of
-  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-  GNU General Public License for more details.
-
-  You should have received a copy of the GNU General Public License
-  along with OPM.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#ifndef OPM_OUTPUT_ECLIPSE_VECTOR_TABDIMS_HPP
-#define OPM_OUTPUT_ECLIPSE_VECTOR_TABDIMS_HPP
-
-#include <vector>
-
-namespace Opm { namespace RestartIO { namespace Helpers { namespace VectorItems {
-
-    namespace TabDims {
-        enum index : std::vector<int>::size_type {
-            // Number of elements in 'TAB' array
-            TabSize           = 0,
-
-            // Oil PVT table
-            PvtoMainStart     =  6,
-            PvtoCompStart     =  7,
-            NumPvtoCompNodes  =  8,
-            NumPvtoPressNodes =  9,
-            NumPvtoTables     = 10,
-
-            // Water PVT table
-            PvtwStart         = 11,
-            NumPvtwTables     = 12,
-
-            // Gas PVT tables
-            PvtgMainStart     = 13,
-            PvtgPressStart    = 14,
-            NumPvtgCompNodes  = 15,
-            NumPvtgPressNodes = 16,
-            NumPvtgTables     = 17,
-
-            // Density tables
-            DensityTableStart = 18,
-            DensityNumTables  = 19,
-
-            // SWFN tables
-            SwfnTableStart    = 20,
-            SwfnNumSatNodes   = 21,
-            SwfnNumTables     = 22,
-
-            // SGFN tables
-            SgfnTableStart    = 23,
-            SgfnNumSatNodes   = 24,
-            SgfnNumTables     = 25,
-
-            // SOFN tables
-            SofnTableStart    = 26,
-            SofnNumSatNodes   = 28,
-            SofnNumTables     = 29,
-
-            // Size of TABDIMS array
-            TabDimsNumElems  = 100,
-        };
-    } // namespace TabDims
-
-}}}} // namespace Opm::RestartIO::Helpers::VectorItems
-
-#endif // OPM_OUTPUT_ECLIPSE_VECTOR_TABDIMS_HPP

opm/output/eclipse/VectorItems/well.hpp

@@ -1,187 +0,0 @@
-/*
-  Copyright (c) 2018 Equinor ASA
-
-  This file is part of the Open Porous Media project (OPM).
-
-  OPM is free software: you can redistribute it and/or modify
-  it under the terms of the GNU General Public License as published by
-  the Free Software Foundation, either version 3 of the License, or
-  (at your option) any later version.
-
-  OPM is distributed in the hope that it will be useful,
-  but WITHOUT ANY WARRANTY; without even the implied warranty of
-  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-  GNU General Public License for more details.
-
-  You should have received a copy of the GNU General Public License
-  along with OPM.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#ifndef OPM_OUTPUT_ECLIPSE_VECTOR_WELL_HPP
-#define OPM_OUTPUT_ECLIPSE_VECTOR_WELL_HPP
-
-#include <vector>
-
-namespace Opm { namespace RestartIO { namespace Helpers { namespace VectorItems {
-
-    namespace IWell {
-        enum index : std::vector<int>::size_type {
-            IHead    =  0, // I-location (one-based) of well head
-            JHead    =  1, // J-location (one-based) of well head
-            FirstK   =  2, // Layer ID (one-based) of top/first connection
-            LastK    =  3, // Layer ID (one-based) of bottom/last connection
-            NConn    =  4, // Number of active cells connected to well
-            Group    =  5, // Index (one-based) of well's current group
-            WType    =  6, // Well type (producer vs. injector)
-            ActWCtrl =  7, // Well's active target control mode (constraint).
-
-            item9    =  8, // Unknown
-            item11   = 10, // Unknown
-            VFPTab   = 11, // ID (one-based) of well's current VFP table.
-
-            PredReqWCtrl = 15, // Well's requested control mode from
-                               // simulation deck (WCONINJE, WCONPROD).
-
-            item18 = 17, // Unknown
-	    XFlow  = 22,
-            item25 = 24, // Unknown
-            item32 = 31, // Unknown
-            item48 = 47, // Unknown
-
-            HistReqWCtrl = 49, // Well's requested control mode from
-                               // simulation deck (WCONHIST, WCONINJH)
-
-            MsWID  = 70, // Multisegment well ID
-                         //   Value 0 for regular wells
-                         //   Value 1..#MS wells for MS wells
-            NWseg  = 71, // Number of well segments
-                         //   Value 0 for regular wells
-                         //   Value #segments for MS wells
-
-            CompOrd = 98, // Well's completion ordering scheme.
-        };
-
-        namespace Value {
-            enum WellType : int {
-                WTUnk    = 0,  // Unknown well type (OPM only)
-                Producer = 1,  // Well is producer
-                OilInj   = 2,  // Well is oil injector
-                WatInj   = 3,  // Well is water injector
-                GasInj   = 4,  // Well is gas injector
-            };
-
-            enum WellCtrlMode : int {
-                WMCtlUnk = -10,  // Unknown well control mode (OPM only)
-                Group    = - 1,  // Well under group control
-                Shut     =   0,  // Well is shut
-                OilRate  =   1,  // Well controlled by oil rate
-                WatRate  =   2,  // Well controlled by water rate
-                GasRate  =   3,  // Well controlled by gas rate
-                LiqRate  =   4,  // Well controlled by liquid rate
-
-                ResVRate =   5,  // Well controlled by
-                                 // reservoir voidage rate
-
-                THP      =   6,  // Well controlled by
-                                 // tubing head pressure target
-
-                BHP      =   7,  // Well controlled by
-                                 // bottom-hole pressure target
-
-                CombRate =   9,  // Well controlled by linearly
-                                 // combined rate target
-            };
-
-            enum CompOrder : int {
-                Track = 0, // Connections ordered along
-                           // well track (increasing MD)
-
-                Depth = 1, // Connections ordered by inceasing
-                           // true vertical depth.  Not really
-                           // supported in OPM Flow.
-
-                Input = 2, // Connections listed in order of
-                           // appearance in simulation model's
-                           // COMPDAT keyword.
-            };
-        } // Value
-    } // IWell
-
-    namespace SWell {
-        enum index : std::vector<float>::size_type {
-            OilRateTarget  = 0, // Well's current oil rate production target
-            WatRateTarget  = 1, // Well's current water rate production target
-            GasRateTarget  = 2, // Well's current gas rate production target
-            LiqRateTarget  = 3, // Well's current liquid rate production target
-            ResVRateTarget = 4, // Well's current reservoir voidate rate
-                                // production target
-
-            THPTarget      = 5, // Well's tubing head pressure target
-            BHPTarget      = 6, // Well's bottom hole pressure target
-
-            DatumDepth     = 9, // Well's reference depth for BHP
-
-            HistLiqRateTarget = 33, // Well's historical/observed liquid
-                                    // rate target/limit
-
-            HistGasRateTarget = 54, // Well's historical/observed gas rate
-                                    // target/limit
-
-            HistBHPTarget     = 55, // Well's historical/observed bottom
-                                    // hole pressure target/limit
-        };
-    } // SWell
-
-    namespace XWell {
-        enum index : std::vector<double>::size_type {
-            OilPrRate  =  0, // Well's oil production rate
-            WatPrRate  =  1, // Well's water production rate
-            GasPrRate  =  2, // Well's gas production rate
-            LiqPrRate  =  3, // Well's liquid production rate
-            VoidPrRate =  4, // Well's reservoir voidage production rate
-
-            FlowBHP    =  6, // Well's flowing/producing bottom hole pressure
-            WatCut     =  7, // Well's producing water cut
-            GORatio    =  8, // Well's producing gas/oil ratio
-
-            OilPrTotal   = 18, // Well's total cumulative oil production
-            WatPrTotal   = 19, // Well's total cumulative water production
-            GasPrTotal   = 20, // Well's total cumulative gas production
-            VoidPrTotal  = 21, // Well's total cumulative reservoir
-                               // voidage production
-
-            WatInjTotal = 23,  // Well's total cumulative water injection
-            GasInjTotal = 24,  // Well's total cumulative gas injection
-
-            GasFVF      = 34,  // Well's producing gas formation volume factor.
-
-            item37      = 36,   // Unknown
-            item38      = 37,   // Unknown
-
-            BHPTarget   = 41,   // Well's current BHP Target/Limit
-
-            HistOilPrTotal  = 75, // Well's total cumulative oil production
-                                  // (observed/historical rates)
-            HistWatPrTotal  = 76, // Well's total cumulative water
-                                  // production (observed/historical rates)
-            HistGasPrTotal  = 77, // Well's total cumulative gas production
-                                  // (observed(historical rates)
-
-            HistWatInjTotal = 81, // Well's total cumulative water injection
-                                  // (observed/historical rates)
-            HistGasInjTotal = 82, // Well's total cumulative gas injection
-                                  // (observed/historical rates)
-
-            WatVoidPrRate = 122, // Well's voidage production rate
-            GasVoidPrRate = 123, // Well's voidage production rate
-        };
-    } // XWell
-
-    namespace ZWell {
-        enum index : std::vector<const char*>::size_type {
-            WellName = 0, // Well name
-        };
-    } // ZWell
-}}}} // Opm::RestartIO::Helpers::VectorItems
-
-#endif // OPM_OUTPUT_ECLIPSE_VECTOR_WELL_HPP

opm/output/eclipse/WindowedArray.hpp

@@ -1,270 +0,0 @@
-/*
-  Copyright (c) 2018 Statoil ASA
-
-  This file is part of the Open Porous Media project (OPM).
-
-  OPM is free software: you can redistribute it and/or modify
-  it under the terms of the GNU General Public License as published by
-  the Free Software Foundation, either version 3 of the License, or
-  (at your option) any later version.
-
-  OPM is distributed in the hope that it will be useful,
-  but WITHOUT ANY WARRANTY; without even the implied warranty of
-  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-  GNU General Public License for more details.
-
-  You should have received a copy of the GNU General Public License
-  along with OPM.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#ifndef OPM_WINDOWED_ARRAY_HPP
-#define OPM_WINDOWED_ARRAY_HPP
-
-#include <cassert>
-#include <exception>
-#include <iterator>
-#include <stdexcept>
-#include <type_traits>
-#include <vector>
-
-#include <boost/range/iterator_range.hpp>
-
-/// \file
-///
-/// Provide facilities to simplify constructing restart vectors
-/// such as IWEL or RSEG.
-
-namespace Opm { namespace RestartIO { namespace Helpers {
-
-    /// Provide read-only and read/write access to constantly sized
-    /// portions/windows of a linearised buffer with an implied
-    /// 1D array structure.
-    ///
-    /// Intended as backing store for vectors that have a constant
-    /// number of items per entity (e.g., N integer data items for
-    /// each active group at a report step).
-    ///
-    /// \tparam T Element type for underlying data items.
-    template <typename T>
-    class WindowedArray
-    {
-    public:
-        /// Read/write access.
-        using WriteWindow = boost::iterator_range<
-            typename std::vector<T>::iterator>;
-
-        /// Read-only access.
-        using ReadWindow = boost::iterator_range<
-            typename std::vector<T>::const_iterator>;
-
-        using Idx = typename std::vector<T>::size_type;
-
-        /// Distinct compile-time type for number of windows in
-        /// underlying storage.
-        struct NumWindows { Idx value; };
-
-        /// Distinct compile-time type for size of windows
-        /// (number of data items per window.)
-        struct WindowSize { Idx value; };
-
-        /// Constructor.
-        ///
-        /// \param[in] n Number of windows.
-        /// \param[in] sz Number of data items per window.
-        explicit WindowedArray(const NumWindows n, const WindowSize sz)
-            : x_         (n.value * sz.value)
-            , windowSize_(sz.value)
-        {
-            if (sz.value == 0)
-                throw std::invalid_argument("Window array with windowsize==0 is not permitted");
-        }
-
-        /// Retrieve number of windows allocated for this array.
-        Idx numWindows() const
-        {
-            return this->x_.size() / this->windowSize_;
-        }
-
-        /// Retrieve number of data items per windows.
-        Idx windowSize() const
-        {
-            return this->windowSize_;
-        }
-
-        /// Request read/write access to individual window.
-        ///
-        /// \param[in] window Numeric ID of particular read/write window.
-        ///   Must be in range \code [0 .. numWindows()-1] \endcode.
-        WriteWindow operator[](const Idx window)
-        {
-            assert ((window < this->numWindows()) &&
-                    "Window ID Out of Bounds");
-
-            auto b = std::begin(this->x_) + window*this->windowSize_;
-            auto e = b + this->windowSize_;
-
-            return { b, e };
-        }
-
-        /// Request read-only access to individual window.
-        ///
-        /// \param[in] window Numeric ID of particular read-only window.
-        ///   Must be in range \code [0 .. numWindows()-1] \endcode.
-        ReadWindow operator[](const Idx window) const
-        {
-            assert ((window < this->numWindows()) &&
-                    "Window ID Out of Bounds");
-
-            auto b = std::begin(this->x_) + window*this->windowSize_;
-            auto e = b + this->windowSize_;
-
-            return { b, e };
-        }
-
-        /// Get read-only access to full, linearised data items for
-        /// all windows.
-        const std::vector<T>& data() const
-        {
-            return this->x_;
-        }
-
-        /// Extract full, linearised data items for all windows.
-        ///
-        /// Destroys the internal state of the \c WindowedArray.
-        std::vector<T> getDataDestructively()
-        {
-            return std::move(this->x_);
-        }
-
-    private:
-        std::vector<T> x_;
-
-        Idx windowSize_;
-    };
-
-
-    /// Provide read-only and read/write access to constantly sized
-    /// portions/windows of a linearised buffer with an implied
-    /// row/column matrix (2D array) structure.
-    ///
-    /// Intended as backing store for vectors that have a constant
-    /// number of items per sub-entity of a fixed number of containing
-    /// entities (e.g., K double precision data items for each of N
-    /// maximum well connections for each of M maximum active wells at
-    /// a particular report step).
-    ///
-    /// \tparam T Element type for underlying data items.
-    template <typename T>
-    class WindowedMatrix
-    {
-    private:
-        using NumWindows  = typename WindowedArray<T>::NumWindows;
-
-    public:
-        using WriteWindow = typename WindowedArray<T>::WriteWindow;
-        using ReadWindow  = typename WindowedArray<T>::ReadWindow;
-        using WindowSize  = typename WindowedArray<T>::WindowSize;
-        using Idx         = typename WindowedArray<T>::Idx;
-
-        /// Distinct compile-time type for number of matrix rows
-        /// in underlying storage.
-        struct NumRows { Idx value; };
-
-        /// Distinct compile-time type for number of matrix columns
-        /// in underlying storage.
-        struct NumCols { Idx value; };
-
-        /// Constructor.
-        ///
-        /// \param[in] nRows Number of rows.
-        /// \param[in] nCols Number of columns.
-        /// \param[in] sz Number of data items per (row,column) window.
-        explicit WindowedMatrix(const NumRows& nRows,
-                                const NumCols& nCols,
-                                const WindowSize& sz)
-            : data_   (NumWindows{ nRows.value * nCols.value }, sz)
-            , numCols_(nCols.value)
-        {
-            if (nCols.value == 0)
-                throw std::invalid_argument("Window matrix with columns==0 is not permitted");
-        }
-
-        /// Retrieve number of columns allocated for this matrix.
-        Idx numCols() const
-        {
-            return this->numCols_;
-        }
-
-        /// Retrieve number of rows allocated for this matrix.
-        Idx numRows() const
-        {
-            return this->data_.numWindows() / this->numCols();
-        }
-
-        /// Retrieve number of data items per windows.
-        Idx windowSize() const
-        {
-            return this->data_.windowSize();
-        }
-
-        /// Request read/write access to individual window.
-        ///
-        /// \param[in] row Numeric ID of particular row in matrix.
-        ///   Must be in range \code [0 .. numRows()-1] \endcode.
-        ///
-        /// \param[in] col Numeric ID of particular column in matrix.
-        ///   Must be in range \code [0 .. numCols()-1] \endcode.
-        ///
-        /// \return Read/write window at position \code (row,col) \endcode.
-        WriteWindow operator()(const Idx row, const Idx col)
-        {
-            return this->data_[ this->i(row, col) ];
-        }
-
-        /// Request read-only access to individual window.
-        ///
-        /// \param[in] row Numeric ID of particular row in matrix.
-        ///   Must be in range \code [0 .. numRows()-1] \endcode.
-        ///
-        /// \param[in] col Numeric ID of particular column in matrix.
-        ///   Must be in range \code [0 .. numCols()-1] \endcode.
-        ///
-        /// \return Read-only window at position \code (row,col) \endcode.
-        ReadWindow operator()(const Idx row, const Idx col) const
-        {
-            return this->data_[ this->i(row, col) ];
-        }
-
-        /// Get read-only access to full, linearised data items for
-        /// all windows.
-        auto data() const
-            -> decltype(std::declval<const WindowedArray<T>>().data())
-        {
-            return this->data_.data();
-        }
-
-        /// Extract full, linearised data items for all windows.
-        ///
-        /// Destroys the internal state of the \c WindowedMatrix.
-        auto getDataDestructively()
-            -> decltype(std::declval<WindowedArray<T>>()
-                        .getDataDestructively())
-        {
-            return this->data_.getDataDestructively();
-        }
-
-    private:
-        WindowedArray<T> data_;
-
-        Idx numCols_;
-
-        /// Row major (C) order.
-        Idx i(const Idx row, const Idx col) const
-        {
-            return row*this->numCols() + col;
-        }
-    };
-
-}}} // Opm::RestartIO::Helpers
-
-#endif // OPM_WINDOW_ARRAY_HPP

opm/output/eclipse/WriteInit.hpp

@@ -1,60 +0,0 @@
-/*
-  Copyright (c) 2019 Equinor ASA
-
-  This file is part of the Open Porous Media project (OPM).
-
-  OPM is free software: you can redistribute it and/or modify
-  it under the terms of the GNU General Public License as published by
-  the Free Software Foundation, either version 3 of the License, or
-  (at your option) any later version.
-
-  OPM is distributed in the hope that it will be useful,
-  but WITHOUT ANY WARRANTY; without even the implied warranty of
-  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-  GNU General Public License for more details.
-
-  You should have received a copy of the GNU General Public License
-  along with OPM.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#ifndef OPM_WRITE_INIT_HPP
-#define OPM_WRITE_INIT_HPP
-
-#include <map>
-#include <string>
-#include <vector>
-
-namespace Opm {
-
-    class EclipseGrid;
-    class EclipseState;
-    class NNC;
-    class Schedule;
-
-} // namespace Opm
-
-namespace Opm { namespace data {
-
-    class Solution;
-
-}} // namespace Opm::data
-
-namespace Opm { namespace EclIO { namespace OutputStream {
-
-    class Init;
-
-}}} // namespace Opm::EclIO::OutputStream
-
-namespace Opm { namespace InitIO {
-
-    void write(const ::Opm::EclipseState&              es,
-               const ::Opm::EclipseGrid&               grid,
-               const ::Opm::Schedule&                  schedule,
-               const ::Opm::data::Solution&            simProps,
-               std::map<std::string, std::vector<int>> int_data,
-               const ::Opm::NNC&                       nnc,
-               ::Opm::EclIO::OutputStream::Init&       initFile);
-
-}} // namespace Opm::InitIO
-
-#endif // OPM_WRITE_INIT_HPP

opm/output/eclipse/WriteRFT.hpp

@@ -1,89 +0,0 @@
-/*
-  Copyright (c) 2019 Equinor ASA
-
-  This file is part of the Open Porous Media project (OPM).
-
-  OPM is free software: you can redistribute it and/or modify
-  it under the terms of the GNU General Public License as published by
-  the Free Software Foundation, either version 3 of the License, or
-  (at your option) any later version.
-
-  OPM is distributed in the hope that it will be useful,
-  but WITHOUT ANY WARRANTY; without even the implied warranty of
-  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-  GNU General Public License for more details.
-
-  You should have received a copy of the GNU General Public License
-  along with OPM.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#ifndef OPM_WRITE_RFT_HPP
-#define OPM_WRITE_RFT_HPP
-
-namespace Opm {
-
-    class EclipseGrid;
-    class Schedule;
-    class UnitSystem;
-
-} // namespace Opm
-
-namespace Opm { namespace data {
-
-    class WellRates;
-
-}} // namespace Opm::data
-
-namespace Opm { namespace EclIO { namespace OutputStream {
-
-    class RFT;
-
-}}} // namespace Opm::EclIO::OutputStream
-
-namespace Opm { namespace RftIO {
-
-    /// Collect RFT data and output to pre-opened output stream.
-    ///
-    /// RFT data is output for all affected wells at a given timestep,
-    /// and consists of
-    ///
-    ///   1) Time stamp (elapsed and date)
-    ///   2) Metadata about the output (units of measure, well types,
-    ///      data type identifier)
-    ///   3) Depth, pressure, Sw, Sg, (I,J,K), and hostgrid for each
-    ///      reservoir connection of the affected well.
-    ///
-    /// If no RFT output is requested at given timestep, then this
-    /// function returns with no output written to the RFT file.
-    ///
-    /// \param[in] reportStep Report step time point for which to output
-    ///    RFT data.
-    ///
-    /// \param[in] elapsed Number of seconds of simulated time until
-    ///    this report step (\p reportStep).
-    ///
-    /// \param[in] usys Unit system conventions for output.  Typically
-    ///    corresponds to run's active unit system (i.e., \code
-    ///    EclipseState::getUnits() \endcode).
-    ///
-    /// \param[in] grid Run's active grid.  Used to determine which
-    ///    reservoir connections are in active grid cells.
-    ///
-    /// \param[in] schedule Run's SCHEDULE section from which to access
-    ///    the active wells and the RFT configuration.
-    ///
-    /// \param[in,out] rftFile RFT output stream.  On input, appropriately
-    ///    positioned for new content (i.e., at end-of-file).  On output,
-    ///    containing new RFT output (if applicable) and positioned after
-    ///    new contents.
-    void write(const int                        reportStep,
-               const double                     elapsed,
-               const ::Opm::UnitSystem&         usys,
-               const ::Opm::EclipseGrid&        grid,
-               const ::Opm::Schedule&           schedule,
-               const ::Opm::data::WellRates&    wellSol,
-               ::Opm::EclIO::OutputStream::RFT& rftFile);
-
-}} // namespace Opm::RftIO
-
-#endif // OPM_WRITE_RFT_HPP

opm/output/eclipse/WriteRestartHelpers.hpp

@@ -1,75 +0,0 @@
-/*
-  Copyright (c) 2018 Statoil ASA
-
-  This file is part of the Open Porous Media project (OPM).
-
-  OPM is free software: you can redistribute it and/or modify
-  it under the terms of the GNU General Public License as published by
-  the Free Software Foundation, either version 3 of the License, or
-  (at your option) any later version.
-
-  OPM is distributed in the hope that it will be useful,
-  but WITHOUT ANY WARRANTY; without even the implied warranty of
-  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-  GNU General Public License for more details.
-
-  You should have received a copy of the GNU General Public License
-  along with OPM.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#ifndef OPM_WRITE_RESTART_HELPERS_HPP
-#define OPM_WRITE_RESTART_HELPERS_HPP
-
-#include <vector>
-
-// Missing definitions (really belong in ert/ecl_well/well_const.h, but not
-// defined there)
-#define SCON_KH_INDEX 3
-
-
-// Forward declarations
-
-namespace Opm {
-
-    class EclipseGrid;
-    class EclipseState;
-    class Schedule;
-    class Well;
-    class UnitSystem;
-    class UDQActive;
-
-} // Opm
-
-namespace Opm { namespace RestartIO { namespace Helpers {
-
-    const double UNIMPLEMENTED_VALUE = 1e-100; // placeholder for values not yet available 
-
-    std::vector<double>
-    createDoubHead(const EclipseState& es,
-                   const Schedule&     sched,
-                   const std::size_t   lookup_step,
-                   const double        simTime,
-                   const double        nextTimeStep);
-
-
-
-    std::vector<int>
-    createInteHead(const EclipseState& es,
-                   const EclipseGrid&  grid,
-                   const Schedule&     sched,
-                   const double        simTime,
-                   const int           num_solver_steps,
-                   const int           lookup_step);   // The integer index used to look up dynamic properties, e.g. the number of well.
-
-    std::vector<bool>
-    createLogiHead(const EclipseState& es);
-
-    std::vector<int>
-    createUdqDims(const Schedule&     		sched,
-                  const std::size_t       lookup_step,
-                  const std::vector<int>& inteHead);
-
-
-}}} // Opm::RestartIO::Helpers
-
-#endif  // OPM_WRITE_RESTART_HELPERS_HPP

opm/parser/eclipse/Deck/Deck.hpp

@@ -124,12 +124,13 @@ namespace Opm {
             using iterator = std::vector< DeckKeyword >::iterator;
 
             Deck();
+            // cppcheck-suppress noExplicitConstructor
+            Deck( std::initializer_list< DeckKeyword > );
+            // cppcheck-suppress noExplicitConstructor
+            Deck( std::initializer_list< std::string > );
 
             Deck( const Deck& );
 
-            //! \brief Deleted assignment operator.
-            Deck& operator=(const Deck& rhs) = delete;
-
             void addKeyword( DeckKeyword&& keyword );
             void addKeyword( const DeckKeyword& keyword );
 
@@ -140,10 +141,8 @@ namespace Opm {
             UnitSystem& getActiveUnitSystem();
             UnitSystem& getDefaultUnitSystem();
 
-            const std::string& getInputPath() const;
-            const std::string& getDataFile() const;
+            const std::string getDataFile() const;
             void setDataFile(const std::string& dataFile);
-            std::string makeDeckPath(const std::string& path) const;
 
             iterator begin();
             iterator end();
@@ -157,7 +156,6 @@ namespace Opm {
             UnitSystem activeUnits;
 
             std::string m_dataFile;
-            std::string input_path;
     };
 }
 #endif  /* DECK_HPP */

opm/parser/eclipse/Deck/DeckItem.hpp

@@ -27,7 +27,6 @@
 
 #include <opm/parser/eclipse/Units/Dimension.hpp>
 #include <opm/parser/eclipse/Utility/Typetools.hpp>
-#include <opm/parser/eclipse/Deck/UDAValue.hpp>
 
 namespace Opm {
     class DeckOutput;
@@ -35,10 +34,11 @@ namespace Opm {
     class DeckItem {
     public:
         DeckItem() = default;
-        DeckItem( const std::string&, int);
-        DeckItem( const std::string&, double);
-        DeckItem( const std::string&, std::string);
-        DeckItem( const std::string&, UDAValue);
+        explicit DeckItem( const std::string& );
+
+        DeckItem( const std::string&, int, size_t size_hint = 8 );
+        DeckItem( const std::string&, double, size_t size_hint = 8 );
+        DeckItem( const std::string&, std::string, size_t size_hint = 8 );
 
         const std::string& name() const;
 
@@ -58,23 +58,19 @@ namespace Opm {
         size_t size() const;
         size_t out_size() const;
 
-        //template< typename T > T& get( size_t ) ;
-        template< typename T > T get( size_t ) const;
+        template< typename T > const T& get( size_t ) const;
         double getSIDouble( size_t ) const;
         std::string getTrimmedString( size_t ) const;
 
         template< typename T > const std::vector< T >& getData() const;
         const std::vector< double >& getSIDoubleData() const;
 
-        void push_back( UDAValue );
         void push_back( int );
         void push_back( double );
         void push_back( std::string );
-        void push_back( UDAValue, size_t );
         void push_back( int, size_t );
         void push_back( double, size_t );
         void push_back( std::string, size_t );
-        void push_backDefault( UDAValue );
         void push_backDefault( int );
         void push_backDefault( double );
         void push_backDefault( std::string );
@@ -109,24 +105,19 @@ namespace Opm {
         */
         bool operator==(const DeckItem& other) const;
         bool operator!=(const DeckItem& other) const;
-        static bool to_bool(std::string string_value);
+
     private:
-        mutable std::vector< double > dval;
+        std::vector< double > dval;
         std::vector< int > ival;
         std::vector< std::string > sval;
-        std::vector< UDAValue > uval;
 
         type_tag type = type_tag::unknown;
 
         std::string item_name;
         std::vector< bool > defaulted;
         std::vector< Dimension > dimensions;
-        /*
-          To save space we mutate the dval object in place when asking for SI
-          data; the current state of of the dval member is tracked with the
-          raw_data bool member.
-        */
-        mutable bool raw_data = true;
+        mutable std::vector< double > SIdata;
+
         template< typename T > std::vector< T >& value_ref();
         template< typename T > const std::vector< T >& value_ref() const;
         template< typename T > void push( T );

opm/parser/eclipse/Deck/DeckKeyword.hpp

@@ -23,36 +23,25 @@
 #include <string>
 #include <vector>
 #include <memory>
-#include <utility>
 
-#include <opm/parser/eclipse/Parser/ParserKeyword.hpp>
-#include <opm/parser/eclipse/Deck/DeckValue.hpp>
 #include <opm/parser/eclipse/Deck/DeckRecord.hpp>
 
 namespace Opm {
-    class DeckOutput;
     class ParserKeyword;
+    class DeckOutput;
 
     class DeckKeyword {
     public:
         typedef std::vector< DeckRecord >::const_iterator const_iterator;
 
-        explicit DeckKeyword(const ParserKeyword& parserKeyword);
-
-        DeckKeyword(const ParserKeyword& parserKeyword, const std::string& keywordName);
-
-        DeckKeyword(const ParserKeyword& parserKeyword, const std::vector<std::vector<DeckValue>>& record_list);
-
-        DeckKeyword(const ParserKeyword& parserKeyword, const std::vector<int>& data);
-        DeckKeyword(const ParserKeyword& parserKeyword, const std::vector<double>& data);
+        explicit DeckKeyword(const std::string& keywordName);
+        DeckKeyword(const std::string& keywordName, bool knownKeyword);
 
         const std::string& name() const;
         void setFixedSize();
-        void setLocation(const std::pair<const std::string&, std::size_t>& location);
+        void setLocation(const std::string& fileName, int lineNumber);
         const std::string& getFileName() const;
         int getLineNumber() const;
-        std::pair<std::string, std::size_t> location() const;
-
 
         size_t size() const;
         void addRecord(DeckRecord&& record);
@@ -60,13 +49,13 @@ namespace Opm {
         DeckRecord& getRecord(size_t index);
         const DeckRecord& getDataRecord() const;
         void setDataKeyword(bool isDataKeyword = true);
+        bool isKnown() const;
         bool isDataKeyword() const;
 
         const std::vector<int>& getIntData() const;
         const std::vector<double>& getRawDoubleData() const;
         const std::vector<double>& getSIDoubleData() const;
         const std::vector<std::string>& getStringData() const;
-        const ParserKeyword& parserKeyword() const;
         size_t getDataSize() const;
         void write( DeckOutput& output ) const;
         void write_data( DeckOutput& output ) const;
@@ -94,9 +83,9 @@ namespace Opm {
         int m_lineNumber;
 
         std::vector< DeckRecord > m_recordList;
+        bool m_knownKeyword;
         bool m_isDataKeyword;
         bool m_slashTerminated;
-        ParserKeyword parser_keyword;
     };
 }
 

opm/parser/eclipse/Deck/DeckOutput.hpp

@@ -28,8 +28,7 @@ namespace Opm {
 
     class DeckOutput {
     public:
-        explicit DeckOutput(std::ostream& s, int precision = 10);
-        ~DeckOutput();
+        explicit DeckOutput(std::ostream& s);
         void stash_default( );
 
         void start_record( );
@@ -52,11 +51,9 @@ namespace Opm {
         size_t default_count;
         size_t row_count;
         bool record_on;
-        int org_precision;
 
         template <typename T> void write_value(const T& value);
         void write_sep( );
-        void set_precision(int precision);
     };
 }
 

opm/parser/eclipse/Deck/DeckValue.hpp

@@ -1,58 +0,0 @@
-/*
-  Copyright 2019 Equinor ASA.
-
-  This file is part of the Open Porous Media project (OPM).
-
-  OPM is free software: you can redistribute it and/or modify
-  it under the terms of the GNU General Public License as published by
-  the Free Software Foundation, either version 3 of the License, or
-  (at your option) any later version.
-
-  OPM is distributed in the hope that it will be useful,
-  but WITHOUT ANY WARRANTY; without even the implied warranty of
-  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-  GNU General Public License for more details.
-
-  You should have received a copy of the GNU General Public License
-  along with OPM.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#ifndef DECK_VALUE_HPP
-#define DECK_VALUE_HPP
-
-#include <string>
-
-#include <opm/parser/eclipse/Utility/Typetools.hpp>
-
-namespace Opm {
-
-class DeckValue {
-
-    public:
-        DeckValue();
-        explicit DeckValue(int);
-        explicit DeckValue(double);
-        explicit DeckValue(const std::string&);
-        
-        bool is_default() const;
-
-        template<typename T>
-        T get() const;
-
-        template<typename T>
-        bool is_compatible() const;
-
-    private:
-
-        bool default_value;
-        type_tag value_enum;
-        int int_value;
-        double double_value;
-        std::string string_value;    
-
-};
-
-}
-
-
-#endif

opm/parser/eclipse/Deck/UDAValue.hpp

@@ -1,69 +0,0 @@
-/*
-  Copyright 2019 Equinor ASA.
-
-  This file is part of the Open Porous Media project (OPM).
-
-  OPM is free software: you can redistribute it and/or modify
-  it under the terms of the GNU General Public License as published by
-  the Free Software Foundation, either version 3 of the License, or
-  (at your option) any later version.
-
-  OPM is distributed in the hope that it will be useful,
-  but WITHOUT ANY WARRANTY; without even the implied warranty of
-  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-  GNU General Public License for more details.
-
-  You should have received a copy of the GNU General Public License
-  along with OPM.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#ifndef UDA_VALUE_HPP
-#define UDA_VALUE_HPP
-
-#include <stdexcept>
-#include <vector>
-#include <string>
-#include <iosfwd>
-
-#include <opm/parser/eclipse/Units/Dimension.hpp>
-
-namespace Opm {
-
-class UDAValue {
-public:
-    UDAValue();
-    explicit UDAValue(double);
-    explicit UDAValue(const std::string&);
-
-    template<typename T>
-    T get() const;
-
-    template<typename T>
-    bool is() const;
-
-    void reset(double value);
-    void reset(const std::string& value);
-
-    void assert_numeric() const;
-    void assert_numeric(const std::string& error_msg) const;
-    void set_dim(const Dimension& dim) const;
-    const Dimension& get_dim() const;
-
-    bool operator==(const UDAValue& other) const;
-    bool operator!=(const UDAValue& other) const;
-private:
-    bool numeric_value;
-    double double_value;
-    std::string string_value;
-
-    /* This 'mutable' modifier is a hack to avoid tampering with the overall
-       const-ness of the data in a deck item. */
-    mutable Dimension dim;
-};
-
-std::ostream& operator<<( std::ostream& stream, const UDAValue& uda_value );
-}
-
-
-
-#endif

opm/parser/eclipse/EclipseState/Aquancon.hpp

@@ -44,22 +44,21 @@ namespace Opm {
             struct AquanconOutput{
                 int aquiferID;
                 std::vector<size_t> global_index;
-                std::vector<std::shared_ptr<double>> influx_coeff; // Size = size(global_index)
+                std::vector<double> influx_coeff; // Size = size(global_index)
                 std::vector<double> influx_multiplier; // Size = size(global_index)
                 std::vector<int> reservoir_face_dir; // Size = size(global_index)
-                std::vector<int> record_index;
             };
 
             Aquancon(const EclipseGrid& grid, const Deck& deck);
 
             const std::vector<Aquancon::AquanconOutput>& getAquOutput() const;
-
+    
         private:
 
-            std::vector<Aquancon::AquanconOutput> logic_application(const std::vector<Aquancon::AquanconOutput>& original_vector);
+            void logic_application(std::vector<Aquancon::AquanconOutput>& output_vector);
 
-            void collate_function(std::vector<Aquancon::AquanconOutput>& output_vector,
-                                  std::vector<Opm::AquanconRecord>& m_aqurecord,
+            void collate_function(std::vector<Aquancon::AquanconOutput>& output_vector, 
+                                  std::vector<Opm::AquanconRecord>& m_aqurecord, 
                                   std::vector<int> m_aquiferID_per_record, int m_maxAquID);
 
             void convert_record_id_to_aquifer_id(std::vector<int>& record_indices_matching_id, int i,

opm/parser/eclipse/EclipseState/AquiferCT.hpp

@@ -25,22 +25,20 @@
   This includes the logic for parsing as well as the associated tables. It is meant to be used by opm-grid and opm-simulators in order to
   implement the Carter Tracy analytical aquifer model in OPM Flow.
 */
-#include <opm/parser/eclipse/Parser/ParserKeywords/A.hpp>
 
+#include <opm/parser/eclipse/EclipseState/EclipseState.hpp>
+#include <opm/parser/eclipse/Parser/ParserKeywords/A.hpp>
 #include <opm/parser/eclipse/Deck/Deck.hpp>
 #include <opm/parser/eclipse/Deck/DeckItem.hpp>
 #include <opm/parser/eclipse/Deck/DeckRecord.hpp>
 #include <opm/parser/eclipse/Deck/DeckKeyword.hpp>
-#include <opm/parser/eclipse/Units/UnitSystem.hpp>
-
 #include <opm/parser/eclipse/EclipseState/Tables/Aqudims.hpp>
 #include <opm/parser/eclipse/EclipseState/Tables/TableContainer.hpp>
 #include <opm/parser/eclipse/EclipseState/Tables/AqutabTable.hpp>
+#include <boost/concept_check.hpp>
 
 namespace Opm {
 
-    class EclipseState;
-
     class AquiferCT {
         public:
 
@@ -62,7 +60,6 @@ namespace Opm {
                             theta , //angle subtended by the aquifer boundary
                             c2 ; //6.283 (METRIC, PVT-M); 1.1191 (FIELD); 6.283 (LAB).
 
-                    std::shared_ptr<double> p0; //Initial aquifer pressure at datum depth, d0
                     std::vector<double> td, pi;
             };
 
@@ -71,23 +68,23 @@ namespace Opm {
             const std::vector<AquiferCT::AQUCT_data>& getAquifers() const;
             int getAqInflTabID(size_t aquiferIndex);
             int getAqPvtTabID(size_t aquiferIndex);
-
+    
         private:
-
+  
             std::vector<AquiferCT::AQUCT_data> m_aquct;
-
-            //Set the default Pd v/s Td tables (constant terminal rate case for an infinite aquifer) as described in
-            //Van Everdingen, A. & Hurst, W., December, 1949.The Application of the Laplace Transformation to Flow Problems in Reservoirs.
+            
+            //Set the default Pd v/s Td tables (constant terminal rate case for an infinite aquifer) as described in 
+            //Van Everdingen, A. & Hurst, W., December, 1949.The Application of the Laplace Transformation to Flow Problems in Reservoirs. 
             //Petroleum Transactions, AIME.
             inline void set_default_tables(std::vector<double>& td, std::vector<double>& pi)
-            {
-                std::vector<double> default_pressure_ = { 0.112, 0.229, 0.315, 0.376, 0.424, 0.469, 0.503, 0.564, 0.616, 0.659, 0.702, 0.735,
-                                                          0.772, 0.802, 0.927, 1.02, 1.101, 1.169, 1.275, 1.362, 1.436, 1.5, 1.556, 1.604,
-                                                          1.651, 1.829, 1.96, 2.067, 2.147, 2.282, 2.388, 2.476, 2.55, 2.615, 2.672, 2.723,
+            {   
+                std::vector<double> default_pressure_ = { 0.112, 0.229, 0.315, 0.376, 0.424, 0.469, 0.503, 0.564, 0.616, 0.659, 0.702, 0.735, 
+                                                          0.772, 0.802, 0.927, 1.02, 1.101, 1.169, 1.275, 1.362, 1.436, 1.5, 1.556, 1.604, 
+                                                          1.651, 1.829, 1.96, 2.067, 2.147, 2.282, 2.388, 2.476, 2.55, 2.615, 2.672, 2.723, 
                                                           2.921, 3.064, 3.173, 3.263, 3.406, 3.516, 3.608, 3.684, 3.75, 3.809, 3.86 };
 
-                std::vector<double> default_time_ = { 0.01, 0.05, 0.1, 0.15, 0.2, 0.25, 0.3, 0.4, 0.5, 0.6, 0.7, 0.8, 0.9, 1,
-                                                        1.5, 2, 2.5, 3, 4, 5, 6, 7, 8, 9, 10, 15, 20, 25, 30, 40, 50, 60, 70,
+                std::vector<double> default_time_ = { 0.01, 0.05, 0.1, 0.15, 0.2, 0.25, 0.3, 0.4, 0.5, 0.6, 0.7, 0.8, 0.9, 1, 
+                                                        1.5, 2, 2.5, 3, 4, 5, 6, 7, 8, 9, 10, 15, 20, 25, 30, 40, 50, 60, 70, 
                                                         80, 90, 100, 150, 200, 250, 300, 400, 500, 600, 700, 800, 900, 1000 };
 
                 td = default_time_;

opm/parser/eclipse/EclipseState/Aquifetp.hpp

@@ -1,74 +0,0 @@
-/*
-  Copyright (C) 2017 TNO
-
-  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_AQUIFERFETP_HPP
-#define OPM_AQUIFERFETP_HPP
-
-/*
-  The Aquiferfetp which stands for AquiferFetkovich is a data container object meant to hold the data for the fetkovich aquifer model.
-  This includes the logic for parsing as well as the associated tables. It is meant to be used by opm-grid and opm-simulators in order to
-  implement the Fetkovich analytical aquifer model in OPM Flow.
-*/
-
-#include <opm/parser/eclipse/EclipseState/EclipseState.hpp>
-#include <opm/parser/eclipse/Parser/ParserKeywords/A.hpp>
-#include <opm/parser/eclipse/Deck/Deck.hpp>
-#include <opm/parser/eclipse/Deck/DeckItem.hpp>
-#include <opm/parser/eclipse/Deck/DeckRecord.hpp>
-#include <opm/parser/eclipse/Deck/DeckKeyword.hpp>
-#include <opm/parser/eclipse/EclipseState/Tables/Aqudims.hpp>
-#include <opm/parser/eclipse/EclipseState/Tables/TableContainer.hpp>
-#include <boost/concept_check.hpp>
-#include <opm/parser/eclipse/Units/UnitSystem.hpp>
-
-namespace Opm {
-
-    class Aquifetp {
-        public:
-
-            struct AQUFETP_data{
-
-                    // Aquifer ID
-                    int aquiferID;
-                    // Table IDs
-                    int inftableID, pvttableID;
-                    std::vector<int> cell_id;
-                    // Variables constants
-                    double  J, // Specified Productivity Index
-			  rho, // water density in the aquifer
-			  C_t, // total rock compressibility
-			   V0, // initial volume of water in aquifer
-			   d0; // aquifer datum depth
-		    std::shared_ptr<double> p0; //Initial aquifer pressure at datum depth d0 - nullptr if the pressure has been defaulted.
-            };
-
-            Aquifetp(const Deck& deck);
-
-            const std::vector<Aquifetp::AQUFETP_data>& getAquifers() const;
-            int getAqPvtTabID(size_t aquiferIndex);
-    
-        private:
-  
-            std::vector<Aquifetp::AQUFETP_data> m_aqufetp;
-
-    };
-}
-
-
-#endif

opm/parser/eclipse/EclipseState/Eclipse3DProperties.hpp

@@ -49,14 +49,10 @@ namespace Opm {
     public:
 
         Eclipse3DProperties() = default;
-
         Eclipse3DProperties(const Deck& deck,
                             const TableManager& tableManager,
                             const EclipseGrid& eclipseGrid);
 
-        Eclipse3DProperties( UnitSystem unit_system,
-                             const TableManager& tableManager,
-                             const EclipseGrid& eclipseGrid);
 
         std::vector< int > getRegions( const std::string& keyword ) const;
         std::string getDefaultRegionKeyword() const;
@@ -93,13 +89,10 @@ namespace Opm {
         void handleEQUALREGKeyword(const DeckKeyword& deckKeyword );
         void handleMULTIREGKeyword(const DeckKeyword& deckKeyword );
         void handleOPERATEKeyword( const DeckKeyword& deckKeyword, BoxManager& boxManager);
-        void handleOPERATERKeyword( const DeckKeyword& deckKeyword);
 
         void loadGridPropertyFromDeckKeyword(const Box& inputBox,
                                              const DeckKeyword& deckKeyword);
 
-        void adjustSOGCRwithSWL();
-
         std::string            m_defaultRegion;
         UnitSystem             m_deckUnitSystem;
         GridProperties<int>    m_intGridProperties;

opm/parser/eclipse/EclipseState/EclipseConfig.hpp

@@ -29,13 +29,11 @@
 namespace Opm {
 
     class Deck;
-    class ParseContext;
-    class ErrorGuard;
 
     class EclipseConfig
     {
     public:
-        EclipseConfig(const Deck& deck, const ParseContext& parseContext, ErrorGuard& errors);
+        EclipseConfig(const Deck& deck);
 
         const InitConfig& init() const;
         const IOConfig& io() const;

opm/parser/eclipse/EclipseState/EclipseState.hpp

@@ -23,17 +23,15 @@
 #include <memory>
 #include <vector>
 
-#include <opm/parser/eclipse/Parser/ErrorGuard.hpp>
-#include <opm/parser/eclipse/Parser/ParseContext.hpp>
 #include <opm/parser/eclipse/EclipseState/Eclipse3DProperties.hpp>
 #include <opm/parser/eclipse/EclipseState/EclipseConfig.hpp>
-#include <opm/parser/eclipse/EclipseState/Edit/EDITNNC.hpp>
 #include <opm/parser/eclipse/EclipseState/Grid/EclipseGrid.hpp>
 #include <opm/parser/eclipse/EclipseState/Grid/FaultCollection.hpp>
 #include <opm/parser/eclipse/EclipseState/Grid/NNC.hpp>
 #include <opm/parser/eclipse/EclipseState/Grid/TransMult.hpp>
 #include <opm/parser/eclipse/EclipseState/Runspec.hpp>
 #include <opm/parser/eclipse/EclipseState/Tables/TableManager.hpp>
+#include <opm/parser/eclipse/Parser/ParseContext.hpp>
 #include <opm/parser/eclipse/EclipseState/SimulationConfig/SimulationConfig.hpp>
 
 namespace Opm {
@@ -66,11 +64,9 @@ namespace Opm {
             AllProperties = IntProperties | DoubleProperties
         };
 
-        template<typename T>
-        EclipseState(const Deck& deck , const ParseContext& parseContext, T&& errors);
-        EclipseState(const Deck& deck , const ParseContext& parseContext, ErrorGuard& errors);
-        EclipseState(const Deck& deck);
+        EclipseState(const Deck& deck , ParseContext parseContext = ParseContext());
 
+        const ParseContext& getParseContext() const;
         const IOConfig& getIOConfig() const;
         IOConfig& getIOConfig();
 
@@ -89,11 +85,6 @@ namespace Opm {
         const NNC& getInputNNC() const;
         bool hasInputNNC() const;
 
-        /// editing non-neighboring connections
-        /// the non-standard adjacencies as specified in input deck
-        const EDITNNC& getInputEDITNNC() const;
-        bool hasInputEDITNNC() const;
-
         const Eclipse3DProperties& get3DProperties() const;
         const TableManager& getTableManager() const;
         const EclipseConfig& getEclipseConfig() const;
@@ -121,12 +112,12 @@ namespace Opm {
         void complainAboutAmbiguousKeyword(const Deck& deck,
                                            const std::string& keywordName);
 
+        ParseContext m_parseContext;
         const TableManager m_tables;
         Runspec m_runspec;
         EclipseConfig m_eclipseConfig;
         UnitSystem m_deckUnitSystem;
         NNC m_inputNnc;
-        EDITNNC m_inputEditNnc;
         EclipseGrid m_inputGrid;
         Eclipse3DProperties m_eclipseProperties;
         const SimulationConfig m_simulationConfig;

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

@@ -1,48 +0,0 @@
-/*
-  Copyright 2018 Equinor AS
-
-  This file is part of the Open Porous Media project (OPM).
-
-  OPM is free software: you can redistribute it and/or modify
-  it under the terms of the GNU General Public License as published by
-  the Free Software Foundation, either version 3 of the License, or
-  (at your option) any later version.
-
-  OPM is distributed in the hope that it will be useful,
-  but WITHOUT ANY WARRANTY; without even the implied warranty of
-  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-  GNU General Public License for more details.
-
-  You should have received a copy of the GNU General Public License
-  along with OPM.  If not, see <http://www.gnu.org/licenses/>.
-*/
-#ifndef OPM_COMMON_EDITNNC_HPP
-#define OPM_COMMON_EDITNNC_HPP
-
-#include <opm/parser/eclipse/EclipseState/Grid/NNC.hpp>
-namespace Opm
-{
-
-/// Represents edit information for non-neighboring connections (NNCs, faults, etc.)
-class EDITNNC
-{
-public:
-    EDITNNC() = default;
-
-    /// Construct from input deck
-    explicit EDITNNC(const Deck& deck);
-    /// \brief Get an ordered set of EDITNNC
-    const std::vector<NNCdata>& data() const
-    {
-        return m_editnnc;
-    }
-    /// \brief Get the number of entries
-    size_t size() const;
-    /// \brief Whether EDITNNC was empty.
-    bool empty() const;
-
-private:
-    std::vector<NNCdata> m_editnnc;
-};
-}
-#endif // OPM_COMMON_EDITNNC_HPP

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

@@ -25,24 +25,23 @@
 #include <cstddef>
 
 namespace Opm {
-    class EclipseGrid;
+
     class Box {
     public:
-
-        struct index_pair {
-            std::size_t global;
-            std::size_t active;
-        };
-
-        Box(const EclipseGrid& grid);
-        Box(const EclipseGrid& grid , int i1 , int i2 , int j1 , int j2 , int k1 , int k2);
+        Box() = default;
+        Box(int nx , int ny , int nz);
+        Box(const Box& globalBox , int i1 , int i2 , int j1 , int j2 , int k1 , int k2); // Zero offset coordinates.
+        Box(int nx, int ny, int nz, int i1 , int i2 , int j1 , int j2 , int k1 , int k2);
         size_t size() const;
         bool   isGlobal() const;
         size_t getDim(size_t idim) const;
-        const std::vector<index_pair>& index_list() const;
         const std::vector<size_t>& getIndexList() const;
         bool equal(const Box& other) const;
 
+        explicit operator bool() const;
+        std::vector<size_t>::const_iterator begin() const;
+        std::vector<size_t>::const_iterator end() const;
+
 
         int I1() const;
         int I2() const;
@@ -53,14 +52,12 @@ namespace Opm {
 
     private:
         void initIndexList();
-        const EclipseGrid& grid;
         size_t m_dims[3] = { 0, 0, 0 };
         size_t m_offset[3];
         size_t m_stride[3];
 
         bool   m_isGlobal;
-        std::vector<size_t> global_index_list;
-        std::vector<index_pair> m_index_list;
+        std::vector<size_t> m_indexList;
 
         int lower(int dim) const;
         int upper(int dim) const;

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

@@ -25,7 +25,6 @@
 #include <memory>
 
 #include <opm/parser/eclipse/EclipseState/Grid/Box.hpp>
-#include <opm/parser/eclipse/EclipseState/Grid/EclipseGrid.hpp>
 
 /*
   This class implements a simple book keeping system for the current
@@ -54,7 +53,7 @@ namespace Opm {
 
     class BoxManager {
     public:
-        BoxManager(const EclipseGrid& grid);
+        BoxManager(int nx , int ny , int nz);
 
         void setInputBox( int i1,int i2 , int j1 , int j2 , int k1 , int k2);
         void setKeywordBox( int i1,int i2 , int j1 , int j2 , int k1 , int k2);
@@ -64,12 +63,14 @@ namespace Opm {
         void endKeyword();
 
         const Box& getActiveBox() const;
+        const Box& getGlobalBox() const;
+        const Box& getInputBox() const;
+        const Box& getKeywordBox() const;
 
     private:
-        const EclipseGrid& grid;
-        std::unique_ptr<Box> m_globalBox;
-        std::unique_ptr<Box> m_inputBox;
-        std::unique_ptr<Box> m_keywordBox;
+        Box m_globalBox;
+        Box m_inputBox;
+        Box m_keywordBox;
     };
 }
 

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

@@ -26,9 +26,9 @@
 #include <opm/parser/eclipse/EclipseState/Grid/MinpvMode.hpp>
 #include <opm/parser/eclipse/EclipseState/Grid/PinchMode.hpp>
 #include <opm/parser/eclipse/EclipseState/Grid/GridDims.hpp>
-#include <opm/parser/eclipse/EclipseState/Grid/NNC.hpp>
 
-#include <opm/io/eclipse/EclFile.hpp>
+#include <ert/ecl/ecl_grid.h>
+#include <ert/util/ert_unique_ptr.hpp>
 
 #include <array>
 #include <memory>
@@ -38,7 +38,6 @@ namespace Opm {
 
     class Deck;
     class ZcornMapper;
-    class NNC;
 
     /**
        About cell information and dimension: The actual grid
@@ -59,9 +58,9 @@ namespace Opm {
           These constructors will make a copy of the src grid, with
           zcorn and or actnum have been adjustments.
         */
-        EclipseGrid(const EclipseGrid& src) = default;
+        EclipseGrid(const EclipseGrid& src, const double* zcorn , const std::vector<int>& actnum);
+        EclipseGrid(const EclipseGrid& src, const std::vector<double>& zcorn , const std::vector<int>& actnum);
         EclipseGrid(const EclipseGrid& src, const std::vector<int>& actnum);
-        EclipseGrid(const EclipseGrid& src, const double* zcorn, const std::vector<int>& actnum);
 
         EclipseGrid(size_t nx, size_t ny, size_t nz,
                     double dx = 1.0, double dy = 1.0, double dz = 1.0);
@@ -77,7 +76,6 @@ namespace Opm {
         /// explicitly.  If a null pointer is passed, every cell is active.
         EclipseGrid(const Deck& deck, const int * actnum = nullptr);
 
-        static bool hasGDFILE(const Deck& deck);
         static bool hasCylindricalKeywords(const Deck& deck);
         static bool hasCornerPointKeywords(const Deck&);
         static bool hasCartesianKeywords(const Deck&);
@@ -87,7 +85,6 @@ namespace Opm {
         size_t activeIndex(size_t i, size_t j, size_t k) const;
         size_t activeIndex(size_t globalIndex) const;
 
-        void save(const std::string& filename, bool formatted, const Opm::NNC& nnc, const Opm::UnitSystem& units) const;
         /*
           Observe that the there is a getGlobalIndex(i,j,k)
           implementation in the base class. This method - translating
@@ -103,7 +100,6 @@ namespace Opm {
           applied in the 'THETA' direction; this will only apply if
           the theta keywords entered sum up to exactly 360 degrees!
         */
-
         bool circle( ) const;
         bool isPinchActive( ) const;
         double getPinchThresholdThickness( ) const;
@@ -111,7 +107,8 @@ namespace Opm {
         PinchMode::ModeEnum getMultzOption( ) const;
 
         MinpvMode::ModeEnum getMinpvMode() const;
-        const std::vector<double>& getMinpvVector( ) const;
+        double getMinpvValue( ) const;
+
 
         /*
           Will return a vector of nactive elements. The method will
@@ -125,7 +122,6 @@ namespace Opm {
 
              ??? : Exception.
         */
-
         template<typename T>
         std::vector<T> compressedVector(const std::vector<T>& input_vector) const {
             if( input_vector.size() == this->getNumActive() ) {
@@ -150,13 +146,13 @@ namespace Opm {
         /// Will return a vector a length num_active; where the value
         /// of each element is the corresponding global index.
         const std::vector<int>& getActiveMap() const;
-        const std::array<double, 3>& getCellCenter(size_t i,size_t j, size_t k) const;
-        const std::array<double, 3>& getCellCenter(size_t globalIndex) const;
+        std::array<double, 3> getCellCenter(size_t i,size_t j, size_t k) const;
+        std::array<double, 3> getCellCenter(size_t globalIndex) const;
         std::array<double, 3> getCornerPos(size_t i,size_t j, size_t k, size_t corner_index) const;
         double getCellVolume(size_t globalIndex) const;
         double getCellVolume(size_t i , size_t j , size_t k) const;
-        double getCellThickness(size_t globalIndex) const;
-        double getCellThickness(size_t i , size_t j , size_t k) const;
+        double getCellThicknes(size_t globalIndex) const;
+        double getCellThicknes(size_t i , size_t j , size_t k) const;
         std::array<double, 3> getCellDims(size_t i,size_t j, size_t k) const;
         std::array<double, 3> getCellDims(size_t globalIndex) const;
         bool cellActive( size_t globalIndex ) const;
@@ -165,65 +161,45 @@ namespace Opm {
         double getCellDepth(size_t globalIndex) const;
         ZcornMapper zcornMapper() const;
 
-        const std::vector<double>& getCOORD() const;
-        const std::vector<double>& getZCORN() const;
-        const std::vector<int>& getACTNUM( ) const;
-        const std::vector<double>& getMAPAXES() const;
-        const std::string& getMAPUNITS() const { return m_mapunits; } ;
-
         /*
-          The fixupZCORN method is run as part of constructiong the grid. This will adjust the
-          z-coordinates to ensure that cells do not overlap. The return value is the number of
-          points which have been adjusted. The number of zcorn nodes that has ben fixed is
-          stored in private member zcorn_fixed.
+          The exportZCORN method will adjust the z coordinates to ensure that cells do not
+          overlap. The return value is the number of points which have been adjusted.
         */
+        size_t exportZCORN( std::vector<double>& zcorn) const;
 
-        size_t fixupZCORN();
-        size_t getZcornFixed() { return zcorn_fixed; };
-
-        // resetACTNUM with no arguments will make all cells in the grid active.
-
-        void resetACTNUM();
-        void resetACTNUM( const std::vector<int>& actnum);
 
+        void exportMAPAXES( std::vector<double>& mapaxes) const;
+        void exportCOORD( std::vector<double>& coord) const;
+        void exportACTNUM( std::vector<int>& actnum) const;
+        void resetACTNUM( const int * actnum);
         bool equal(const EclipseGrid& other) const;
+        const ecl_grid_type * c_ptr() const;
 
     private:
-        std::vector<double> m_minpvVector;
+        double m_minpvValue;
         MinpvMode::ModeEnum m_minpvMode;
         Value<double> m_pinch;
         PinchMode::ModeEnum m_pinchoutMode;
         PinchMode::ModeEnum m_multzMode;
-
         mutable std::vector< int > activeMap;
         bool m_circle = false;
 
-        size_t zcorn_fixed = 0;
-        bool m_useActnumFromGdfile = false;
-
-        // Input grid data.
-        std::vector<double> m_zcorn;
-        std::vector<double> m_coord;
-        std::vector<double> m_mapaxes;
-        std::vector<int> m_actnum;
-        std::string m_mapunits;
-
-        // Mapping to/from active cells.
-        int m_nactive;
-        std::vector<int> m_active_to_global;
-        std::vector<int> m_global_to_active;
-
-        // Geometry data.
-        std::vector<double> m_volume;
-        std::vector<double> m_depth;
-        std::vector<double> m_dx;
-        std::vector<double> m_dy;
-        std::vector<double> m_dz;
-        std::vector<std::array<double, 3>> m_cellCenter;
-
-        void initGridFromEGridFile(Opm::EclIO::EclFile& egridfile, std::string fileName);
-
-        void initBinaryGrid(const Deck& deck);
+        /*
+          The internal class grid_ptr is a a std::unique_ptr with
+          special copy semantics. The purpose of implementing this is
+          that the EclipseGrid class can now use the default
+          implementation for the copy and move constructors.
+        */
+        using ert_ptr = ERT::ert_unique_ptr<ecl_grid_type , ecl_grid_free>;
+        class grid_ptr : public ert_ptr {
+        public:
+            using ert_ptr::unique_ptr;
+            grid_ptr() = default;
+            grid_ptr(grid_ptr&&) = default;
+            grid_ptr(const grid_ptr& src) :
+                ert_ptr( ecl_grid_alloc_copy( src.get() ) ) {}
+        };
+        grid_ptr m_grid;
 
         void initCornerPointGrid(const std::array<int,3>& dims ,
                                  const std::vector<double>& coord ,
@@ -231,8 +207,6 @@ namespace Opm {
                                  const int * actnum,
                                  const double * mapaxes);
 
-        bool keywInputBeforeGdfile(const Deck& deck, const std::string keyword) const;
-
         void initCylindricalGrid(       const std::array<int, 3>&, const Deck&);
         void initCartesianGrid(         const std::array<int, 3>&, const Deck&);
         void initCornerPointGrid(       const std::array<int, 3>&, const Deck&);
@@ -249,20 +223,6 @@ namespace Opm {
         static std::vector<double> createDVector(const std::array<int, 3>& dims, size_t dim, const std::string& DKey,
                 const std::string& DVKey, const Deck&);
         static void scatterDim(const std::array<int, 3>& dims , size_t dim , const std::vector<double>& DV , std::vector<double>& D);
-
-
-        std::vector<double> makeCoordDxDyDzTops(const std::array<int, 3>& dims, const std::vector<double>& dx, const std::vector<double>& dy, const std::vector<double>& dz, const std::vector<double>& tops) const;
-        std::vector<double> makeZcornDzTops(const std::array<int, 3>& dims, const std::vector<double>& dz, const std::vector<double>& tops) const ;
-        std::vector<double> makeZcornDzvDepthz(const std::array<int, 3>& dims, const std::vector<double>& dzv, const std::vector<double>& depthz) const;
-        std::vector<double> makeCoordDxvDyvDzvDepthz(const std::array<int, 3>& dims, const std::vector<double>& dxv, const std::vector<double>& dyv, const std::vector<double>& dzv, const std::vector<double>& depthz) const;
-
-        double sumIdir(int j, int k, int i1, const std::array<int, 3>& dims, const std::vector<double>& dx) const;
-        double sumJdir(int i, int k, int j1, const std::array<int, 3>& dims, const std::vector<double>& dy) const;
-        double sumKdir(int i, int j, const std::array<int, 3>& dims, const std::vector<double>& dz) const;
-
-        void calculateGeometryData();
-
-        void getCellCorners(const std::array<int, 3>& ijk, const std::array<int, 3>& dims, std::array<double,8>& X, std::array<double,8>& Y, std::array<double,8>& Z) const;
    };
 
     class CoordMapper {

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

@@ -52,7 +52,7 @@ private:
     void addFaultFaces(const GridDims& grid,
                        const DeckRecord&  faultRecord,
                        const std::string& faultName);
-    OrderedMap<std::string, Fault> m_faults;
+    OrderedMap<Fault> m_faults;
 
 };
 }