Moved files to opm/simulators/ subdirs.

CMakeLists_files.cmake

@@ -23,11 +23,7 @@
 # originally generated with the command:
 # find opm -name '*.c*' -printf '\t%p\n' | sort
 list (APPEND MAIN_SOURCE_FILES
-  opm/autodiff/ExtractParallelGridInformationToISTL.cpp
-  opm/autodiff/moduleVersion.cpp
   opm/autodiff/MPIUtilities.cpp
-  opm/autodiff/VFPProdProperties.cpp
-  opm/autodiff/VFPInjProperties.cpp
   opm/autodiff/MissingFeatures.cpp
   opm/core/props/rock/RockFromDeck.cpp
   opm/core/props/satfunc/RelpermDiagnostics.cpp
@@ -39,12 +35,16 @@ list (APPEND MAIN_SOURCE_FILES
   opm/core/wells/WellsManager.cpp
   opm/core/wells/well_controls.c
   opm/core/wells/wells.c
-  opm/simulators/DeferredLogger.cpp
+  opm/simulators/linalg/ExtractParallelGridInformationToISTL.cpp
   opm/simulators/timestepping/TimeStepControl.cpp
   opm/simulators/timestepping/AdaptiveSimulatorTimer.cpp
   opm/simulators/timestepping/SimulatorTimer.cpp
   opm/simulators/timestepping/gatherConvergenceReport.cpp
-  opm/simulators/gatherDeferredLogger.cpp
+  opm/simulators/utils/DeferredLogger.cpp
+  opm/simulators/utils/gatherDeferredLogger.cpp
+  opm/simulators/utils/moduleVersion.cpp
+  opm/simulators/wells/VFPProdProperties.cpp
+  opm/simulators/wells/VFPInjProperties.cpp
   )
 
 # originally generated with the command:
@@ -114,55 +114,19 @@ list (APPEND TEST_DATA_FILES
 # originally generated with the command:
 # find opm -name '*.h*' -a ! -name '*-pch.hpp' -printf '\t%p\n' | sort
 list (APPEND PUBLIC_HEADER_FILES
-  opm/autodiff/AquiferInterface.hpp
-  opm/autodiff/AquiferCarterTracy.hpp
-  opm/autodiff/AquiferFetkovich.hpp
-  opm/autodiff/BlackoilAmg.hpp
-  opm/autodiff/BlackoilAmgCpr.hpp
-  opm/autodiff/amgcpr.hh
-  opm/autodiff/twolevelmethodcpr.hh
   opm/autodiff/BlackoilDetails.hpp
+  opm/autodiff/BlackoilModelEbos.hpp
   opm/autodiff/BlackoilModelParametersEbos.hpp
-  opm/autodiff/BlackoilAquiferModel.hpp
-  opm/autodiff/BlackoilAquiferModel_impl.hpp
-  opm/autodiff/CPRPreconditioner.hpp
   opm/autodiff/createGlobalCellArray.hpp
-  opm/autodiff/ExtractParallelGridInformationToISTL.hpp
-  opm/autodiff/FlowLinearSolverParameters.hpp
   opm/autodiff/FlowMainEbos.hpp
-  opm/autodiff/GraphColoring.hpp
-  opm/autodiff/ISTLSolverEbos.hpp
-  opm/autodiff/ISTLSolverEbosCpr.hpp
+  opm/autodiff/GridInit.hpp
   opm/autodiff/IterationReport.hpp
-  opm/autodiff/MatrixBlock.hpp
-  opm/autodiff/moduleVersion.hpp
   opm/autodiff/MPIUtilities.hpp
   opm/autodiff/NonlinearSolverEbos.hpp
-  opm/autodiff/ParallelOverlappingILU0.hpp
-  opm/autodiff/ParallelRestrictedAdditiveSchwarz.hpp
   opm/autodiff/RateConverter.hpp
   opm/autodiff/SimFIBODetails.hpp
   opm/autodiff/SimulatorFullyImplicitBlackoilEbos.hpp
-  opm/autodiff/WellConnectionAuxiliaryModule.hpp
-  opm/autodiff/WellStateFullyImplicitBlackoil.hpp
-  opm/autodiff/VFPProperties.hpp
-  opm/autodiff/VFPHelpers.hpp
-  opm/autodiff/VFPInjProperties.hpp
-  opm/autodiff/VFPProdProperties.hpp
-  opm/autodiff/WellHelpers.hpp
-  opm/autodiff/WellInterface.hpp
-  opm/autodiff/WellInterface_impl.hpp
-  opm/autodiff/StandardWell.hpp
-  opm/autodiff/StandardWell_impl.hpp
-  opm/autodiff/MultisegmentWell.hpp
-  opm/autodiff/MultisegmentWell_impl.hpp
-  opm/autodiff/StandardWellV.hpp
-  opm/autodiff/StandardWellV_impl.hpp
-  opm/autodiff/MSWellHelpers.hpp
-  opm/autodiff/BlackoilWellModel.hpp
-  opm/autodiff/BlackoilWellModel_impl.hpp
   opm/autodiff/MissingFeatures.hpp
-  opm/core/linalg/ParallelIstlInformation.hpp
   opm/core/props/BlackoilPhases.hpp
   opm/core/props/phaseUsageFromDeck.hpp
   opm/core/props/rock/RockFromDeck.hpp
@@ -178,9 +142,25 @@ list (APPEND PUBLIC_HEADER_FILES
   opm/core/wells/WellsGroup.hpp
   opm/core/wells/WellsManager.hpp
   opm/core/wells/WellsManager_impl.hpp
-  opm/simulators/ParallelFileMerger.hpp
-  opm/simulators/DeferredLoggingErrorHelpers.hpp
-  opm/simulators/DeferredLogger.hpp
+  opm/simulators/aquifers/AquiferInterface.hpp
+  opm/simulators/aquifers/AquiferCarterTracy.hpp
+  opm/simulators/aquifers/AquiferFetkovich.hpp
+  opm/simulators/aquifers/BlackoilAquiferModel.hpp
+  opm/simulators/aquifers/BlackoilAquiferModel_impl.hpp
+  opm/simulators/linalg/BlackoilAmg.hpp
+  opm/simulators/linalg/BlackoilAmgCpr.hpp
+  opm/simulators/linalg/amgcpr.hh
+  opm/simulators/linalg/twolevelmethodcpr.hh
+  opm/simulators/linalg/CPRPreconditioner.hpp
+  opm/simulators/linalg/ExtractParallelGridInformationToISTL.hpp
+  opm/simulators/linalg/FlowLinearSolverParameters.hpp
+  opm/simulators/linalg/GraphColoring.hpp
+  opm/simulators/linalg/ISTLSolverEbos.hpp
+  opm/simulators/linalg/ISTLSolverEbosCpr.hpp
+  opm/simulators/linalg/MatrixBlock.hpp
+  opm/simulators/linalg/ParallelOverlappingILU0.hpp
+  opm/simulators/linalg/ParallelRestrictedAdditiveSchwarz.hpp
+  opm/simulators/linalg/ParallelIstlInformation.hpp
   opm/simulators/timestepping/AdaptiveSimulatorTimer.hpp
   opm/simulators/timestepping/AdaptiveTimeSteppingEbos.hpp
   opm/simulators/timestepping/ConvergenceReport.hpp
@@ -189,5 +169,27 @@ list (APPEND PUBLIC_HEADER_FILES
   opm/simulators/timestepping/SimulatorTimer.hpp
   opm/simulators/timestepping/SimulatorTimerInterface.hpp
   opm/simulators/timestepping/gatherConvergenceReport.hpp
-  opm/simulators/gatherDeferredLogger.hpp
+  opm/simulators/utils/ParallelFileMerger.hpp
+  opm/simulators/utils/DeferredLoggingErrorHelpers.hpp
+  opm/simulators/utils/DeferredLogger.hpp
+  opm/simulators/utils/gatherDeferredLogger.hpp
+  opm/simulators/utils/moduleVersion.hpp
+  opm/simulators/wells/WellConnectionAuxiliaryModule.hpp
+  opm/simulators/wells/WellStateFullyImplicitBlackoil.hpp
+  opm/simulators/wells/VFPProperties.hpp
+  opm/simulators/wells/VFPHelpers.hpp
+  opm/simulators/wells/VFPInjProperties.hpp
+  opm/simulators/wells/VFPProdProperties.hpp
+  opm/simulators/wells/WellHelpers.hpp
+  opm/simulators/wells/WellInterface.hpp
+  opm/simulators/wells/WellInterface_impl.hpp
+  opm/simulators/wells/StandardWell.hpp
+  opm/simulators/wells/StandardWell_impl.hpp
+  opm/simulators/wells/MultisegmentWell.hpp
+  opm/simulators/wells/MultisegmentWell_impl.hpp
+  opm/simulators/wells/StandardWellV.hpp
+  opm/simulators/wells/StandardWellV_impl.hpp
+  opm/simulators/wells/MSWellHelpers.hpp
+  opm/simulators/wells/BlackoilWellModel.hpp
+  opm/simulators/wells/BlackoilWellModel_impl.hpp
   )

ebos/ebos.hh

@@ -30,9 +30,9 @@
 
 #include "eclproblem.hh"
 
-#include <opm/autodiff/BlackoilWellModel.hpp>
-#include <opm/autodiff/BlackoilAquiferModel.hpp>
-#include <opm/autodiff/ISTLSolverEbos.hpp>
+#include <opm/simulators/wells/BlackoilWellModel.hpp>
+#include <opm/simulators/aquifers/BlackoilAquiferModel.hpp>
+#include <opm/simulators/linalg/ISTLSolverEbos.hpp>
 
 #include <ewoms/common/start.hh>
 

flow/flow.cpp

@@ -31,7 +31,7 @@
 
 #include <opm/autodiff/SimulatorFullyImplicitBlackoilEbos.hpp>
 #include <opm/autodiff/FlowMainEbos.hpp>
-#include <opm/autodiff/moduleVersion.hpp>
+#include <opm/simulators/utils/moduleVersion.hpp>
 #include <ewoms/common/propertysystem.hh>
 #include <ewoms/common/parametersystem.hh>
 #include <opm/autodiff/MissingFeatures.hpp>

flow/flow_blackoil_dunecpr.cpp

@@ -21,7 +21,7 @@
 #include "config.h"
 #include "flow/flow_tag.hpp"
 //#include <opm/linearsolvers/amgclsolverbackend.hh>
-#include  <opm/autodiff/ISTLSolverEbosCpr.hpp>
+#include  <opm/simulators/linalg/ISTLSolverEbosCpr.hpp>
 //#include <ewoms/linear/superlubackend.hh>
 
 BEGIN_PROPERTIES

opm/autodiff/BlackoilDetails.hpp

@@ -24,7 +24,7 @@
 #ifndef OPM_BLACKOILDETAILS_HEADER_INCLUDED
 #define OPM_BLACKOILDETAILS_HEADER_INCLUDED
 
-#include <opm/core/linalg/ParallelIstlInformation.hpp>
+#include <opm/simulators/linalg/ParallelIstlInformation.hpp>
 #include <opm/core/props/BlackoilPhases.hpp>
 
 namespace Opm {

opm/autodiff/BlackoilModelEbos.hpp

@@ -31,14 +31,14 @@
 
 #include <opm/autodiff/NonlinearSolverEbos.hpp>
 #include <opm/autodiff/BlackoilModelParametersEbos.hpp>
-#include <opm/autodiff/BlackoilWellModel.hpp>
-#include <opm/autodiff/BlackoilAquiferModel.hpp>
-#include <opm/autodiff/WellConnectionAuxiliaryModule.hpp>
+#include <opm/simulators/wells/BlackoilWellModel.hpp>
+#include <opm/simulators/aquifers/BlackoilAquiferModel.hpp>
+#include <opm/simulators/wells/WellConnectionAuxiliaryModule.hpp>
 #include <opm/autodiff/BlackoilDetails.hpp>
 
 #include <opm/grid/UnstructuredGrid.h>
 #include <opm/core/simulator/SimulatorReport.hpp>
-#include <opm/core/linalg/ParallelIstlInformation.hpp>
+#include <opm/simulators/linalg/ParallelIstlInformation.hpp>
 #include <opm/core/props/phaseUsageFromDeck.hpp>
 #include <opm/common/ErrorMacros.hpp>
 #include <opm/common/Exceptions.hpp>
@@ -49,7 +49,7 @@
 #include <opm/parser/eclipse/EclipseState/EclipseState.hpp>
 #include <opm/parser/eclipse/EclipseState/Tables/TableManager.hpp>
 
-#include <opm/autodiff/ISTLSolverEbos.hpp>
+#include <opm/simulators/linalg/ISTLSolverEbos.hpp>
 #include <opm/common/data/SimulationDataContainer.hpp>
 
 #include <dune/istl/owneroverlapcopy.hh>

opm/autodiff/FlowMainEbos.hpp

@@ -25,12 +25,12 @@
 
 #include <sys/utsname.h>
 
-#include <opm/simulators/ParallelFileMerger.hpp>
+#include <opm/simulators/utils/ParallelFileMerger.hpp>
 
 #include <opm/autodiff/BlackoilModelEbos.hpp>
 #include <opm/autodiff/MissingFeatures.hpp>
-#include <opm/autodiff/moduleVersion.hpp>
-#include <opm/autodiff/ExtractParallelGridInformationToISTL.hpp>
+#include <opm/simulators/utils/moduleVersion.hpp>
+#include <opm/simulators/linalg/ExtractParallelGridInformationToISTL.hpp>
 #include <opm/autodiff/SimulatorFullyImplicitBlackoilEbos.hpp>
 
 #include <opm/core/props/satfunc/RelpermDiagnostics.hpp>
@@ -382,7 +382,7 @@ namespace Opm
         void printPRTHeader()
         {
           if (output_cout_) {
-              const std::string version = moduleVersionName();
+              const std::string version = moduleVersion();
               const double megabyte = 1024 * 1024;
               unsigned num_cpu = std::thread::hardware_concurrency();
               struct utsname arch;

opm/autodiff/MPIUtilities.cpp

@@ -20,7 +20,7 @@
 
 #include <config.h>
 #include <boost/any.hpp>
-#include <opm/core/linalg/ParallelIstlInformation.hpp>
+#include <opm/simulators/linalg/ParallelIstlInformation.hpp>
 
 namespace Opm
 {

opm/autodiff/RateConverter.hpp

@@ -24,7 +24,7 @@
 
 #include <opm/core/props/BlackoilPhases.hpp>
 #include <opm/grid/utility/RegionMapping.hpp>
-#include <opm/core/linalg/ParallelIstlInformation.hpp>
+#include <opm/simulators/linalg/ParallelIstlInformation.hpp>
 
 #include <dune/grid/common/gridenums.hh>
 #include <algorithm>

opm/autodiff/SimulatorFullyImplicitBlackoilEbos.hpp

@@ -22,13 +22,12 @@
 #ifndef OPM_SIMULATORFULLYIMPLICITBLACKOILEBOS_HEADER_INCLUDED
 #define OPM_SIMULATORFULLYIMPLICITBLACKOILEBOS_HEADER_INCLUDED
 
-#include <opm/autodiff/IterationReport.hpp>
 #include <opm/autodiff/NonlinearSolverEbos.hpp>
 #include <opm/autodiff/BlackoilModelEbos.hpp>
 #include <opm/autodiff/BlackoilModelParametersEbos.hpp>
-#include <opm/autodiff/WellStateFullyImplicitBlackoil.hpp>
-#include <opm/autodiff/BlackoilAquiferModel.hpp>
-#include <opm/autodiff/moduleVersion.hpp>
+#include <opm/simulators/wells/WellStateFullyImplicitBlackoil.hpp>
+#include <opm/simulators/aquifers/BlackoilAquiferModel.hpp>
+#include <opm/simulators/utils/moduleVersion.hpp>
 #include <opm/simulators/timestepping/AdaptiveTimeSteppingEbos.hpp>
 #include <opm/grid/utility/StopWatch.hpp>
 

opm/simulators/aquifers/AquiferCarterTracy.hpp

@@ -21,7 +21,7 @@
 #ifndef OPM_AQUIFERCT_HEADER_INCLUDED
 #define OPM_AQUIFERCT_HEADER_INCLUDED
 
-#include <opm/autodiff/AquiferInterface.hpp>
+#include <opm/simulators/aquifers/AquiferInterface.hpp>
 
 namespace Opm
 {

opm/simulators/aquifers/AquiferFetkovich.hpp

@@ -21,7 +21,7 @@ along with OPM.  If not, see <http://www.gnu.org/licenses/>.
 #ifndef OPM_AQUIFETP_HEADER_INCLUDED
 #define OPM_AQUIFETP_HEADER_INCLUDED
 
-#include <opm/autodiff/AquiferInterface.hpp>
+#include <opm/simulators/aquifers/AquiferInterface.hpp>
 
 namespace Opm
 {

opm/simulators/aquifers/AquiferInterface.hpp

@@ -25,7 +25,6 @@
 #include <opm/parser/eclipse/EclipseState/AquiferCT.hpp>
 #include <opm/parser/eclipse/EclipseState/Aquifetp.hpp>
 #include <opm/parser/eclipse/EclipseState/Aquancon.hpp>
-#include <opm/autodiff/BlackoilAquiferModel.hpp>
 #include <opm/common/utility/numeric/linearInterpolation.hpp>
 
 #include <opm/material/common/MathToolbox.hpp>

opm/simulators/aquifers/BlackoilAquiferModel.hpp

@@ -30,8 +30,8 @@
 #include <opm/parser/eclipse/EclipseState/Aquifetp.hpp>
 #include <opm/parser/eclipse/EclipseState/Aquancon.hpp>
 #include <opm/simulators/timestepping/SimulatorTimer.hpp>
-#include <opm/autodiff/AquiferCarterTracy.hpp>
-#include <opm/autodiff/AquiferFetkovich.hpp>
+#include <opm/simulators/aquifers/AquiferCarterTracy.hpp>
+#include <opm/simulators/aquifers/AquiferFetkovich.hpp>
 #include <opm/material/densead/Math.hpp>
 
 namespace Opm {

opm/simulators/linalg/BlackoilAmg.hpp

@@ -20,11 +20,11 @@
 #define OPM_AMG_HEADER_INCLUDED
 
 #include <ewoms/linear/matrixblock.hh>
-#include <opm/autodiff/ParallelOverlappingILU0.hpp>
-#include <opm/autodiff/FlowLinearSolverParameters.hpp>
-#include <opm/autodiff/CPRPreconditioner.hpp>
-#include <opm/autodiff/amgcpr.hh>
-#include <opm/autodiff/twolevelmethodcpr.hh>
+#include <opm/simulators/linalg/ParallelOverlappingILU0.hpp>
+#include <opm/simulators/linalg/FlowLinearSolverParameters.hpp>
+#include <opm/simulators/linalg/CPRPreconditioner.hpp>
+#include <opm/simulators/linalg/amgcpr.hh>
+#include <opm/simulators/linalg/twolevelmethodcpr.hh>
 #include <dune/istl/paamg/twolevelmethod.hh>
 #include <dune/istl/paamg/aggregates.hh>
 #include <dune/istl/bvector.hh>

opm/simulators/linalg/BlackoilAmgCpr.hpp

@@ -19,12 +19,12 @@
 #ifndef OPM_AMGCPR_HEADER_INCLUDED
 #define OPM_AMGCPR_HEADER_INCLUDED
 
-#include <opm/autodiff/twolevelmethodcpr.hh>
+#include <opm/simulators/linalg/twolevelmethodcpr.hh>
 #include <ewoms/linear/matrixblock.hh>
-#include <opm/autodiff/ParallelOverlappingILU0.hpp>
-#include <opm/autodiff/FlowLinearSolverParameters.hpp>
-#include <opm/autodiff/CPRPreconditioner.hpp>
-#include <opm/autodiff/amgcpr.hh>
+#include <opm/simulators/linalg/ParallelOverlappingILU0.hpp>
+#include <opm/simulators/linalg/FlowLinearSolverParameters.hpp>
+#include <opm/simulators/linalg/CPRPreconditioner.hpp>
+#include <opm/simulators/linalg/amgcpr.hh>
 #include <dune/istl/paamg/twolevelmethod.hh>
 #include <dune/istl/paamg/aggregates.hh>
 #include <dune/istl/bvector.hh>

opm/simulators/linalg/CPRPreconditioner.hpp

@@ -29,8 +29,8 @@
 
 #include <opm/common/utility/platform_dependent/disable_warnings.h>
 #include <opm/common/utility/parameters/ParameterGroup.hpp>
-#include <opm/autodiff/ParallelOverlappingILU0.hpp>
-#include <opm/autodiff/FlowLinearSolverParameters.hpp>
+#include <opm/simulators/linalg/ParallelOverlappingILU0.hpp>
+#include <opm/simulators/linalg/FlowLinearSolverParameters.hpp>
 
 #include <dune/istl/bvector.hh>
 #include <dune/istl/bcrsmatrix.hh>
@@ -49,8 +49,8 @@
 #include <opm/common/ErrorMacros.hpp>
 #include <opm/common/Exceptions.hpp>
 
-#include <opm/autodiff/ParallelRestrictedAdditiveSchwarz.hpp>
-#include <opm/autodiff/ParallelOverlappingILU0.hpp>
+#include <opm/simulators/linalg/ParallelRestrictedAdditiveSchwarz.hpp>
+#include <opm/simulators/linalg/ParallelOverlappingILU0.hpp>
 namespace Opm
 {
 

opm/simulators/linalg/ExtractParallelGridInformationToISTL.cpp

@@ -19,7 +19,7 @@
 */
 #include <config.h>
 #include "ExtractParallelGridInformationToISTL.hpp"
-#include <opm/core/linalg/ParallelIstlInformation.hpp>
+#include <opm/simulators/linalg/ParallelIstlInformation.hpp>
 #include <dune/common/version.hh>
 #include <dune/common/shared_ptr.hh>
  namespace Opm

opm/simulators/linalg/FlowLinearSolverParameters.hpp

@@ -25,7 +25,7 @@
 #define OPM_FLOWLINEARSOLVERPARAMETERS_HEADER_INCLUDED
 
 #include <opm/common/utility/parameters/ParameterGroup.hpp>
-#include <opm/autodiff/ParallelOverlappingILU0.hpp>
+#include <opm/simulators/linalg/ParallelOverlappingILU0.hpp>
 
 #include <ewoms/common/parametersystem.hh>
 

opm/simulators/linalg/ISTLSolverEbos.hpp

@@ -21,16 +21,16 @@
 #ifndef OPM_ISTLSOLVER_EBOS_HEADER_INCLUDED
 #define OPM_ISTLSOLVER_EBOS_HEADER_INCLUDED
 
-#include <opm/autodiff/MatrixBlock.hpp>
-#include <opm/autodiff/BlackoilAmg.hpp>
-#include <opm/autodiff/CPRPreconditioner.hpp>
+#include <opm/simulators/linalg/MatrixBlock.hpp>
+#include <opm/simulators/linalg/BlackoilAmg.hpp>
+#include <opm/simulators/linalg/CPRPreconditioner.hpp>
 #include <opm/autodiff/MPIUtilities.hpp>
-#include <opm/autodiff/ParallelRestrictedAdditiveSchwarz.hpp>
-#include <opm/autodiff/ParallelOverlappingILU0.hpp>
-#include <opm/autodiff/ExtractParallelGridInformationToISTL.hpp>
+#include <opm/simulators/linalg/ParallelRestrictedAdditiveSchwarz.hpp>
+#include <opm/simulators/linalg/ParallelOverlappingILU0.hpp>
+#include <opm/simulators/linalg/ExtractParallelGridInformationToISTL.hpp>
 #include <opm/autodiff/BlackoilDetails.hpp>
 #include <opm/common/Exceptions.hpp>
-#include <opm/core/linalg/ParallelIstlInformation.hpp>
+#include <opm/simulators/linalg/ParallelIstlInformation.hpp>
 #include <opm/common/utility/platform_dependent/disable_warnings.h>
 #include <opm/material/fluidsystems/BlackOilDefaultIndexTraits.hpp>
 

opm/simulators/linalg/ISTLSolverEbosCpr.hpp

@@ -20,8 +20,8 @@
 #ifndef OPM_ISTLSOLVERCPR_EBOS_HEADER_INCLUDED
 #define OPM_ISTLSOLVERCPR_EBOS_HEADER_INCLUDED
 
-#include <opm/autodiff/ISTLSolverEbos.hpp>
-#include <opm/autodiff/BlackoilAmgCpr.hpp>
+#include <opm/simulators/linalg/ISTLSolverEbos.hpp>
+#include <opm/simulators/linalg/BlackoilAmgCpr.hpp>
 #include <utility>
 #include <memory>
 

opm/simulators/linalg/ParallelOverlappingILU0.hpp

@@ -20,7 +20,7 @@
 #ifndef OPM_PARALLELOVERLAPPINGILU0_HEADER_INCLUDED
 #define OPM_PARALLELOVERLAPPINGILU0_HEADER_INCLUDED
 
-#include <opm/autodiff/GraphColoring.hpp>
+#include <opm/simulators/linalg/GraphColoring.hpp>
 #include <opm/common/Exceptions.hpp>
 #include <opm/common/ErrorMacros.hpp>
 #include <dune/common/version.hh>

opm/simulators/utils/DeferredLogger.cpp

@@ -18,7 +18,7 @@
 */
 
 
-#include <opm/simulators/DeferredLogger.hpp>
+#include <opm/simulators/utils/DeferredLogger.hpp>
 
 namespace Opm
 {

opm/simulators/utils/DeferredLoggingErrorHelpers.hpp

@@ -21,7 +21,7 @@
 #ifndef OPM_DEFERREDLOGGINGERRORHELPERS_HPP
 #define OPM_DEFERREDLOGGINGERRORHELPERS_HPP
 
-#include <opm/simulators/DeferredLogger.hpp>
+#include <opm/simulators/utils/DeferredLogger.hpp>
 
 #include <dune/common/version.hh>
 #include <dune/common/parallel/mpihelper.hh>

opm/simulators/utils/gatherDeferredLogger.cpp

@@ -20,7 +20,7 @@
 
 #include "config.h"
 
-#include <opm/simulators/gatherDeferredLogger.hpp>
+#include <opm/simulators/utils/gatherDeferredLogger.hpp>
 
 #if HAVE_MPI
 

opm/simulators/utils/gatherDeferredLogger.hpp

@@ -21,7 +21,7 @@
 #ifndef OPM_GATHERDEFERREDLOGGER_HEADER_INCLUDED
 #define OPM_GATHERDEFERREDLOGGER_HEADER_INCLUDED
 
-#include <opm/simulators/DeferredLogger.hpp>
+#include <opm/simulators/utils/DeferredLogger.hpp>
 
 namespace Opm
 {

opm/simulators/utils/moduleVersion.cpp

@@ -17,7 +17,7 @@
   along with OPM.  If not, see <http://www.gnu.org/licenses/>.
 */
 
-#include <opm/autodiff/moduleVersion.hpp>
+#include <opm/simulators/utils/moduleVersion.hpp>
 #include "project-version.h"
 
 namespace Opm

opm/simulators/wells/BlackoilWellModel.hpp

@@ -39,24 +39,24 @@
 #include <opm/core/wells.h>
 #include <opm/core/wells/WellCollection.hpp>
 #include <opm/core/simulator/SimulatorReport.hpp>
-#include <opm/autodiff/VFPInjProperties.hpp>
-#include <opm/autodiff/VFPProdProperties.hpp>
+#include <opm/simulators/wells/VFPInjProperties.hpp>
+#include <opm/simulators/wells/VFPProdProperties.hpp>
 #include <opm/autodiff/BlackoilDetails.hpp>
-#include <opm/autodiff/WellStateFullyImplicitBlackoil.hpp>
+#include <opm/simulators/wells/WellStateFullyImplicitBlackoil.hpp>
 #include <opm/autodiff/RateConverter.hpp>
-#include <opm/autodiff/WellInterface.hpp>
-#include <opm/autodiff/StandardWell.hpp>
-#include <opm/autodiff/StandardWellV.hpp>
-#include <opm/autodiff/MultisegmentWell.hpp>
+#include <opm/simulators/wells/WellInterface.hpp>
+#include <opm/simulators/wells/StandardWell.hpp>
+#include <opm/simulators/wells/StandardWellV.hpp>
+#include <opm/simulators/wells/MultisegmentWell.hpp>
 #include <opm/simulators/timestepping/gatherConvergenceReport.hpp>
-#include<opm/autodiff/SimFIBODetails.hpp>
-#include<dune/common/fmatrix.hh>
-#include<dune/istl/bcrsmatrix.hh>
-#include<dune/istl/matrixmatrix.hh>
+#include <opm/autodiff/SimFIBODetails.hpp>
+#include <dune/common/fmatrix.hh>
+#include <dune/istl/bcrsmatrix.hh>
+#include <dune/istl/matrixmatrix.hh>
 
 #include <opm/material/densead/Math.hpp>
 
-#include <opm/simulators/DeferredLogger.hpp>
+#include <opm/simulators/utils/DeferredLogger.hpp>
 
 BEGIN_PROPERTIES
 

opm/simulators/wells/BlackoilWellModel_impl.hpp

@@ -20,7 +20,7 @@
  along with OPM.  If not, see <http://www.gnu.org/licenses/>.
 */
 
-#include <opm/simulators/DeferredLoggingErrorHelpers.hpp>
+#include <opm/simulators/utils/DeferredLoggingErrorHelpers.hpp>
 
 namespace Opm {
     template<typename TypeTag>

opm/simulators/wells/MSWellHelpers.hpp

@@ -22,8 +22,8 @@
 #ifndef OPM_MSWELLHELPERS_HEADER_INCLUDED
 #define OPM_MSWELLHELPERS_HEADER_INCLUDED
 
-#include <opm/simulators/DeferredLoggingErrorHelpers.hpp>
-#include <opm/simulators/DeferredLogger.hpp>
+#include <opm/simulators/utils/DeferredLoggingErrorHelpers.hpp>
+#include <opm/simulators/utils/DeferredLogger.hpp>
 #include <opm/common/ErrorMacros.hpp>
 #include <dune/istl/solvers.hh>
 #if HAVE_UMFPACK

opm/simulators/wells/MultisegmentWell.hpp

@@ -23,7 +23,7 @@
 #define OPM_MULTISEGMENTWELL_HEADER_INCLUDED
 
 
-#include <opm/autodiff/WellInterface.hpp>
+#include <opm/simulators/wells/WellInterface.hpp>
 
 namespace Opm
 {

opm/simulators/wells/MultisegmentWell_impl.hpp

@@ -19,8 +19,8 @@
 */
 
 
-#include <opm/autodiff/MSWellHelpers.hpp>
-#include <opm/simulators/DeferredLoggingErrorHelpers.hpp>
+#include <opm/simulators/wells/MSWellHelpers.hpp>
+#include <opm/simulators/utils/DeferredLoggingErrorHelpers.hpp>
 
 namespace Opm
 {

opm/simulators/wells/StandardWell.hpp

@@ -24,8 +24,8 @@
 #define OPM_STANDARDWELL_HEADER_INCLUDED
 
 
-#include <opm/autodiff/WellInterface.hpp>
-#include <opm/autodiff/ISTLSolverEbos.hpp>
+#include <opm/simulators/wells/WellInterface.hpp>
+#include <opm/simulators/linalg/ISTLSolverEbos.hpp>
 #include <opm/autodiff/RateConverter.hpp>
 
 namespace Opm

opm/simulators/wells/StandardWellV.hpp

@@ -24,8 +24,8 @@
 #define OPM_STANDARDWELLV_HEADER_INCLUDED
 
 
-#include <opm/autodiff/WellInterface.hpp>
-#include <opm/autodiff/ISTLSolverEbos.hpp>
+#include <opm/simulators/wells/WellInterface.hpp>
+#include <opm/simulators/linalg/ISTLSolverEbos.hpp>
 #include <opm/autodiff/RateConverter.hpp>
 
 #include <opm/material/densead/DynamicEvaluation.hpp>

opm/simulators/wells/StandardWellV_impl.hpp

@@ -19,7 +19,7 @@
   along with OPM.  If not, see <http://www.gnu.org/licenses/>.
 */
 
-#include <opm/simulators/DeferredLoggingErrorHelpers.hpp>
+#include <opm/simulators/utils/DeferredLoggingErrorHelpers.hpp>
 
 namespace Opm
 {

opm/simulators/wells/StandardWell_impl.hpp

@@ -19,7 +19,7 @@
   along with OPM.  If not, see <http://www.gnu.org/licenses/>.
 */
 
-#include <opm/simulators/DeferredLoggingErrorHelpers.hpp>
+#include <opm/simulators/utils/DeferredLoggingErrorHelpers.hpp>
 
 namespace Opm
 {

opm/simulators/wells/VFPInjProperties.cpp

@@ -23,11 +23,11 @@
 
 #include "config.h"
 
-#include <opm/autodiff/VFPInjProperties.hpp>
+#include <opm/simulators/wells/VFPInjProperties.hpp>
 #include <opm/core/props/BlackoilPhases.hpp>
 #include <opm/common/ErrorMacros.hpp>
 
-#include <opm/autodiff/VFPHelpers.hpp>
+#include <opm/simulators/wells/VFPHelpers.hpp>
 
 namespace Opm {
 

opm/simulators/wells/VFPInjProperties.hpp

@@ -24,7 +24,7 @@
 #include <opm/core/wells.h>
 #include <opm/material/densead/Math.hpp>
 #include <opm/material/densead/Evaluation.hpp>
-#include <opm/autodiff/VFPHelpers.hpp>
+#include <opm/simulators/wells/VFPHelpers.hpp>
 
 #include <vector>
 #include <map>

opm/simulators/wells/VFPProdProperties.cpp

@@ -19,12 +19,12 @@
 
 #include "config.h"
 
-#include <opm/autodiff/VFPProdProperties.hpp>
+#include <opm/simulators/wells/VFPProdProperties.hpp>
 #include <opm/core/props/BlackoilPhases.hpp>
 #include <opm/common/ErrorMacros.hpp>
 #include <opm/material/densead/Math.hpp>
 #include <opm/material/densead/Evaluation.hpp>
-#include <opm/autodiff/VFPHelpers.hpp>
+#include <opm/simulators/wells/VFPHelpers.hpp>
 
 
 

opm/simulators/wells/VFPProdProperties.hpp

@@ -24,7 +24,7 @@
 #include <opm/core/wells.h>
 #include <opm/material/densead/Math.hpp>
 #include <opm/material/densead/Evaluation.hpp>
-#include <opm/autodiff/VFPHelpers.hpp>
+#include <opm/simulators/wells/VFPHelpers.hpp>
 
 #include <vector>
 #include <map>

opm/simulators/wells/WellInterface.hpp

@@ -38,14 +38,14 @@
 #include <opm/core/wells/WellsManager.hpp>
 #include <opm/core/simulator/SimulatorReport.hpp>
 
-#include <opm/autodiff/VFPProperties.hpp>
-#include <opm/autodiff/WellHelpers.hpp>
-#include <opm/autodiff/WellStateFullyImplicitBlackoil.hpp>
+#include <opm/simulators/wells/VFPProperties.hpp>
+#include <opm/simulators/wells/WellHelpers.hpp>
+#include <opm/simulators/wells/WellStateFullyImplicitBlackoil.hpp>
 #include <opm/autodiff/BlackoilModelParametersEbos.hpp>
 #include <opm/autodiff/RateConverter.hpp>
 
 #include <opm/simulators/timestepping/ConvergenceReport.hpp>
-#include <opm/simulators/DeferredLogger.hpp>
+#include <opm/simulators/utils/DeferredLogger.hpp>
 
 #include <ewoms/models/blackoil/blackoilpolymermodules.hh>
 #include <ewoms/models/blackoil/blackoilsolventmodules.hh>

opm/simulators/wells/WellInterface_impl.hpp

@@ -19,7 +19,7 @@
   along with OPM.  If not, see <http://www.gnu.org/licenses/>.
 */
 
-#include <opm/simulators/DeferredLoggingErrorHelpers.hpp>
+#include <opm/simulators/utils/DeferredLoggingErrorHelpers.hpp>
 
 namespace Opm
 {

tests/test_blackoil_amg.cpp

@@ -21,7 +21,7 @@
 #define BOOST_TEST_MODULE BlackoilAmgTest
 #define BOOST_TEST_NO_MAIN
 #include <boost/test/unit_test.hpp>
-#include <opm/autodiff/BlackoilAmg.hpp>
+#include <opm/simulators/linalg/BlackoilAmg.hpp>
 
 #include <dune/common/parallel/mpihelper.hh>
 #include <dune/common/fmatrix.hh>

tests/test_deferredlogger.cpp

@@ -24,7 +24,7 @@
 
 #include <boost/test/unit_test.hpp>
 
-#include "opm/simulators/DeferredLogger.hpp"
+#include <opm/simulators/utils/DeferredLogger.hpp>
 
 #include <opm/common/OpmLog/OpmLog.hpp>
 #include <opm/common/OpmLog/LogBackend.hpp>

tests/test_gatherdeferredlogger.cpp

@@ -25,7 +25,7 @@
 
 #include <boost/test/unit_test.hpp>
 
-#include <opm/simulators/gatherDeferredLogger.hpp>
+#include <opm/simulators/utils/gatherDeferredLogger.hpp>
 #include <dune/common/parallel/mpihelper.hh>
 
 #include <opm/common/OpmLog/OpmLog.hpp>

tests/test_graphcoloring.cpp

@@ -4,7 +4,7 @@
 #include <dune/istl/bcrsmatrix.hh>
 #include <dune/istl/paamg/graph.hh>
 
-#include <opm/autodiff/GraphColoring.hpp>
+#include <opm/simulators/linalg/GraphColoring.hpp>
 
 #define BOOST_TEST_MODULE GraphColoringTest
 #define BOOST_TEST_MAIN

tests/test_invert.cpp

@@ -21,7 +21,7 @@
 
 #define BOOST_TEST_MODULE InvertSpecializationTest
 #include <boost/test/unit_test.hpp>
-#include <opm/autodiff/MatrixBlock.hpp>
+#include <opm/simulators/linalg/MatrixBlock.hpp>
 
 
 void checkIdentity(Dune::FieldMatrix<double, 4, 4> M) {

tests/test_milu.cpp

@@ -9,7 +9,7 @@
 #include<dune/istl/bvector.hh>
 #include<dune/common/fmatrix.hh>
 #include<dune/common/fvector.hh>
-#include<opm/autodiff/ParallelOverlappingILU0.hpp>
+#include<opm/simulators/linalg/ParallelOverlappingILU0.hpp>
 
 #include <boost/test/unit_test.hpp>
 #include <boost/test/floating_point_comparison.hpp>

tests/test_multmatrixtransposed.cpp

@@ -21,7 +21,7 @@
 
 #define BOOST_TEST_MODULE MultMatrixTransposed
 #include <boost/test/unit_test.hpp>
-#include <opm/autodiff/MatrixBlock.hpp>
+#include <opm/simulators/linalg/MatrixBlock.hpp>
 
 using namespace Dune;
 using namespace Opm::Detail;

tests/test_parallelistlinformation.cpp

@@ -26,7 +26,7 @@
 #define BOOST_TEST_MODULE OPM-ParallelIstlInformation
 #include <boost/test/unit_test.hpp>
 #include "DuneIstlTestHelpers.hpp"
-#include <opm/core/linalg/ParallelIstlInformation.hpp>
+#include <opm/simulators/linalg/ParallelIstlInformation.hpp>
 #include <functional>
 #ifdef HAVE_DUNE_ISTL
 

tests/test_vfpproperties.cpp

@@ -41,8 +41,8 @@
 #include <opm/parser/eclipse/EclipseState/Schedule/VFPProdTable.hpp>
 #include <opm/parser/eclipse/Units/UnitSystem.hpp>
 
-#include <opm/autodiff/VFPHelpers.hpp>
-#include <opm/autodiff/VFPProdProperties.hpp>
+#include <opm/simulators/wells/VFPHelpers.hpp>
+#include <opm/simulators/wells/VFPProdProperties.hpp>
 
 
 

tests/test_wellmodel.cpp

@@ -49,8 +49,8 @@
 #include <ebos/eclproblem.hh>
 #include <ewoms/common/start.hh>
 
-#include <opm/autodiff/StandardWell.hpp>
-#include <opm/autodiff/BlackoilWellModel.hpp>
+#include <opm/simulators/wells/StandardWell.hpp>
+#include <opm/simulators/wells/BlackoilWellModel.hpp>
 
 #if HAVE_DUNE_FEM
 #include <dune/fem/misc/mpimanager.hh>

tests/test_wellstatefullyimplicitblackoil.cpp

@@ -21,7 +21,7 @@
 
 #define BOOST_TEST_MODULE WellStateFIBOTest
 
-#include <opm/autodiff/WellStateFullyImplicitBlackoil.hpp>
+#include <opm/simulators/wells/WellStateFullyImplicitBlackoil.hpp>
 
 #include <boost/test/unit_test.hpp>