Moved Flow-related classes and files to opm/simulators/flow.

2025-02-25 18:55:30 -06:00 · 2019-06-20 09:09:19 +02:00 · 2019-06-20 09:09:19 +02:00 · a33cfbf0bc
commit a33cfbf0bc
parent c4e0bc2385
23 changed files with 52 additions and 47 deletions
--- a/CMakeLists_files.cmake
+++ b/CMakeLists_files.cmake
@ -25,7 +25,6 @@
 list (APPEND MAIN_SOURCE_FILES
  ebos/nncsorter.cpp
  opm/autodiff/MPIUtilities.cpp
-  opm/autodiff/MissingFeatures.cpp
  opm/core/props/rock/RockFromDeck.cpp
  opm/core/props/satfunc/RelpermDiagnostics.cpp
  opm/core/simulator/SimulatorReport.cpp
@ -36,6 +35,7 @@ list (APPEND MAIN_SOURCE_FILES
  opm/core/wells/WellsManager.cpp
  opm/core/wells/well_controls.c
  opm/core/wells/wells.c
+  opm/simulators/flow/MissingFeatures.cpp
  opm/simulators/linalg/ExtractParallelGridInformationToISTL.cpp
  opm/simulators/linalg/setupPropertyTree.cpp
  opm/simulators/timestepping/TimeStepControl.cpp
@ -124,18 +124,17 @@ list (APPEND TEST_DATA_FILES
 # find opm -name '*.h*' -a ! -name '*-pch.hpp' -printf '\t%p\n' | sort
 list (APPEND PUBLIC_HEADER_FILES
  opm/autodiff/BlackoilDetails.hpp
-  opm/autodiff/BlackoilModelEbos.hpp
-  opm/autodiff/BlackoilModelParametersEbos.hpp
+  opm/simulators/flow/BlackoilModelEbos.hpp
+  opm/simulators/flow/BlackoilModelParametersEbos.hpp
  opm/autodiff/createGlobalCellArray.hpp
-  opm/autodiff/FlowMainEbos.hpp
+  opm/simulators/flow/FlowMainEbos.hpp
  opm/autodiff/GridInit.hpp
  opm/autodiff/IterationReport.hpp
  opm/autodiff/MPIUtilities.hpp
-  opm/autodiff/NonlinearSolverEbos.hpp
-  opm/autodiff/RateConverter.hpp
+  opm/simulators/flow/NonlinearSolverEbos.hpp
  opm/autodiff/SimFIBODetails.hpp
-  opm/autodiff/SimulatorFullyImplicitBlackoilEbos.hpp
-  opm/autodiff/MissingFeatures.hpp
+  opm/simulators/flow/SimulatorFullyImplicitBlackoilEbos.hpp
+  opm/simulators/flow/MissingFeatures.hpp
  opm/core/props/BlackoilPhases.hpp
  opm/core/props/phaseUsageFromDeck.hpp
  opm/core/props/rock/RockFromDeck.hpp
@ -194,6 +193,7 @@ list (APPEND PUBLIC_HEADER_FILES
  opm/simulators/utils/DeferredLogger.hpp
  opm/simulators/utils/gatherDeferredLogger.hpp
  opm/simulators/utils/moduleVersion.hpp
+  opm/simulators/wells/RateConverter.hpp
  opm/simulators/wells/WellConnectionAuxiliaryModule.hpp
  opm/simulators/wells/WellStateFullyImplicitBlackoil.hpp
  opm/simulators/wells/VFPProperties.hpp
--- a/flow/flow.cpp
+++ b/flow/flow.cpp
@ -29,12 +29,12 @@
 #include <flow/flow_ebos_oilwater_polymer.hpp>
 #include <flow/flow_ebos_oilwater_polymer_injectivity.hpp>

-#include <opm/autodiff/SimulatorFullyImplicitBlackoilEbos.hpp>
-#include <opm/autodiff/FlowMainEbos.hpp>
+#include <opm/simulators/flow/SimulatorFullyImplicitBlackoilEbos.hpp>
+#include <opm/simulators/flow/FlowMainEbos.hpp>
 #include <opm/simulators/utils/moduleVersion.hpp>
 #include <ewoms/common/propertysystem.hh>
 #include <ewoms/common/parametersystem.hh>
-#include <opm/autodiff/MissingFeatures.hpp>
+#include <opm/simulators/flow/MissingFeatures.hpp>
 #include <opm/material/common/ResetLocale.hpp>

 #include <opm/parser/eclipse/Deck/Deck.hpp>
--- a/flow/flow_ebos_blackoil.cpp
+++ b/flow/flow_ebos_blackoil.cpp
@ -23,8 +23,8 @@

 #include <opm/material/common/ResetLocale.hpp>
 #include <opm/grid/CpGrid.hpp>
-#include <opm/autodiff/SimulatorFullyImplicitBlackoilEbos.hpp>
-#include <opm/autodiff/FlowMainEbos.hpp>
+#include <opm/simulators/flow/SimulatorFullyImplicitBlackoilEbos.hpp>
+#include <opm/simulators/flow/FlowMainEbos.hpp>

 #if HAVE_DUNE_FEM
 #include <dune/fem/misc/mpimanager.hh>
--- a/flow/flow_ebos_energy.cpp
+++ b/flow/flow_ebos_energy.cpp
@ -20,8 +20,8 @@

 #include <opm/material/common/ResetLocale.hpp>
 #include <opm/grid/CpGrid.hpp>
-#include <opm/autodiff/SimulatorFullyImplicitBlackoilEbos.hpp>
-#include <opm/autodiff/FlowMainEbos.hpp>
+#include <opm/simulators/flow/SimulatorFullyImplicitBlackoilEbos.hpp>
+#include <opm/simulators/flow/FlowMainEbos.hpp>

 #if HAVE_DUNE_FEM
 #include <dune/fem/misc/mpimanager.hh>
--- a/flow/flow_ebos_gasoil.cpp
+++ b/flow/flow_ebos_gasoil.cpp
@ -25,8 +25,8 @@
 #include <ewoms/models/blackoil/blackoiltwophaseindices.hh>

 #include <opm/grid/CpGrid.hpp>
-#include <opm/autodiff/SimulatorFullyImplicitBlackoilEbos.hpp>
-#include <opm/autodiff/FlowMainEbos.hpp>
+#include <opm/simulators/flow/SimulatorFullyImplicitBlackoilEbos.hpp>
+#include <opm/simulators/flow/FlowMainEbos.hpp>

 #if HAVE_DUNE_FEM
 #include <dune/fem/misc/mpimanager.hh>
--- a/flow/flow_ebos_oilwater.cpp
+++ b/flow/flow_ebos_oilwater.cpp
@ -25,8 +25,8 @@
 #include <ewoms/models/blackoil/blackoiltwophaseindices.hh>

 #include <opm/grid/CpGrid.hpp>
-#include <opm/autodiff/SimulatorFullyImplicitBlackoilEbos.hpp>
-#include <opm/autodiff/FlowMainEbos.hpp>
+#include <opm/simulators/flow/SimulatorFullyImplicitBlackoilEbos.hpp>
+#include <opm/simulators/flow/FlowMainEbos.hpp>

 #if HAVE_DUNE_FEM
 #include <dune/fem/misc/mpimanager.hh>
--- a/flow/flow_ebos_oilwater_polymer.cpp
+++ b/flow/flow_ebos_oilwater_polymer.cpp
@ -25,8 +25,8 @@
 #include <ewoms/models/blackoil/blackoiltwophaseindices.hh>

 #include <opm/grid/CpGrid.hpp>
-#include <opm/autodiff/SimulatorFullyImplicitBlackoilEbos.hpp>
-#include <opm/autodiff/FlowMainEbos.hpp>
+#include <opm/simulators/flow/SimulatorFullyImplicitBlackoilEbos.hpp>
+#include <opm/simulators/flow/FlowMainEbos.hpp>

 #if HAVE_DUNE_FEM
 #include <dune/fem/misc/mpimanager.hh>
--- a/flow/flow_ebos_oilwater_polymer_injectivity.cpp
+++ b/flow/flow_ebos_oilwater_polymer_injectivity.cpp
@ -25,8 +25,8 @@
 #include <ewoms/models/blackoil/blackoiltwophaseindices.hh>

 #include <opm/grid/CpGrid.hpp>
-#include <opm/autodiff/SimulatorFullyImplicitBlackoilEbos.hpp>
-#include <opm/autodiff/FlowMainEbos.hpp>
+#include <opm/simulators/flow/SimulatorFullyImplicitBlackoilEbos.hpp>
+#include <opm/simulators/flow/FlowMainEbos.hpp>

 #if HAVE_DUNE_FEM
 #include <dune/fem/misc/mpimanager.hh>
--- a/flow/flow_ebos_polymer.cpp
+++ b/flow/flow_ebos_polymer.cpp
@ -20,8 +20,8 @@

 #include <opm/material/common/ResetLocale.hpp>
 #include <opm/grid/CpGrid.hpp>
-#include <opm/autodiff/SimulatorFullyImplicitBlackoilEbos.hpp>
-#include <opm/autodiff/FlowMainEbos.hpp>
+#include <opm/simulators/flow/SimulatorFullyImplicitBlackoilEbos.hpp>
+#include <opm/simulators/flow/FlowMainEbos.hpp>

 #if HAVE_DUNE_FEM
 #include <dune/fem/misc/mpimanager.hh>
--- a/flow/flow_ebos_solvent.cpp
+++ b/flow/flow_ebos_solvent.cpp
@ -20,8 +20,8 @@

 #include <opm/material/common/ResetLocale.hpp>
 #include <opm/grid/CpGrid.hpp>
-#include <opm/autodiff/SimulatorFullyImplicitBlackoilEbos.hpp>
-#include <opm/autodiff/FlowMainEbos.hpp>
+#include <opm/simulators/flow/SimulatorFullyImplicitBlackoilEbos.hpp>
+#include <opm/simulators/flow/FlowMainEbos.hpp>

 #if HAVE_DUNE_FEM
 #include <dune/fem/misc/mpimanager.hh>
--- a/flow/flow_tag.hpp
+++ b/flow/flow_tag.hpp
@ -20,11 +20,12 @@
 */
 #ifndef FLOW_TAG_HPP
 #define FLOW_TAG_HPP
-#include <opm/autodiff/SimulatorFullyImplicitBlackoilEbos.hpp>
-#include <opm/autodiff/FlowMainEbos.hpp>
+
+#include <opm/simulators/flow/FlowMainEbos.hpp>
+#include <opm/simulators/flow/MissingFeatures.hpp>
+#include <opm/simulators/flow/SimulatorFullyImplicitBlackoilEbos.hpp>
 #include <ewoms/common/propertysystem.hh>
 #include <ewoms/common/parametersystem.hh>
-#include <opm/autodiff/MissingFeatures.hpp>
 #include <opm/common/utility/parameters/ParameterGroup.hpp>
 #include <opm/material/common/ResetLocale.hpp>

--- a/opm/simulators/flow/BlackoilModelEbos.hpp
+++ b/opm/simulators/flow/BlackoilModelEbos.hpp
@ -29,8 +29,8 @@

 #include <opm/simulators/timestepping/AdaptiveTimeSteppingEbos.hpp>

-#include <opm/autodiff/NonlinearSolverEbos.hpp>
-#include <opm/autodiff/BlackoilModelParametersEbos.hpp>
+#include <opm/simulators/flow/NonlinearSolverEbos.hpp>
+#include <opm/simulators/flow/BlackoilModelParametersEbos.hpp>
 #include <opm/simulators/wells/BlackoilWellModel.hpp>
 #include <opm/simulators/aquifers/BlackoilAquiferModel.hpp>
 #include <opm/simulators/wells/WellConnectionAuxiliaryModule.hpp>
--- a/opm/simulators/flow/BlackoilModelParametersEbos.hpp
+++ b/opm/simulators/flow/BlackoilModelParametersEbos.hpp
--- a/opm/simulators/flow/FlowMainEbos.hpp
+++ b/opm/simulators/flow/FlowMainEbos.hpp
@ -25,13 +25,12 @@

 #include <sys/utsname.h>

+#include <opm/simulators/flow/BlackoilModelEbos.hpp>
+#include <opm/simulators/flow/MissingFeatures.hpp>
+#include <opm/simulators/flow/SimulatorFullyImplicitBlackoilEbos.hpp>
 #include <opm/simulators/utils/ParallelFileMerger.hpp>
-
-#include <opm/autodiff/BlackoilModelEbos.hpp>
-#include <opm/autodiff/MissingFeatures.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>

--- a/opm/simulators/flow/MissingFeatures.cpp
+++ b/opm/simulators/flow/MissingFeatures.cpp
@ -16,6 +16,9 @@
  You should have received a copy of the GNU General Public License
  along with OPM.  If not, see <http://www.gnu.org/licenses/>.
 */
+
+#include <opm/simulators/flow/MissingFeatures.hpp>
+
 #include <opm/common/OpmLog/OpmLog.hpp>

 #include <opm/parser/eclipse/Deck/DeckKeyword.hpp>
@ -26,8 +29,6 @@
 #include <opm/parser/eclipse/Parser/ParserKeywords/E.hpp>
 #include <opm/parser/eclipse/Parser/ParserKeywords/P.hpp>

-#include <opm/autodiff/MissingFeatures.hpp>
-
 #include <unordered_set>
 #include <string>
 #include <map>
--- a/opm/simulators/flow/MissingFeatures.hpp
+++ b/opm/simulators/flow/MissingFeatures.hpp
@ -20,6 +20,10 @@
 #ifndef OPM_MISSINGFEATURES_HEADER_INCLUDED
 #define OPM_MISSINGFEATURES_HEADER_INCLUDED

+#include <opm/parser/eclipse/Deck/Deck.hpp>
+
+#include <string>
+#include <map>

 namespace Opm {

--- a/opm/simulators/flow/NonlinearSolverEbos.hpp
+++ b/opm/simulators/flow/NonlinearSolverEbos.hpp
--- a/opm/simulators/flow/SimulatorFullyImplicitBlackoilEbos.hpp
+++ b/opm/simulators/flow/SimulatorFullyImplicitBlackoilEbos.hpp
@ -22,9 +22,9 @@
 #ifndef OPM_SIMULATORFULLYIMPLICITBLACKOILEBOS_HEADER_INCLUDED
 #define OPM_SIMULATORFULLYIMPLICITBLACKOILEBOS_HEADER_INCLUDED

-#include <opm/autodiff/NonlinearSolverEbos.hpp>
-#include <opm/autodiff/BlackoilModelEbos.hpp>
-#include <opm/autodiff/BlackoilModelParametersEbos.hpp>
+#include <opm/simulators/flow/NonlinearSolverEbos.hpp>
+#include <opm/simulators/flow/BlackoilModelEbos.hpp>
+#include <opm/simulators/flow/BlackoilModelParametersEbos.hpp>
 #include <opm/simulators/wells/WellStateFullyImplicitBlackoil.hpp>
 #include <opm/simulators/aquifers/BlackoilAquiferModel.hpp>
 #include <opm/simulators/utils/moduleVersion.hpp>
--- a/opm/simulators/wells/BlackoilWellModel.hpp
+++ b/opm/simulators/wells/BlackoilWellModel.hpp
@ -43,7 +43,7 @@
 #include <opm/simulators/wells/VFPProdProperties.hpp>
 #include <opm/autodiff/BlackoilDetails.hpp>
 #include <opm/simulators/wells/WellStateFullyImplicitBlackoil.hpp>
-#include <opm/autodiff/RateConverter.hpp>
+#include <opm/simulators/wells/RateConverter.hpp>
 #include <opm/simulators/wells/WellInterface.hpp>
 #include <opm/simulators/wells/StandardWell.hpp>
 #include <opm/simulators/wells/MultisegmentWell.hpp>
--- a/opm/simulators/wells/RateConverter.hpp
+++ b/opm/simulators/wells/RateConverter.hpp
--- a/opm/simulators/wells/StandardWell.hpp
+++ b/opm/simulators/wells/StandardWell.hpp
@ -24,9 +24,9 @@
 #define OPM_STANDARDWELL_HEADER_INCLUDED


+#include <opm/simulators/wells/RateConverter.hpp>
 #include <opm/simulators/wells/WellInterface.hpp>
 #include <opm/simulators/linalg/ISTLSolverEbos.hpp>
-#include <opm/autodiff/RateConverter.hpp>

 #include <opm/material/densead/DynamicEvaluation.hpp>

--- a/opm/simulators/wells/WellInterface.hpp
+++ b/opm/simulators/wells/WellInterface.hpp
@ -38,11 +38,11 @@
 #include <opm/core/wells/WellsManager.hpp>
 #include <opm/core/simulator/SimulatorReport.hpp>

+#include <opm/simulators/wells/RateConverter.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/flow/BlackoilModelParametersEbos.hpp>

 #include <opm/simulators/timestepping/ConvergenceReport.hpp>
 #include <opm/simulators/utils/DeferredLogger.hpp>
--- a/tests/test_wellmodel.cpp
+++ b/tests/test_wellmodel.cpp
@ -41,8 +41,8 @@

 #include <opm/material/fluidmatrixinteractions/EclMaterialLawManager.hpp>
 #include <opm/grid/GridHelpers.hpp>
-#include <opm/autodiff/FlowMainEbos.hpp>
-#include <opm/autodiff/BlackoilModelEbos.hpp>
+#include <opm/simulators/flow/FlowMainEbos.hpp>
+#include <opm/simulators/flow/BlackoilModelEbos.hpp>
 #include <opm/autodiff/createGlobalCellArray.hpp>
 #include <opm/autodiff/GridInit.hpp>