Move files out of opm/core/simulator.

CMakeLists_files.cmake

@@ -26,7 +26,7 @@ list (APPEND MAIN_SOURCE_FILES
   ebos/nncsorter.cpp
   opm/core/props/rock/RockFromDeck.cpp
   opm/core/props/satfunc/RelpermDiagnostics.cpp
-  opm/core/simulator/SimulatorReport.cpp
+  opm/simulators/timestepping/SimulatorReport.cpp
   opm/core/wells/InjectionSpecification.cpp
   opm/core/wells/ProductionSpecification.cpp
   opm/core/wells/WellCollection.cpp
@@ -134,8 +134,8 @@ list (APPEND PUBLIC_HEADER_FILES
   opm/core/props/rock/RockFromDeck.hpp
   opm/core/props/satfunc/RelpermDiagnostics.hpp
   opm/core/props/satfunc/RelpermDiagnostics_impl.hpp
-  opm/core/simulator/SimulatorReport.hpp
-  opm/core/simulator/WellState.hpp
+  opm/simulators/timestepping/SimulatorReport.hpp
+  opm/simulators/wells/WellState.hpp
   opm/core/well_controls.h
   opm/core/wells.h
   opm/core/wells/InjectionSpecification.hpp

opm/simulators/flow/BlackoilModelEbos.hpp

@@ -37,7 +37,7 @@
 #include <opm/simulators/flow/countGlobalCells.hpp>
 
 #include <opm/grid/UnstructuredGrid.h>
-#include <opm/core/simulator/SimulatorReport.hpp>
+#include <opm/simulators/timestepping/SimulatorReport.hpp>
 #include <opm/simulators/linalg/ParallelIstlInformation.hpp>
 #include <opm/core/props/phaseUsageFromDeck.hpp>
 #include <opm/common/ErrorMacros.hpp>

opm/simulators/flow/NonlinearSolverEbos.hpp

@@ -21,7 +21,7 @@
 #ifndef OPM_NON_LINEAR_SOLVER_EBOS_HPP
 #define OPM_NON_LINEAR_SOLVER_EBOS_HPP
 
-#include <opm/core/simulator/SimulatorReport.hpp>
+#include <opm/simulators/timestepping/SimulatorReport.hpp>
 #include <opm/common/utility/parameters/ParameterGroup.hpp>
 #include <opm/common/ErrorMacros.hpp>
 #include <opm/common/Exceptions.hpp>

opm/simulators/timestepping/AdaptiveTimeSteppingEbos.hpp

@@ -6,7 +6,7 @@
 #include <iostream>
 #include <utility>
 
-#include <opm/core/simulator/SimulatorReport.hpp>
+#include <opm/simulators/timestepping/SimulatorReport.hpp>
 #include <opm/grid/utility/StopWatch.hpp>
 #include <opm/common/OpmLog/OpmLog.hpp>
 #include <opm/common/utility/parameters/ParameterGroup.hpp>

opm/simulators/timestepping/SimulatorReport.cpp

@@ -19,7 +19,7 @@
 
 #include "config.h"
 
-#include <opm/core/simulator/SimulatorReport.hpp>
+#include <opm/simulators/timestepping/SimulatorReport.hpp>
 
 #include <iomanip>
 #include <ostream>

opm/simulators/wells/BlackoilWellModel.hpp

@@ -38,7 +38,7 @@
 
 #include <opm/core/wells.h>
 #include <opm/core/wells/WellCollection.hpp>
-#include <opm/core/simulator/SimulatorReport.hpp>
+#include <opm/simulators/timestepping/SimulatorReport.hpp>
 #include <opm/simulators/wells/VFPInjProperties.hpp>
 #include <opm/simulators/wells/VFPProdProperties.hpp>
 #include <opm/simulators/flow/countGlobalCells.hpp>

opm/simulators/wells/WellInterface.hpp

@@ -36,7 +36,7 @@
 #include <opm/core/well_controls.h>
 #include <opm/core/props/BlackoilPhases.hpp>
 #include <opm/core/wells/WellsManager.hpp>
-#include <opm/core/simulator/SimulatorReport.hpp>
+#include <opm/simulators/timestepping/SimulatorReport.hpp>
 
 #include <opm/simulators/wells/RateConverter.hpp>
 #include <opm/simulators/wells/VFPProperties.hpp>

opm/simulators/wells/WellStateFullyImplicitBlackoil.hpp

@@ -23,7 +23,7 @@
 
 #include <opm/core/wells.h>
 #include <opm/core/well_controls.h>
-#include <opm/core/simulator/WellState.hpp>
+#include <opm/simulators/wells/WellState.hpp>
 #include <opm/core/props/BlackoilPhases.hpp>
 
 #include <opm/parser/eclipse/EclipseState/Schedule/Schedule.hpp>

tests/test_stoppedwells.cpp

@@ -28,7 +28,7 @@
 #include <opm/core/wells/WellsManager.hpp>
 #include <opm/core/wells.h>
 #include <opm/core/well_controls.h>
-#include <opm/core/simulator/WellState.hpp>
+#include <opm/simulators/wells/WellState.hpp>
 #include <opm/grid/GridManager.hpp>