Bump version to 2023.10 (final)

[backport] Fix build with older versions of boost

.clang-format

@@ -1,6 +1,5 @@
 {
         BasedOnStyle: WebKit,
-        AlignAfterOpenBracket: AlwaysBreak,
         AlignConsecutiveAssignments: false,
         AlignConsecutiveDeclarations: false,
         AlignAfterOpenBracket: Align,

CMakeLists.txt

@@ -219,9 +219,17 @@ if (OPM_ENABLE_PYTHON)
     # We always need to search for Development as we use
     # pybind11_add_module even if don't embed Python
     if (NOT OPM_ENABLE_EMBEDDED_PYTHON)
-      find_package(Python3 REQUIRED COMPONENTS Interpreter Development.Module)
+      if(${CMAKE_VERSION} VERSION_LESS "3.18.0")
+        find_package(Python3 REQUIRED COMPONENTS Interpreter Development)
+      else()
+        find_package(Python3 REQUIRED COMPONENTS Interpreter Development.Module)
+      endif()
     else()
-      find_package(Python3 REQUIRED COMPONENTS Interpreter Development.Embed Development.Module)
+      if(${CMAKE_VERSION} VERSION_LESS "3.18.0")
+        find_package(Python3 REQUIRED COMPONENTS Interpreter Development)
+      else()
+        find_package(Python3 REQUIRED COMPONENTS Interpreter Development.Embed Development.Module)
+      endif()
       get_target_property(_lib_path Python3::Python IMPORTED_LOCATION)
       set(PYTHON_LIBRARY ${_lib_path})
       set(PYTHON_LIBRARIES {PYTHON_LIBRARY})
@@ -358,7 +366,7 @@ endif()
 find_package(dune-common REQUIRED)
 opm_need_version_of ("dune-common")
 target_include_directories(dunecommon INTERFACE ${dune-common_INCLUDE_DIRS})
-string(REPLACE " " ";" dflags ${dune-common_CXX_FLAGS})
+string(REPLACE " " ";" dflags "${dune-common_CXX_FLAGS}")
 target_compile_options(dunecommon INTERFACE ${dflags})
 target_compile_definitions(dunecommon INTERFACE DUNE_COMMON_VERSION_MAJOR=${DUNE_COMMON_VERSION_MAJOR})
 target_compile_definitions(dunecommon INTERFACE DUNE_COMMON_VERSION_MINOR=${DUNE_COMMON_VERSION_MINOR})
@@ -371,6 +379,7 @@ if(Boost_UNIT_TEST_FRAMEWORK_FOUND)
 endif()
 if(BUILD_EXAMPLES)
   target_link_libraries(co2brinepvt dunecommon)
+  install(TARGETS co2brinepvt DESTINATION bin)
 endif()
 
 # Install build system files and documentation

CMakeLists_files.cmake

@@ -51,6 +51,7 @@ list (APPEND MAIN_SOURCE_FILES
       src/opm/material/common/TridiagonalMatrix.cpp
       src/opm/material/common/UniformXTabulated2DFunction.cpp
       src/opm/material/components/CO2.cpp
+      src/opm/material/components/H2.cpp
       src/opm/material/densead/Evaluation.cpp
       src/opm/material/fluidmatrixinteractions/EclEpsScalingPoints.cpp
       src/opm/material/fluidsystems/BlackOilFluidSystem.cpp
@@ -118,6 +119,7 @@ if(ENABLE_ECL_INPUT)
     src/opm/input/eclipse/EclipseState/Grid/BoxManager.cpp
     src/opm/input/eclipse/EclipseState/Grid/Carfin.cpp
     src/opm/input/eclipse/EclipseState/Grid/CarfinManager.cpp
+    src/opm/input/eclipse/EclipseState/Grid/LgrCollection.cpp
     src/opm/input/eclipse/EclipseState/Grid/EclipseGrid.cpp
     src/opm/input/eclipse/EclipseState/Grid/FieldProps.cpp
     src/opm/input/eclipse/EclipseState/Grid/FieldPropsManager.cpp
@@ -145,6 +147,7 @@ if(ENABLE_ECL_INPUT)
     src/opm/input/eclipse/EclipseState/Phase.cpp
     src/opm/input/eclipse/EclipseState/TracerConfig.cpp
     src/opm/input/eclipse/EclipseState/MICPpara.cpp
+    src/opm/input/eclipse/EclipseState/WagHysteresisConfig.cpp
     src/opm/input/eclipse/Schedule/Action/ActionAST.cpp
     src/opm/input/eclipse/Schedule/Action/ActionContext.cpp
     src/opm/input/eclipse/Schedule/Action/ActionResult.cpp
@@ -159,6 +162,7 @@ if(ENABLE_ECL_INPUT)
     src/opm/input/eclipse/Schedule/Action/State.cpp
     src/opm/input/eclipse/Schedule/Action/WGNames.cpp
     src/opm/input/eclipse/Schedule/ArrayDimChecker.cpp
+    src/opm/input/eclipse/Schedule/BCProp.cpp
     src/opm/input/eclipse/Schedule/CompletedCells.cpp
     src/opm/input/eclipse/Schedule/eval_uda.cpp
     src/opm/input/eclipse/Schedule/Events.cpp
@@ -170,6 +174,7 @@ if(ENABLE_ECL_INPUT)
     src/opm/input/eclipse/Schedule/Group/GuideRateModel.cpp
     src/opm/input/eclipse/Schedule/Group/GConSale.cpp
     src/opm/input/eclipse/Schedule/Group/GConSump.cpp
+    src/opm/input/eclipse/Schedule/Group/GroupEconProductionLimits.cpp
     src/opm/input/eclipse/Schedule/Group/GTNode.cpp
     src/opm/input/eclipse/Schedule/KeywordHandlers.cpp
     src/opm/input/eclipse/Schedule/MessageLimits.cpp
@@ -198,11 +203,13 @@ if(ENABLE_ECL_INPUT)
     src/opm/input/eclipse/Schedule/Tuning.cpp
     src/opm/input/eclipse/Schedule/WriteRestartFileEvents.cpp
     src/opm/input/eclipse/Schedule/Well/Connection.cpp
+    src/opm/input/eclipse/Schedule/Well/FilterCake.cpp
     src/opm/input/eclipse/Schedule/Well/injection.cpp
     src/opm/input/eclipse/Schedule/Well/NameOrder.cpp
     src/opm/input/eclipse/Schedule/Well/PAvg.cpp
     src/opm/input/eclipse/Schedule/Well/PAvgCalculator.cpp
     src/opm/input/eclipse/Schedule/Well/PAvgCalculatorCollection.cpp
+    src/opm/input/eclipse/Schedule/Well/PAvgDynamicSourceData.cpp
     src/opm/input/eclipse/Schedule/Well/Well.cpp
     src/opm/input/eclipse/Schedule/Well/WellConnections.cpp
     src/opm/input/eclipse/Schedule/Well/WellMatcher.cpp
@@ -218,8 +225,10 @@ if(ENABLE_ECL_INPUT)
     src/opm/input/eclipse/Schedule/Well/WellTestState.cpp
     src/opm/input/eclipse/Schedule/WellTraj/RigEclipseWellLogExtractor.cpp
     src/opm/input/eclipse/Schedule/Well/WellTracerProperties.cpp
+    src/opm/input/eclipse/Schedule/Well/WINJMULT.cpp
     src/opm/input/eclipse/Schedule/Well/WList.cpp
     src/opm/input/eclipse/Schedule/Well/WListManager.cpp
+    src/opm/input/eclipse/Schedule/Well/WVFPDP.cpp
     src/opm/input/eclipse/Schedule/Well/WVFPEXP.cpp
     src/opm/input/eclipse/Schedule/WellTraj/RigEclipseWellLogExtractor.cpp
     src/opm/input/eclipse/EclipseState/SimulationConfig/BCConfig.cpp
@@ -242,6 +251,7 @@ if(ENABLE_ECL_INPUT)
     src/opm/input/eclipse/EclipseState/Tables/TableContainer.cpp
     src/opm/input/eclipse/EclipseState/Tables/TableIndex.cpp
     src/opm/input/eclipse/EclipseState/Tables/TLMixpar.cpp
+    src/opm/input/eclipse/EclipseState/Tables/Ppcwmax.cpp
     src/opm/input/eclipse/EclipseState/Tables/TableManager.cpp
     src/opm/input/eclipse/EclipseState/Tables/TableSchema.cpp
     src/opm/input/eclipse/EclipseState/Tables/Tables.cpp
@@ -291,6 +301,8 @@ if(ENABLE_ECL_INPUT)
     src/opm/material/fluidmatrixinteractions/EclMaterialLawManagerHystParams.cpp
     src/opm/material/fluidsystems/blackoilpvt/BrineCo2Pvt.cpp
     src/opm/material/fluidsystems/blackoilpvt/Co2GasPvt.cpp
+    src/opm/material/fluidsystems/blackoilpvt/BrineH2Pvt.cpp
+    src/opm/material/fluidsystems/blackoilpvt/H2GasPvt.cpp
     src/opm/material/fluidsystems/blackoilpvt/ConstantCompressibilityBrinePvt.cpp
     src/opm/material/fluidsystems/blackoilpvt/ConstantCompressibilityOilPvt.cpp
     src/opm/material/fluidsystems/blackoilpvt/ConstantCompressibilityWaterPvt.cpp
@@ -456,19 +468,23 @@ if(ENABLE_ECL_INPUT)
     tests/test_RestartFileView.cpp
     tests/test_EclIO.cpp
     tests/test_EGrid.cpp
+    tests/test_EInit.cpp
     tests/test_ERft.cpp
     tests/test_ERst.cpp
     tests/test_ESmry.cpp
-    tests/test_EInit.cpp
     tests/test_ExtESmry.cpp
+    tests/test_PAvgCalculator.cpp
+    tests/test_PAvgDynamicSourceData.cpp
     tests/test_Serialization.cpp
     tests/material/test_co2brinepvt.cpp
+    tests/material/test_h2brinepvt.cpp
     tests/material/test_eclblackoilfluidsystem.cpp
     tests/material/test_eclblackoilpvt.cpp
     tests/material/test_eclmateriallawmanager.cpp
     tests/parser/ACTIONX.cpp
     tests/parser/ADDREGTests.cpp
     tests/parser/AquiferTests.cpp
+    tests/parser/BCConfigTests.cpp
     tests/parser/BoxTests.cpp
     tests/parser/CarfinTests.cpp
     tests/parser/ColumnSchemaTests.cpp
@@ -491,6 +507,7 @@ if(ENABLE_ECL_INPUT)
     tests/parser/ImportTests.cpp
     tests/parser/InitConfigTest.cpp
     tests/parser/IOConfigTests.cpp
+    tests/parser/LgrTests.cpp
     tests/parser/MICPTests.cpp
     tests/parser/MessageLimitTests.cpp
     tests/parser/MultiRegTests.cpp
@@ -584,6 +601,13 @@ list(APPEND TEST_SOURCE_FILES ${DUNE_TEST_SOURCE_FILES})
 
 list (APPEND TEST_DATA_FILES
       tests/testdata.param
+      tests/material/brine_unittest.json
+      tests/material/co2_unittest_part1.json
+      tests/material/co2_unittest_part2.json
+      tests/material/co2_unittest_above_sat.json
+      tests/material/co2_unittest_below_sat.json
+      tests/material/h2o_unittest.json
+      tests/material/h2_unittest.json
 )
 if(ENABLE_ECL_OUTPUT)
   list (APPEND TEST_DATA_FILES
@@ -782,6 +806,7 @@ list( APPEND PUBLIC_HEADER_FILES
       opm/material/components/Air.hpp
       opm/material/components/C1.hpp
       opm/material/components/Brine.hpp
+      opm/material/components/BrineDynamic.hpp
       opm/material/fluidstates/BlackOilFluidState.hpp
       opm/material/fluidstates/NonEquilibriumFluidState.hpp
       opm/material/fluidstates/FluidStateSaturationModules.hpp
@@ -815,6 +840,7 @@ list( APPEND PUBLIC_HEADER_FILES
       opm/material/binarycoefficients/H2O_CO2.hpp
       opm/material/binarycoefficients/Air_Xylene.hpp
       opm/material/binarycoefficients/Brine_CO2.hpp
+      opm/material/binarycoefficients/Brine_H2.hpp
       opm/material/binarycoefficients/HenryIapws.hpp
       opm/material/Constants.hpp
       opm/material/fluidsystems/NullParameterCache.hpp
@@ -838,6 +864,7 @@ list( APPEND PUBLIC_HEADER_FILES
       opm/material/fluidsystems/blackoilpvt/WaterPvtThermal.hpp
       opm/material/fluidsystems/blackoilpvt/WaterPvtMultiplexer.hpp
       opm/material/fluidsystems/blackoilpvt/BrineCo2Pvt.hpp
+      opm/material/fluidsystems/blackoilpvt/BrineH2Pvt.hpp
       opm/material/fluidsystems/blackoilpvt/OilPvtMultiplexer.hpp
       opm/material/fluidsystems/blackoilpvt/GasPvtMultiplexer.hpp
       opm/material/fluidsystems/blackoilpvt/DryHumidGasPvt.hpp
@@ -850,9 +877,11 @@ list( APPEND PUBLIC_HEADER_FILES
       opm/material/fluidsystems/blackoilpvt/ConstantCompressibilityBrinePvt.hpp
       opm/material/fluidsystems/blackoilpvt/GasPvtThermal.hpp
       opm/material/fluidsystems/blackoilpvt/Co2GasPvt.hpp
+      opm/material/fluidsystems/blackoilpvt/H2GasPvt.hpp
       opm/material/fluidsystems/blackoilpvt/ConstantCompressibilityOilPvt.hpp
       opm/material/fluidsystems/H2OAirFluidSystem.hpp
       opm/material/fluidsystems/H2ON2FluidSystem.hpp
+      opm/material/fluidsystems/ThreeComponentFluidSystem.hh
       opm/material/fluidmatrixinteractions/EclTwoPhaseMaterial.hpp
       opm/material/fluidmatrixinteractions/SatCurveMultiplexerParams.hpp
       opm/material/fluidmatrixinteractions/EclTwoPhaseMaterialParams.hpp
@@ -1068,6 +1097,7 @@ if(ENABLE_ECL_INPUT)
        opm/input/eclipse/EclipseState/Grid/Fault.hpp
        opm/input/eclipse/EclipseState/Grid/Box.hpp
        opm/input/eclipse/EclipseState/Grid/Carfin.hpp
+       opm/input/eclipse/EclipseState/Grid/LgrCollection.hpp
        opm/input/eclipse/EclipseState/Grid/FieldProps.hpp
        opm/input/eclipse/EclipseState/Grid/FieldPropsManager.hpp
        opm/input/eclipse/EclipseState/Grid/FaultFace.hpp
@@ -1081,6 +1111,7 @@ if(ENABLE_ECL_INPUT)
        opm/input/eclipse/EclipseState/EndpointScaling.hpp
        opm/input/eclipse/EclipseState/TracerConfig.hpp
        opm/input/eclipse/EclipseState/MICPpara.hpp
+       opm/input/eclipse/EclipseState/WagHysteresisConfig.hpp
        opm/input/eclipse/EclipseState/Tables/DenT.hpp
        opm/input/eclipse/EclipseState/Tables/JouleThomson.hpp
        opm/input/eclipse/EclipseState/Tables/SimpleTable.hpp
@@ -1112,6 +1143,7 @@ if(ENABLE_ECL_INPUT)
        opm/input/eclipse/EclipseState/Tables/SgcwmisTable.hpp
        opm/input/eclipse/EclipseState/Tables/Sof2Table.hpp
        opm/input/eclipse/EclipseState/Tables/TLMixpar.hpp
+       opm/input/eclipse/EclipseState/Tables/Ppcwmax.hpp
        opm/input/eclipse/EclipseState/Tables/TableManager.hpp
        opm/input/eclipse/EclipseState/Tables/SwfnTable.hpp
        opm/input/eclipse/EclipseState/Tables/EnptvdTable.hpp
@@ -1193,6 +1225,7 @@ if(ENABLE_ECL_INPUT)
        opm/input/eclipse/Schedule/Action/State.hpp
        opm/input/eclipse/Schedule/Action/WGNames.hpp
        opm/input/eclipse/Schedule/ArrayDimChecker.hpp
+       opm/input/eclipse/Schedule/BCProp.hpp
        opm/input/eclipse/Schedule/GasLiftOpt.hpp
        opm/input/eclipse/Schedule/Network/Balance.hpp
        opm/input/eclipse/Schedule/Network/Branch.hpp
@@ -1201,9 +1234,11 @@ if(ENABLE_ECL_INPUT)
        opm/input/eclipse/Schedule/VFPInjTable.hpp
        opm/input/eclipse/Schedule/VFPProdTable.hpp
        opm/input/eclipse/Schedule/Well/Connection.hpp
+       opm/input/eclipse/Schedule/Well/FilterCake.hpp
        opm/input/eclipse/Schedule/Well/PAvg.hpp
        opm/input/eclipse/Schedule/Well/PAvgCalculator.hpp
        opm/input/eclipse/Schedule/Well/PAvgCalculatorCollection.hpp
+       opm/input/eclipse/Schedule/Well/PAvgDynamicSourceData.hpp
        opm/input/eclipse/Schedule/Well/Well.hpp
        opm/input/eclipse/Schedule/Well/WellEnums.hpp
        opm/input/eclipse/Schedule/Well/WellInjectionControls.hpp
@@ -1218,6 +1253,8 @@ if(ENABLE_ECL_INPUT)
        opm/input/eclipse/Schedule/Well/WellMICPProperties.hpp
        opm/input/eclipse/Schedule/Well/WellPolymerProperties.hpp
        opm/input/eclipse/Schedule/Well/WellTracerProperties.hpp
+       opm/input/eclipse/Schedule/Well/WINJMULT.hpp
+       opm/input/eclipse/Schedule/Well/WVFPDP.hpp
        opm/input/eclipse/Schedule/Well/WVFPEXP.hpp
        opm/input/eclipse/Schedule/Well/WellTestConfig.hpp
        opm/input/eclipse/Schedule/Well/WellTestState.hpp
@@ -1240,6 +1277,7 @@ if(ENABLE_ECL_INPUT)
        opm/input/eclipse/Schedule/Group/GuideRate.hpp
        opm/input/eclipse/Schedule/Group/GConSale.hpp
        opm/input/eclipse/Schedule/Group/GConSump.hpp
+       opm/input/eclipse/Schedule/Group/GroupEconProductionLimits.hpp
        opm/input/eclipse/Schedule/Group/GuideRateConfig.hpp
        opm/input/eclipse/Schedule/Group/GuideRateModel.hpp
        opm/input/eclipse/Schedule/MessageLimits.hpp

cmake/Modules/FindSuiteSparse.cmake

@@ -294,7 +294,7 @@ if(SuiteSparse_FOUND)
     string (TOUPPER ${_module} _MODULE)
     if(SuiteSparse_${_MODULE}_FOUND)
       if(NOT TARGET SuiteSparse::${_module})
-	message(STATUS "Creating target SuitSparse::${_module}")
+	message(STATUS "Creating target SuiteSparse::${_module}")
 	add_library(SuiteSparse::${_module} UNKNOWN IMPORTED GLOBAL)
 	set_target_properties(SuiteSparse::${_module} PROPERTIES
 	  IMPORTED_LOCATION ${${_MODULE}_LIBRARY}

cmake/Modules/Finddune-polygongrid.cmake

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

cmake/Modules/LibtoolArchives.cmake

@@ -1,200 +0,0 @@
-# translate a list of libraries into a command-line that can be passed to the
-# compiler/linker. first parameter is the name of the variable that will
-# receive this list, the rest is considered the list of libraries
-function (linker_cmdline what INTO outvar FROM)
-  if (NOT (UNIX OR MSYS OR MINGW))
-	return ()
-  endif (NOT (UNIX OR MSYS OR MINGW))
-
-  # if we are going to put these in regexps, we must escape period
-  string (REPLACE "." "\\." esc_dl_pref "${CMAKE_SHARED_LIBRARY_PREFIX}")
-  string (REPLACE "." "\\." esc_dl_suff "${CMAKE_SHARED_LIBRARY_SUFFIX}")
-  string (REPLACE "." "\\." esc_ar_pref "${CMAKE_STATIC_LIBRARY_PREFIX}")
-  string (REPLACE "." "\\." esc_ar_suff "${CMAKE_STATIC_LIBRARY_PREFIX}")
-
-  # CMake loves absolute paths, whereas libtool won't have any of it!
-  # (you get an error message about argument not parsed). translate each
-  # of the libraries into a linker option
-  set (deplib_list "")
-  set (deplib_list_tmp "")
-  foreach (deplib IN LISTS ARGN)
-    # resolve imported targets
-    string(FIND ${deplib} "::" _sep)
-    if (_sep GREATER "-1")
-      set(_lib "")
-      # the code below does not really work for imported interface library
-      # as cmake will error out whene querying IMPORTED_LOCATION, because the
-      # property is not whitelisted. I have no idea how to determine if
-      # a library is an imported interface library
-      # At least it works for resolving OpenMP::OpenMP_CXX
-      #
-      # get_property(_def TARGET ${deplib} PROPERTY IMPORTED_LOCATION DEFINED)
-      # if (_def)
-      #   get_property(_def TARGET ${deplib} PROPERTY IMPORTED_LOCATION SET)
-      #   if (_def)
-      #     get_target_property(_tmp_lib ${deplib} IMPORTED_LOCATION)
-      #    list(APPEND _lib ${_tmp_lib})
-      #   endif()
-      # endif()
-      get_property(_def TARGET ${deplib} PROPERTY INTERFACE_LINK_LIBRARIES SET)
-      if (_def)
-	get_target_property(_tmp_lib ${deplib} INTERFACE_LINK_LIBRARIES)
-	list(APPEND _lib ${_tmp_lib})
-      endif()
-      set(deplib ${_lib})
-    endif()
-    list(APPEND deplib_list_tmp ${deplib})
-  endforeach()
-  foreach (deplib IN LISTS deplib_list_tmp)
-	# starts with a hyphen already? then just add it
-	string (SUBSTRING ${deplib} 0 1 dash)
-	if (${dash} STREQUAL "-")
-	  list (APPEND deplib_list ${deplib})
-	else (${dash} STREQUAL "-")
-	  # otherwise, parse the name into a directory and a name
-	  get_filename_component (deplib_dir ${deplib} PATH)
-	  get_filename_component (deplib_orig ${deplib} NAME)
-	  string (REGEX REPLACE
-		"^${esc_dl_pref}(.*)${esc_dl_suff}$"
-		"\\1"
-		deplib_name
-		${deplib_orig}
-		)
-	  string (REGEX REPLACE
-		"^${esc_ar_pref}(.*)${esc_ar_suff}$"
-		"\\1"
-		deplib_name
-		${deplib_name}
-		)
-	  # directory and name each on their own; this is somewhat
-	  # unsatisfactory because it may be that a system dir is specified
-	  # by an earlier directory and you start picking up libraries from
-	  # there instead of the "closest" path here. also, the soversion
-	  # is more or less lost. remove system default path, to lessen the
-	  # chance that we pick the wrong library
-	  if (NOT ((deplib_dir STREQUAL "/usr/lib") OR
-                (deplib_dir STREQUAL "") OR
-		(deplib_dir STREQUAL "/usr/${CMAKE_INSTALL_LIBDIR}")))
-	    list (APPEND deplib_list "-L${deplib_dir}")
-	  endif ()
-	  # if there was no translation of the name, the library is named
-	  # unconventionally (.so.3gf, I'm looking at you), so pass this
-	  # name unmodified to the linker switch
-	  if (deplib_orig STREQUAL deplib_name AND
-	      NOT deplib_orig STREQUAL "stdc++fs")
-		list (APPEND deplib_list "-l:${deplib_orig}")
-	  else ()
-		list (APPEND deplib_list "-l${deplib_name}")
-	  endif (deplib_orig STREQUAL deplib_name AND
-	    NOT deplib_orig STREQUAL "stdc++fs")
-	endif (${dash} STREQUAL "-")
-  endforeach (deplib)
-  # caller determines whether we want it returned as a list or a string
-  if ("${what}" STREQUAL "LIST")
-	set (${outvar} ${deplib_list})
-  else ("${what}" STREQUAL "LIST")
-	set (${outvar} "${deplib_list}")
-	string (REPLACE ";" " " ${outvar} "${${outvar}}")
-  endif ("${what}" STREQUAL "LIST")
-  set (${outvar} "${${outvar}}" PARENT_SCOPE)
-endfunction (linker_cmdline what INTO outvar FROM)
-
-function (configure_la name target)
-  if (NOT (UNIX OR MSYS OR MINGW))
-	return ()
-  endif (NOT (UNIX OR MSYS OR MINGW))
-  
-  # these generic variables are initialized from the project info
-  set (current "${${name}_VERSION_MAJOR}")
-  set (age "${${name}_VERSION_MINOR}")
-  set (inherited_linker_flags "${${name}_LINKER_FLAGS}")
-  set (dependency_libs "${${name}_LIBRARIES}")
-
-  # translate list of libraries to command line
-  linker_cmdline (LIST INTO dependency_libs FROM ${dependency_libs})
-  
-  # convert from CMake list (i.e. semi-colon separated)
-  string (REPLACE ";" " " inherited_linker_flags "${inherited_linker_flags}")
-  string (REPLACE ";" " " dependency_libs "${dependency_libs}")
-
-  # this is the preferred installation path
-  set (libdir "${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_LIBDIR}")
-
-  # ${name}_LIBRARY_TYPE is either SHARED or STATIC
-  if (${name}_LIBRARY_TYPE STREQUAL "SHARED")
-	set (libprefix "${CMAKE_SHARED_LIBRARY_PREFIX}")
-	set (libsuffix "${CMAKE_SHARED_LIBRARY_SUFFIX}")
-	set (libname "${CMAKE_SHARED_LIBRARY_PREFIX}${target}${CMAKE_SHARED_LIBRARY_SUFFIX}")
-	# only Unix has soversion in library names
-	if (UNIX)
-	  set (dlname "${libname}.${current}")
-	  set (library_names "${libname}.${current}.${age} ${libname}.${current} ${libname}")
-	else (UNIX)
-	  set (dlname "${libname}")
-	  set (library_names "${libname}")
-	endif (UNIX)
-	set (old_library "")
-  else (${name}_LIBRARY_TYPE STREQUAL "SHARED")
-	set (dlname "")
-	set (library_names "")
-	set (old_library "${CMAKE_STATIC_LIBRARY_PREFIX}${target}${CMAKE_STATIC_LIBRARY_SUFFIX}")
-  endif (${name}_LIBRARY_TYPE STREQUAL "SHARED")
-
-  # get the version of libtool installed on the system; this is
-  # necessary because libtool checks that the file contains its own
-  # signature(!)
-  if (NOT libtool_MAIN)
-	find_file (
-	  libtool_MAIN
-	  ltmain.sh
-	  PATHS /usr
-	  PATH_SUFFIXES share/libtool/config/
-	  DOC "Location of libtool"
-	  )
-	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")
-	endif (NOT libtool_MAIN)
-  endif (NOT libtool_MAIN)
-  if (libtool_MAIN)
-	file (STRINGS
-	  ${libtool_MAIN}
-	  ltversion_STRING
-	  REGEX "^VERSION=\".*\""
-	  )
-  endif (libtool_MAIN)
-  if (ltversion_STRING)	
-	string (REGEX REPLACE
-	  "^VERSION=\"?(.*)\"?"
-	  "\\1"
-	  ltversion
-	  ${ltversion_STRING}
-	  )
-  endif (ltversion_STRING)
-
-  # assume that we are in cmake/Modules, and that the template have been
-  # put in cmake/Templates. we cannot use CMAKE_CURRENT_LIST_DIR because
-  # this is in a function, and we cannot know who's calling us
-  set (templ_dir "${OPM_MACROS_ROOT}/cmake/Templates")
-
-  
-  # only write an .la if libtool is found; otherwise we have no use
-  # for it.
-  if (ltversion)
-	set (la_file "lib${target}.la")
-	message (STATUS "Writing libtool archive for ${target}")
-	configure_file (
-	  ${templ_dir}/la.in
-	  ${CMAKE_ARCHIVE_OUTPUT_DIRECTORY}/${la_file}
-	  @ONLY@
-	  )
-  else (ltversion)
-	set (la_file "")
-  endif (ltversion)
-
-  # return this variable to the caller
-  if (ARGV2)
-	set (${ARGV2} "${la_file}" PARENT_SCOPE)
-  endif (ARGV2)
-endfunction (configure_la target)

cmake/Modules/OpmInit.cmake

@@ -110,6 +110,10 @@ macro (OpmInitDirVars)
   endif (COMMAND dir_hook)
 endmacro ()
 
+if("${CMAKE_SIZEOF_VOID_P}" LESS 8)
+  message(FATAL_ERROR "OPM will only work correctly on 64bit (or higher) systems!")
+endif()
+
 OpmInitProjVars ()
 OpmInitDirVars ()
 

cmake/Modules/OpmProject.cmake

@@ -1,38 +1,5 @@
 # - Helper routines for opm-core like projects
 
-include (LibtoolArchives) # linker_cmdline
-
-# convert a list back to a command-line string
-function (unseparate_args var_name prefix value)
-  separate_arguments (value)
-  foreach (item IN LISTS value)
-	set (prefixed_item "${prefix}${item}")
-	if (${var_name})
-	  set (${var_name} "${${var_name}} ${prefixed_item}")
-	else (${var_name})
-	  set (${var_name} "${prefixed_item}")
-	endif (${var_name})
-  endforeach (item)
-  set (${var_name} "${${var_name}}" PARENT_SCOPE)
-endfunction (unseparate_args var_name prefix value)
-
-# wrapper to set variables in pkg-config file
-function (configure_pc_file name source dest prefix libdir includedir)
-  # escape set of standard strings
-  unseparate_args (includes "-I" "${${name}_INCLUDE_DIRS}")
-  unseparate_args (defs "" "${${name}_DEFINITIONS}")
-  linker_cmdline (STRING INTO libs FROM ${${name}_LIBRARIES})
-
-  # necessary to make these variables visible to configure_file
-  set (name "${${name}_NAME}")
-  set (description "${${name}_DESCRIPTION}")
-  set (major "${${name}_VERSION_MAJOR}")
-  set (minor "${${name}_VERSION_MINOR}")
-  set (target "${${name}_LIBRARY}")
-  linker_cmdline (STRING INTO target from ${target})
-  configure_file (${source} ${dest} @ONLY)
-endfunction (configure_pc_file name source dist prefix libdir includedir)
-
 function (configure_cmake_file name variant version)
   # declarative list of the variable names that are used in the template
   # and that must be defined in the project to be exported
@@ -91,16 +58,6 @@ function (opm_cmake_config name)
 	APPEND "${${name}_CONFIG_VARS}"
 	)
 
-  # config-mode .pc file; use this to find the build tree
-  configure_pc_file (
-	${name}
-	${template_dir}/opm-project.pc.in
-	${PROJECT_BINARY_DIR}/${${name}_NAME}.pc
-	${PROJECT_BINARY_DIR}
-	"${CMAKE_LIBRARY_OUTPUT_DIRECTORY}"
-	${PROJECT_SOURCE_DIR}
-	)
-
   # The next replace will result in bogus entries if install directory is
   # a subdirectory of source tree,
   # and we have existing entries pointing to that install directory.
@@ -154,28 +111,4 @@ function (opm_cmake_config name)
 	FILES ${PROJECT_BINARY_DIR}/${${name}_NAME}-config-version.cmake
 	DESTINATION share/cmake${${name}_VER_DIR}/${${name}_NAME}
 	)
-
-  # find-mode .pc file; use this to locate system installation
-  configure_pc_file (
-	${name}
-	${template_dir}/opm-project.pc.in
-	${PROJECT_BINARY_DIR}/${${name}_NAME}-install.pc
-	${CMAKE_INSTALL_PREFIX}
-	${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_LIBDIR}${${name}_VER_DIR}
-	${CMAKE_INSTALL_PREFIX}/include${${name}_VER_DIR}
-	)
-
-  # put this in the right system location; if we have binaries then it
-  # should go in the arch-specific lib/ directory, otherwise use the
-  # common/noarch lib/ directory (these targets come from UseMultiArch)
-  if (${name}_TARGET)
-	set (_pkg_dir ${CMAKE_INSTALL_LIBDIR})
-  else ()
-	set (_pkg_dir lib)
-  endif ()
-  install (
-	FILES ${PROJECT_BINARY_DIR}/${${name}_NAME}-install.pc
-	DESTINATION ${CMAKE_INSTALL_PREFIX}/${_pkg_dir}/pkgconfig${${name}_VER_DIR}/
-	RENAME ${${name}_NAME}.pc
-	)
 endfunction (opm_cmake_config name)

cmake/Modules/OpmSatellites.cmake

@@ -305,7 +305,10 @@ macro(opm_add_test TestName)
       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(HAVE_DYNAMIC_BOOST_TEST)
+        set_target_properties (${CURTEST_EXE_NAME} PROPERTIES
+                                COMPILE_DEFINITIONS BOOST_TEST_DYN_LINK)
+      endif()
       if(TARGET ${project}_prepare)
         add_dependencies("${CURTEST_EXE_NAME}" ${project}_prepare)
       endif()

cmake/Modules/OpmStaticTargets.cmake

@@ -1,103 +0,0 @@
-####################################################################
-#                                                                  #
-# Setup static targets for all submodules.                         #
-# Useful when building a static benchmark executable               #
-#                                                                  #
-####################################################################
-
-# Macros
-
-# Clone a git and build it statically
-# If ARGN is specified installation is skipped, ARGN0 is
-# a build-system target name and the rest of ARGN are build tool parameters
-function(opm_from_git repo name revision)
-  if(ARGN)
-    list(GET ARGN 0 target)
-    list(REMOVE_AT ARGN 0)
-    # This is used for top build of benchmarks.
-    # Clones the local source tree and builds it against the static libraries,
-    # skipping the install step. Note that in pricinple URL instead of GIT_REPOSITORY
-    # could have been used, but externalproject cannot handle build directories
-    # which are a subdirectory of the source tree, and since that is typically the case
-    # we work-around by re-cloning the local git.
-    # The ommision of GIT_TAG ensures that we build the tip of the local git.
-    set(COMMANDS BUILD_COMMAND ${CMAKE_COMMAND} --build <BINARY_DIR> --target ${target} -- ${ARGN}
-                 GIT_TAG ${revision}
-                 INSTALL_COMMAND)
-  else()
-    # This is used with "normal" static builds.
-    set(COMMANDS GIT_TAG ${revision})
-  endif()
-  externalproject_add(${name}-static
-                      GIT_REPOSITORY ${repo}
-                      PREFIX static/${name}
-                      CONFIGURE_COMMAND PKG_CONFIG_PATH=${CMAKE_BINARY_DIR}/static/installed/lib/pkgconfig:${CMAKE_BINARY_DIR}/static/installed/${CMAKE_INSTALL_LIBDIR}/pkgconfig:$ENV{PKG_CONFIG_PATH}
-                                 ${CMAKE_COMMAND} -DCMAKE_INSTALL_PREFIX=${CMAKE_BINARY_DIR}/static/installed
-                                 -DCMAKE_TOOLCHAIN_FILE=${CMAKE_TOOLCHAIN_FILE}
-                                 -DCMAKE_BUILD_TYPE=${CMAKE_BUILD_TYPE}
-                                 -DBUILD_SHARED_LIBS=0
-                                 -DBUILD_TESTING=0 -DBUILD_EXAMPLES=0 <SOURCE_DIR>
-                                 -G ${CMAKE_GENERATOR}
-                      ${COMMANDS} "")
-  set_target_properties(${name}-static PROPERTIES EXCLUDE_FROM_ALL 1)
-endfunction()
-
-# Convenience macro for adding dependencies without having to include the -static all over
-macro(opm_static_add_dependencies target)
-  foreach(arg ${ARGN})
-    add_dependencies(${target}-static ${arg}-static)
-  endforeach()
-endmacro()
-
-include(ExternalProject)
-include(GNUInstallDirs)
-
-# Defaults to building master
-if(NOT OPM_BENCHMARK_VERSION)
-  set(OPM_BENCHMARK_VERSION "origin/master")
-endif()
-
-# ERT
-externalproject_add(ert-static
-                    GIT_REPOSITORY https://github.com/Ensembles/ert
-                    PREFIX static/ert
-                    GIT_TAG ${revision}
-                    CONFIGURE_COMMAND ${CMAKE_COMMAND}
-                                      -DCMAKE_INSTALL_PREFIX=${CMAKE_BINARY_DIR}/static/installed
-                                      -DCMAKE_BUILD_TYPE=${CMAKE_BUILD_TYPE}
-                                      -DBUILD_SHARED_LIBS=0 <SOURCE_DIR>/devel)
-set_target_properties(ert-static PROPERTIES EXCLUDE_FROM_ALL 1)
-
-# 2015.04 release used dune v2.3.1
-if(OPM_BENCHMARK_VERSION STREQUAL "release/2015.04/final")
-  set(DUNE_VERSION v2.3.1)
-endif()
-
-# Master currently uses dune v2.3.1
-if(OPM_BENCHMARK_VERSION STREQUAL "origin/master")
-  set(DUNE_VERSION v2.3.1)
-endif()
-
-# Fallback
-if(NOT DUNE_VERSION)
-  set(DUNE_VERSION v2.3.1)
-endif()
-
-# Dune
-foreach(dune_repo dune-common dune-geometry dune-grid dune-istl)
-  opm_from_git(http://git.dune-project.org/repositories/${dune_repo} ${dune_repo} ${DUNE_VERSION})
-endforeach()
-opm_static_add_dependencies(dune-istl dune-common)
-opm_static_add_dependencies(dune-geometry dune-common)
-opm_static_add_dependencies(dune-grid dune-geometry)
-
-# OPM
-foreach(opm_repo opm-common opm-parser opm-core opm-output opm-grid opm-material
-                 opm-upscaling)
-  opm_from_git(https://github.com/OPM/${opm_repo} ${opm_repo} ${OPM_BENCHMARK_VERSION})
-endforeach()
-opm_static_add_dependencies(opm-parser opm-common ert)
-opm_static_add_dependencies(opm-core opm-parser dune-istl)
-opm_static_add_dependencies(opm-grid opm-core dune-grid)
-opm_static_add_dependencies(opm-material opm-core)
-opm_static_add_dependencies(opm-upscaling opm-grid opm-material)

cmake/Modules/opm-verteq-prereqs.cmake

@@ -1,20 +0,0 @@
-# -*- mode: cmake; tab-width: 2; indent-tabs-mode: t; truncate-lines: t; compile-command: "cmake -Wdev" -*-
-# vim: set filetype=cmake autoindent tabstop=2 shiftwidth=2 noexpandtab softtabstop=2 nowrap:
-
-# defines that must be present in config.h for our headers
-set (opm-verteq_CONFIG_VAR
-	)
-
-# dependencies
-set (opm-verteq_DEPS
-	# compile with C99 support if available
-	"C99"
-	# compile with C++0x/11 support if available
-	"CXX11Features"
-	# various runtime library enhancements
-	"Boost 1.44.0
-		COMPONENTS date_time filesystem system unit_test_framework REQUIRED"
-	# OPM dependency
-	"opm-common;
-	opm-core REQUIRED"
-	)

docs/man1/arraylist.1

@@ -1,6 +1,9 @@
-.TH SUMMARY "1" "October 2022" "arraylist 2022.10" "User Commands"
+.TH SUMMARY "1" "October 2023" "arraylist 2023.10" "User Commands"
 .SH NAME
-summary \- Printer for list of arrays in Eclipse summary files
+arraylist \- Printer for list of arrays in Eclipse summary files
+.SH SYNOPSIS
+.B arraylist
+[\fI\,OPTIONS\/\fR] \fI\,ECL_DECK_FILENAME\/\fR
 .SH DESCRIPTION
 List all arrays found in an EclFile specified on the command line.
 .PP

docs/man1/co2brinepvt.1

@@ -1,6 +1,10 @@
-.TH CO2BRINEPVT "1" "April 2022" "co2brinepvt" "User Commands"
+.TH CO2BRINEPVT "1" "October 2023" "co2brinepvt" "User Commands"
 .SH NAME
 co2brinepvt \- compute and print pvt properties for co2 with brine
+.SH SYNOPSIS
+.B co2brinepvt
+[\fI\,OPTIONS\/\fR] \fI\,PROPERTY\/\fR \fI\,PHASE\/\fR
+\fI\,PRESSURE\/\fR \fI\,TEMPERATURE\/\fR [\fI\,SALINITY\/\fR]  [\fI\,RS\/\fR]
 .SH DESCRIPTION
 co2brinepvt computes PVT properties of a brine/co2 system
 for a given phase (oil or brine), pressure, temperature, salinity and rs.

docs/man1/compareECL.1

@@ -1,6 +1,9 @@
-.TH COMPAREECL "1" "October 2022" "compareECL 2022.10" "User Commands"
+.TH COMPAREECL "1" "October 2023" "compareECL 2023.10" "User Commands"
 .SH NAME
 compareECL \- Comparator for Eclipse files
+.SH SYNOPSIS
+.B convertECL
+[\fI\,OPTIONS\/\fR] \fI\,ECL_DECK_FILENAME_1\/\fR \fI\,ECL_DECK_FILENAME_2\/\fR
 .SH DESCRIPTION
 compareECL compares ECLIPSE files (restart (.RST), unified restart (.UNRST), initial (.INIT), summary (.SMRY), unified summary (.UNSMRY) or .RFT) and gridsizes (from .EGRID or .GRID file) from two simulations.
 The program takes four arguments:

docs/man1/convertECL.1

@@ -1,6 +1,10 @@
-.TH CONVERTECL "1" "October 2022" "convertECL 2022.10" "User Commands"
+.TH CONVERTECL "1" "October 2023" "convertECL 2023.10" "User Commands"
 .SH NAME
-convertECL \- Converter for Eclipse files (binary <-> formatted format)
+convertECL \- Converter for Eclipse files (binary <-> formatted
+format)
+.SH SYNOPSIS
+.B convertECL
+[\fI\,OPTIONS\/\fR] \fI\,ECL_DECK_FILENAME\/\fR
 .SH DESCRIPTION
 convertECL needs one argument which is the input file to be converted. If this is a binary file the output file will be formatted. If the input file is formatted the output will be binary.
 .PP

docs/man1/opmhash.1

@@ -1,8 +1,11 @@
-.TH OPMHASH "1" "October 2022" "opmhash 2022.10" "User Commands"
+.TH OPMHASH "1" "October 2023" "opmhash 2023.10" "User Commands"
 .SH NAME
 opmhash \- Hasher for summary keywords in Eclipse files
+.SH SYNOPSIS
+.B opmhash
+[\fI\,OPTIONS\/\fR] \fI\,ECL_DECK_FILENAME\/\fR
+[\fI\,ECL_DECK_FILENAME_2\/\fR] [\fI\,ECL_DECK_FILENAME_3\/\fR] ...
 .SH DESCRIPTION
-opmhash: invalid option \fB\-\-\fR 'h'
 The purpose of the opmhash program is to load a deck and create a summary, by
 diffing two such summaries it is simple to determine if two decks are similar.
 For each keyword a hash of the normalized content is calculated. The output of

docs/man1/opmpack.1

@@ -1,6 +1,9 @@
-.TH OPMPACK "1" "October 2022" "opmpack 2022.10" "User Commands"
+.TH OPMPACK "1" "October 2023" "opmpack 2023.10" "User Commands"
 .SH NAME
 opmpack \- Validator and printer of deck in Eclipse files without comments
+.SH SYNOPSIS
+.B opmpack
+[\fI\,OPTIONS\/\fR] \fI\,ECL_DECK_FILENAME\/\fR
 .SH DESCRIPTION
 The opmpack program will load a deck, resolve all include
 files and then print it out again on stdout. All comments

docs/man1/rst_deck.1

@@ -1,6 +1,10 @@
-.TH RST_DECK: "1" "October 2022" "rst_deck 2022.10" "User Commands"
+.TH RST_DECK: "1" "October 2023" "rst_deck 2023.10" "User Commands"
 .SH NAME
 rst_deck \- Convert simulation deck to a deck ready for restart
+.SH SYNOPSIS
+.B rst_deck
+[\fI\,OPTIONS\/\fR] \fI\,ECL_DECK_FILENAME\/\fR
+\fI\,RESTART_SOURCE\/\fR [\fI\,BASENAME_RESTART_DECK\/\fR
 .SH DESCRIPTION
 The rst_deck program will load a simulation deck and parameters for a restart
 and reformat the deck to become a restart deck. Before the updated deck is

docs/man1/summary.1

@@ -1,6 +1,10 @@
-.TH SUMMARY "1" "October 2022" "summary 2022.10" "User Commands"
+.TH SUMMARY "1" "October 2023" "summary 2023.10" "User Commands"
 .SH NAME
 summary \- Printer for summary keys in Eclipse summary files
+.SH SYNOPSIS
+.B summary
+[\fI\,OPTIONS\/\fR] \fI\,ECL_DECK_FILENAME\/\fR
+\fI\,SUMMARY_KEY1\/\fR [\fI\,SUMMARY_KEY2\/\fR] ...
 .SH DESCRIPTION
 summary needs a minimum of two arguments. First is smspec filename and then list of vectors
 .PP

dune.module

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

examples/co2brinepvt.cpp

@@ -93,7 +93,7 @@ int main(int argc, char **argv)
     if (argc > 6)
         rs = atof(argv[6]);
 
-    const double MmNaCl = 58e-3; // molar mass of NaCl [kg/mol]
+    const double MmNaCl = 58.44e-3; // molar mass of NaCl [kg/mol]
     // convert to mass fraction
     std::vector<double> salinity = {0.0};
     if (molality > 0.0)

external/resinsight/LibCore/cvfArray.h

@@ -72,13 +72,13 @@ public:
     void                    assign(const std::vector<T>& data);
     void                    resize(size_t size);
     void                    clear();
-    inline virtual size_t   size() const;
+    inline size_t           size() const override;
 
     inline void             set(size_t index, const T& val);
     inline void             setAll(const T& val);
     inline void             setConsecutive(const T& startVal);
     inline const T&         get(size_t index) const;
-    inline virtual T        val(size_t index) const;
+    inline T                val(size_t index) const override;
 
     inline const T* ptr() const;
     inline T*       ptr();

external/resinsight/LibCore/cvfAssert.cpp

@@ -46,7 +46,9 @@ namespace cvf {
 
 // User actions (interactive responses)
 static const int USERACTION_CONTINUE    = 0;
+#ifdef WIN32
 static const int USERACTION_DEBUGBREAK  = 1;
+#endif
 static const int USERACTION_ABORT       = 2;
 
 
@@ -79,7 +81,7 @@ public:
 class AssertHandlerConsole : public AssertHandler
 {
 public:
-    virtual Assert::FailAction  handleAssert(const char* fileName, int lineNumber, const char* expr, const char* msg);
+    Assert::FailAction  handleAssert(const char* fileName, int lineNumber, const char* expr, const char* msg) override;
 
 private:
     static void reportToConsole(const char* fileName, int lineNumber, const char* expr, const char* msg);
@@ -270,7 +272,7 @@ void AssertHandlerConsole::winCreateConsoleAndRedirectIO(bool redirectInput)
 class AssertHandlerWinDialog : public AssertHandler
 {
 public:
-    virtual Assert::FailAction  handleAssert(const char* fileName, int lineNumber, const char* expr, const char* msg);
+    Assert::FailAction  handleAssert(const char* fileName, int lineNumber, const char* expr, const char* msg) override;
 
 private:
     static int  handleUsingDialog(const char* fileName, int lineNumber, const char* expr, const char* msg);

external/resinsight/LibCore/cvfColor3.h

@@ -112,7 +112,7 @@ public:
     Color3f();
     Color3f(float r, float g, float b);
     Color3f(const Color3f& other);
-    Color3f(ColorIdent colorIdent);
+    explicit Color3f(ColorIdent colorIdent);
     explicit Color3f(const Color3ub& other);
 
     Color3f&        operator=(const Color3f& rhs);
@@ -158,7 +158,7 @@ public:
     Color3ub();
     Color3ub(ubyte r, ubyte g, ubyte b);
     Color3ub(const Color3ub& other);
-    Color3ub(ColorIdent colorIdent);
+    explicit Color3ub(ColorIdent colorIdent);
     explicit Color3ub(const Color3f& other);
 
     Color3ub&       operator=(const Color3ub& rhs);

external/resinsight/LibCore/cvfDebugTimer.h

@@ -60,7 +60,7 @@ public:
     };
 
 public:
-    DebugTimer(const char* prefix, OperationMode operationMode = NORMAL);
+    explicit DebugTimer(const char* prefix, OperationMode operationMode = NORMAL);
     ~DebugTimer();
 
     void    restart(const char* msg = NULL);

external/resinsight/LibCore/cvfFlags.h

@@ -52,7 +52,7 @@ class Flags
 public:
     inline Flags(); 
     inline Flags(const Flags& other);
-    inline Flags(FlagEnum flag);
+    explicit inline Flags(FlagEnum flag);
 
     inline Flags&  operator=(const Flags& rhs);
     inline Flags&  operator=(FlagEnum flag);

external/resinsight/LibCore/cvfObject.h

@@ -99,7 +99,7 @@ class ref
 public:
     ref(T* object = NULL);
     ref(const ref& other);
-    template<typename T2> ref(const ref<T2>& other);
+    template<typename T2> explicit ref(const ref<T2>& other);
     ~ref();
 
     ref&                        operator=(T* rhs);
@@ -150,7 +150,7 @@ class cref
 public:
     cref(const T* object = NULL);
     cref(const cref& other);
-    template<typename T2> cref(const cref<T2>& other);
+    template<typename T2> explicit cref(const cref<T2>& other);
     ~cref();
 
     cref&                       operator=(const T* rhs);

external/resinsight/LibCore/cvfPlane.cpp

@@ -374,7 +374,7 @@ bool Plane::intersect(const Plane& other, Vec3d* point, Vec3d* direction) const
 
     CVF_ASSERT(point);
 
-    double invdet = UNDEFINED_DOUBLE;  
+    double invdet;
 
     Vec3d normal1 = this->normal();
     Vec3d normal2 = other.normal();

external/resinsight/LibCore/cvfTrace.cpp

@@ -72,7 +72,7 @@ namespace cvf {
 //--------------------------------------------------------------------------------------------------
 /// Write debug text to console, DevStudio output window and file (future)
 //--------------------------------------------------------------------------------------------------
-void Trace::show(String message)
+void Trace::show(const String& message)
 {
     showTraceOutput(message, true);
 }
@@ -88,7 +88,7 @@ void Trace::show(const char* format, ...)
     va_list argList;
     va_start(argList, format);
 
-    const int maxFormatLength = 4000;
+    constexpr int maxFormatLength = 4000;
     char temp[maxFormatLength + 1];
 
 #ifdef WIN32
@@ -96,7 +96,7 @@ void Trace::show(const char* format, ...)
 #elif defined(CVF_ANDROID)
     __android_log_print(ANDROID_LOG_DEBUG, "CVF_TAG", format, argList);
 #else
-    vsprintf(temp, format, argList);
+    vsnprintf(temp, maxFormatLength, format, argList);
 #endif
 
     va_end(argList);    
@@ -124,7 +124,7 @@ void Trace::showFileLineNumber(const String& file, int line, const String& messa
 //--------------------------------------------------------------------------------------------------
 /// Show the trace output in console and DevStudio output window
 //--------------------------------------------------------------------------------------------------
-void Trace::showTraceOutput(String text, bool addNewLine)
+void Trace::showTraceOutput(const String& text, bool addNewLine)
 {
 #ifdef WIN32
     AllocConsole();

external/resinsight/LibCore/cvfTrace.h

@@ -51,12 +51,12 @@ namespace cvf {
 class Trace
 {
 public:
-    static void show(String message);
+    static void show(const String& message);
     static void show(const char* format, ...);
     static void showFileLineNumber(const String& file, int line, const String& message);
 
 private:
-    static void showTraceOutput(String text, bool addNewLine);
+    static void showTraceOutput(const String& text, bool addNewLine);
 };
 
 

external/resinsight/LibCore/cvfVector3.cpp

@@ -22,7 +22,6 @@
 //##################################################################################################
 
 
-#include "cvfBase.h"
 #include "cvfVector3.h"
 
 namespace external {

external/resinsight/LibCore/cvfVector3.h

@@ -158,6 +158,11 @@ typedef Vector3<int>    Vec3i;  ///< A vector with int components
 typedef Vector3<uint>   Vec3ui;  ///< A vector with uint components
 typedef Vector3<size_t> Vec3st;  ///< A vector with size_t components
 
+template<> Vec3d const Vec3d::UNDEFINED;
+template<> Vec3f const Vec3f::UNDEFINED;
+template<> Vec3i const Vec3i::UNDEFINED;
+template<> Vec3st const Vec3st::UNDEFINED;
+
 }
 } //namespace external
 #include "cvfVector3.inl"

external/resinsight/LibCore/cvfVector4.inl

@@ -491,7 +491,7 @@ inline void Vector4<S>::setZero()
 template<typename S>
 inline bool Vector4<S>::isZero() const
 {
-    return (m_v[0] == 0) && (m_v[1] == 0) && (m_v[2] == 0) && (m_v[2] == 0);
+    return (m_v[0] == 0) && (m_v[1] == 0) && (m_v[2] == 0) && (m_v[3] == 0);
 }
 
 

external/resinsight/LibGeometry/cvfBoundingBoxTree.cpp

@@ -243,7 +243,6 @@ int largestComponent(const cvf::Vec3d v)
 
     if (v.z() > maxLength)
     {
-        maxLength = v.z();
         idx = 2;
     }
 
@@ -787,8 +786,11 @@ void AABBTree::deleteInternalNodesBottomUp(AABBTreeNode* node)
     auto internalNode = dynamic_cast<AABBTreeNodeInternal*>(node);
     CVF_ASSERT(internalNode);
 
-    AABBTree::deleteInternalNodesBottomUp(internalNode->left());
-    AABBTree::deleteInternalNodesBottomUp(internalNode->right());
+    if (internalNode)
+    {
+        AABBTree::deleteInternalNodesBottomUp(internalNode->left());
+        AABBTree::deleteInternalNodesBottomUp(internalNode->right());
+    }
 
     delete internalNode;
 }

external/resinsight/LibGeometry/cvfRay.cpp

@@ -283,8 +283,8 @@ bool Ray::boxIntersect(const BoundingBox& box, Vec3d* intersectionPoint) const
 
     // Find candidate planes; this loop can be avoided if rays cast all from the eye(assume perpsective view)
     bool inside = true;
-    char quadrant[3];
-    double candidatePlane[3];
+    char quadrant[3]{};
+    double candidatePlane[3] = {0.0, 0.0, 0.0};
 
     Vec3d min = box.min();
     Vec3d max = box.max();
@@ -320,17 +320,13 @@ bool Ray::boxIntersect(const BoundingBox& box, Vec3d* intersectionPoint) const
     }
 
     // Calculate T distances to candidate planes
-    double maxT[3];
+    double maxT[3]{-1.0f, -1.0f, -1.0f};
     for (i = 0; i < 3; i++)
     {
         if (quadrant[i] != MIDDLE && m_direction[i] !=0.0f)
         {
             maxT[i] = (candidatePlane[i] - m_origin[i]) / m_direction[i];
         }
-        else
-        {
-            maxT[i] = -1.0f;
-        }
     }
 
     // Get largest of the maxT's for final choice of intersection

external/resinsight/ReservoirDataModel/RigWellPath.cpp

@@ -30,9 +30,9 @@ namespace external {
 //--------------------------------------------------------------------------------------------------
 RigWellPath::RigWellPath()
     : cvf::Object()
+    , objectBeingDeleted( this )
     , m_hasDatumElevation( false )
     , m_datumElevation( 0.0 )
-    , objectBeingDeleted( this )
     , m_uniqueStartIndex( 0u )
     , m_uniqueEndIndex( std::numeric_limits<size_t>::max() )
 {
@@ -43,13 +43,13 @@ RigWellPath::RigWellPath()
 //--------------------------------------------------------------------------------------------------
 RigWellPath::RigWellPath( const RigWellPath& rhs )
     : cvf::Object()
+    , objectBeingDeleted( this )
     , m_wellPathPoints( rhs.m_wellPathPoints )
     , m_measuredDepths( rhs.m_measuredDepths )
     , m_hasDatumElevation( rhs.m_hasDatumElevation )
     , m_datumElevation( rhs.m_datumElevation )
     , m_uniqueStartIndex( rhs.m_uniqueStartIndex )
     , m_uniqueEndIndex( rhs.m_uniqueEndIndex )
-    , objectBeingDeleted( this )
 {
     CVF_ASSERT( m_wellPathPoints.size() == m_measuredDepths.size() );
 }
@@ -59,12 +59,12 @@ RigWellPath::RigWellPath( const RigWellPath& rhs )
 //--------------------------------------------------------------------------------------------------
 RigWellPath::RigWellPath( const std::vector<cvf::Vec3d>& wellPathPoints, const std::vector<double>& measuredDepths )
     : cvf::Object()
+    , objectBeingDeleted( this )
     , m_wellPathPoints( wellPathPoints )
     , m_measuredDepths( measuredDepths )
     , m_hasDatumElevation( false )
     , m_datumElevation( 0.0 )
     , m_uniqueStartIndex( 0u )
-    , objectBeingDeleted( this )
     , m_uniqueEndIndex( std::numeric_limits<size_t>::max() )
 {
     CVF_ASSERT( m_wellPathPoints.size() == m_measuredDepths.size() );

external/resinsight/cafHexGridIntersectionTools/cafHexGridIntersectionTools.cpp

@@ -166,7 +166,7 @@ bool HexGridIntersectionTools::planeTriangleIntersection( const cvf::Plane& plan
         if ( onPosSide[2] ) topVx = 3;
 
         // Case 3a: Two negative distances and the last is within tolerance of zero.
-        if ( sqrSignedDistances[topVx - 1] < sqrDistanceTolerance )
+        if ( topVx > 0 && sqrSignedDistances[topVx - 1] < sqrDistanceTolerance )
         {
             return false;
         }
@@ -178,7 +178,7 @@ bool HexGridIntersectionTools::planeTriangleIntersection( const cvf::Plane& plan
         if ( !onPosSide[2] ) topVx = 3;
 
         // Case 3a: Two positive distances and the last is within tolerance of zero.
-        if ( sqrSignedDistances[topVx - 1] > -sqrDistanceTolerance )
+        if ( topVx > 0 && sqrSignedDistances[topVx - 1] > -sqrDistanceTolerance )
         {
             return false;
         }
@@ -1084,7 +1084,7 @@ int HexGridIntersectionTools::planeHexIntersectionMC( const cvf::Plane&    plane
     }
 
     cvf::Vec3d edgeIntersections[12];
-    double     normDistAlongEdge[12];
+    double     normDistAlongEdge[12]{};
 
     // Compute vertex coordinates on the edges where we have intersections
     if ( cubeIdxToCutEdgeBitfield[cubeIndex] & 1 )

external/resinsight/cafPdmCore/cafSignal.h

@@ -108,7 +108,7 @@ public:
     using MemberCallbackAndActiveFlag = std::pair<MemberCallback, bool>;
 
 public:
-    Signal( const SignalEmitter* emitter )
+    explicit Signal( const SignalEmitter* emitter )
         : m_emitter( emitter )
     {
         m_emitter->addEmittedSignal( this );

jenkins/build-opm-module.sh

@@ -123,9 +123,9 @@ function build_module {
     TESTTHREADS=${TESTTHREADS:-1}
     if test -z "$CTEST_CONFIGURATION"
     then
-      ctest -T Test --no-compress-output -j$TESTTHREADS
+      ctest -T Test --no-compress-output -j$TESTTHREADS -LE "gpu_.*"
     else
-      ctest -j$TESTTHREADS -C $CTEST_CONFIGURATION --timeout 5000 -T Test --no-compress-output
+      ctest -j$TESTTHREADS -C $CTEST_CONFIGURATION --timeout 5000 -T Test --no-compress-output -LE "gpu_.*"
     fi
 
     # Convert to junit format

msim/include/opm/msim/msim.hpp

@@ -45,7 +45,10 @@ private:
 
     void run_step(WellTestState& wtest_state, UDQState& udq_state, data::Solution& sol, data::Wells& well_data, data::GroupAndNetworkValues& group_nwrk_data, size_t report_step, EclipseIO& io);
     void run_step(WellTestState& wtest_state, UDQState& udq_state, data::Solution& sol, data::Wells& well_data, data::GroupAndNetworkValues& group_nwrk_data, size_t report_step, double dt, EclipseIO& io);
-    void output(WellTestState& wtest_state, const UDQState& udq_state, size_t report_step, bool substep, double seconds_elapsed, const data::Solution& sol, const data::Wells& well_data, const data::GroupAndNetworkValues& group_data, EclipseIO& io);
+    void output(const WellTestState& wtest_state, const UDQState& udq_state,
+                size_t report_step, bool substep, double seconds_elapsed,
+                const data::Solution& sol, const data::Wells& well_data,
+                const data::GroupAndNetworkValues& group_data, EclipseIO& io);
     void simulate(data::Solution& sol, data::Wells& well_data, data::GroupAndNetworkValues& group_nwrk_data, size_t report_step, double seconds_elapsed, double time_step);
 
     EclipseState state;

msim/src/msim.cpp

@@ -33,7 +33,6 @@
 #include <opm/input/eclipse/Schedule/Action/SimulatorUpdate.hpp>
 #include <opm/input/eclipse/Schedule/UDQ/UDQState.hpp>
 #include <opm/input/eclipse/Schedule/UDQ/UDQConfig.hpp>
-#include <opm/input/eclipse/Schedule/Well/PAvgCalculatorCollection.hpp>
 #include <opm/input/eclipse/Schedule/Well/Well.hpp>
 #include <opm/input/eclipse/Schedule/Well/WellMatcher.hpp>
 #include <opm/input/eclipse/Schedule/Well/WellTestState.hpp>
@@ -122,13 +121,19 @@ void msim::run_step(WellTestState& wtest_state, UDQState& udq_state, data::Solut
                           report_step,
                           seconds_elapsed,
                           well_data,
+                          /* wbp = */ {},
                           group_nwrk_data,
-                          {},
-                          {},
-                          {},
-                          {});
+                          /* sing_values = */ {},
+                          /* initial_inplace = */ {},
+                          /* inplace = */ {});
 
-        this->schedule.getUDQConfig( report_step ).eval(report_step, schedule.wellMatcher(report_step), this->st, udq_state);
+        this->schedule.getUDQConfig(report_step - 1)
+            .eval(report_step,
+                  this->schedule,
+                  this->schedule.wellMatcher(report_step),
+                  this->schedule.segmentMatcherFactory(report_step),
+                  this->st,
+                  udq_state);
 
         this->output(wtest_state,
                      udq_state,
@@ -144,7 +149,10 @@ void msim::run_step(WellTestState& wtest_state, UDQState& udq_state, data::Solut
 
 
 
-void msim::output(WellTestState& wtest_state, const UDQState& udq_state, size_t report_step, bool substep, double seconds_elapsed, const data::Solution& sol, const data::Wells& well_data, const data::GroupAndNetworkValues& group_nwrk_data, EclipseIO& io) {
+void msim::output(const WellTestState& wtest_state, const UDQState& udq_state,
+                  size_t report_step, bool substep, double seconds_elapsed,
+                  const data::Solution& sol, const data::Wells& well_data,
+                  const data::GroupAndNetworkValues& group_nwrk_data, EclipseIO& io) {
     RestartValue value(sol, well_data, group_nwrk_data, {});
     io.writeTimeStep(this->action_state,
                      wtest_state,

opm/common/Exceptions.hpp

@@ -66,6 +66,13 @@ public:
         : NumericalProblem(message)
     {}
 };
+class TimeSteppingBreakdown : public NumericalProblem
+{
+public:
+    explicit TimeSteppingBreakdown(const std::string &message)
+        : NumericalProblem(message)
+    {}
+};
 }
 
 #endif // OPM_EXCEPTIONS_HPP

opm/common/TimingMacros.hpp

@@ -19,8 +19,27 @@
 #ifndef OPM_TIMINGMACROS_HPP
 #define OPM_TIMINGMACROS_HPP
 
-// macros used to time blocks for example with tracy
-// time block of main part of codes which do not effect performance
+// This file defines macros
+// OPM_TIMEBLOCK - time block of main part of codes which do not effect performance
+// OPM_TIMEFUNCTION - time block of main part of codes which do not effect performance with name from function
+// OPM_TIMEBLOCK_LOCAL - detailed timing which may effect performance
+// OPM_TIMEFUNCTION_LOCAL - detailed timing which may effect performance with name from function
+
+#ifndef DETAILED_PROFILING
+#define DETAILED_PROFILING 0 // set to 1 to enable invasive profiling
+#endif
+
+#if USE_TRACY
+#define TRACY_ENABLE 1
+#include <tracy/Tracy.hpp>
+#define OPM_TIMEBLOCK(blockname) ZoneNamedN(blockname, #blockname, true)
+#define OPM_TIMEFUNCTION() ZoneNamedN(myname, __func__, true)
+#if DETAILED_PROFILING
+#define OPM_TIMEBLOCK_LOCAL(blockname) ZoneNamedN(blockname, #blockname, true)
+#define OPM_TIMEFUNCTION_LOCAL() ZoneNamedN(myname, __func__, true)
+#endif
+#endif
+
 #ifndef OPM_TIMEBLOCK
 #define OPM_TIMEBLOCK(x)\
     do { /* nothing */ } while (false)
@@ -32,4 +51,14 @@
     do { /* nothing */ } while (false)
 #endif
 
+#ifndef OPM_TIMEFUNCTION
+#define OPM_TIMEFUNCTION()\
+    do { /* nothing */ } while (false)
+#endif
+
+#ifndef OPM_TIMEFUNCTION_LOCAL
+#define OPM_TIMEFUNCTION_LOCAL()\
+    do { /* nothing */ } while (false)
+#endif
+
 #endif // OPM_TIMINGMACROS_HPP

opm/common/utility/numeric/cmp.hpp

@@ -20,11 +20,12 @@
 #ifndef COMMON_UTIL_NUMERIC_CMP
 #define COMMON_UTIL_NUMERIC_CMP
 
-#include <cstddef>
-#include <vector>
-#include <type_traits>
-#include <cmath>
 #include <algorithm>
+#include <cmath>
+#include <cstddef>
+#include <cstring>
+#include <type_traits>
+#include <vector>
 
 namespace Opm {
 
@@ -109,7 +110,7 @@ namespace Opm {
 
         template<typename T>
         bool array_equal(const T* p1, const T* p2, size_t num_elements, T abs_eps, T rel_eps) {
-            if (memcmp(p1 , p2 , num_elements * sizeof * p1) == 0)
+            if (std::memcmp(p1 , p2 , num_elements * sizeof * p1) == 0)
                 return true;
             else {
                 size_t index;

opm/common/utility/parameters/Parameter.hpp

@@ -52,7 +52,7 @@ namespace Opm {
 	    /// @brief
 	    /// @todo Doc me!
 	    /// @return
-	    virtual std::string getTag() const {return ID_xmltag__param;}
+            std::string getTag() const override { return ID_xmltag__param; }
 	    /// @brief
 	    /// @todo Doc me!
 	    /// @param

opm/common/utility/parameters/ParameterGroup.hpp

@@ -93,7 +93,7 @@ namespace Opm {
 
 	    // From ParameterMapItem
 	    virtual ~ParameterGroup();
-	    virtual std::string getTag() const;
+            std::string getTag() const override;
 
 	    /// \brief A constructor typically used to initialize a
 	    ///        ParameterGroup from command-line arguments.

opm/input/eclipse/Deck/DeckRecord.hpp

@@ -34,7 +34,7 @@ namespace Opm {
         typedef std::vector< DeckItem >::const_iterator const_iterator;
 
         DeckRecord() = default;
-        DeckRecord( std::vector< DeckItem >&& items, const bool check_for_duplicate_names = true );
+        explicit DeckRecord( std::vector< DeckItem >&& items, const bool check_for_duplicate_names = true );
 
         static DeckRecord serializationTestObject();
 

opm/input/eclipse/Deck/DeckSection.hpp

@@ -27,6 +27,7 @@
 namespace Opm {
 
 class Deck;
+class ErrorGuard;
 
 enum class Section {
     RUNSPEC,
@@ -63,6 +64,7 @@ class DeckSection : public DeckView {
         // the right order
         static bool checkSectionTopology(const Deck& deck,
                                          const Parser&,
+                                         ErrorGuard& errorGuard,
                                          bool ensureKeywordSectionAffiliation = false);
 
 

opm/input/eclipse/Deck/DeckTree.hpp

@@ -38,7 +38,7 @@ namespace Opm {
 class DeckTree {
 public:
     DeckTree() = default;
-    DeckTree(const std::string&);
+    explicit DeckTree(const std::string&);
 
     const std::string& parent(const std::string& fname) const;
     bool includes(const std::string& parent_file, const std::string& include_file) const;

opm/input/eclipse/Deck/DeckView.hpp

@@ -33,7 +33,7 @@ public:
 
 
     struct Iterator : public storage_type::iterator {
-        Iterator(storage_type::const_iterator inner_iter) :
+        explicit Iterator(storage_type::const_iterator inner_iter) :
             inner(inner_iter)
         {}
 

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

@@ -124,7 +124,7 @@ namespace Opm {
 
         AquiferCT() = default;
         AquiferCT(const TableManager& tables, const Deck& deck);
-        AquiferCT(const std::vector<AquiferCT::AQUCT_data>& data);
+        explicit AquiferCT(const std::vector<AquiferCT::AQUCT_data>& data);
 
         void loadFromRestart(const RestartIO::RstAquifer& rst,
                              const TableManager&          tables);

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

@@ -20,13 +20,15 @@
 #ifndef OPM_NUMERICALAQUIFERS_HPP
 #define OPM_NUMERICALAQUIFERS_HPP
 
+#include <opm/input/eclipse/EclipseState/Aquifer/NumericalAquifer/SingleNumericalAquifer.hpp>
+
+#include <cstddef>
 #include <map>
 #include <unordered_map>
+#include <vector>
 
 #include <stddef.h>
 
-#include <opm/input/eclipse/EclipseState/Aquifer/NumericalAquifer/SingleNumericalAquifer.hpp>
-
 namespace Opm {
     class Deck;
     class EclipseGrid;
@@ -46,6 +48,7 @@ namespace Opm {
         bool operator==(const NumericalAquifers& other) const;
 
         std::unordered_map<size_t, const NumericalAquiferCell*> allAquiferCells() const;
+        std::vector<std::size_t> allAquiferCellIds() const;
 
         std::unordered_map<size_t, double> aquiferCellVolumes() const;
 

opm/input/eclipse/EclipseState/EclipseState.hpp

@@ -28,11 +28,13 @@
 #include <opm/input/eclipse/EclipseState/EclipseConfig.hpp>
 #include <opm/input/eclipse/EclipseState/TracerConfig.hpp>
 #include <opm/input/eclipse/EclipseState/MICPpara.hpp>
+#include <opm/input/eclipse/EclipseState/WagHysteresisConfig.hpp>
 #include <opm/input/eclipse/EclipseState/Grid/FieldPropsManager.hpp>
 #include <opm/input/eclipse/EclipseState/Grid/EclipseGrid.hpp>
 #include <opm/input/eclipse/EclipseState/Grid/FaultCollection.hpp>
 #include <opm/input/eclipse/EclipseState/Grid/NNC.hpp>
 #include <opm/input/eclipse/EclipseState/Grid/TransMult.hpp>
+#include <opm/input/eclipse/EclipseState/Grid/LgrCollection.hpp>
 #include <opm/input/eclipse/EclipseState/Runspec.hpp>
 #include <opm/input/eclipse/EclipseState/Tables/TableManager.hpp>
 #include <opm/input/eclipse/EclipseState/SimulationConfig/SimulationConfig.hpp>
@@ -94,6 +96,9 @@ namespace Opm {
         const EclipseConfig& cfg() const;
         const GridDims& gridDims() const;
 
+        const LgrCollection& getLgrs() const;
+        bool hasInputLGR() const;
+
         // the unit system used by the deck. note that it is rarely needed
         // to convert units because internally to opm-parser everything is
         // represented by SI units.
@@ -108,6 +113,7 @@ namespace Opm {
         const AquiferConfig& aquifer() const;
         const TracerConfig& tracer() const;
         const MICPpara& getMICPpara() const;
+        const WagHysteresisConfig& getWagHysteresis() const;
 
         void reset_actnum(const std::vector<int>& new_actnum);
         void pruneDeactivatedAquiferConnections(const std::vector<std::size_t>& deactivated_cells);
@@ -129,6 +135,7 @@ namespace Opm {
             serializer(m_deckUnitSystem);
             serializer(m_inputNnc);
             serializer(m_gridDims);
+            serializer(m_lgrs);
             serializer(m_simulationConfig);
             serializer(aquifer_config);
             serializer(m_transMult);
@@ -136,6 +143,7 @@ namespace Opm {
             serializer(m_title);
             serializer(tracer_config);
             serializer(m_micppara);
+            serializer(wag_hyst_config);
         }
 
         static bool rst_cmp(const EclipseState& full_state, const EclipseState& rst_state);
@@ -145,12 +153,13 @@ namespace Opm {
         void initIOConfigPostSchedule(const Deck& deck);
         void assignRunTitle(const Deck& deck);
         void reportNumberOfActivePhases() const;
+        void initLgrs(const Deck& deck);
         void conveyNumericalAquiferEffects();
         void applyMULTXYZ();
         void initFaults(const Deck& deck);
         void initPara(const Deck& deck);
 
-        void setMULTFLT(const Opm::DeckSection& section);
+        void setMULTFLT(const Opm::DeckSection& section, bool edit = false);
 
         void complainAboutAmbiguousKeyword(const Deck& deck,
                                            const std::string& keywordName);
@@ -164,11 +173,13 @@ namespace Opm {
         NNC m_inputNnc;
         GridDims m_gridDims;
         FieldPropsManager field_props;
+        LgrCollection m_lgrs;
         SimulationConfig m_simulationConfig;
         AquiferConfig aquifer_config;
         TransMult m_transMult;
         TracerConfig tracer_config;
         MICPpara m_micppara;
+        WagHysteresisConfig wag_hyst_config;
 
         std::string m_title{};
         FaultCollection m_faults{};

opm/input/eclipse/EclipseState/Grid/Carfin.hpp

@@ -55,6 +55,7 @@ namespace Opm
             {}
         };
 
+        Carfin() = default;
 
         explicit Carfin(const GridDims& gridDims,
                      IsActive        isActive,
@@ -93,6 +94,15 @@ namespace Opm
         int NY() const;
         int NZ() const;
 
+        template<class Serializer>
+        void serializeOp(Serializer& serializer)
+        {
+            serializer(m_dims);    
+            serializer(m_offset);     
+            serializer(m_end_offset);     
+            serializer(name_grid);           
+        }
+
     private:
         GridDims m_globalGridDims_{};
         IsActive m_globalIsActive_{};

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

@@ -31,6 +31,7 @@
 #include <stdexcept>
 #include <unordered_set>
 #include <vector>
+#include <map>
 
 namespace Opm {
 
@@ -64,7 +65,8 @@ namespace Opm {
         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);
+                    double dx = 1.0, double dy = 1.0, double dz = 1.0,
+                    double top = 0.0);
         explicit EclipseGrid(const GridDims& gd);
 
         EclipseGrid(const std::array<int, 3>& dims ,
@@ -75,7 +77,7 @@ namespace Opm {
 
         /// EclipseGrid ignores ACTNUM in Deck, and therefore needs ACTNUM
         /// explicitly.  If a null pointer is passed, every cell is active.
-        EclipseGrid(const Deck& deck, const int * actnum = nullptr);
+        explicit EclipseGrid(const Deck& deck, const int * actnum = nullptr);
 
         static bool hasGDFILE(const Deck& deck);
         static bool hasCylindricalKeywords(const Deck& deck);
@@ -254,12 +256,15 @@ namespace Opm {
         std::vector<int> m_global_to_active;
         // Numerical aquifer cells, needs to be active
         std::unordered_set<size_t> m_aquifer_cells;
+        // Keep track of aquifer cell depths
+        std::map<size_t, double> m_aquifer_cell_depths;
 
         // Radial grids need this for volume calculations.
         std::optional<std::vector<double>> m_thetav;
         std::optional<std::vector<double>> m_rv;
 
         void updateNumericalAquiferCells(const Deck&);
+        double computeCellGeometricDepth(size_t globalIndex) const;
 
         void initGridFromEGridFile(Opm::EclIO::EclFile& egridfile, std::string fileName);
         void resetACTNUM( const int* actnum);

opm/input/eclipse/EclipseState/Grid/FieldProps.hpp

@@ -19,22 +19,32 @@
 #ifndef FIELDPROPS_HPP
 #define FIELDPROPS_HPP
 
-#include <limits>
-#include <optional>
-#include <string>
-#include <unordered_set>
-#include <vector>
-
-#include <opm/input/eclipse/Deck/value_status.hpp>
-#include <opm/input/eclipse/Deck/DeckSection.hpp>
-#include <opm/input/eclipse/Units/UnitSystem.hpp>
 #include <opm/input/eclipse/EclipseState/Grid/Box.hpp>
-#include <opm/input/eclipse/EclipseState/Grid/SatfuncPropertyInitializers.hpp>
-#include <opm/input/eclipse/EclipseState/Tables/TableManager.hpp>
-#include <opm/input/eclipse/EclipseState/Runspec.hpp>
-#include <opm/input/eclipse/EclipseState/Grid/Keywords.hpp>
-#include <opm/input/eclipse/EclipseState/Grid/TranCalculator.hpp>
 #include <opm/input/eclipse/EclipseState/Grid/FieldData.hpp>
+#include <opm/input/eclipse/EclipseState/Grid/Keywords.hpp>
+#include <opm/input/eclipse/EclipseState/Grid/SatfuncPropertyInitializers.hpp>
+#include <opm/input/eclipse/EclipseState/Grid/TranCalculator.hpp>
+#include <opm/input/eclipse/EclipseState/Runspec.hpp>
+#include <opm/input/eclipse/EclipseState/Util/OrderedMap.hpp>
+#include <opm/input/eclipse/EclipseState/Tables/TableManager.hpp>
+
+#include <opm/input/eclipse/Units/UnitSystem.hpp>
+
+#include <opm/input/eclipse/Deck/DeckSection.hpp>
+#include <opm/input/eclipse/Deck/value_status.hpp>
+
+#include <cstddef>
+#include <limits>
+#include <map>
+#include <memory>
+#include <optional>
+#include <set>
+#include <stdexcept>
+#include <string>
+#include <unordered_map>
+#include <unordered_set>
+#include <utility>
+#include <vector>
 
 namespace Opm {
 
@@ -137,6 +147,12 @@ static const std::unordered_map<std::string, keyword_info<double>> double_keywor
                                                                                       {"THCOIL",  keyword_info<double>{}.unit_string("Energy/AbsoluteTemperature*Length*Time")},
                                                                                       {"THCGAS",  keyword_info<double>{}.unit_string("Energy/AbsoluteTemperature*Length*Time")},
                                                                                       {"THCWATER",keyword_info<double>{}.unit_string("Energy/AbsoluteTemperature*Length*Time")},
+                                                                                      {"YMODULE", keyword_info<double>{}.unit_string("Giga*Pascal")},
+                                                                                      {"PRATIO", keyword_info<double>{}.unit_string("1")},
+                                                                                      {"BIOTCOEF", keyword_info<double>{}.unit_string("1")},
+                                                                                      {"POELCOEF", keyword_info<double>{}.unit_string("1")},
+                                                                                      {"THERMEXR", keyword_info<double>{}.unit_string("1/AbsoluteTemperature")},
+                                                                                      {"THELCOEF", keyword_info<double>{}.unit_string("Pressure/AbsoluteTemperature")},
                                                                                       {"MULTX",   keyword_info<double>{}.init(1.0).mult(true)},
                                                                                       {"MULTX-",  keyword_info<double>{}.init(1.0).mult(true)},
                                                                                       {"MULTY",   keyword_info<double>{}.init(1.0).mult(true)},
@@ -175,7 +191,11 @@ static const std::unordered_map<std::string, keyword_info<int>> int_keywords = {
 }
 
 namespace PROPS {
-static const std::unordered_map<std::string, keyword_info<double>> double_keywords = {{"SWATINIT", keyword_info<double>{}}};
+static const std::unordered_map<std::string, keyword_info<double>> double_keywords = {{"SWATINIT", keyword_info<double>{}},
+                                                                                      {"PCG",      keyword_info<double>{}.unit_string("Pressure")},
+                                                                                      {"IPCG",     keyword_info<double>{}.unit_string("Pressure")},
+                                                                                      {"PCW",      keyword_info<double>{}.unit_string("Pressure")},
+                                                                                      {"IPCW",     keyword_info<double>{}.unit_string("Pressure")}};
 static const std::unordered_map<std::string, keyword_info<int>> int_keywords = {};
 
 #define dirfunc(base) base, base "X", base "X-", base "Y", base "Y-", base "Z", base "Z-"
@@ -197,10 +217,6 @@ static const std::set<std::string> satfunc = {"SWLPC", "ISWLPC", "SGLPC", "ISGLP
                                               dirfunc("ISOGCR"),
                                               dirfunc("SWCR"),
                                               dirfunc("ISWCR"),
-                                              dirfunc("PCW"),
-                                              dirfunc("IPCW"),
-                                              dirfunc("PCG"),
-                                              dirfunc("IPCG"),
                                               dirfunc("KRW"),
                                               dirfunc("IKRW"),
                                               dirfunc("KRWR"),
@@ -216,21 +232,7 @@ static const std::set<std::string> satfunc = {"SWLPC", "ISWLPC", "SGLPC", "ISGLP
                                               dirfunc("KRGR"),
                                               dirfunc("IKRGR")};
 
-static const std::map<std::string,std::string> sogcr_shift = {{"SOGCR",    "SWL"},
-                                                              {"SOGCRX",   "SWLX"},
-                                                              {"SOGCRX-",  "SWLX-"},
-                                                              {"SOGCRY",   "SWLY"},
-                                                              {"SOGCRY-",  "SWLY-"},
-                                                              {"SOGCRZ",   "SWLZ"},
-                                                              {"SOGCRZ-",  "SWLZ-"},
-                                                              {"ISOGCR",   "ISWL"},
-                                                              {"ISOGCRX",  "ISWLX"},
-                                                              {"ISOGCRX-", "ISWLX-"},
-                                                              {"ISOGCRY",  "ISWLY"},
-                                                              {"ISOGCRY-", "ISWLY-"},
-                                                              {"ISOGCRZ",  "ISWLZ"},
-                                                              {"ISOGCRZ-", "ISWLZ-"}};
-
+#undef dirfunc
 }
 
 namespace REGIONS {
@@ -240,6 +242,7 @@ static const std::unordered_map<std::string, keyword_info<int>> int_keywords = {
                                                                                 {"FIPNUM",   keyword_info<int>{}.init(1)},
                                                                                 {"IMBNUM",   keyword_info<int>{}.init(1)},
                                                                                 {"OPERNUM",  keyword_info<int>{}},
+                                                                                {"STRESSEQUILNUM", keyword_info<int>{}.init(1)},
                                                                                 {"MISCNUM",  keyword_info<int>{}},
                                                                                 {"MISCNUM",  keyword_info<int>{}},
                                                                                 {"PVTNUM",   keyword_info<int>{}.init(1)},
@@ -294,6 +297,7 @@ static const std::unordered_map<std::string, keyword_info<int>> int_keywords = {
 template <typename T>
 keyword_info<T> global_kw_info(const std::string& name, bool allow_unsupported = false);
 
+bool is_oper_keyword(const std::string& name);
 } // end namespace keywords
 
 } // end namespace FieldProps
@@ -323,8 +327,6 @@ public:
         }
     };
 
-
-
     enum class GetStatus {
          OK = 1,
          INVALID_DATA = 2,               // std::runtime_error
@@ -332,8 +334,6 @@ public:
          NOT_SUPPPORTED_KEYWORD = 4      // std::logic_error
     };
 
-
-
     template<typename T>
     struct FieldDataManager {
         const std::string& keyword;
@@ -384,10 +384,9 @@ public:
 
     };
 
-
-
     /// Normal constructor for FieldProps.
     FieldProps(const Deck& deck, const Phases& phases, const EclipseGrid& grid, const TableManager& table_arg);
+
     /// Special case constructor used to process ACTNUM only.
     FieldProps(const Deck& deck, const EclipseGrid& grid);
 
@@ -409,102 +408,121 @@ public:
     template <typename T>
     std::vector<std::string> keys() const;
 
-
     template <typename T>
-    FieldDataManager<T> try_get(const std::string& keyword,
-                                bool allow_unsupported=false) {
-        if (!allow_unsupported && !FieldProps::supported<T>(keyword))
-            return FieldDataManager<T>(keyword, GetStatus::NOT_SUPPPORTED_KEYWORD, nullptr);
-
-        const Fieldprops::FieldData<T> * field_data;
-        bool has0 = this->has<T>(keyword);
-
-        field_data = std::addressof(this->init_get<T>(keyword,
-                                                      std::is_same<T,double>::value && allow_unsupported));
-        if (field_data->valid() || allow_unsupported)
-            return FieldDataManager<T>(keyword, GetStatus::OK, field_data);
-
-        if (!has0) {
-            this->erase<T>(keyword);
-            return FieldDataManager<T>(keyword, GetStatus::MISSING_KEYWORD, nullptr);
+    FieldDataManager<T>
+    try_get(const std::string& keyword, const bool allow_unsupported = false)
+    {
+        if (!allow_unsupported && !FieldProps::template supported<T>(keyword)) {
+            return { keyword, GetStatus::NOT_SUPPPORTED_KEYWORD, nullptr };
         }
 
-        return FieldDataManager<T>(keyword, GetStatus::INVALID_DATA, nullptr);
-    }
+        const auto has0 = this->template has<T>(keyword);
 
+        const auto& field_data =
+            this->template init_get<T>(keyword, std::is_same<T,double>::value && allow_unsupported);
 
-    template <typename T>
-    const std::vector<T>& get(const std::string& keyword) {
-        const auto& data = this->try_get<T>(keyword);
-        return data.data();
+        if (field_data.valid() || allow_unsupported) {
+            // Note: FieldDataManager depends on init_get<>() producing a
+            // long-lived FieldData instance.
+            return { keyword, GetStatus::OK, &field_data };
+        }
+
+        if (! has0) {
+            this->template erase<T>(keyword);
+
+            return { keyword, GetStatus::MISSING_KEYWORD, nullptr };
+        }
+
+        return { keyword, GetStatus::INVALID_DATA, nullptr };
     }
 
     template <typename T>
-    std::vector<T> get_global(const std::string& keyword) {
-        const auto& managed_field_data = this->try_get<T>(keyword);
+    const std::vector<T>& get(const std::string& keyword)
+    {
+        return this->template try_get<T>(keyword).data();
+    }
+
+    template <typename T>
+    std::vector<T> get_global(const std::string& keyword)
+    {
+        const auto managed_field_data = this->template try_get<T>(keyword);
         const auto& field_data = managed_field_data.field_data();
-        const auto& kw_info = Fieldprops::keywords::global_kw_info<T>(keyword);
-        if (kw_info.global)
-            return *field_data.global_data;
-        else
-            return this->global_copy(field_data.data, kw_info.scalar_init);
+
+        const auto& kw_info = Fieldprops::keywords::
+            template global_kw_info<T>(keyword);
+
+        return kw_info.global
+            ? *field_data.global_data
+            : this->global_copy(field_data.data, kw_info.scalar_init);
     }
 
-
     template <typename T>
-    std::vector<T> get_copy(const std::string& keyword, bool global) {
-        bool has0 = this->has<T>(keyword);
-        const auto& field_data = this->try_get<T>(keyword).field_data();
+    std::vector<T> get_copy(const std::string& keyword, bool global)
+    {
+        const auto has0 = this->template has<T>(keyword);
+
+        // Recall: FieldDataManager::field_data() will throw various
+        // exception types if the 'status' is anything other than 'OK'.
+        //
+        // Get_copy() depends on this behaviour to not proceed to extracting
+        // values in such cases.  In other words, get_copy() uses exceptions
+        // for control flow, and we cannot move this try_get() call into the
+        // 'has0' branch even though the actual 'field_data' object returned
+        // from try_get() is only needed/used there.
+        const auto& field_data = this->template try_get<T>(keyword).field_data();
 
         if (has0) {
-            if (global)
-                return this->global_copy(field_data.data, field_data.kw_info.scalar_init);
-            else
-                return field_data.data;
-        } else {
-            if (global) {
-                const auto& kw_info = Fieldprops::keywords::global_kw_info<T>(keyword);
-                return this->global_copy(this->extract<T>(keyword), kw_info.scalar_init);
-            } else
-                return this->extract<T>(keyword);
+            return this->get_copy(field_data.data, field_data.kw_info.scalar_init, global);
         }
+
+        const auto initial_value = Fieldprops::keywords::
+            template global_kw_info<T>(keyword).scalar_init;
+
+        return this->get_copy(this->template extract<T>(keyword), initial_value, global);
     }
 
-
     template <typename T>
-    std::vector<bool> defaulted(const std::string& keyword) {
-        const auto& field = this->init_get<T>(keyword);
+    std::vector<bool> defaulted(const std::string& keyword)
+    {
+        const auto& field = this->template init_get<T>(keyword);
         std::vector<bool> def(field.size());
 
-        for (std::size_t i=0; i < def.size(); i++)
-            def[i] = value::defaulted( field.value_status[i]);
+        for (std::size_t i = 0; i < def.size(); ++i) {
+            def[i] = value::defaulted(field.value_status[i]);
+        }
 
         return def;
     }
 
-
     template <typename T>
-    std::vector<T> global_copy(const std::vector<T>& data, const std::optional<T>& default_value) const {
-        T fill_value = default_value.has_value() ? *default_value : 0;
+    std::vector<T> global_copy(const std::vector<T>&   data,
+                               const std::optional<T>& default_value) const
+    {
+        const T fill_value = default_value.has_value() ? *default_value : 0;
+
         std::vector<T> global_data(this->global_size, fill_value);
+
         std::size_t i = 0;
         for (std::size_t g = 0; g < this->global_size; g++) {
             if (this->m_actnum[g]) {
                 global_data[g] = data[i];
-                i++;
+                ++i;
             }
         }
+
         return global_data;
     }
 
     std::size_t active_size;
     std::size_t global_size;
 
-    std::size_t num_int() const {
+    std::size_t num_int() const
+    {
         return this->int_data.size();
     }
 
-    std::size_t num_double() const {
+    std::size_t num_double() const
+    {
         return this->double_data.size();
     }
 
@@ -534,6 +552,22 @@ private:
     template <typename T>
     std::vector<T> extract(const std::string& keyword);
 
+    template <typename T>
+    std::vector<T> get_copy(const std::vector<T>&   x,
+                            const std::optional<T>& initial_value,
+                            const bool              global) const
+    {
+        return (! global) ? x : this->global_copy(x, initial_value);
+    }
+
+    template <typename T>
+    std::vector<T> get_copy(std::vector<T>&&        x,
+                            const std::optional<T>& initial_value,
+                            const bool              global) const
+    {
+        return (! global) ? std::move(x) : this->global_copy(x, initial_value);
+    }
+
     template <typename T>
     void operate(const DeckRecord& record, Fieldprops::FieldData<T>& target_data, const Fieldprops::FieldData<T>& src_data, const std::vector<Box::cell_index>& index_list);
 
@@ -563,6 +597,8 @@ private:
     void init_satfunc(const std::string& keyword, Fieldprops::FieldData<double>& satfunc);
     void init_porv(Fieldprops::FieldData<double>& porv);
     void init_tempi(Fieldprops::FieldData<double>& tempi);
+    std::string canonical_fipreg_name(const std::string& fipreg);
+    const std::string& canonical_fipreg_name(const std::string& fipreg) const;
 
     const UnitSystem unit_system;
     std::size_t nx,ny,nz;
@@ -578,6 +614,7 @@ private:
     std::vector<MultregpRecord> multregp;
     std::unordered_map<std::string, Fieldprops::FieldData<int>> int_data;
     std::unordered_map<std::string, Fieldprops::FieldData<double>> double_data;
+    std::unordered_map<std::string, std::string> fipreg_shortname_translation{};
 
     std::unordered_map<std::string,Fieldprops::TranCalculator> tran;
 };

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

@@ -69,6 +69,7 @@ public:
 
     bool operator==(const FieldPropsManager& other) const;
     static bool rst_cmp(const FieldPropsManager& full_arg, const FieldPropsManager& rst_arg);
+
     /*
       Because the FieldProps class can autocreate properties the semantics of
       get() and has() is slightly non intuitve:
@@ -136,8 +137,8 @@ public:
       contain said keyword, or if the keyword has not been fully initialized. If
       you ask for a totally unknown keyword the method will return nullptr.
     */
-    template <typename T> const std::vector<T>* try_get(const
-    std::string& keyword) const;
+    template <typename T>
+    const std::vector<T>* try_get(const std::string& keyword) const;
 
     /*
       You can ask whether the elements in the keyword have a default value -

opm/input/eclipse/EclipseState/Grid/LgrCollection.hpp

@@ -0,0 +1,65 @@
+/*
+ Copyright (C) 2023 Equinor
+  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_PARSER_LGR_COLLECTION_HPP
+#define OPM_PARSER_LGR_COLLECTION_HPP
+
+#include <string>
+
+#include <opm/input/eclipse/EclipseState/Util/OrderedMap.hpp>
+#include <opm/input/eclipse/EclipseState/Grid/CarfinManager.hpp>
+#include <opm/input/eclipse/EclipseState/Grid/Carfin.hpp>
+#include <opm/input/eclipse/EclipseState/Grid/EclipseGrid.hpp>
+
+namespace Opm {
+
+    class DeckRecord;
+    class GridDims;
+    class GRIDSection;
+
+
+class LgrCollection {
+public:
+    LgrCollection();
+    LgrCollection(const GRIDSection& gridSection, const EclipseGrid& grid);
+
+   static LgrCollection serializationTestObject();
+
+   explicit LgrCollection(const Deck& deck);
+
+    size_t size() const;
+    bool hasLgr(const std::string& lgrName) const;
+    Carfin& getLgr(const std::string& lgrName);
+    const Carfin& getLgr(const std::string& lgrName) const;
+    Carfin& getLgr(size_t lgrIndex);
+    const Carfin& getLgr(size_t lgrIndex) const;
+
+    void addLgr(const EclipseGrid& grid, const DeckRecord& lgrRecord);
+
+    bool operator==(const LgrCollection& data) const;
+
+    template<class Serializer>
+    void serializeOp(Serializer& serializer)
+    {
+        serializer(m_lgrs);
+    }
+
+private:
+    OrderedMap<Carfin, 8> m_lgrs;
+
+};
+}
+
+#endif // OPM_PARSER_LGR_COLLECTION_HPP

opm/input/eclipse/EclipseState/Grid/MULTREGTScanner.hpp

@@ -17,23 +17,31 @@
   along with OPM.  If not, see <http://www.gnu.org/licenses/>.
 */
 
-
 #ifndef OPM_PARSER_MULTREGTSCANNER_HPP
 #define OPM_PARSER_MULTREGTSCANNER_HPP
 
 #include <opm/input/eclipse/EclipseState/Grid/FaceDir.hpp>
+#include <opm/input/eclipse/EclipseState/Grid/GridDims.hpp>
+
+#include <cstddef>
+#include <map>
+#include <string>
+#include <utility>
+#include <vector>
 
 namespace Opm {
 
     class DeckRecord;
     class DeckKeyword;
     class FieldPropsManager;
-    class GridDims;
+
+} // namespace Opm
+
+namespace Opm {
 
     namespace MULTREGT {
-
-
-        enum NNCBehaviourEnum {
+        enum class NNCBehaviourEnum
+        {
             NNC = 1,
             NONNC = 2,
             ALL = 3,
@@ -42,12 +50,10 @@ namespace Opm {
 
         std::string RegionNameFromDeckValue(const std::string& stringValue);
         NNCBehaviourEnum NNCBehaviourFromString(const std::string& stringValue);
-    }
+    } // namespace MULTREGT
 
-
-
-
-    struct MULTREGTRecord {
+    struct MULTREGTRecord
+    {
         int src_value;
         int target_value;
         double trans_mult;
@@ -55,13 +61,15 @@ namespace Opm {
         MULTREGT::NNCBehaviourEnum nnc_behaviour;
         std::string region_name;
 
-        bool operator==(const MULTREGTRecord& data) const {
-            return src_value == data.src_value &&
-                   target_value == data.target_value &&
-                   trans_mult == data.trans_mult &&
-                   directions == data.directions &&
-                   nnc_behaviour == data.nnc_behaviour &&
-                   region_name == data.region_name;
+        bool operator==(const MULTREGTRecord& data) const
+        {
+            return (src_value == data.src_value)
+                && (target_value == data.target_value)
+                && (trans_mult == data.trans_mult)
+                && (directions == data.directions)
+                && (nnc_behaviour == data.nnc_behaviour)
+                && (region_name == data.region_name)
+                ;
         }
 
         template<class Serializer>
@@ -76,58 +84,62 @@ namespace Opm {
         }
     };
 
-    typedef std::map< std::pair<int , int> , const MULTREGTRecord * >  MULTREGTSearchMap;
-    typedef std::tuple<size_t , FaceDir::DirEnum , double> MULTREGTConnection;
-
-
-
-    class MULTREGTScanner {
-
+    class MULTREGTScanner
+    {
     public:
-        using ExternalSearchMap = std::map<std::string, std::map<std::pair<int,int>, int>>;
-
         MULTREGTScanner() = default;
         MULTREGTScanner(const MULTREGTScanner& data);
         MULTREGTScanner(const GridDims& grid,
                         const FieldPropsManager* fp_arg,
-                        const std::vector< const DeckKeyword* >& keywords);
+                        const std::vector<const DeckKeyword*>& keywords);
 
         static MULTREGTScanner serializationTestObject();
 
-        double getRegionMultiplier(size_t globalCellIdx1, size_t globalCellIdx2, FaceDir::DirEnum faceDir) const;
-
         bool operator==(const MULTREGTScanner& data) const;
         MULTREGTScanner& operator=(const MULTREGTScanner& data);
 
-        template<class Serializer>
+        void applyNumericalAquifer(const std::vector<std::size_t>& aquifer_cells);
+
+        double getRegionMultiplier(std::size_t globalCellIdx1,
+                                   std::size_t globalCellIdx2,
+                                   FaceDir::DirEnum faceDir) const;
+
+        double getRegionMultiplierNNC(std::size_t globalCellIdx1,
+                                      std::size_t globalCellIdx2) const;
+
+        template <class Serializer>
         void serializeOp(Serializer& serializer)
         {
-            serializer(nx);
-            serializer(ny);
-            serializer(nz);
+            serializer(gridDims);
+
             serializer(m_records);
-            ExternalSearchMap searchMap = getSearchMap();
-            serializer(searchMap);
-            if (m_searchMap.empty())
-                constructSearchMap(searchMap);
+            serializer(m_searchMap);
+
             serializer(regions);
-            serializer(default_region);
+            serializer(aquifer_cells);
         }
 
     private:
-        ExternalSearchMap getSearchMap() const;
-        void constructSearchMap(const ExternalSearchMap& searchMap);
+        using MULTREGTSearchMap = std::map<
+            std::pair<int, int>,
+            std::vector<MULTREGTRecord>::size_type
+        >;
 
-        void addKeyword( const DeckKeyword& deckKeyword, const std::string& defaultRegion);
+        GridDims gridDims{};
+        const FieldPropsManager* fp{nullptr};
+
+        std::vector<MULTREGTRecord> m_records{};
+        std::map<std::string, MULTREGTSearchMap> m_searchMap{};
+        std::map<std::string, std::vector<int>> regions{};
+        std::vector<std::size_t> aquifer_cells{};
+
+        void addKeyword(const DeckKeyword& deckKeyword);
         void assertKeywordSupported(const DeckKeyword& deckKeyword);
-        std::size_t nx = 0,ny = 0, nz = 0;
-        const FieldPropsManager* fp = nullptr;
-        std::vector< MULTREGTRecord > m_records;
-        std::map<std::string , MULTREGTSearchMap> m_searchMap;
-        std::map<std::string, std::vector<int>> regions;
-        std::string default_region;
+
+        bool isAquNNC(std::size_t globalCellIdx1, std::size_t globalCellIdx2) const;
+        bool isAquCell(std::size_t globalCellIdx) const;
     };
 
-}
+} // namespace Opm
 
 #endif // OPM_PARSER_MULTREGTSCANNER_HPP

opm/input/eclipse/EclipseState/Grid/TransMult.hpp

@@ -56,9 +56,11 @@ namespace Opm {
         double getMultiplier(size_t globalIndex, FaceDir::DirEnum faceDir) const;
         double getMultiplier(size_t i , size_t j , size_t k, FaceDir::DirEnum faceDir) const;
         double getRegionMultiplier( size_t globalCellIndex1, size_t globalCellIndex2, FaceDir::DirEnum faceDir) const;
+        double getRegionMultiplierNNC(std::size_t globalCellIndex1, std::size_t globalCellIndex2) const;
         void applyMULT(const std::vector<double>& srcMultProp, FaceDir::DirEnum faceDir);
         void applyMULTFLT(const FaultCollection& faults);
         void applyMULTFLT(const Fault& fault);
+        void applyNumericalAquifer(const std::vector<std::size_t>& aquifer_cells);
 
         bool operator==(const TransMult& data) const;
 

opm/input/eclipse/EclipseState/InitConfig/Equil.hpp

@@ -6,8 +6,21 @@
 
 namespace Opm {
     class DeckKeyword;
+    class DeckRecord;
+
     class EquilRecord {
         public:
+            EquilRecord() = default;
+            EquilRecord(double datum_depth_arg, double datum_depth_pc_arg,
+                        double woc_depth, double woc_pc,
+                        double goc_depth, double goc_pc,
+                        bool live_oil_init,
+                        bool wet_gas_init,
+                        int target_accuracy,
+                        bool humid_gas_init);
+            explicit EquilRecord(const DeckRecord& record);
+
+            static EquilRecord serializationTestObject();
             double datumDepth() const;
             double datumDepthPressure() const;
             double waterOilContactDepth() const;
@@ -20,10 +33,6 @@ namespace Opm {
             int initializationTargetAccuracy() const;
             bool humidGasInitConstantRvw() const;
 
-            EquilRecord();
-
-            EquilRecord( double datum_depth_arg, double datum_depth_pc_arg, double woc_depth, double woc_pc, double goc_depth, double goc_pc, bool live_oil_init, bool wet_gas_init, int target_accuracy, bool humid_gas_init);
-
             bool operator==(const EquilRecord& data) const;
 
             template<class Serializer>
@@ -42,29 +51,75 @@ namespace Opm {
             }
 
         private:
-            double datum_depth;
-            double datum_depth_ps;
-            double water_oil_contact_depth;
-            double water_oil_contact_capillary_pressure;
-            double gas_oil_contact_depth;
-            double gas_oil_contact_capillary_pressure;
+            double datum_depth = 0.0;
+            double datum_depth_ps = 0.0;
+            double water_oil_contact_depth = 0.0;
+            double water_oil_contact_capillary_pressure = 0.0;
+            double gas_oil_contact_depth = 0.0;
+            double gas_oil_contact_capillary_pressure = 0.0;
 
-            bool live_oil_init_proc;
-            bool wet_gas_init_proc;
-            int init_target_accuracy;
-            bool humid_gas_init_proc;
+            bool live_oil_init_proc = false;
+            bool wet_gas_init_proc = false;
+            int init_target_accuracy = 0;
+            bool humid_gas_init_proc = false;
     };
 
-    class Equil {
+    class StressEquilRecord {
         public:
-            using const_iterator = std::vector< EquilRecord >::const_iterator;
+            StressEquilRecord() = default;
+            explicit StressEquilRecord(const DeckRecord& record);
 
-            Equil() = default;
-            explicit Equil( const DeckKeyword& );
+            static StressEquilRecord serializationTestObject();
 
-            static Equil serializationTestObject();
+            bool operator==(const StressEquilRecord& data) const;
 
-            const EquilRecord& getRecord( size_t id ) const;
+            double datumDepth() const;
+            double datumPosX() const;
+            double datumPosY() const;
+            double stressXX() const;
+            double stressXX_grad() const;
+            double stressYY() const;
+            double stressYY_grad() const;
+            double stressZZ() const;
+            double stressZZ_grad() const;
+
+            template<class Serializer>
+            void serializeOp(Serializer& serializer)
+            {
+                serializer(datum_depth);
+                serializer(datum_posx);
+                serializer(datum_posy);
+                serializer(stress_xx);
+                serializer(stress_xx_grad);
+                serializer(stress_yy);
+                serializer(stress_yy_grad);
+                serializer(stress_zz);
+                serializer(stress_zz_grad);
+            }
+
+        private:
+            double datum_depth = 0.0;
+            double datum_posx = 0.0;
+            double datum_posy = 0.0;
+            double stress_xx = 0.0;
+            double stress_xx_grad = 0.0;
+            double stress_yy = 0.0;
+            double stress_yy_grad = 0.0;
+            double stress_zz = 0.0;
+            double stress_zz_grad = 0.0;
+    };
+
+    template<class RecordType>
+    class EquilContainer {
+        public:
+            using const_iterator = typename std::vector<RecordType>::const_iterator;
+
+            EquilContainer() = default;
+            explicit EquilContainer( const DeckKeyword& );
+
+            static EquilContainer serializationTestObject();
+
+            const RecordType& getRecord(std::size_t id) const;
 
             size_t size() const;
             bool empty() const;
@@ -72,7 +127,7 @@ namespace Opm {
             const_iterator begin() const;
             const_iterator end() const;
 
-            bool operator==(const Equil& data) const;
+            bool operator==(const EquilContainer& data) const;
 
             template<class Serializer>
             void serializeOp(Serializer& serializer)
@@ -81,9 +136,11 @@ namespace Opm {
             }
 
         private:
-            std::vector< EquilRecord > m_records;
+            std::vector<RecordType> m_records;
     };
 
+    using Equil = EquilContainer<EquilRecord>;
+    using StressEquil = EquilContainer<StressEquilRecord>;
 }
 
 #endif //OPM_EQUIL_HPP

opm/input/eclipse/EclipseState/InitConfig/InitConfig.hpp

@@ -45,6 +45,9 @@ namespace Opm {
         bool hasEquil() const;
         const Equil& getEquil() const;
 
+        bool hasStressEquil() const;
+        const StressEquil& getStressEquil() const;
+
         bool hasGravity() const;
 
         bool hasFoamConfig() const;
@@ -64,6 +67,7 @@ namespace Opm {
         void serializeOp(Serializer& serializer)
         {
             serializer(equil);
+            serializer(stress_equil);
             serializer(foamconfig);
             serializer(m_filleps);
             serializer(m_gravity);
@@ -74,6 +78,7 @@ namespace Opm {
 
     private:
         Equil equil;
+        StressEquil stress_equil;
         FoamConfig foamconfig;
         bool m_filleps;
         bool m_gravity = true;

opm/input/eclipse/EclipseState/Runspec.hpp

@@ -31,7 +31,6 @@
 #include <string>
 
 namespace Opm {
-
 class Deck;
 
 class Phases {
@@ -95,7 +94,8 @@ public:
         return this->nDynWlistMax;
     }
 
-    const std::optional<KeywordLocation>& location() const {
+    const std::optional<KeywordLocation>& location() const
+    {
         return this->m_location;
     }
 
@@ -113,7 +113,6 @@ public:
             rst_cmp(*this, data);
     }
 
-
     template<class Serializer>
     void serializeOp(Serializer& serializer)
     {
@@ -143,7 +142,6 @@ public:
 
     static WellSegmentDims serializationTestObject();
 
-
     int maxSegmentedWells() const
     {
         return this->nSegWellMax;
@@ -159,6 +157,11 @@ public:
         return this->nLatBranchMax;
     }
 
+    const std::optional<KeywordLocation>& location() const
+    {
+        return this->location_;
+    }
+
     bool operator==(const WellSegmentDims& data) const;
 
     template<class Serializer>
@@ -167,12 +170,14 @@ public:
         serializer(nSegWellMax);
         serializer(nSegmentMax);
         serializer(nLatBranchMax);
+        serializer(location_);
     }
 
 private:
     int nSegWellMax;
     int nSegmentMax;
     int nLatBranchMax;
+    std::optional<KeywordLocation> location_;
 };
 
 class NetworkDims {
@@ -294,6 +299,11 @@ public:
      */
     double curvatureCapPrs() const;
 
+    /*!
+     * \brief Wag hysteresis.
+     */
+    bool activeWag() const;
+
     bool operator==(const EclHysterConfig& data) const;
 
     template<class Serializer>
@@ -304,6 +314,7 @@ public:
         serializer(krHystMod);
         serializer(modParamTrappedValue);
         serializer(curvatureCapPrsValue);
+        serializer(activeWagHyst);
     }
 
 private:
@@ -317,6 +328,9 @@ private:
     double modParamTrappedValue { 0.1 };
     // curvature parameter for capillary pressure
     double curvatureCapPrsValue { 0.1 };
+
+    // enable WAG hysteresis
+    bool activeWagHyst  { false };
 };
 
 class SatFuncControls {
@@ -329,8 +343,9 @@ public:
 
     enum class KeywordFamily {
         Family_I,               // SGOF, SWOF, SLGOF
-        Family_II,              // SGFN, SOF{2,3}, SWFN
-        Family_III,              // GSF, WSF
+        Family_II,              // SGFN, SOF{2,3}, SWFN, SGWFN
+        Family_III,             // GSF, WSF
+
         Undefined,
     };
 
@@ -455,7 +470,9 @@ public:
     const Nupcol& nupcol() const noexcept;
     const Tracers& tracers() const;
     bool co2Storage() const noexcept;
+    bool h2Storage() const noexcept;
     bool micp() const noexcept;
+    bool mech() const noexcept;
 
     bool operator==(const Runspec& data) const;
     static bool rst_cmp(const Runspec& full_state, const Runspec& rst_state);
@@ -478,7 +495,9 @@ public:
         serializer(m_sfuncctrl);
         serializer(m_nupcol);
         serializer(m_co2storage);
+        serializer(m_h2storage);
         serializer(m_micp);
+        serializer(m_mech);
     }
 
 private:
@@ -498,7 +517,9 @@ private:
     Nupcol m_nupcol;
     Tracers m_tracers;
     bool m_co2storage;
+    bool m_h2storage;
     bool m_micp;
+    bool m_mech;
 };
 
 

opm/input/eclipse/EclipseState/SimulationConfig/BCConfig.hpp

@@ -33,59 +33,34 @@ namespace Opm {
 class Deck;
 class DeckRecord;
 
-enum class BCType {
-     RATE,
-     FREE,
-     DIRICHLET,
-     THERMAL
-};
-
-enum class BCComponent {
-     OIL,
-     GAS,
-     WATER,
-     SOLVENT,
-     POLYMER,
-     NONE
-};
-
-
 class BCConfig {
 public:
 
-    struct BCFace {
+    struct BCRegion {
+        int index;
         int i1,i2;
         int j1,j2;
         int k1,k2;
-        BCType bctype;
         FaceDir::DirEnum dir;
-        BCComponent component;
-        double rate;
-        std::optional<double> pressure;
-        std::optional<double> temperature;
 
-        BCFace() = default;
-        explicit BCFace(const DeckRecord& record, const GridDims& grid);
+        BCRegion() = default;
+        explicit BCRegion(const DeckRecord& record, const GridDims& grid);
 
-        static BCFace serializationTestObject();
+        static BCRegion serializationTestObject();
 
-        bool operator==(const BCFace& other) const;
+        bool operator==(const BCRegion& other) const;
 
         template<class Serializer>
         void serializeOp(Serializer& serializer)
         {
+            serializer(index);
             serializer(i1);
             serializer(i2);
             serializer(j1);
             serializer(j2);
             serializer(k1);
             serializer(k2);
-            serializer(bctype);
             serializer(dir);
-            serializer(component);
-            serializer(rate);
-            serializer(pressure);
-            serializer(temperature);
         }
     };
 
@@ -96,8 +71,8 @@ public:
     static BCConfig serializationTestObject();
 
     std::size_t size() const;
-    std::vector<BCFace>::const_iterator begin() const;
-    std::vector<BCFace>::const_iterator end() const;
+    std::vector<BCRegion>::const_iterator begin() const;
+    std::vector<BCRegion>::const_iterator end() const;
     bool operator==(const BCConfig& other) const;
 
     template<class Serializer>
@@ -107,7 +82,7 @@ public:
     }
 
 private:
-    std::vector<BCFace> m_faces;
+    std::vector<BCRegion> m_faces;
 };
 
 } //namespace Opm

opm/input/eclipse/EclipseState/SimulationConfig/RockConfig.hpp

@@ -20,6 +20,7 @@
 #ifndef OPM_ROCK_CONFIG_HPP
 #define OPM_ROCK_CONFIG_HPP
 
+#include <cstddef>
 #include <string>
 #include <vector>
 
@@ -28,36 +29,36 @@ namespace Opm {
 class Deck;
 class FieldPropsManager;
 
-class RockConfig {
+class RockConfig
+{
 public:
-
-enum class Hysteresis {
-    REVERS = 1,
-    IRREVERS = 2,
-    HYSTER = 3,
-    BOBERG = 4,
-    REVLIMIT = 5,
-    PALM_MAN = 6,
-    NONE = 7
-};
-
-
-struct RockComp {
-    double pref;
-    double compressibility;
-
-    RockComp() = default;
-    RockComp(double pref_arg, double comp_arg);
-    bool operator==(const RockComp& other) const;
-
-    template<class Serializer>
-    void serializeOp(Serializer& serializer)
+    enum class Hysteresis
     {
-        serializer(pref);
-        serializer(compressibility);
-    }
-};
+        REVERS = 1,
+        IRREVERS = 2,
+        HYSTER = 3,
+        BOBERG = 4,
+        REVLIMIT = 5,
+        PALM_MAN = 6,
+        NONE = 7,
+    };
 
+    struct RockComp
+    {
+        double pref{};
+        double compressibility{};
+
+        RockComp() = default;
+        RockComp(double pref_arg, double comp_arg);
+        bool operator==(const RockComp& other) const;
+
+        template<class Serializer>
+        void serializeOp(Serializer& serializer)
+        {
+            serializer(pref);
+            serializer(compressibility);
+        }
+    };
 
     RockConfig();
     RockConfig(const Deck& deck, const FieldPropsManager& fp);
@@ -95,4 +96,4 @@ private:
 
 } //namespace Opm
 
-#endif
+#endif // OPM_ROCK_CONFIG_HPP

opm/input/eclipse/EclipseState/Tables/FlatTable.hpp

@@ -96,12 +96,6 @@ struct GravityTable : public FlatTableWithCopy<GRAVITYRecord>
     {
         return GravityTable({{1.0, 2.0, 3.0}});
     }
-
-    template <class Serializer>
-    void serializeOp(Serializer& serializer)
-    {
-        FlatTableWithCopy::serializeOp(serializer);
-    }
 };
 
 struct DENSITYRecord {
@@ -137,12 +131,6 @@ struct DensityTable : public FlatTableWithCopy<DENSITYRecord>
     {
         return DensityTable({{1.0, 2.0, 3.0}});
     }
-
-    template <class Serializer>
-    void serializeOp(Serializer& serializer)
-    {
-        FlatTableWithCopy::serializeOp(serializer);
-    }
 };
 
 struct DiffCoeffRecord {
@@ -286,12 +274,6 @@ struct PvtwTable : public FlatTableWithCopy<PVTWRecord>
     {
         return PvtwTable({{1.0, 2.0, 3.0, 4.0, 5.0}});
     }
-
-    template <class Serializer>
-    void serializeOp(Serializer& serializer)
-    {
-        FlatTableWithCopy::serializeOp(serializer);
-    }
 };
 
 struct ROCKRecord {
@@ -313,8 +295,11 @@ struct ROCKRecord {
     }
 };
 
-struct RockTable : public FlatTable< ROCKRecord > {
-    using FlatTable< ROCKRecord >::FlatTable;
+struct RockTable : public FlatTableWithCopy<ROCKRecord>
+{
+    RockTable() = default;
+    explicit RockTable(const DeckKeyword& kw);
+    explicit RockTable(std::initializer_list<ROCKRecord> records);
 
     static RockTable serializationTestObject()
     {

opm/input/eclipse/EclipseState/Tables/GasvisctTable.hpp

@@ -24,15 +24,14 @@
 
 namespace Opm {
 
-    class Deck;
     class DeckItem;
 
     class GasvisctTable : public SimpleTable {
     public:
-        GasvisctTable( const Deck& deck, const DeckItem& deckItem );
+        GasvisctTable( const DeckItem& item, const int tableID  );
 
         const TableColumn& getTemperatureColumn() const;
-        const TableColumn& getGasViscosityColumn(size_t compIdx) const;
+        const TableColumn& getGasViscosityColumn() const;
     };
 }
 

opm/input/eclipse/EclipseState/Tables/PlymaxTable.hpp

@@ -28,7 +28,7 @@ namespace Opm {
     class PlymaxTable : public SimpleTable {
         public:
 
-        PlymaxTable( const DeckRecord& record );
+        explicit PlymaxTable(const DeckRecord& record);
 
         const TableColumn& getPolymerConcentrationColumn() const;
         const TableColumn& getMaxPolymerConcentrationColumn() const;

opm/input/eclipse/EclipseState/Tables/PlyrockTable.hpp

@@ -23,13 +23,13 @@
 
 namespace Opm {
 
-    class DeckReckord;
+    class DeckRecord;
 
     class PlyrockTable : public SimpleTable {
     public:
 
         // This is not really a table; every column has only one element.
-        PlyrockTable( const DeckRecord& record );
+        explicit PlyrockTable(const DeckRecord& record);
 
         // since this keyword is not necessarily monotonic, it cannot be evaluated!
         //using SimpleTable::evaluate;

opm/input/eclipse/EclipseState/Tables/Ppcwmax.hpp

@@ -0,0 +1,79 @@
+/*
+  Copyright (C) 2023 Equinor
+
+  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 PPCWMAX_HPP
+#define PPCWMAX_HPP
+
+#include <cstddef>
+#include <vector>
+
+namespace Opm {
+class Deck;
+
+struct PpcwmaxRecord {
+    double max_cap_pres;
+    bool option;
+
+    PpcwmaxRecord() = default;
+    PpcwmaxRecord(double pres, bool optn) :
+        max_cap_pres(pres),
+        option(optn)
+    {};
+
+    bool operator==(const PpcwmaxRecord& other) const {
+        return this->max_cap_pres == other.max_cap_pres &&
+               this->option == other.option;
+    }
+
+    template<class Serializer>
+    void serializeOp(Serializer& serializer)
+    {
+        serializer(max_cap_pres);
+        serializer(option);
+    }
+};
+
+class Ppcwmax {
+public:
+    Ppcwmax() = default;
+    explicit Ppcwmax(const Deck& deck);
+    explicit Ppcwmax(std::initializer_list<PpcwmaxRecord> records);
+    static Ppcwmax serializationTestObject();
+    std::size_t size() const;
+    bool empty() const;
+    std::vector< PpcwmaxRecord >::const_iterator begin() const;
+    std::vector< PpcwmaxRecord >::const_iterator end() const;
+    const PpcwmaxRecord& operator[](const std::size_t index) const;
+
+    bool operator==(const Ppcwmax& other) const {
+        return this->data == other.data;
+    }
+
+    template<class Serializer>
+    void serializeOp(Serializer& serializer)
+    {
+        serializer(data);
+    }
+
+private:
+    std::vector<PpcwmaxRecord> data;  
+
+};
+}
+
+#endif

opm/input/eclipse/EclipseState/Tables/TableManager.hpp

@@ -57,6 +57,7 @@
 #include <opm/input/eclipse/EclipseState/Tables/Eqldims.hpp>
 #include <opm/input/eclipse/EclipseState/Tables/Regdims.hpp>
 #include <opm/input/eclipse/EclipseState/Tables/TLMixpar.hpp>
+#include <opm/input/eclipse/EclipseState/Tables/Ppcwmax.hpp>
 
 namespace Opm {
 
@@ -78,6 +79,7 @@ namespace Opm {
         const Aqudims& getAqudims() const;
         const Regdims& getRegdims() const;
         const TLMixpar& getTLMixpar() const;
+        const Ppcwmax& getPpcwmax() const;
         /*
           WIll return max{ Tabdims::NTFIP , Regdims::NTFIP }.
         */
@@ -260,6 +262,7 @@ namespace Opm {
             serializer(m_rtemp);
             serializer(m_salinity);
             serializer(m_tlmixpar);
+            serializer(m_ppcwmax);
             if (!serializer.isSerializing()) {
                 m_simpleTables = simpleTables;
                 if (split.plyshMax > 0) {
@@ -289,7 +292,6 @@ namespace Opm {
         void initRTempTables(const Deck& deck);
         void initDims(const Deck& deck);
         void initRocktabTables(const Deck& deck);
-        void initGasvisctTables(const Deck& deck);
 
         void initPlymaxTables(const Deck& deck);
         void initPlyrockTables(const Deck& deck);
@@ -392,6 +394,7 @@ namespace Opm {
         Eqldims m_eqldims;
         Aqudims m_aqudims;
         TLMixpar m_tlmixpar;
+        Ppcwmax m_ppcwmax;
 
         bool hasImptvd = false;// if deck has keyword IMPTVD
         bool hasEnptvd = false;// if deck has keyword ENPTVD

opm/input/eclipse/EclipseState/Util/OrderedMap.hpp

@@ -20,14 +20,19 @@
 #ifndef OPM_ORDERED_MAP_HPP
 #define OPM_ORDERED_MAP_HPP
 
-#include <unordered_map>
-#include <vector>
-#include <string>
-#include <stdexcept>
+#include <algorithm>
+#include <cctype>
+#include <cstddef>
+#include <functional>
 #include <iterator>
 #include <set>
-#include <cctype>
-#include <algorithm>
+#include <stdexcept>
+#include <string>
+#include <string_view>
+#include <tuple>
+#include <unordered_map>
+#include <utility>
+#include <vector>
 
 namespace Opm {
 
@@ -68,11 +73,11 @@ findSimilarStrings(std::string str,
     return concatedStr.substr(0, concatedStr.size()-2);
 }
 
-template<std::size_t MAX_CHARS>
+template<std::string_view::size_type MAX_CHARS>
 class TruncatedStringHash
 {
 public:
-    std::size_t operator()(const std::string_view& key) const
+    std::size_t operator()(std::string_view key) const
     {
         return hasher(key.substr(0, MAX_CHARS));
     }
@@ -82,13 +87,13 @@ private:
 
 
 template<>
-class TruncatedStringHash<std::string::npos> : public std::hash<std::string_view>
+class TruncatedStringHash<std::string_view::npos> : public std::hash<std::string_view>
 {};
 
-template<std::size_t MAX_CHARS>
+template<std::string_view::size_type MAX_CHARS>
 struct TruncatedStringEquals
 {
-    bool operator()(const std::string& str1, const std::string& str2) const
+    bool operator()(std::string_view str1, std::string_view str2) const
     {
         return str1.substr(0, MAX_CHARS) == str2.substr(0, MAX_CHARS);
     }
@@ -102,21 +107,23 @@ struct TruncatedStringEquals<std::string::npos> : public std::equal_to<std::stri
 
 /// \brief A map with iteration in the order of insertion.
 ///
-/// Each entry has an associated index indicating when a value with that key was
-/// first inserted. When itering over it's entries values with lower insertion index
-/// are traversed before ones with an higher insertion index.
+/// Each entry has an associated index indicating when a value with that key
+/// was first inserted.  When iterating over the entries, elements with a
+/// lower insertion index are traversed before elements with a higher
+/// insertion index.
 ///
-/// \tparam MAX_CHARS The maximum number of characters that are use a keys. Default is
-///                   std::string::npos, which honors all characters. Any keys with the
+/// \tparam T Element type.  The map's value type is \code pair<string, T> \endcode.
+///
+/// \tparam MAX_CHARS Maximum number of characters used in key comparisons.
+///                   Default value honors all characters.  Keys with the
 ///                   same first MAX_CHARS characters are considered equal.
-///
-template <typename T, std::size_t MAX_CHARS = std::string::npos>
+template <typename T, std::string_view::size_type MAX_CHARS = std::string_view::npos>
 class OrderedMap {
 public:
-    using storage_type = typename std::vector<std::pair<std::string,T>>;
-    using index_type = typename std::unordered_map<std::string,std::size_t,
-                                                   Opm::OrderedMapDetail::TruncatedStringHash<MAX_CHARS>,
-                                                   Opm::OrderedMapDetail::TruncatedStringEquals<MAX_CHARS>>;
+    using storage_type = std::vector<std::pair<std::string, T>>;
+    using index_type = std::unordered_map<std::string, typename storage_type::size_type,
+                                          OrderedMapDetail::TruncatedStringHash<MAX_CHARS>,
+                                          OrderedMapDetail::TruncatedStringEquals<MAX_CHARS>>;
     using iter_type = typename storage_type::iterator;
     using const_iter_type = typename storage_type::const_iterator;
 

opm/input/eclipse/EclipseState/WagHysteresisConfig.hpp

@@ -0,0 +1,143 @@
+/*
+  Copyright 2023 Equinor.
+
+  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_PARSER_WAGHYSTERSISCONFIG_HPP
+#define	OPM_PARSER_WAGHYSTERSISCONFIG_HPP
+
+namespace Opm {
+
+class Deck;
+class DeckRecord;
+
+  class WagHysteresisConfig {
+  public:
+
+      struct WagHysteresisConfigRecord {
+
+      private:
+          // WAG hysteresis Lands parameter
+          double wagLandsParamValue  { 1.0 };
+          // WAG hysteresis reduction factor
+          double wagSecondaryDrainageReductionValue  { 0.0 };
+          // WAG gas model flag
+          bool wagGasFlagValue  { true };
+          // WAG residual oil model flag
+          bool wagResidualOilFlagValue  { false };
+          // WAG water model flag
+          bool wagWaterFlagValue  { false };
+          // WAG hysteresis linear fraction
+          double wagImbCurveLinearFractionValue  { 0.1 };
+          // WAG hysteresis 3-phase threshold
+          double wagWaterThresholdSaturationValue  { 0.001 };
+
+      public:
+          WagHysteresisConfigRecord() = default;
+
+          explicit WagHysteresisConfigRecord(const DeckRecord& record);
+
+          double wagLandsParam() const {
+              return wagLandsParamValue;
+          }
+
+          double wagSecondaryDrainageReduction() const {
+              return wagSecondaryDrainageReductionValue;
+          }
+
+          bool wagGasFlag() const {
+              return wagGasFlagValue;
+          }
+
+          bool wagResidualOilFlag() const {
+              return wagResidualOilFlagValue;
+          }
+
+          bool wagWaterFlag() const {
+              return wagWaterFlagValue;
+          }
+
+          double wagImbCurveLinearFraction() const {
+              return wagImbCurveLinearFractionValue;
+          }
+
+          double wagWaterThresholdSaturation() const {
+              return wagWaterThresholdSaturationValue;
+          }
+
+          bool operator==(const WagHysteresisConfigRecord& data) const
+          {
+              return this->wagLandsParam() == data.wagLandsParam() &&
+               this->wagSecondaryDrainageReduction() == data.wagSecondaryDrainageReduction() &&
+               this->wagGasFlag() == data.wagGasFlag() &&
+               this->wagResidualOilFlag() == data.wagResidualOilFlag() &&
+               this->wagWaterFlag() == data.wagWaterFlag() &&
+               this->wagImbCurveLinearFraction() == data.wagImbCurveLinearFraction() &&
+               this->wagWaterThresholdSaturation() == data.wagWaterThresholdSaturation();
+          }
+
+          template<class Serializer>
+          void serializeOp(Serializer& serializer)
+          {
+              serializer(wagLandsParamValue);
+              serializer(wagSecondaryDrainageReductionValue);
+              serializer(wagGasFlagValue);
+              serializer(wagResidualOilFlagValue);
+              serializer(wagWaterFlagValue);
+              serializer(wagImbCurveLinearFractionValue);
+              serializer(wagWaterThresholdSaturationValue);
+          }
+
+          static WagHysteresisConfigRecord serializationTestObject()
+          {
+              WagHysteresisConfigRecord result;
+              result.wagLandsParamValue = 0;
+              result.wagSecondaryDrainageReductionValue = 1;
+              result.wagGasFlagValue = true;
+              result.wagResidualOilFlagValue = false;
+              result.wagWaterFlagValue = false;
+              result.wagImbCurveLinearFractionValue = 2;
+              result.wagWaterThresholdSaturationValue = 3;
+
+              return result;
+          }
+      };
+
+      WagHysteresisConfig();
+
+      explicit WagHysteresisConfig(const Deck& deck);
+
+      size_t size() const;
+      bool empty() const;
+
+      const std::vector<WagHysteresisConfigRecord>::const_iterator begin() const;
+      const std::vector<WagHysteresisConfigRecord>::const_iterator end() const;
+
+      template<class Serializer>
+      void serializeOp(Serializer& serializer)
+      {
+        serializer(wagrecords);
+      }
+      bool operator==(const WagHysteresisConfig& other) const;
+
+      const WagHysteresisConfigRecord& operator[](std::size_t index) const;
+
+  private:
+      std::vector<WagHysteresisConfigRecord> wagrecords;
+  };
+}
+
+#endif // OPM_PARSER_WAGHYSTERSISCONFIG_HPP

opm/input/eclipse/Generator/KeywordGenerator.hpp

@@ -30,7 +30,7 @@ namespace Opm {
     class KeywordGenerator {
 
     public:
-        KeywordGenerator(bool verbose);
+        explicit KeywordGenerator(bool verbose);
 
         static void ensurePath( const std::string& file_name);
         static std::string endTest();

opm/input/eclipse/Parser/ParseContext.hpp

@@ -218,6 +218,18 @@ class KeywordLocation;
         /// RUNSPEC keyword WELLDIMS (item 4).
         const static std::string RUNSPEC_GROUPSIZE_TOO_LARGE;
 
+        /// Dynamic number of multi-segmented wells exceeds maximum declared
+        /// in RUNSPEC keyword WSEGDIMS (item 1).
+        const static std::string RUNSPEC_NUMMSW_TOO_LARGE;
+
+        /// Dynamic number of segments per MS well exceeds maximum declared
+        /// in RUNSPEC keyword WSEGDIMS (item 2).
+        const static std::string RUNSPEC_NUMSEG_PER_WELL_TOO_LARGE;
+
+        /// Dynamic number of branches exceeds maximum number declared in
+        /// RUNSPEC keyword WSEGDIMS (item 3).
+        const static std::string RUNSPEC_NUMBRANCH_TOO_LARGE;
+
         /*
           Should we allow keywords of length more than eight characters? If the
           keyword is too long it will be internalized using only the eight first
@@ -302,6 +314,14 @@ class KeywordLocation;
          */
         const static std::string ACTIONX_ILLEGAL_KEYWORD;
 
+        /*
+          Error flag marking parser errors ic ACTIONX conditions
+         */
+        const static std::string ACTIONX_CONDITION_ERROR;
+        /*
+          Error flag marking that an ACTIONX has no condition
+         */
+        const static std::string ACTIONX_NO_CONDITION;
 
         /*
           The RPTSCH, RPTSOL and RPTSCHED keywords have two alternative forms,
@@ -339,6 +359,7 @@ class KeywordLocation;
 
         const static std::string SCHEDULE_GROUP_ERROR;
         const static std::string SCHEDULE_IGNORED_GUIDE_RATE;
+        const static std::string SCHEDULE_WELL_IN_FIELD_GROUP;
 
         const static std::string SCHEDULE_COMPSEGS_INVALID;
         const static std::string SCHEDULE_COMPSEGS_NOT_SUPPORTED;

opm/input/eclipse/Parser/Parser.hpp

@@ -97,7 +97,30 @@ namespace Opm {
         bool hasKeyword( const std::string& ) const;
         const ParserKeyword& getKeyword(const std::string& name) const;
 
-        bool isRecognizedKeyword( const std::string_view& deckKeywordName) const;
+        /// Whether or not string is a valid keyword.
+        ///
+        /// The full keyword recognition process first verifies that the
+        /// input string looks like a valid keyword and, if so matches that
+        /// string against the builtin set of known keywords.  The function
+        /// additionally includes those keywords that match against keyword
+        /// collections, typically the SUMMARY section "meta" keywords in
+        /// the *_PROBE files.
+        ///
+        /// \return Whether or not \p deckKeywordName is a builtin deck
+        /// keyword or a known summary keyword.
+        bool isRecognizedKeyword(std::string_view deckKeywordName) const;
+
+        /// Whether or not string is a valid keyword.
+        ///
+        /// First checks that the input string looks like a valid keyword
+        /// and, if so, matches the string against the builtin set of known
+        /// keywords.
+        ///
+        /// \param[in] deckKeywordName Potential deck keyword.
+        ///
+        /// \return Whether or not \p deckKeywordName is a builtin deck keyword.
+        bool isBaseRecognizedKeyword(std::string_view deckKeywordName) const;
+
         const ParserKeyword& getParserKeywordFromDeckName(const std::string_view& deckKeywordName) const;
         std::vector<std::string> getAllDeckNames () const;
 

opm/input/eclipse/Parser/ParserEnums.hpp

@@ -30,19 +30,19 @@ namespace Opm {
         OTHER_KEYWORD_IN_DECK = 2,
         UNKNOWN = 3,
         FIXED_CODE = 4,
-        DOUBLE_SLASH_TERMINATED = 5
+        DOUBLE_SLASH_TERMINATED = 5,
+        SPECIAL_CASE_ROCK = 6,
     };
 
-
     enum ParserKeywordActionEnum {
         INTERNALIZE = 0,
         IGNORE = 1,
         IGNORE_WARNING = 2,
-        THROW_EXCEPTION = 3
+        THROW_EXCEPTION = 3,
     };
 
-    const std::string ParserKeywordActionEnum2String(ParserKeywordActionEnum enumValue);
-    const std::string ParserKeywordSizeEnum2String(ParserKeywordSizeEnum enumValue);
+    std::string ParserKeywordActionEnum2String(ParserKeywordActionEnum enumValue);
+    std::string ParserKeywordSizeEnum2String(ParserKeywordSizeEnum enumValue);
 
     ParserKeywordSizeEnum ParserKeywordSizeEnumFromString(const std::string& stringValue);
     ParserKeywordActionEnum ParserKeywordActionEnumFromString(const std::string& stringValue);

opm/input/eclipse/Parser/ParserKeyword.hpp

@@ -94,7 +94,9 @@ namespace Opm {
         static bool validInternalName(const std::string& name);
         static bool validDeckName(const std::string_view& name);
         bool hasMatchRegex() const;
+        bool hasMatchRegexSuffix() const;
         void setMatchRegex(const std::string& deckNameRegexp);
+        void setMatchRegexSuffix(const std::string& deckNameRegexp);
         bool matches(const std::string_view& ) const;
         bool hasDimension() const;
         void addRecord( ParserRecord );
@@ -154,6 +156,7 @@ namespace Opm {
         std::unordered_set<std::string> m_validSectionNames;
         std::string m_matchRegexString;
         std::regex m_matchRegex;
+        std::string m_matchRegexSuffix{};
         std::vector< ParserRecord > m_records;
         std::string m_Description;
         bool raw_string_keyword = false;
@@ -175,6 +178,7 @@ namespace Opm {
         void initSizeKeyword(bool table_collection, const Json::JsonObject& sizeObject);
         void addItems( const Json::JsonObject& jsonConfig);
         void parseRecords( const Json::JsonObject& recordsConfig);
+        bool matchesDeckNames(std::string_view name) const;
     };
 
 std::ostream& operator<<( std::ostream&, const ParserKeyword& );

opm/input/eclipse/Schedule/Action/ActionX.hpp

@@ -75,7 +75,10 @@ class ActionX {
 public:
     ActionX();
     ActionX(const std::string& name, size_t max_run, double max_wait, std::time_t start_time);
-    ActionX(const DeckKeyword& kw, const Actdims& actimds, std::time_t start_time);
+    ActionX(const std::string& name, size_t max_run, double max_wait,
+            std::time_t start_time,
+            const std::vector<Condition>&& conditions,
+            const std::vector<std::string>&& tokens);
     ActionX(const DeckRecord& record, std::time_t start_time);
     explicit ActionX(const RestartIO::RstAction& rst_action);
 
@@ -131,6 +134,15 @@ private:
     std::vector<Condition> m_conditions;
 };
 
+/// \brief Parse ActionX keyword.
+/// \param kw The keyword representation of ActionX
+/// \param actdims Dimensions for ActionX as specified in the deck.
+/// \param start_time The first time that the ActionX should be evaluated
+/// \return A tuple of the ActionX created and a vector that contains for each error experienced
+///         during parsing the string indicating the type of error and the error string itself.
+std::tuple<ActionX, std::vector<std::pair<std::string, std::string>>>
+parseActionX(const DeckKeyword& kw, const Actdims& actimds, std::time_t start_time);
+
 }
 }
 #endif /* WELL_HPP_ */

opm/input/eclipse/Schedule/Action/SimulatorUpdate.hpp

@@ -25,23 +25,27 @@
 
 namespace Opm {
 
-/*
-  This struct is used to communicate back from the Schdule::applyAction() what
-  needs to be updated in the simulator when execution is returned to the
-  simulator code.
-*/
+/// This struct is used to communicate back from the Schedule::applyAction()
+/// what needs to be updated in the simulator when execution is returned to
+/// the simulator code.
 
-
-struct SimulatorUpdate {
-    // These wells have been affected by the ACTIONX and the simulator needs to
+struct SimulatorUpdate
+{
+    // Wells affected by ACTIONX and for which the simulator needs to
     // reapply rates and state from the newly updated Schedule object.
     std::unordered_set<std::string> affected_wells;
 
-    // If one of the transmissibility multiplier keywords has been invoked as an
-    // ACTIONX keyword the simulator needs to recalculate the transmissibility.
+    // If one of the transmissibility multiplier keywords has been invoked
+    // as an ACTIONX keyword the simulator needs to recalculate the
+    // transmissibility.
     bool tran_update{false};
+
+    /// Whether or not well structure changed in processing an ACTIONX
+    /// block.  Typically because of a keyword like WELSPECS, COMPDAT,
+    /// and/or WELOPEN.
+    bool well_structure_changed{false};
 };
 
-}
+} // namespace Opm
 
-#endif
+#endif // SIMULATOR_UPDATE_HPP

opm/input/eclipse/Schedule/Action/State.hpp

@@ -42,7 +42,7 @@ class State {
 struct RunState {
     RunState() = default;
 
-    RunState(std::time_t sim_time)
+    explicit RunState(std::time_t sim_time)
         : run_count(1)
         , last_run(sim_time)
     {}

opm/input/eclipse/Schedule/BCProp.hpp

@@ -0,0 +1,148 @@
+/*
+  Copyright 2023 Equinor ASA.
+  Copyright 2023 Norce.
+
+  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_BC_PROP_HPP
+#define OPM_BC_PROP_HPP
+
+#include <vector>
+#include <cstddef>
+#include <optional>
+
+#include <opm/input/eclipse/EclipseState/Grid/FaceDir.hpp>
+#include <opm/input/eclipse/EclipseState/Grid/GridDims.hpp>
+
+namespace Opm {
+
+class Deck;
+class DeckRecord;
+
+enum class BCType {
+     RATE,
+     FREE,
+     DIRICHLET,
+     THERMAL,
+     CLOSED,
+     NONE
+};
+
+enum class BCMECHType {
+     FREE,
+     FIXED,
+     NONE
+};
+
+enum class BCComponent {
+     OIL,
+     GAS,
+     WATER,
+     SOLVENT,
+     POLYMER,
+     NONE
+};
+
+struct MechBCValue {
+    std::array<double,3> disp{};
+    std::array<double,6> stress{};
+    std::array<bool,3> fixeddir{};
+
+    static MechBCValue serializationTestObject()
+    {
+        return MechBCValue{{1.0, 2.0, 3.0},
+                           {3.0, 4.0, 5.0, 6.0, 7.0, 8.0},
+                           {true, false, true}};
+    }
+
+    template<class Serializer>
+    void serializeOp(Serializer& serializer)
+    {
+        serializer(disp);
+        serializer(stress);
+        serializer(fixeddir);
+    }
+
+    bool operator==(const MechBCValue& other) const
+    {
+        return disp == other.disp &&
+               stress == other.stress &&
+               fixeddir == other.fixeddir;
+    }
+};
+
+class BCProp {
+public:
+
+    struct BCFace {
+        int index;
+        BCType bctype;
+        BCMECHType bcmechtype;
+        BCComponent component;
+        double rate;
+        std::optional<double> pressure;
+        std::optional<double> temperature;
+
+        std::optional<MechBCValue> mechbcvalue;
+
+        BCFace() = default;
+        explicit BCFace(const DeckRecord& record);
+
+        static BCFace serializationTestObject();
+
+        bool operator==(const BCFace& other) const;
+
+        template<class Serializer>
+        void serializeOp(Serializer& serializer)
+        {
+            serializer(index);
+            serializer(bctype);
+            serializer(bcmechtype);
+            serializer(component);
+            serializer(rate);
+            serializer(pressure);
+            serializer(temperature);
+            serializer(mechbcvalue);
+        }
+    };
+
+
+    BCProp() = default;
+
+    static BCProp serializationTestObject();
+
+    std::size_t size() const;
+    std::vector<BCFace>::const_iterator begin() const;
+    std::vector<BCFace>::const_iterator end() const;
+    bool operator==(const BCProp& other) const;
+    const BCFace& operator[](int index) const;
+
+    void updateBCProp(const DeckRecord& record);
+
+    template<class Serializer>
+    void serializeOp(Serializer& serializer)
+    {
+        serializer(m_faces);
+    }
+
+private:
+    std::vector<BCFace> m_faces;
+};
+
+} //namespace Opm
+
+#endif

opm/input/eclipse/Schedule/CompletedCells.hpp

@@ -121,7 +121,7 @@ public:
     };
 
     CompletedCells() = default;
-    CompletedCells(const GridDims& dims);
+    explicit CompletedCells(const GridDims& dims);
     CompletedCells(std::size_t nx, std::size_t ny, std::size_t nz);
     const Cell& get(std::size_t i, std::size_t j, std::size_t k) const;
     std::pair<bool, Cell&> try_get(std::size_t i, std::size_t j, std::size_t k);

opm/input/eclipse/Schedule/GasLiftOpt.hpp

@@ -31,7 +31,7 @@ class GasLiftGroup {
 public:
     GasLiftGroup() = default;
 
-    GasLiftGroup(const std::string& name) :
+    explicit GasLiftGroup(const std::string& name) :
         m_name(name)
     {}
 

opm/input/eclipse/Schedule/Group/GConSump.hpp

@@ -69,7 +69,9 @@ namespace Opm {
         bool has(const std::string& name) const;
         const GCONSUMPGroup& get(const std::string& name) const;
         const GCONSUMPGroupProp get(const std::string& name, const SummaryState& st) const;
-        void add(const std::string& name, const UDAValue& consumption_rate, const UDAValue& import_rate, const std::string network_node, double udq_undefined_arg, const UnitSystem& unit_system);
+        void add(const std::string& name, const UDAValue& consumption_rate,
+                 const UDAValue& import_rate, const std::string& network_node,
+                 double udq_undefined_arg, const UnitSystem& unit_system);
         size_t size() const;
 
         bool operator==(const GConSump& data) const;

opm/input/eclipse/Schedule/Group/Group.hpp

@@ -174,6 +174,31 @@ struct GroupInjectionProperties {
     }
 };
 
+struct GroupLimitAction
+{
+    ExceedAction allRates{ExceedAction::NONE};
+    ExceedAction water{ExceedAction::NONE};
+    ExceedAction gas{ExceedAction::NONE};
+    ExceedAction liquid{ExceedAction::NONE};
+
+    template<class Serializer>
+    void serializeOp(Serializer& serializer)
+    {
+        serializer(allRates);
+        serializer(water);
+        serializer(gas);
+        serializer(liquid); 
+    }
+
+    bool operator==(const GroupLimitAction& other) const
+    {
+        return (this->allRates == other.allRates)
+            && (this->water == other.water)
+            && (this->gas == other.gas)
+            && (this->liquid == other.liquid);
+    }
+};
+
 struct InjectionControls {
     Phase phase;
     InjectionCMode cmode;
@@ -194,7 +219,7 @@ struct GroupProductionProperties {
 
     std::string name;
     ProductionCMode cmode = ProductionCMode::NONE;
-    ExceedAction exceed_action = ExceedAction::NONE;
+    GroupLimitAction group_limit_action;
     UDAValue oil_target;
     UDAValue water_target;
     UDAValue gas_target;
@@ -216,7 +241,7 @@ struct GroupProductionProperties {
     {
         serializer(name);
         serializer(cmode);
-        serializer(exceed_action);
+        serializer(group_limit_action);
         serializer(oil_target);
         serializer(water_target);
         serializer(gas_target);
@@ -232,7 +257,7 @@ struct GroupProductionProperties {
 
 struct ProductionControls {
     ProductionCMode cmode;
-    ExceedAction exceed_action;
+    GroupLimitAction group_limit_action;
     double oil_target;
     double water_target;
     double gas_target;
@@ -253,9 +278,7 @@ struct ProductionControls {
     std::size_t insert_index() const;
     const std::string& name() const;
     bool is_field() const;
-    int getGroupNetVFPTable() const;
 
-    bool updateNetVFPTable(int vfp_arg);
     bool update_gefac(double gefac, bool transfer_gefac);
 
     // [[deprecated("use Group::control_group() or Group::flow_group()")]]
@@ -317,7 +340,6 @@ struct ProductionControls {
         serializer(group_type);
         serializer(gefac);
         serializer(transfer_gefac);
-        serializer(vfp_table);
         serializer(parent_group);
         serializer(m_wells);
         serializer(m_groups);
@@ -338,7 +360,6 @@ private:
     GroupType group_type;
     double gefac;
     bool transfer_gefac;
-    int vfp_table;
 
     std::string parent_group;
     IOrderSet<std::string> m_wells;

opm/input/eclipse/Schedule/Group/GroupEconProductionLimits.hpp

@@ -0,0 +1,146 @@
+/*
+  Copyright 2023 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 GROUP_ECON_PRODUCTION_LIMITS_H
+#define GROUP_ECON_PRODUCTION_LIMITS_H
+
+#include <map>
+#include <string>
+#include <optional>
+
+#include <opm/input/eclipse/Deck/UDAValue.hpp>
+#include <opm/input/eclipse/Units/UnitSystem.hpp>
+#include <opm/input/eclipse/Schedule/Schedule.hpp>
+#include <opm/input/eclipse/Schedule/SummaryState.hpp>
+#include <opm/common/utility/Serializer.hpp>
+#include <opm/common/utility/MemPacker.hpp>
+
+namespace Opm {
+
+class DeckRecord;
+
+class GroupEconProductionLimits {
+public:
+    enum class EconWorkover {
+        NONE = 0,
+        CON  = 1, // CON
+        CONP = 2, // +CON
+        WELL = 3,
+        PLUG = 4,
+        ALL  = 5
+    };
+
+    class GEconGroup {
+    public:
+        GEconGroup() = default;
+        GEconGroup(const DeckRecord &record, const int report_step);
+        bool endRun() const;
+        UDAValue minOilRate() const;
+        UDAValue minGasRate() const;
+        UDAValue maxWaterCut() const;
+        UDAValue maxGasOilRatio() const;
+        UDAValue maxWaterGasRatio() const;
+        int maxOpenWells() const;
+        bool operator==(const GEconGroup& other) const;
+        int reportStep() const;
+        template<class Serializer>
+        void serializeOp(Serializer& serializer)
+        {
+            serializer(m_min_oil_rate);
+            serializer(m_min_gas_rate);
+            serializer(m_max_water_cut);
+            serializer(m_max_gas_oil_ratio);
+            serializer(m_max_water_gas_ratio);
+            serializer(m_workover);
+            serializer(m_end_run);
+            serializer(m_max_open_wells);
+        }
+        static GEconGroup serializationTestObject();
+        EconWorkover workover() const;
+
+    private:
+        UDAValue m_min_oil_rate;
+        UDAValue m_min_gas_rate;
+        UDAValue m_max_water_cut;
+        UDAValue m_max_gas_oil_ratio;
+        UDAValue m_max_water_gas_ratio;
+        EconWorkover m_workover;
+        bool m_end_run;
+        int m_max_open_wells;
+        int m_report_step;  // Used to get UDQ undefined value
+    };
+
+    class GEconGroupProp {
+        /* Same as GEconGroup but with UDA values realized at given report step*/
+    public:
+        GEconGroupProp(const double min_oil_rate,
+                       const double min_gas_rate,
+                       const double max_water_cut,
+                       const double max_gas_oil_ratio,
+                       const double max_water_gas_ratio,
+                       EconWorkover workover,
+                       bool end_run,
+                       int max_open_wells);
+        bool endRun() const;
+        std::optional<double> minOilRate() const;
+        std::optional<double> minGasRate() const;
+        std::optional<double> maxWaterCut() const;
+        std::optional<double> maxGasOilRatio() const;
+        std::optional<double> maxWaterGasRatio() const;
+        int maxOpenWells() const;
+        EconWorkover workover() const;
+
+    private:
+        std::optional<double> m_min_oil_rate;
+        std::optional<double> m_min_gas_rate;
+        std::optional<double> m_max_water_cut;
+        std::optional<double> m_max_gas_oil_ratio;
+        std::optional<double> m_max_water_gas_ratio;
+        EconWorkover m_workover;
+        bool m_end_run;
+        int m_max_open_wells;
+    };
+
+    GroupEconProductionLimits() = default;
+    //explicit GroupEconProductionLimits(const RestartIO::RstWell& rstWell);
+
+    void add_group(const int report_step, const std::string &group_name, const DeckRecord &record);
+    static EconWorkover econWorkoverFromString(const std::string& string_value);
+    const GEconGroup& get_group(const std::string& gname) const;
+    GEconGroupProp get_group_prop(
+        const Schedule &schedule, const SummaryState &st, const std::string& gname) const;
+    bool has_group(const std::string& gname) const;
+    bool operator==(const GroupEconProductionLimits& other) const;
+    bool operator!=(const GroupEconProductionLimits& other) const;
+    template<class Serializer>
+    void serializeOp(Serializer& serializer) const
+    {
+        serializer(m_groups);
+    }
+    static GroupEconProductionLimits serializationTestObject();
+    size_t size() const;
+
+private:
+    std::map<std::string, GEconGroup> m_groups;
+};
+
+} // namespace Opm
+
+
+#endif

opm/input/eclipse/Schedule/Group/GuideRate.hpp

@@ -111,7 +111,7 @@ public:
         GuideRateModel::Target target { GuideRateModel::Target::NONE };
     };
 
-    GuideRate(const Schedule& schedule);
+    explicit GuideRate(const Schedule& schedule);
 
     void setSerializationTestData();
 

opm/input/eclipse/Schedule/MSW/AICD.hpp

@@ -35,7 +35,7 @@ namespace Opm {
     class AutoICD : public SICD {
     public:
         AutoICD() = default;
-        AutoICD(const DeckRecord& record);
+        explicit AutoICD(const DeckRecord& record);
 
         static AutoICD serializationTestObject();
 

opm/input/eclipse/Schedule/MSW/Segment.hpp

@@ -90,7 +90,7 @@ namespace Opm {
                 const double x_in,
                 const double y_in);
 
-        Segment(const RestartIO::RstSegment& rst_segment);
+        explicit Segment(const RestartIO::RstSegment& rst_segment);
 
         static Segment serializationTestObject();
 

opm/input/eclipse/Schedule/MSW/Valve.hpp

@@ -69,6 +69,7 @@ namespace Opm {
 
         // Status: OPEN or SHUT
         ICDStatus status() const;
+        int ecl_status() const;
 
         void setConMaxCrossArea(const double area);
 

opm/input/eclipse/Schedule/MSW/WellSegments.hpp

@@ -77,6 +77,8 @@ namespace Opm {
 
         std::size_t size() const;
         bool empty() const;
+        int maxSegmentID() const;
+        int maxBranchID() const;
         double depthTopSegment() const;
         double lengthTopSegment() const;
         double volumeTopSegment() const;

opm/input/eclipse/Schedule/Network/ExtNetwork.hpp

@@ -37,10 +37,10 @@ class ExtNetwork {
 public:
     ExtNetwork() = default;
     bool active() const;
-    bool has_node(const std::string& name) const;
-    void add_node(Node node);
     void add_branch(Branch branch);
     void drop_branch(const std::string& uptree_node, const std::string& downtree_node);
+    bool has_node(const std::string& name) const;
+    void update_node(Node node);
     const Node& node(const std::string& name) const;
     const Node& root() const;
     std::vector<Branch> downtree_branches(const std::string& node) const;
@@ -64,7 +64,7 @@ private:
     std::vector<Branch> m_branches;
     std::vector<std::string> insert_indexed_node_names;
     std::map<std::string, Node> m_nodes;
-    bool has_indexed_node_name(const std::string name) const;
+    bool has_indexed_node_name(const std::string& name) const;
     void add_indexed_node_name(std::string name);
 };
 

opm/input/eclipse/Schedule/Network/Node.hpp

@@ -30,7 +30,7 @@ namespace Network {
 class Node {
 public:
     Node() = default;
-    Node(const std::string& name);
+    explicit Node(const std::string& name);
 
     const std::string& name() const;
     const std::optional<double>& terminal_pressure() const;

opm/input/eclipse/Schedule/RSTConfig.hpp

@@ -185,6 +185,7 @@
 #include <unordered_map>
 #include <map>
 #include <optional>
+#include <string>
 
 namespace Opm {
 

opm/input/eclipse/Schedule/Schedule.hpp

@@ -21,10 +21,11 @@
 
 #include <cstddef>
 #include <ctime>
+#include <functional>
+#include <iosfwd>
 #include <map>
 #include <memory>
 #include <optional>
-#include <iosfwd>
 #include <set>
 #include <string>
 #include <unordered_map>
@@ -32,14 +33,14 @@
 #include <vector>
 
 #include <opm/input/eclipse/EclipseState/Runspec.hpp>
+#include <opm/input/eclipse/Schedule/Action/WGNames.hpp>
+#include <opm/input/eclipse/Schedule/CompletedCells.hpp>
 #include <opm/input/eclipse/Schedule/Group/Group.hpp>
 #include <opm/input/eclipse/Schedule/MessageLimits.hpp>
 #include <opm/input/eclipse/Schedule/ScheduleDeck.hpp>
 #include <opm/input/eclipse/Schedule/ScheduleState.hpp>
 #include <opm/input/eclipse/Schedule/Well/PAvg.hpp>
 #include <opm/input/eclipse/Schedule/WriteRestartFileEvents.hpp>
-#include <opm/input/eclipse/Schedule/CompletedCells.hpp>
-#include <opm/input/eclipse/Schedule/Action/WGNames.hpp>
 #include <opm/input/eclipse/Units/UnitSystem.hpp>
 
 namespace Opm
@@ -65,6 +66,7 @@ namespace Opm
     class Python;
     class RPTConfig;
     class SCHEDULESection;
+    class SegmentMatcher;
     struct SimulatorUpdate;
     class SummaryState;
     class TracerConfig;
@@ -91,6 +93,7 @@ namespace Opm
         double sumthin{-1.0};
         bool rptonly{false};
         bool gaslift_opt_active{false};
+        std::optional<OilVaporizationProperties> oilVap;
 
         ScheduleStatic() = default;
 
@@ -236,6 +239,7 @@ namespace Opm
         bool hasWell(const std::string& wellName, std::size_t timeStep) const;
 
         WellMatcher wellMatcher(std::size_t report_step) const;
+        std::function<std::unique_ptr<SegmentMatcher>()> segmentMatcherFactory(std::size_t report_step) const;
         std::vector<std::string> wellNames(const std::string& pattern, std::size_t timeStep, const std::vector<std::string>& matching_wells = {}) const;
         std::vector<std::string> wellNames(const std::string& pattern) const;
         std::vector<std::string> wellNames(std::size_t timeStep) const;
@@ -349,6 +353,7 @@ namespace Opm
             this->template pack_unpack<WellTestConfig>(serializer);
             this->template pack_unpack<GConSale>(serializer);
             this->template pack_unpack<GConSump>(serializer);
+            this->template pack_unpack<GroupEconProductionLimits>(serializer);
             this->template pack_unpack<WListManager>(serializer);
             this->template pack_unpack<Network::ExtNetwork>(serializer);
             this->template pack_unpack<Network::Balance>(serializer);
@@ -513,11 +518,11 @@ namespace Opm
             const bool actionx_mode;
             const ParseContext& parseContext;
             ErrorGuard& errors;
-            SimulatorUpdate * sim_update;
-            const std::unordered_map<std::string, double> * target_wellpi;
-            std::unordered_map<std::string, double>* wpimult_global_factor;
-            WelSegsSet *welsegs_wells;
-            std::set<std::string>*compsegs_wells;
+            SimulatorUpdate* sim_update{nullptr};
+            const std::unordered_map<std::string, double>* target_wellpi{nullptr};
+            std::unordered_map<std::string, double>* wpimult_global_factor{nullptr};
+            WelSegsSet* welsegs_wells{nullptr};
+            std::set<std::string>* compsegs_wells{nullptr};
             const ScheduleGrid& grid;
 
             /// \param welsegs_wells All wells with a WELSEGS entry for checks.
@@ -530,8 +535,8 @@ namespace Opm
                            bool actionx_mode_,
                            const ParseContext& parseContext_,
                            ErrorGuard& errors_,
-                           SimulatorUpdate * sim_update_,
-                           const std::unordered_map<std::string, double> * target_wellpi_,
+                           SimulatorUpdate* sim_update_,
+                           const std::unordered_map<std::string, double>* target_wellpi_,
                            std::unordered_map<std::string, double>* wpimult_global_factor_,
                            WelSegsSet* welsegs_wells_,
                            std::set<std::string>* compsegs_wells_)
@@ -551,6 +556,7 @@ namespace Opm
             {}
 
             void affected_well(const std::string& well_name);
+            void record_well_structure_change();
 
             /// \brief Mark that the well occured in a  WELSEGS keyword
             void welsegs_handled(const std::string& well_name)
@@ -678,12 +684,14 @@ namespace Opm
         void handleAQUCT     (HandlerContext&);
         void handleAQUFETP   (HandlerContext&);
         void handleAQUFLUX   (HandlerContext&);
+        void handleBCProp    (HandlerContext&);
         void handleBRANPROP  (HandlerContext&);
         void handleCOMPDAT   (HandlerContext&);
         void handleCOMPLUMP  (HandlerContext&);
         void handleCOMPORD   (HandlerContext&);
         void handleCOMPSEGS  (HandlerContext&);
         void handleCOMPTRAJ  (HandlerContext&);
+        void handleCSKIN     (HandlerContext&);
         void handleDRSDT     (HandlerContext&);
         void handleDRSDTCON  (HandlerContext&);
         void handleDRSDTR    (HandlerContext&);
@@ -694,6 +702,7 @@ namespace Opm
         void handleGCONPROD  (HandlerContext&);
         void handleGCONSALE  (HandlerContext&);
         void handleGCONSUMP  (HandlerContext&);
+        void handleGECON     (HandlerContext&);
         void handleGEFAC     (HandlerContext&);
         void handleGEOKeyword(HandlerContext&);
         void handleGLIFTOPT  (HandlerContext&);
@@ -741,9 +750,14 @@ namespace Opm
         void handleWMICP     (HandlerContext&);
         void handleWPAVE     (HandlerContext&);
         void handleWPAVEDEP  (HandlerContext&);
+        void handleWVFPDP    (HandlerContext&);
         void handleWVFPEXP   (HandlerContext&);
         void handleWWPAVE    (HandlerContext&);
         void handleWPIMULT   (HandlerContext&);
+        void handleWINJCLN   (HandlerContext&);
+        void handleWINJDAM   (HandlerContext&);
+        void handleWINJFCNC  (HandlerContext&);
+        void handleWINJMULT  (HandlerContext&);
         void handleWPMITAB   (HandlerContext&);
         void handleWPOLYMER  (HandlerContext&);
         void handleWRFT      (HandlerContext&);

opm/input/eclipse/Schedule/ScheduleState.hpp

@@ -35,6 +35,7 @@
 #include <opm/input/eclipse/Schedule/Tuning.hpp>
 #include <opm/input/eclipse/Schedule/OilVaporizationProperties.hpp>
 #include <opm/input/eclipse/Schedule/Events.hpp>
+#include <opm/input/eclipse/Schedule/BCProp.hpp>
 #include <opm/input/eclipse/Schedule/Group/Group.hpp>
 #include <opm/input/eclipse/Schedule/Well/WellEnums.hpp>
 #include <opm/input/eclipse/Schedule/MessageLimits.hpp>
@@ -63,6 +64,7 @@ namespace Opm {
     class GasLiftOpt;
     class GConSale;
     class GConSump;
+    class GroupEconProductionLimits;
     class GroupOrder;
     class GuideRateConfig;
     class NameOrder;
@@ -358,6 +360,7 @@ namespace Opm {
 
         ptr_member<GConSale> gconsale;
         ptr_member<GConSump> gconsump;
+        ptr_member<GroupEconProductionLimits> gecon;
         ptr_member<GuideRateConfig> guide_rate;
 
         ptr_member<WListManager> wlist_manager;
@@ -390,6 +393,8 @@ namespace Opm {
                                   return this->gconsale;
             else if constexpr ( std::is_same_v<T, GConSump> )
                                   return this->gconsump;
+            else if constexpr ( std::is_same_v<T, GroupEconProductionLimits> )
+                                  return this->gecon;
             else if constexpr ( std::is_same_v<T, WListManager> )
                                   return this->wlist_manager;
             else if constexpr ( std::is_same_v<T, Network::ExtNetwork> )
@@ -430,6 +435,8 @@ namespace Opm {
                                   return this->gconsale;
             else if constexpr ( std::is_same_v<T, GConSump> )
                                   return this->gconsump;
+            else if constexpr ( std::is_same_v<T, GroupEconProductionLimits> )
+                                  return this->gecon;
             else if constexpr ( std::is_same_v<T, WListManager> )
                                   return this->wlist_manager;
             else if constexpr ( std::is_same_v<T, Network::ExtNetwork> )
@@ -482,6 +489,7 @@ namespace Opm {
         map_member<std::string, Well> wells;
         // constant flux aquifers
         std::unordered_map<int, SingleAquiferFlux> aqufluxs;
+        BCProp bcprop;
         std::unordered_map<std::string, double> target_wellpi;
         std::optional<NextStep> next_tstep;
 
@@ -510,6 +518,7 @@ namespace Opm {
             serializer(m_whistctl_mode);
             serializer(target_wellpi);
             serializer(aqufluxs);
+            serializer(bcprop);
         }
 
 

opm/input/eclipse/Schedule/Tuning.hpp

@@ -20,6 +20,8 @@
 #ifndef OPM_TUNING_HPP
 #define OPM_TUNING_HPP
 
+#include <optional>
+
 namespace Opm {
 
     class NextStep {
@@ -49,7 +51,7 @@ namespace Opm {
         static Tuning serializationTestObject();
 
         // Record1
-        double TSINIT;
+        std::optional<double> TSINIT;
         double TSMAXZ;
         double TSMINZ;
         double TSMCHP;

opm/input/eclipse/Schedule/UDQ/UDQASTNode.hpp

@@ -91,6 +91,9 @@ private:
     UDQSet eval_group_expression(const std::string& string_value,
                                  const UDQContext&  context) const;
 
+    UDQSet eval_segment_expression(const std::string& string_value,
+                                   const UDQContext&  context) const;
+
     UDQSet eval_scalar_function(const UDQVarType  target_type,
                                 const UDQContext& context) const;
 

opm/input/eclipse/Schedule/UDQ/UDQActive.hpp

@@ -45,13 +45,15 @@ public:
 
     struct RstRecord {
 
-        RstRecord(UDAControl control_arg, UDAValue value_arg, std::string wgname_arg)
+        RstRecord(UDAControl control_arg, UDAValue value_arg,
+                  const std::string& wgname_arg)
             : control(control_arg)
             , value(value_arg)
             , wgname(wgname_arg)
         {};
 
-        RstRecord(UDAControl control_arg, UDAValue value_arg, std::string wgname_arg, Phase phase)
+        RstRecord(UDAControl control_arg, UDAValue value_arg,
+                  const std::string& wgname_arg, Phase phase)
             : RstRecord(control_arg, value_arg, wgname_arg)
         {
             this->ig_phase = phase;