Move opm/core/props to opm/simulators/utils

The opm/core directory is no longer meaningful, and it contains only
components which might collectively be described as simulator
utilities.

CMakeLists_files.cmake

@@ -56,10 +56,6 @@ endmacro()
 # originally generated with the command:
 # find opm -name '*.c*' -printf '\t%p\n' | sort
 list (APPEND MAIN_SOURCE_FILES
-  opm/core/props/BlackoilPhases.cpp
-  opm/core/props/phaseUsageFromDeck.cpp
-  opm/core/props/satfunc/RelpermDiagnostics.cpp
-  opm/simulators/timestepping/SimulatorReport.cpp
   opm/simulators/flow/ActionHandler.cpp
   opm/simulators/flow/Banners.cpp
   opm/simulators/flow/CollectDataOnIORank.cpp
@@ -111,21 +107,25 @@ list (APPEND MAIN_SOURCE_FILES
   opm/simulators/timestepping/AdaptiveSimulatorTimer.cpp
   opm/simulators/timestepping/AdaptiveTimeStepping.cpp
   opm/simulators/timestepping/ConvergenceReport.cpp
-  opm/simulators/timestepping/TimeStepControl.cpp
+  opm/simulators/timestepping/SimulatorReport.cpp
   opm/simulators/timestepping/SimulatorTimer.cpp
   opm/simulators/timestepping/SimulatorTimerInterface.cpp
+  opm/simulators/timestepping/TimeStepControl.cpp
   opm/simulators/timestepping/gatherConvergenceReport.cpp
+  opm/simulators/utils/BlackoilPhases.cpp
   opm/simulators/utils/ComponentName.cpp
-  opm/simulators/utils/compressPartition.cpp
   opm/simulators/utils/DeferredLogger.cpp
-  opm/simulators/utils/gatherDeferredLogger.cpp
   opm/simulators/utils/ParallelFileMerger.cpp
   opm/simulators/utils/ParallelRestart.cpp
   opm/simulators/utils/PartiallySupportedFlowKeywords.cpp
   opm/simulators/utils/PressureAverage.cpp
-  opm/simulators/utils/readDeck.cpp
   opm/simulators/utils/SerializationPackers.cpp
   opm/simulators/utils/UnsupportedFlowKeywords.cpp
+  opm/simulators/utils/compressPartition.cpp
+  opm/simulators/utils/gatherDeferredLogger.cpp
+  opm/simulators/utils/phaseUsageFromDeck.cpp
+  opm/simulators/utils/readDeck.cpp
+  opm/simulators/utils/satfunc/RelpermDiagnostics.cpp
   opm/simulators/wells/ALQState.cpp
   opm/simulators/wells/BlackoilWellModelConstraints.cpp
   opm/simulators/wells/BlackoilWellModelGeneric.cpp
@@ -509,10 +509,6 @@ list (APPEND PUBLIC_HEADER_FILES
   opm/simulators/flow/equil/EquilibrationHelpers_impl.hpp
   opm/simulators/flow/equil/InitStateEquil.hpp
   opm/simulators/flow/equil/InitStateEquil_impl.hpp
-  opm/core/props/BlackoilPhases.hpp
-  opm/core/props/phaseUsageFromDeck.hpp
-  opm/core/props/satfunc/RelpermDiagnostics.hpp
-  opm/simulators/timestepping/SimulatorReport.hpp
   opm/simulators/wells/SegmentState.hpp
   opm/simulators/wells/WellContainer.hpp
   opm/simulators/aquifers/AquiferAnalytical.hpp
@@ -560,23 +556,27 @@ list (APPEND PUBLIC_HEADER_FILES
   opm/simulators/timestepping/TimeStepControl.hpp
   opm/simulators/timestepping/TimeStepControlInterface.hpp
   opm/simulators/timestepping/SimulatorTimer.hpp
+  opm/simulators/timestepping/SimulatorReport.hpp
   opm/simulators/timestepping/SimulatorTimerInterface.hpp
   opm/simulators/timestepping/gatherConvergenceReport.hpp
+  opm/simulators/utils/BlackoilPhases.hpp
   opm/simulators/utils/ComponentName.hpp
-  opm/simulators/utils/compressPartition.hpp
-  opm/simulators/utils/ParallelFileMerger.hpp
-  opm/simulators/utils/DeferredLoggingErrorHelpers.hpp
   opm/simulators/utils/DeferredLogger.hpp
-  opm/simulators/utils/gatherDeferredLogger.hpp
+  opm/simulators/utils/DeferredLoggingErrorHelpers.hpp
-  opm/simulators/utils/moduleVersion.hpp
   opm/simulators/utils/ParallelEclipseState.hpp
+  opm/simulators/utils/ParallelFileMerger.hpp
   opm/simulators/utils/ParallelNLDDPartitioningZoltan.hpp
   opm/simulators/utils/ParallelRestart.hpp
+  opm/simulators/utils/PressureAverage.hpp
   opm/simulators/utils/PropsDataHandle.hpp
   opm/simulators/utils/SerializationPackers.hpp
   opm/simulators/utils/VectorVectorDataHandle.hpp
-  opm/simulators/utils/PressureAverage.hpp
+  opm/simulators/utils/compressPartition.hpp
+  opm/simulators/utils/gatherDeferredLogger.hpp
+  opm/simulators/utils/moduleVersion.hpp
+  opm/simulators/utils/phaseUsageFromDeck.hpp
   opm/simulators/utils/readDeck.hpp
+  opm/simulators/utils/satfunc/RelpermDiagnostics.hpp
   opm/simulators/wells/ALQState.hpp
   opm/simulators/wells/BlackoilWellModel.hpp
   opm/simulators/wells/BlackoilWellModel_impl.hpp

examples/printvfp.cpp

@@ -33,9 +33,9 @@
 #include <opm/simulators/wells/VFPProperties.hpp>
 #include <opm/simulators/wells/WellState.hpp>
 
-#include <opm/input/eclipse/Units/Units.hpp>
+#include <opm/simulators/utils/phaseUsageFromDeck.hpp>
 
-#include <opm/core/props/phaseUsageFromDeck.hpp>
+#include <opm/input/eclipse/Units/Units.hpp>
 
 #include <opm/input/eclipse/Deck/Deck.hpp>
 

opm/simulators/flow/BlackoilModel.hpp

@@ -30,8 +30,6 @@
 #include <opm/common/Exceptions.hpp>
 #include <opm/common/OpmLog/OpmLog.hpp>
 
-#include <opm/core/props/phaseUsageFromDeck.hpp>
-
 #include <opm/input/eclipse/EclipseState/EclipseState.hpp>
 #include <opm/input/eclipse/EclipseState/Tables/TableManager.hpp>
 
@@ -47,10 +45,13 @@
 #include <opm/simulators/timestepping/ConvergenceReport.hpp>
 #include <opm/simulators/timestepping/SimulatorReport.hpp>
 #include <opm/simulators/timestepping/SimulatorTimer.hpp>
+
+#include <opm/simulators/wells/BlackoilWellModel.hpp>
+
 #include <opm/simulators/utils/ComponentName.hpp>
 #include <opm/simulators/utils/DeferredLoggingErrorHelpers.hpp>
 #include <opm/simulators/utils/ParallelCommunication.hpp>
-#include <opm/simulators/wells/BlackoilWellModel.hpp>
+#include <opm/simulators/utils/phaseUsageFromDeck.hpp>
 
 #include <dune/common/timer.hh>
 

opm/simulators/flow/FlowProblem.hpp

@@ -36,8 +36,6 @@
 
 #include <opm/common/utility/TimeService.hpp>
 
-#include <opm/core/props/satfunc/RelpermDiagnostics.hpp>
-
 #include <opm/input/eclipse/EclipseState/EclipseState.hpp>
 #include <opm/input/eclipse/Parser/ParserKeywords/E.hpp>
 #include <opm/input/eclipse/Schedule/Schedule.hpp>
@@ -80,8 +78,10 @@
 #include <opm/simulators/flow/VtkTracerModule.hpp>
 #include <opm/simulators/timestepping/AdaptiveTimeStepping.hpp>
 #include <opm/simulators/timestepping/SimulatorReport.hpp>
+
 #include <opm/simulators/utils/DeferredLoggingErrorHelpers.hpp>
 #include <opm/simulators/utils/ParallelSerialization.hpp>
+#include <opm/simulators/utils/satfunc/RelpermDiagnostics.hpp>
 
 #include <opm/utility/CopyablePtr.hpp>
 

opm/simulators/flow/countGlobalCells.hpp

@@ -24,7 +24,7 @@
 #ifndef OPM_COUNTGLOBALCELLS_HEADER_INCLUDED
 #define OPM_COUNTGLOBALCELLS_HEADER_INCLUDED
 
-#include <opm/core/props/BlackoilPhases.hpp>
+#include <opm/simulators/utils/BlackoilPhases.hpp>
 
 #include <dune/grid/common/gridview.hh>
 

opm/simulators/timestepping/AdaptiveTimeStepping.hpp

@@ -14,8 +14,6 @@
 #include <opm/common/ErrorMacros.hpp>
 #include <opm/common/OpmLog/OpmLog.hpp>
 
-#include <opm/core/props/phaseUsageFromDeck.hpp>
-
 #include <opm/grid/utility/StopWatch.hpp>
 
 #include <opm/input/eclipse/Units/Units.hpp>
@@ -34,6 +32,8 @@
 #include <opm/simulators/timestepping/TimeStepControl.hpp>
 #include <opm/simulators/timestepping/TimeStepControlInterface.hpp>
 
+#include <opm/simulators/utils/phaseUsageFromDeck.hpp>
+
 #include <fmt/format.h>
 
 #include <algorithm>

opm/simulators/utils/BlackoilPhases.cpp

@@ -21,11 +21,11 @@
 #include "config.h"
 #endif // HAVE_CONFIG_H
 
+#include <opm/simulators/utils/BlackoilPhases.hpp>
+
 #include <algorithm>
 #include <vector>
 
-#include <opm/core/props/BlackoilPhases.hpp>
-
 Opm::PhaseUsage::PhaseUsage(std::vector<BlackoilPhases::PhaseIndex> phases)
 {
     std::sort(phases.begin(), phases.end());

opm/simulators/utils/phaseUsageFromDeck.cpp

@@ -22,7 +22,7 @@
 #include "config.h"
 #endif // HAVE_CONFIG_H
 
-#include <opm/core/props/phaseUsageFromDeck.hpp>
+#include <opm/simulators/utils/phaseUsageFromDeck.hpp>
 
 #include <opm/common/ErrorMacros.hpp>
 

opm/simulators/utils/phaseUsageFromDeck.hpp

@@ -21,7 +21,7 @@
 #ifndef OPM_PHASEUSAGEFROMDECK_HEADER_INCLUDED
 #define OPM_PHASEUSAGEFROMDECK_HEADER_INCLUDED
 
-#include <opm/core/props/BlackoilPhases.hpp>
+#include <opm/simulators/utils/BlackoilPhases.hpp>
 
 namespace Opm
 {

opm/simulators/utils/satfunc/RelpermDiagnostics.cpp

@@ -21,8 +21,8 @@
 #include "config.h"
 #endif // HAVE_CONFIG_H
 
-#include <opm/core/props/satfunc/RelpermDiagnostics.hpp>
+#include <opm/simulators/utils/satfunc/RelpermDiagnostics.hpp>
-#include <opm/core/props/phaseUsageFromDeck.hpp>
+#include <opm/simulators/utils/phaseUsageFromDeck.hpp>
 
 #include <opm/material/fluidmatrixinteractions/EclEpsGridProperties.hpp>
 #include <opm/material/fluidmatrixinteractions/EclEpsScalingPoints.hpp>
@@ -45,10 +45,12 @@
 
 #include <opm/grid/CpGrid.hpp>
 #include <opm/grid/polyhedralgrid.hh>
+
 #ifdef HAVE_DUNE_ALUGRID
 #include <dune/alugrid/grid.hh>
 #include <dune/alugrid/3d/gridview.hh>
 #endif // HAVE_DUNE_ALUGRID
+
 namespace Opm {
 
     bool RelpermDiagnostics::phaseCheck_(const EclipseState& es)

opm/simulators/wells/BlackoilWellModel_impl.hpp

@@ -27,20 +27,23 @@
 #include <opm/simulators/wells/BlackoilWellModel.hpp>
 #endif
 
-#include <opm/simulators/utils/DeferredLoggingErrorHelpers.hpp>
-#include <opm/core/props/phaseUsageFromDeck.hpp>
 #include <opm/grid/utility/cartesianToCompressed.hpp>
 
-#include <opm/input/eclipse/Units/UnitSystem.hpp>
 #include <opm/input/eclipse/Schedule/Network/Balance.hpp>
 #include <opm/input/eclipse/Schedule/Network/ExtNetwork.hpp>
 #include <opm/input/eclipse/Schedule/Well/PAvgDynamicSourceData.hpp>
 #include <opm/input/eclipse/Schedule/Well/WellTestConfig.hpp>
+
+#include <opm/input/eclipse/Units/UnitSystem.hpp>
+
 #include <opm/simulators/wells/BlackoilWellModelConstraints.hpp>
 #include <opm/simulators/wells/ParallelPAvgDynamicSourceData.hpp>
 #include <opm/simulators/wells/ParallelWBPCalculation.hpp>
 #include <opm/simulators/wells/VFPProperties.hpp>
+
+#include <opm/simulators/utils/DeferredLoggingErrorHelpers.hpp>
 #include <opm/simulators/utils/MPIPacker.hpp>
+#include <opm/simulators/utils/phaseUsageFromDeck.hpp>
 
 #if COMPILE_BDA_BRIDGE
 #include <opm/simulators/linalg/bda/WellContributions.hpp>

opm/simulators/wells/GasLiftGroupInfo.hpp

@@ -20,9 +20,10 @@
 #ifndef OPM_GASLIFT_GROUP_INFO_HEADER_INCLUDED
 #define OPM_GASLIFT_GROUP_INFO_HEADER_INCLUDED
 
-#include <opm/core/props/BlackoilPhases.hpp>
 #include <opm/simulators/wells/GasLiftCommon.hpp>
 
+#include <opm/simulators/utils/BlackoilPhases.hpp>
+
 #include <map>
 #include <optional>
 #include <string>

opm/simulators/wells/GasLiftSingleWellGeneric.hpp

@@ -20,12 +20,13 @@
 #ifndef OPM_GASLIFT_SINGLE_WELL_GENERIC_HEADER_INCLUDED
 #define OPM_GASLIFT_SINGLE_WELL_GENERIC_HEADER_INCLUDED
 
-#include <opm/core/props/BlackoilPhases.hpp>
-
 #include <opm/input/eclipse/Schedule/Well/WellProductionControls.hpp>
+
 #include <opm/simulators/wells/GasLiftGroupInfo.hpp>
 #include <opm/simulators/wells/GasLiftCommon.hpp>
 
+#include <opm/simulators/utils/BlackoilPhases.hpp>
+
 #include <optional>
 #include <set>
 #include <stdexcept>

opm/simulators/wells/GasLiftStage2.hpp

@@ -20,9 +20,10 @@
 #ifndef OPM_GASLIFT_STAGE2_HEADER_INCLUDED
 #define OPM_GASLIFT_STAGE2_HEADER_INCLUDED
 
-#include <opm/core/props/BlackoilPhases.hpp>
 #include <opm/simulators/wells/GasLiftSingleWellGeneric.hpp>
 
+#include <opm/simulators/utils/BlackoilPhases.hpp>
+
 #include <map>
 #include <memory>
 #include <optional>

opm/simulators/wells/GroupEconomicLimitsChecker.hpp

@@ -20,7 +20,8 @@
 #ifndef OPM_GROUP_ECONOMIC_LIMITS_CHECKER_HEADER_INCLUDED
 #define OPM_GROUP_ECONOMIC_LIMITS_CHECKER_HEADER_INCLUDED
 
-#include <opm/core/props/BlackoilPhases.hpp>
+#include <opm/simulators/utils/BlackoilPhases.hpp>
+
 #include <opm/input/eclipse/Schedule/Group/GroupEconProductionLimits.hpp>
 #include <opm/input/eclipse/Units/UnitSystem.hpp>
 

opm/simulators/wells/GroupState.hpp

@@ -20,15 +20,18 @@
 #ifndef OPM_GROUPSTATE_HEADER_INCLUDED
 #define OPM_GROUPSTATE_HEADER_INCLUDED
 
+#include <opm/input/eclipse/EclipseState/Phase.hpp>
+
+#include <opm/input/eclipse/Schedule/Group/GPMaint.hpp>
+#include <opm/input/eclipse/Schedule/Group/Group.hpp>
+
+#include <opm/simulators/wells/WellContainer.hpp>
+
+#include <opm/simulators/utils/BlackoilPhases.hpp>
+
 #include <map>
 #include <vector>
 
-#include <opm/core/props/BlackoilPhases.hpp>
-#include <opm/input/eclipse/Schedule/Group/Group.hpp>
-#include <opm/input/eclipse/EclipseState/Phase.hpp>
-#include <opm/input/eclipse/Schedule/Group/GPMaint.hpp>
-#include <opm/simulators/wells/WellContainer.hpp>
-
 namespace Opm {
 
 template<class Scalar>

opm/simulators/wells/MultisegmentWellAssemble.cpp

@@ -20,9 +20,8 @@
 */
 
 #include <config.h>
-#include <opm/simulators/wells/MultisegmentWellAssemble.hpp>
 
-#include <opm/core/props/BlackoilPhases.hpp>
+#include <opm/simulators/wells/MultisegmentWellAssemble.hpp>
 
 #include <opm/material/fluidsystems/BlackOilFluidSystem.hpp>
 
@@ -30,6 +29,8 @@
 #include <opm/models/blackoil/blackoilonephaseindices.hh>
 #include <opm/models/blackoil/blackoiltwophaseindices.hh>
 
+#include <opm/simulators/utils/BlackoilPhases.hpp>
+
 #include <opm/simulators/wells/MultisegmentWellEquations.hpp>
 #include <opm/simulators/wells/MultisegmentWellPrimaryVariables.hpp>
 #include <opm/simulators/wells/WellAssemble.hpp>

opm/simulators/wells/MultisegmentWellSegments.cpp

@@ -41,7 +41,7 @@
 #include <opm/simulators/wells/SegmentState.hpp>
 #include <opm/simulators/wells/WellInterfaceGeneric.hpp>
 
-#include <opm/core/props/BlackoilPhases.hpp>
+#include <opm/simulators/utils/BlackoilPhases.hpp>
 
 #include <fmt/format.h>
 

opm/simulators/wells/RateConverter.hpp

@@ -22,11 +22,12 @@
 #ifndef OPM_RATECONVERTER_HPP_HEADER_INCLUDED
 #define OPM_RATECONVERTER_HPP_HEADER_INCLUDED
 
-#include <opm/core/props/BlackoilPhases.hpp>
 #include <opm/grid/utility/RegionMapping.hpp>
-#include <opm/simulators/utils/DeferredLoggingErrorHelpers.hpp>
+
 #include <opm/simulators/wells/RegionAttributeHelpers.hpp>
 
+#include <opm/simulators/utils/BlackoilPhases.hpp>
+#include <opm/simulators/utils/DeferredLoggingErrorHelpers.hpp>
 #include <opm/simulators/utils/ParallelCommunication.hpp>
 
 #include <dune/grid/common/gridenums.hh>

opm/simulators/wells/RegionAttributeHelpers.hpp

@@ -23,10 +23,12 @@
 #ifndef OPM_REGIONATTRIBUTEHELPERS_HPP_HEADER_INCLUDED
 #define OPM_REGIONATTRIBUTEHELPERS_HPP_HEADER_INCLUDED
 
-#include <opm/core/props/BlackoilPhases.hpp>
+#include <opm/simulators/utils/BlackoilPhases.hpp>
+
 #include <opm/grid/utility/RegionMapping.hpp>
 
 #include <dune/grid/common/gridenums.hh>
+
 #include <algorithm>
 #include <memory>
 #include <stdexcept>

opm/simulators/wells/RegionAverageCalculator.hpp

@@ -20,8 +20,9 @@
 #ifndef OPM_REGIONAVERAGECALCULATOR_HPP_HEADER_INCLUDED
 #define OPM_REGIONAVERAGECALCULATOR_HPP_HEADER_INCLUDED
 
-#include <opm/core/props/BlackoilPhases.hpp>
 #include <opm/simulators/wells/RegionAttributeHelpers.hpp>
+
+#include <opm/simulators/utils/BlackoilPhases.hpp>
 #include <opm/simulators/utils/DeferredLoggingErrorHelpers.hpp>
 
 #include <dune/grid/common/gridenums.hh>

opm/simulators/wells/SingleWellState.hpp

@@ -29,7 +29,8 @@
 #include <opm/simulators/wells/SegmentState.hpp>
 #include <opm/simulators/wells/PerfData.hpp>
 #include <opm/simulators/wells/ParallelWellInfo.hpp>
-#include <opm/core/props/BlackoilPhases.hpp>
+
+#include <opm/simulators/utils/BlackoilPhases.hpp>
 
 namespace Opm {
 

opm/simulators/wells/StandardWellAssemble.cpp

@@ -22,8 +22,6 @@
 #include <config.h>
 #include <opm/simulators/wells/StandardWellAssemble.hpp>
 
-#include <opm/core/props/BlackoilPhases.hpp>
-
 #include <opm/material/densead/Evaluation.hpp>
 #include <opm/material/fluidsystems/BlackOilFluidSystem.hpp>
 
@@ -38,6 +36,8 @@
 #include <opm/simulators/wells/WellInterfaceFluidSystem.hpp>
 #include <opm/simulators/wells/WellState.hpp>
 
+#include <opm/simulators/utils/BlackoilPhases.hpp>
+
 namespace Opm {
 
 //! \brief Class administering assembler access to equation system.

opm/simulators/wells/StandardWellConnections.cpp

@@ -20,9 +20,8 @@
 */
 
 #include <config.h>
-#include <opm/simulators/wells/StandardWellConnections.hpp>
 
-#include <opm/core/props/BlackoilPhases.hpp>
+#include <opm/simulators/wells/StandardWellConnections.hpp>
 
 #include <opm/material/fluidsystems/BlackOilFluidSystem.hpp>
 
@@ -30,7 +29,9 @@
 #include <opm/models/blackoil/blackoilonephaseindices.hh>
 #include <opm/models/blackoil/blackoiltwophaseindices.hh>
 
+#include <opm/simulators/utils/BlackoilPhases.hpp>
 #include <opm/simulators/utils/DeferredLoggingErrorHelpers.hpp>
+
 #include <opm/simulators/wells/ParallelWellInfo.hpp>
 #include <opm/simulators/wells/WellInterfaceIndices.hpp>
 #include <opm/simulators/wells/WellState.hpp>

opm/simulators/wells/WGState.cpp

@@ -21,9 +21,10 @@
 #include "config.h"
 #endif // HAVE_CONFIG_H
 
-#include <opm/core/props/BlackoilPhases.hpp>
 #include <opm/simulators/wells/WGState.hpp>
 
+#include <opm/simulators/utils/BlackoilPhases.hpp>
+
 namespace Opm {
 
 template<class Scalar>

opm/simulators/wells/WellAssemble.hpp

@@ -24,7 +24,7 @@
 #ifndef OPM_WELL_ASSEMBLE_HEADER_INCLUDED
 #define OPM_WELL_ASSEMBLE_HEADER_INCLUDED
 
-#include <opm/core/props/BlackoilPhases.hpp>
+#include <opm/simulators/utils/BlackoilPhases.hpp>
 
 #include <opm/input/eclipse/Schedule/ScheduleTypes.hpp>
 #include <opm/input/eclipse/Schedule/Well/WellEnums.hpp>

opm/simulators/wells/WellBhpThpCalculator.cpp

@@ -20,12 +20,11 @@
 */
 
 #include <config.h>
+
 #include <opm/simulators/wells/WellBhpThpCalculator.hpp>
 
 #include <opm/common/utility/numeric/RootFinders.hpp>
 
-#include <opm/core/props/BlackoilPhases.hpp>
-
 #include <opm/input/eclipse/Schedule/VFPInjTable.hpp>
 #include <opm/input/eclipse/Schedule/Well/Well.hpp>
 #include <opm/input/eclipse/Units/Units.hpp>
@@ -33,6 +32,7 @@
 
 #include <opm/material/densead/Evaluation.hpp>
 
+#include <opm/simulators/utils/BlackoilPhases.hpp>
 #include <opm/simulators/utils/DeferredLoggingErrorHelpers.hpp>
 
 #include <opm/simulators/wells/VFPProperties.hpp>

opm/simulators/wells/WellConstraints.cpp

@@ -20,12 +20,12 @@
 */
 
 #include <config.h>
+
 #include <opm/simulators/wells/WellConstraints.hpp>
 
 #include <opm/input/eclipse/Schedule/Well/WVFPEXP.hpp>
 
-#include <opm/core/props/BlackoilPhases.hpp>
+#include <opm/simulators/utils/BlackoilPhases.hpp>
-
 #include <opm/simulators/utils/DeferredLogger.hpp>
 
 #include <opm/simulators/wells/SingleWellState.hpp>

opm/simulators/wells/WellGroupConstraints.cpp

@@ -20,9 +20,8 @@
 */
 
 #include <config.h>
-#include <opm/simulators/wells/WellGroupConstraints.hpp>
 
-#include <opm/core/props/BlackoilPhases.hpp>
+#include <opm/simulators/wells/WellGroupConstraints.hpp>
 
 #include <opm/input/eclipse/Schedule/Schedule.hpp>
 
@@ -30,6 +29,8 @@
 #include <opm/simulators/wells/WellInterfaceGeneric.hpp>
 #include <opm/simulators/wells/WellState.hpp>
 
+#include <opm/simulators/utils/BlackoilPhases.hpp>
+
 namespace Opm
 {
 

opm/simulators/wells/WellInterface.hpp

@@ -37,8 +37,6 @@ namespace Opm {
 
 #include <opm/input/eclipse/Schedule/Well/WellTestState.hpp>
 
-#include <opm/core/props/BlackoilPhases.hpp>
-
 #include <opm/simulators/flow/BlackoilModelParameters.hpp>
 
 #include <opm/simulators/wells/BlackoilWellModel.hpp>
@@ -52,6 +50,7 @@ namespace Opm {
 
 #include <opm/simulators/timestepping/ConvergenceReport.hpp>
 
+#include <opm/simulators/utils/BlackoilPhases.hpp>
 #include <opm/simulators/utils/DeferredLogger.hpp>
 
 #include <dune/common/fmatrix.hh>

opm/simulators/wells/WellInterfaceFluidSystem.hpp

@@ -25,9 +25,12 @@
 #define OPM_WELLINTERFACE_FLUID_SYSTEM_HEADER_INCLUDED
 
 #include <opm/simulators/wells/WellInterfaceGeneric.hpp>
-#include <opm/core/props/BlackoilPhases.hpp>
+
+#include <opm/simulators/utils/BlackoilPhases.hpp>
 
 #include <limits>
+#include <optional>
+#include <vector>
 
 namespace Opm
 {

opm/simulators/wells/WellState.hpp

@@ -24,15 +24,12 @@
 #include <dune/common/version.hh>
 #include <dune/common/parallel/mpihelper.hh>
 
-#include <opm/core/props/BlackoilPhases.hpp>
-
 #include <opm/common/ErrorMacros.hpp>
 
 #include <opm/input/eclipse/Schedule/Events.hpp>
 
 #include <opm/output/data/Wells.hpp>
 
-#include <opm/simulators/utils/ParallelCommunication.hpp>
 #include <opm/simulators/wells/ALQState.hpp>
 #include <opm/simulators/wells/GlobalWellInfo.hpp>
 #include <opm/simulators/wells/PerfData.hpp>
@@ -40,6 +37,9 @@
 #include <opm/simulators/wells/SingleWellState.hpp>
 #include <opm/simulators/wells/WellContainer.hpp>
 
+#include <opm/simulators/utils/BlackoilPhases.hpp>
+#include <opm/simulators/utils/ParallelCommunication.hpp>
+
 #include <functional>
 #include <map>
 #include <optional>

tests/test_relpermdiagnostics.cpp

@@ -23,8 +23,10 @@
 
 #define BOOST_TEST_MODULE RelpermDiagnostics
 
+#include <opm/simulators/utils/satfunc/RelpermDiagnostics.hpp>
 
 #include <opm/common/utility/platform_dependent/disable_warnings.h>
+
 #include <boost/test/unit_test.hpp>
 #include <boost/version.hpp>
 #if BOOST_VERSION / 100000 == 1 && BOOST_VERSION / 100 % 1000 < 71
@@ -32,19 +34,22 @@
 #else
 #include <boost/test/tools/floating_point_comparison.hpp>
 #endif
+
 #include <opm/common/utility/platform_dependent/reenable_warnings.h>
+
 #include <opm/common/OpmLog/OpmLog.hpp>
 #include <opm/common/OpmLog/CounterLog.hpp>
 
 #include <opm/grid/CpGrid.hpp>
 #include <dune/grid/common/mcmgmapper.hh>
 
-#include <opm/core/props/satfunc/RelpermDiagnostics.hpp>
-#include <opm/input/eclipse/Parser/Parser.hpp>
-#include <opm/input/eclipse/Deck/Deck.hpp>
 #include <opm/input/eclipse/EclipseState/EclipseState.hpp>
 #include <opm/input/eclipse/EclipseState/Tables/TableManager.hpp>
 
+#include <opm/input/eclipse/Deck/Deck.hpp>
+
+#include <opm/input/eclipse/Parser/Parser.hpp>
+
 #if HAVE_DUNE_FEM
 #include <dune/fem/misc/mpimanager.hh>
 #else

tests/test_wellstate.cpp

@@ -39,6 +39,7 @@
 #include <opm/input/eclipse/Schedule/UDQ/UDQParams.hpp>
 #include <opm/input/eclipse/Schedule/Well/Well.hpp>
 #include <opm/input/eclipse/Schedule/Well/WellConnections.hpp>
+
 #include <opm/simulators/wells/GlobalWellInfo.hpp>
 #include <opm/simulators/wells/ParallelWellInfo.hpp>
 #include <opm/simulators/wells/PerfData.hpp>
@@ -48,14 +49,14 @@
 #include <opm/simulators/wells/WellContainer.hpp>
 #include <opm/simulators/wells/WellState.hpp>
 
+#include <opm/simulators/utils/BlackoilPhases.hpp>
+#include <opm/simulators/utils/phaseUsageFromDeck.hpp>
+
 #include <opm/input/eclipse/Units/Units.hpp>
 
 #include <opm/grid/GridHelpers.hpp>
 #include <opm/grid/GridManager.hpp>
 
-#include <opm/core/props/BlackoilPhases.hpp>
-#include <opm/core/props/phaseUsageFromDeck.hpp>
-
 #include <opm/input/eclipse/Deck/Deck.hpp>
 
 #include <opm/input/eclipse/Parser/Parser.hpp>