OPM · GitPaean · May 13, 2026 · May 26, 2026 · May 27, 2026 · May 27, 2026
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -814,6 +814,62 @@ macro(opm-simulators_targets_hook)
       OPM_COMPILE_COMPONENTS_TEMPLATE_LIST=${OPM_COMPILE_COMPONENTS_TEMPLATE_LIST}
   )
 
+  opm_add_executable(
+    TARGET
+      flowexp_comp2_2p
+    SOURCES
+      flowexperimental/comp/flowexp_comp2_2p_main.cpp
+      $<TARGET_OBJECTS:moduleVersion>
+    LIBRARIES
+      opmsimulators
+  )
+
+  opm_add_executable(
+    TARGET
+      flowexp_comp3_2p
+    SOURCES
+      flowexperimental/comp/flowexp_comp3_2p_main.cpp
+      $<TARGET_OBJECTS:moduleVersion>
+    LIBRARIES
+      opmsimulators
+  )
+
+  opm_add_test(flow_comp
+    ONLY_COMPILE
+    ALWAYS_ENABLE
+    DEPENDS
+      opmsimulators
+    LIBRARIES
+      opmsimulators
+    SOURCES
+      flowexperimental/comp/flow_comp.cpp
+      $<TARGET_OBJECTS:moduleVersion>
+  )
+  target_compile_definitions(flow_comp
+    PRIVATE
+      OPM_COMPILE_COMPONENTS_TEMPLATE_LIST=${OPM_COMPILE_COMPONENTS_TEMPLATE_LIST}
+  )
+
+  opm_add_executable(
+    TARGET
+      flow_comp2_2p
+    SOURCES
+      flowexperimental/comp/flow_comp2_2p.cpp
+      $<TARGET_OBJECTS:moduleVersion>
+    LIBRARIES
+      opmsimulators
+  )
+
+  opm_add_executable(
+    TARGET
+      flow_comp3_2p
+    SOURCES
+      flowexperimental/comp/flow_comp3_2p.cpp
+      $<TARGET_OBJECTS:moduleVersion>
+    LIBRARIES
+      opmsimulators
+  )
+
   if(BUILD_FLOW_FLOAT_VARIANTS)
     opm_add_executable(
       TARGET

diff --git a/CMakeLists_files.cmake b/CMakeLists_files.cmake
@@ -73,6 +73,7 @@ list (APPEND MAIN_SOURCE_FILES
   flowexperimental/BlackOilEnergyIntensiveQuantitiesGlobalIndex.hpp
   flowexperimental/BlackOilIntensiveQuantitiesGlobalIndex.hpp
   flowexperimental/comp/EmptyModel.hpp
+  flowexperimental/comp/flow_comp.hpp
   flowexperimental/comp/flowexp_comp.hpp
   flowexperimental/comp/wells/CompWellModel.hpp
   flowexperimental/comp/wells/CompWellModel_impl.hpp
@@ -156,12 +157,14 @@ list (APPEND MAIN_SOURCE_FILES
   opm/simulators/flow/MixingRateControls.cpp
   opm/simulators/flow/NlddReporting.cpp
   opm/simulators/flow/NonlinearSolver.cpp
+  opm/simulators/flow/NonlinearSystemCompositional.hpp
+  opm/simulators/flow/NonlinearSystemCompositional_impl.hpp
   opm/simulators/flow/partitionCells.cpp
   opm/simulators/flow/RFTContainer.cpp
   opm/simulators/flow/RSTConv.cpp
   opm/simulators/flow/RegionPhasePVAverage.cpp
   opm/simulators/flow/SimulatorConvergenceOutput.cpp
-  opm/simulators/flow/SimulatorFullyImplicitBlackoil.cpp
+  opm/simulators/flow/SimulatorFullyImplicit.cpp
   opm/simulators/flow/SimulatorReportBanners.cpp
   opm/simulators/flow/SimulatorSerializer.cpp
   opm/simulators/flow/SolutionContainers.cpp
@@ -203,6 +206,7 @@ list (APPEND MAIN_SOURCE_FILES
   opm/simulators/timestepping/TimeStepControl.cpp
   opm/simulators/timestepping/gatherConvergenceReport.cpp
   opm/simulators/utils/ComponentName.cpp
+  opm/simulators/utils/ComponentNameFlowExp.cpp
   opm/simulators/utils/DeferredLogger.cpp
   opm/simulators/utils/FullySupportedFlowKeywords.cpp
   opm/simulators/utils/ParallelFileMerger.cpp
@@ -938,13 +942,17 @@ list (APPEND PUBLIC_HEADER_FILES
   opm/simulators/flow/Banners.hpp
   opm/simulators/flow/BaseAquiferModel.hpp
   opm/simulators/flow/BioeffectsContainer.hpp
-  opm/simulators/flow/BlackoilModel.hpp
-  opm/simulators/flow/BlackoilModel_impl.hpp
+  opm/simulators/flow/NonlinearSystemBlackOilReservoir.hpp
+  opm/simulators/flow/NonlinearSystemBlackOilReservoir_impl.hpp
   opm/simulators/flow/BlackoilModelConvergenceMonitor.hpp
-  opm/simulators/flow/BlackoilModelNldd.hpp
+  opm/simulators/flow/NonlinearSystemNldd.hpp
   opm/simulators/flow/BlackoilModelParameters.hpp
   opm/simulators/flow/BlackoilModelProperties.hpp
-  opm/simulators/flow/BlackoilModelTPSA.hpp
+  opm/simulators/flow/NonlinearSystemBlackOilReservoirTPSA.hpp
+  opm/simulators/flow/NonlinearSystem.hpp
+  opm/simulators/flow/NonlinearSystem_impl.hpp
+  opm/simulators/flow/NonlinearSystemCompositional.hpp
+  opm/simulators/flow/NonlinearSystemCompositional_impl.hpp
   opm/simulators/flow/CO2H2Container.hpp
   opm/simulators/flow/CollectDataOnIORank.hpp
   opm/simulators/flow/CollectDataOnIORank_impl.hpp
@@ -1013,8 +1021,8 @@ list (APPEND PUBLIC_HEADER_FILES
   opm/simulators/flow/RSTConv.hpp
   opm/simulators/flow/RegionPhasePVAverage.hpp
   opm/simulators/flow/SimulatorConvergenceOutput.hpp
-  opm/simulators/flow/SimulatorFullyImplicitBlackoil.hpp
-  opm/simulators/flow/SimulatorFullyImplicitBlackoil_impl.hpp
+  opm/simulators/flow/SimulatorFullyImplicit.hpp
+  opm/simulators/flow/SimulatorFullyImplicit_impl.hpp
   opm/simulators/flow/SimulatorReportBanners.hpp
   opm/simulators/flow/SimulatorSerializer.hpp
   opm/simulators/flow/SolutionContainers.hpp

diff --git a/compareECLFiles.cmake b/compareECLFiles.cmake
@@ -81,6 +81,7 @@ function(add_test_compareECLFiles)
     FILENAME
     DEV_SIMULATOR
     SIMULATOR
+    REFERENCE_SIMULATOR
     ABS_TOL
     REL_TOL
     DIR
@@ -112,7 +113,11 @@ function(add_test_compareECLFiles)
   if(PARAM_RESTART_SCHED STREQUAL "false" OR PARAM_RESTART_SCHED STREQUAL "true")
     list(APPEND DRIVER_ARGS -h ${PARAM_RESTART_SCHED})
   endif()
-  list(APPEND DRIVER_ARGS -u ${PARAM_SIMULATOR})
+  set(reference_simulator ${PARAM_SIMULATOR})
+  if(PARAM_REFERENCE_SIMULATOR)
+    set(reference_simulator ${PARAM_REFERENCE_SIMULATOR})
+  endif()
+  list(APPEND DRIVER_ARGS -u ${reference_simulator})
   if(USE_DEV_SIMULATOR_IN_TESTS AND PARAM_DEV_SIMULATOR)
     set(PARAM_SIMULATOR ${PARAM_DEV_SIMULATOR})
   endif()
@@ -151,6 +156,7 @@ function(add_test_compareSeparateECLFiles)
     DIR2
     DEV_SIMULATOR
     SIMULATOR
+    REFERENCE_SIMULATOR
     ABS_TOL
     REL_TOL
     IGNORE_EXTRA_KW
@@ -187,6 +193,9 @@ function(add_test_compareSeparateECLFiles)
   if(PARAM_IGNORE_EXTRA_KW)
     list(APPEND DRIVER_ARGS -y ${PARAM_IGNORE_EXTRA_KW})
   endif()
+  if(PARAM_REFERENCE_SIMULATOR)
+    list(APPEND DRIVER_ARGS -l ${PARAM_REFERENCE_SIMULATOR})
+  endif()
   opm_add_test(${PARAM_PREFIX}_${PARAM_SIMULATOR}+${PARAM_CASENAME}
     EXE_TARGET
       ${PARAM_SIMULATOR}
@@ -676,6 +685,16 @@ add_test_runSimulator(
     --enable-vtk-output=true
 )
 
+add_test_runSimulator(CASENAME 1dcompositional_flowexp_comp3_2p
+                      FILENAME 1D_COMP
+                      SIMULATOR flowexp_comp3_2p
+                      DIR compositional)
+
+add_test_runSimulator(CASENAME 1dcompositional_flow_comp3_2p
+                      FILENAME 1D_COMP
+                      SIMULATOR flow_comp3_2p
+                      DIR compositional)
+
 # Tests that are run based on simulator results, but not necessarily direct comparison to reference results
 add_test_runSimulator(
   CASENAME

diff --git a/comparisonTests.cmake b/comparisonTests.cmake
@@ -31,3 +31,29 @@ add_test_compareSeparateECLFiles(
   MPI_PROCS
     1
 )
+
+add_test_compareSeparateECLFiles(
+  CASENAME
+    1dcompositional_flow_comp3_2p_vs_flowexp_comp3_2p
+  DIR1
+    compositional
+  FILENAME1
+    1D_COMP
+  DIR2
+    compositional
+  FILENAME2
+    1D_COMP
+  SIMULATOR
+    flow_comp3_2p
+  REFERENCE_SIMULATOR
+    flowexp_comp3_2p
+  ABS_TOL
+    ${abs_tol}
+  REL_TOL
+    ${rel_tol}
+  TEST_ARGS
+    --solver-max-time-step-in-days=0.4
+  MPI_PROCS
+    1
+)
+
diff --git a/flow/flow_biofilm.cpp b/flow/flow_biofilm.cpp
@@ -25,7 +25,7 @@
 
 #include <opm/grid/CpGrid.hpp>
 #include <opm/simulators/flow/Main.hpp>
-#include <opm/simulators/flow/SimulatorFullyImplicitBlackoil.hpp>
+#include <opm/simulators/flow/SimulatorFullyImplicit.hpp>
 #include <opm/material/thermal/EnergyModuleType.hpp>
 
 namespace Opm {

diff --git a/flow/flow_blackoil.cpp b/flow/flow_blackoil.cpp
@@ -20,7 +20,7 @@
 
 #include <opm/material/common/ResetLocale.hpp>
 #include <opm/grid/CpGrid.hpp>
-#include <opm/simulators/flow/SimulatorFullyImplicitBlackoil.hpp>
+#include <opm/simulators/flow/SimulatorFullyImplicit.hpp>
 #include <opm/simulators/flow/Main.hpp>
 
 #include <opm/models/blackoil/blackoillocalresidualtpfa.hh>

diff --git a/flow/flow_blackoil_legacyassembly.cpp b/flow/flow_blackoil_legacyassembly.cpp
@@ -19,7 +19,7 @@
 #include <flow/flow_blackoil_legacyassembly.hpp>
 
 #include <opm/material/common/ResetLocale.hpp>
-#include <opm/simulators/flow/SimulatorFullyImplicitBlackoil.hpp>
+#include <opm/simulators/flow/SimulatorFullyImplicit.hpp>
 #include <opm/simulators/flow/Main.hpp>
 
 namespace Opm {

diff --git a/flow/flow_blackoil_nohyst.cpp b/flow/flow_blackoil_nohyst.cpp
@@ -22,7 +22,7 @@
 
 #include <opm/material/common/ResetLocale.hpp>
 #include <opm/grid/CpGrid.hpp>
-#include <opm/simulators/flow/SimulatorFullyImplicitBlackoil.hpp>
+#include <opm/simulators/flow/SimulatorFullyImplicit.hpp>
 #include <opm/simulators/flow/Main.hpp>
 
 #include <opm/models/blackoil/blackoillocalresidualtpfa.hh>

diff --git a/flow/flow_blackoil_temp.cpp b/flow/flow_blackoil_temp.cpp
@@ -20,7 +20,7 @@
 
 #include <opm/material/common/ResetLocale.hpp>
 #include <opm/grid/CpGrid.hpp>
-#include <opm/simulators/flow/SimulatorFullyImplicitBlackoil.hpp>
+#include <opm/simulators/flow/SimulatorFullyImplicit.hpp>
 #include <opm/simulators/flow/Main.hpp>
 
 #include <opm/models/blackoil/blackoillocalresidualtpfa.hh>

diff --git a/flow/flow_blackoil_tpsa.cpp b/flow/flow_blackoil_tpsa.cpp
@@ -73,7 +73,7 @@ struct Problem<TypeTag, TTag::FlowBlackOilProblemTPSA>
 
 template <class TypeTag>
 struct NonlinearSystem<TypeTag, TTag::FlowBlackOilProblemTPSA>
-{ using type = BlackoilModelTPSA<TypeTag>; };
+{ using type = NonlinearSystemBlackOilReservoirTPSA<TypeTag>; };
 
 }  // namespace Opm::Properties
 

diff --git a/flow/flow_brine.cpp b/flow/flow_brine.cpp
@@ -23,7 +23,7 @@
 #include <opm/models/discretization/common/tpfalinearizer.hh>
 
 #include <opm/grid/CpGrid.hpp>
-#include <opm/simulators/flow/SimulatorFullyImplicitBlackoil.hpp>
+#include <opm/simulators/flow/SimulatorFullyImplicit.hpp>
 #include <opm/simulators/flow/Main.hpp>
 
 namespace Opm {

diff --git a/flow/flow_brine_precsalt_vapwat.cpp b/flow/flow_brine_precsalt_vapwat.cpp
@@ -23,7 +23,7 @@
 #include <opm/models/discretization/common/tpfalinearizer.hh>
 
 #include <opm/grid/CpGrid.hpp>
-#include <opm/simulators/flow/SimulatorFullyImplicitBlackoil.hpp>
+#include <opm/simulators/flow/SimulatorFullyImplicit.hpp>
 #include <opm/simulators/flow/Main.hpp>
 
 namespace Opm {

diff --git a/flow/flow_brine_saltprecipitation.cpp b/flow/flow_brine_saltprecipitation.cpp
@@ -23,7 +23,7 @@
 #include <opm/models/discretization/common/tpfalinearizer.hh>
 
 #include <opm/grid/CpGrid.hpp>
-#include <opm/simulators/flow/SimulatorFullyImplicitBlackoil.hpp>
+#include <opm/simulators/flow/SimulatorFullyImplicit.hpp>
 #include <opm/simulators/flow/Main.hpp>
 
 namespace Opm {

diff --git a/flow/flow_energy.cpp b/flow/flow_energy.cpp
@@ -20,7 +20,7 @@
 
 #include <opm/material/common/ResetLocale.hpp>
 #include <opm/grid/CpGrid.hpp>
-#include <opm/simulators/flow/SimulatorFullyImplicitBlackoil.hpp>
+#include <opm/simulators/flow/SimulatorFullyImplicit.hpp>
 #include <opm/simulators/flow/Main.hpp>
 #include <opm/material/thermal/EnergyModuleType.hpp>
 #include <opm/models/blackoil/blackoillocalresidualtpfa.hh>

diff --git a/flow/flow_extbo.cpp b/flow/flow_extbo.cpp
@@ -20,7 +20,7 @@
 
 #include <opm/material/common/ResetLocale.hpp>
 #include <opm/grid/CpGrid.hpp>
-#include <opm/simulators/flow/SimulatorFullyImplicitBlackoil.hpp>
+#include <opm/simulators/flow/SimulatorFullyImplicit.hpp>
 #include <opm/simulators/flow/Main.hpp>
 
 namespace Opm {

diff --git a/flow/flow_foam.cpp b/flow/flow_foam.cpp
@@ -20,7 +20,7 @@
 
 #include <opm/material/common/ResetLocale.hpp>
 #include <opm/grid/CpGrid.hpp>
-#include <opm/simulators/flow/SimulatorFullyImplicitBlackoil.hpp>
+#include <opm/simulators/flow/SimulatorFullyImplicit.hpp>
 #include <opm/simulators/flow/Main.hpp>
 
 namespace Opm {

diff --git a/flow/flow_gasoil.cpp b/flow/flow_gasoil.cpp
@@ -22,7 +22,7 @@
 #include <opm/models/blackoil/blackoiltwophaseindices.hh>
 
 #include <opm/grid/CpGrid.hpp>
-#include <opm/simulators/flow/SimulatorFullyImplicitBlackoil.hpp>
+#include <opm/simulators/flow/SimulatorFullyImplicit.hpp>
 #include <opm/simulators/flow/Main.hpp>
 
 #include <opm/models/blackoil/blackoillocalresidualtpfa.hh>

diff --git a/flow/flow_gasoil_energy.cpp b/flow/flow_gasoil_energy.cpp
@@ -22,7 +22,7 @@
 #include <opm/models/blackoil/blackoiltwophaseindices.hh>
 
 #include <opm/grid/CpGrid.hpp>
-#include <opm/simulators/flow/SimulatorFullyImplicitBlackoil.hpp>
+#include <opm/simulators/flow/SimulatorFullyImplicit.hpp>
 #include <opm/simulators/flow/Main.hpp>
 #include <opm/models/blackoil/blackoillocalresidualtpfa.hh>
 #include <opm/models/discretization/common/tpfalinearizer.hh>

diff --git a/flow/flow_gasoildiffuse.cpp b/flow/flow_gasoildiffuse.cpp
@@ -22,7 +22,7 @@
 #include <opm/models/blackoil/blackoiltwophaseindices.hh>
 
 #include <opm/grid/CpGrid.hpp>
-#include <opm/simulators/flow/SimulatorFullyImplicitBlackoil.hpp>
+#include <opm/simulators/flow/SimulatorFullyImplicit.hpp>
 #include <opm/simulators/flow/Main.hpp>
 #include <opm/models/blackoil/blackoillocalresidualtpfa.hh>
 #include <opm/models/discretization/common/tpfalinearizer.hh>

diff --git a/flow/flow_gaswater.cpp b/flow/flow_gaswater.cpp
@@ -22,7 +22,7 @@
 #include <opm/models/blackoil/blackoiltwophaseindices.hh>
 
 #include <opm/grid/CpGrid.hpp>
-#include <opm/simulators/flow/SimulatorFullyImplicitBlackoil.hpp>
+#include <opm/simulators/flow/SimulatorFullyImplicit.hpp>
 #include <opm/simulators/flow/Main.hpp>
 
 #include <opm/models/blackoil/blackoillocalresidualtpfa.hh>

diff --git a/flow/flow_gaswater_brine.cpp b/flow/flow_gaswater_brine.cpp
@@ -24,7 +24,7 @@
 #include <opm/models/discretization/common/tpfalinearizer.hh>
 
 #include <opm/grid/CpGrid.hpp>
-#include <opm/simulators/flow/SimulatorFullyImplicitBlackoil.hpp>
+#include <opm/simulators/flow/SimulatorFullyImplicit.hpp>
 #include <opm/simulators/flow/Main.hpp>
 #include <opm/material/thermal/EnergyModuleType.hpp>
 

diff --git a/flow/flow_gaswater_dissolution.cpp b/flow/flow_gaswater_dissolution.cpp
@@ -22,7 +22,7 @@
 #include <opm/models/blackoil/blackoiltwophaseindices.hh>
 
 #include <opm/grid/CpGrid.hpp>
-#include <opm/simulators/flow/SimulatorFullyImplicitBlackoil.hpp>
+#include <opm/simulators/flow/SimulatorFullyImplicit.hpp>
 #include <opm/simulators/flow/Main.hpp>
 
 #include <opm/models/blackoil/blackoillocalresidualtpfa.hh>

diff --git a/flow/flow_gaswater_dissolution_diffuse.cpp b/flow/flow_gaswater_dissolution_diffuse.cpp
@@ -22,7 +22,7 @@
 #include <opm/models/blackoil/blackoiltwophaseindices.hh>
 
 #include <opm/grid/CpGrid.hpp>
-#include <opm/simulators/flow/SimulatorFullyImplicitBlackoil.hpp>
+#include <opm/simulators/flow/SimulatorFullyImplicit.hpp>
 #include <opm/simulators/flow/Main.hpp>
 
 #include <opm/models/blackoil/blackoillocalresidualtpfa.hh>

diff --git a/flow/flow_gaswater_dissolution_tpsa.cpp b/flow/flow_gaswater_dissolution_tpsa.cpp
@@ -103,7 +103,7 @@ struct Problem<TypeTag, TTag::FlowGasWaterDissolutionProblemTPSA>
 
 template <class TypeTag>
 struct NonlinearSystem<TypeTag, TTag::FlowGasWaterDissolutionProblemTPSA>
-{ using type = BlackoilModelTPSA<TypeTag>; };
+{ using type = NonlinearSystemBlackOilReservoirTPSA<TypeTag>; };
 
 }  // namespace Opm::Properties