move ebos/eclequilinitializer.hh to opm/simulators/flow

CMakeLists_files.cmake

@@ -27,8 +27,6 @@ list (APPEND MAIN_SOURCE_FILES
   ebos/eclgenericproblem.cc
   ebos/eclgenericvanguard.cc
   ebos/ecltransmissibility.cc
-  ebos/equil/equilibrationhelpers.cc
-  ebos/equil/initstateequil.cc
   opm/core/props/BlackoilPhases.cpp
   opm/core/props/phaseUsageFromDeck.cpp
   opm/core/props/satfunc/RelpermDiagnostics.cpp
@@ -56,6 +54,8 @@ list (APPEND MAIN_SOURCE_FILES
   opm/simulators/flow/SimulatorSerializer.cpp
   opm/simulators/flow/SolutionContainers.cpp
   opm/simulators/flow/ValidationFunctions.cpp
+  opm/simulators/flow/equil/EquilibrationHelpers.cpp
+  opm/simulators/flow/equil/InitStateEquil.cpp
   opm/simulators/linalg/ExtractParallelGridInformationToISTL.cpp
   opm/simulators/linalg/FlexibleSolver1.cpp
   opm/simulators/linalg/FlexibleSolver2.cpp
@@ -267,7 +267,7 @@ list (APPEND TEST_SOURCE_FILES
   tests/test_convergencereport.cpp
   tests/test_deferredlogger.cpp
   tests/test_dilu.cpp
-  tests/test_equil.cc
+  tests/test_equil.cpp
   tests/test_extractMatrix.cpp
   tests/test_flexiblesolver.cpp
   tests/test_glift1.cpp
@@ -412,7 +412,6 @@ list (APPEND PUBLIC_HEADER_FILES
   ebos/ebos.hh
   ebos/eclbasevanguard.hh
   ebos/eclcpgridvanguard.hh
-  ebos/eclequilinitializer.hh
   ebos/eclfluxmodule.hh
   ebos/eclgenericcpgridvanguard.hh
   ebos/eclgenericproblem.hh
@@ -439,6 +438,7 @@ list (APPEND PUBLIC_HEADER_FILES
   opm/simulators/flow/EclGenericWriter.hpp
   opm/simulators/flow/EclGenericWriter_impl.hpp
   opm/simulators/flow/EclWriter.hpp
+  opm/simulators/flow/EquilInitializer.hpp
   opm/simulators/flow/ExtraConvergenceOutputThread.hpp
   opm/simulators/flow/FemCpGridCompat.hpp
   opm/simulators/flow/FIBlackoilModel.hpp
@@ -471,6 +471,10 @@ list (APPEND PUBLIC_HEADER_FILES
   opm/simulators/flow/TracerModel.hpp
   opm/simulators/flow/ValidationFunctions.hpp
   opm/simulators/flow/VtkTracerModule.hpp
+  opm/simulators/flow/equil/EquilibrationHelpers.hpp
+  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

ebos/eclproblem.hh

@@ -35,7 +35,6 @@
 #include <dune/common/fmatrix.hh>
 
 #include <ebos/eclcpgridvanguard.hh>
-#include <ebos/eclequilinitializer.hh>
 #include <ebos/eclfluxmodule.hh>
 #include <ebos/eclgenericproblem.hh>
 #include <ebos/eclnewtonmethod.hh>
@@ -78,6 +77,7 @@
 #include <opm/simulators/flow/BaseAquiferModel.hpp>
 #include <opm/simulators/flow/DummyGradientCalculator.hpp>
 #include <opm/simulators/flow/EclWriter.hpp>
+#include <opm/simulators/flow/EquilInitializer.hpp>
 #include <opm/simulators/flow/FIBlackoilModel.hpp>
 #include <opm/simulators/flow/FlowThresholdPressure.hpp>
 #include <opm/simulators/flow/OutputBlackoilModule.hpp>
@@ -184,7 +184,7 @@ class EclProblem : public GetPropType<TypeTag, Properties::BaseProblem>
     using DispersionModule = BlackOilDispersionModule<TypeTag, enableDispersion>;
     using DiffusionModule = BlackOilDiffusionModule<TypeTag, enableDiffusion>;
 
-    using InitialFluidState = typename EclEquilInitializer<TypeTag>::ScalarFluidState;
+    using InitialFluidState = typename EquilInitializer<TypeTag>::ScalarFluidState;
 
     using Toolbox = MathToolbox<Evaluation>;
     using DimMatrix = Dune::FieldMatrix<Scalar, dimWorld, dimWorld>;
@@ -2128,8 +2128,7 @@ protected:
         const auto& simulator = this->simulator();
 
         // initial condition corresponds to hydrostatic conditions.
-        using EquilInitializer = EclEquilInitializer<TypeTag>;
+        EquilInitializer<TypeTag> equilInitializer(simulator, *materialLawManager_);
-        EquilInitializer equilInitializer(simulator, *materialLawManager_);
 
         std::size_t numElems = this->model().numGridDof();
         initialFluidStates_.resize(numElems);

flow/flow_blackoil_alugrid.cpp

@@ -29,12 +29,12 @@
 // these are not explicitly instanced in library
 #include <ebos/eclgenericproblem_impl.hh>
 #include <ebos/ecltransmissibility_impl.hh>
-#include <ebos/equil/initstateequil_impl.hh>
 #include <opm/simulators/flow/AluGridVanguard.hpp>
 #include <opm/simulators/flow/CollectDataOnIORank_impl.hpp>
 #include <opm/simulators/flow/EclGenericWriter_impl.hpp>
 #include <opm/simulators/flow/GenericThresholdPressure_impl.hpp>
 #include <opm/simulators/flow/GenericTracerModel_impl.hpp>
+#include <opm/simulators/flow/equil/InitStateEquil_impl.hpp>
 #include <opm/simulators/utils/GridDataOutput_impl.hpp>
 
 namespace Opm {

flow/flow_blackoil_polyhedralgrid.cpp

@@ -29,11 +29,11 @@
 // these are not explicitly instanced in library
 #include <ebos/eclgenericproblem_impl.hh>
 #include <ebos/ecltransmissibility_impl.hh>
-#include <ebos/equil/initstateequil_impl.hh>
 #include <opm/simulators/flow/CollectDataOnIORank_impl.hpp>
 #include <opm/simulators/flow/EclGenericWriter_impl.hpp>
 #include <opm/simulators/flow/GenericThresholdPressure_impl.hpp>
 #include <opm/simulators/flow/GenericTracerModel_impl.hpp>
+#include <opm/simulators/flow/equil/InitStateEquil_impl.hpp>
 #include <opm/simulators/utils/GridDataOutput_impl.hpp>
 
 namespace Opm {

opm/simulators/flow/EquilInitializer.hpp

@@ -23,12 +23,10 @@
 /**
  * \file
  *
- * \copydoc Opm::EclEquilInitializer
+ * \copydoc Opm::EquilInitializer
  */
-#ifndef EWOMS_ECL_EQUIL_INITIALIZER_HH
+#ifndef OPM_EQUIL_INITIALIZER_HPP
-#define EWOMS_ECL_EQUIL_INITIALIZER_HH
+#define OPM_EQUIL_INITIALIZER_HPP
-
-#include <ebos/equil/initstateequil.hh>
 
 #include <opm/grid/common/CartesianIndexMapper.hpp>
 
@@ -39,6 +37,8 @@
 #include <opm/models/discretization/common/fvbaseproperties.hh>
 #include <opm/models/utils/propertysystem.hh>
 
+#include <opm/simulators/flow/equil/InitStateEquil.hpp>
+
 #include <vector>
 
 namespace Opm {
@@ -54,7 +54,7 @@ namespace Opm {
  * performance improvements.
  */
 template <class TypeTag>
-class EclEquilInitializer
+class EquilInitializer
 {
     using Simulator = GetPropType<TypeTag, Properties::Simulator>;
     using FluidSystem = GetPropType<TypeTag, Properties::FluidSystem>;
@@ -99,8 +99,8 @@ public:
 
 
     template <class EclMaterialLawManager>
-    EclEquilInitializer(const Simulator& simulator,
+    EquilInitializer(const Simulator& simulator,
-                        EclMaterialLawManager& materialLawManager)
+                     EclMaterialLawManager& materialLawManager)
         : simulator_(simulator)
     {
         const auto& vanguard = simulator.vanguard();
@@ -204,4 +204,4 @@ protected:
 };
 } // namespace Opm
 
-#endif
+#endif // OPM_EQUIL_INITIALIZER_HPP

opm/simulators/flow/equil/EquilibrationHelpers.cpp

@@ -21,8 +21,8 @@
   copyright holders.
 */
 
-#include "config.h"
+#include <config.h>
-#include "equilibrationhelpers_impl.hh"
+#include <opm/simulators/flow/equil/EquilibrationHelpers_impl.hpp>
 
 namespace Opm {
 namespace EQUIL {

opm/simulators/flow/equil/EquilibrationHelpers.hpp

@@ -26,14 +26,13 @@
  * \brief Auxiliary routines that to solve the ODEs that emerge from the hydrostatic
  *        equilibrium problem
  */
-#ifndef EWOMS_EQUILIBRATIONHELPERS_HH
+#ifndef OPM_EQUILIBRATION_HELPERS_HPP
-#define EWOMS_EQUILIBRATIONHELPERS_HH
+#define OPM_EQUILIBRATION_HELPERS_HPP
 
 #include <opm/material/common/Tabulated1DFunction.hpp>
 
 #include <opm/input/eclipse/EclipseState/InitConfig/Equil.hpp>
 
-#include <cmath>
 #include <memory>
 #include <vector>
 
@@ -803,4 +802,4 @@ bool isConstPc(const MaterialLawManager& materialLawManager,
 } // namespace Equil
 } // namespace Opm
 
-#endif // EWOMS_EQUILIBRATIONHELPERS_HH
+#endif // OPM_EQUILIBRATION_HELPERS_HPP

opm/simulators/flow/equil/EquilibrationHelpers_impl.hpp

@@ -21,8 +21,6 @@
   copyright holders.
 */
 
-#include <ebos/equil/equilibrationhelpers.hh>
-
 #include <opm/common/TimingMacros.hpp>
 
 #include <opm/common/utility/numeric/RootFinders.hpp>
@@ -31,6 +29,8 @@
 #include <opm/material/fluidstates/SimpleModularFluidState.hpp>
 #include <opm/material/fluidsystems/BlackOilFluidSystem.hpp>
 
+#include <opm/simulators/flow/equil/EquilibrationHelpers.hpp>
+
 #include <fmt/format.h>
 
 namespace Opm {

opm/simulators/flow/equil/InitStateEquil.cpp

@@ -22,8 +22,7 @@
 */
 
 #include <config.h>
-#include <ebos/equil/initstateequil.hh>
+#include <opm/simulators/flow/equil/InitStateEquil_impl.hpp>
-#include <ebos/equil/initstateequil_impl.hh>
 
 #include <opm/grid/CpGrid.hpp>
 

opm/simulators/flow/equil/InitStateEquil.hpp

@@ -26,8 +26,8 @@
  * \brief Routines that actually solve the ODEs that emerge from the hydrostatic
  *        equilibrium problem
  */
-#ifndef EWOMS_INITSTATEEQUIL_HH
+#ifndef OPM_INIT_STATE_EQUIL_HPP
-#define EWOMS_INITSTATEEQUIL_HH
+#define OPM_INIT_STATE_EQUIL_HPP
 
 #include <opm/models/utils/propertysystem.hh>
 
@@ -774,4 +774,4 @@ private:
 } // namespace EQUIL
 } // namespace Opm
 
-#endif // OPM_INITSTATEEQUIL_HEADER_INCLUDED
+#endif // OPM_INIT_STATE_EQUIL_HPP

opm/simulators/flow/equil/InitStateEquil_impl.hpp

@@ -20,12 +20,10 @@
   module for the precise wording of the license and the list of
   copyright holders.
 */
-#ifndef EWOMS_INITSTATEEQUIL_IMPL_HH
+#ifndef OPM_INIT_STATE_EQUIL_IMPL_HPP
-#define EWOMS_INITSTATEEQUIL_IMPL_HH
+#define OPM_INIT_STATE_EQUIL_IMPL_HPP
 
-
+#include <dune/grid/common/mcmgmapper.hh>
-#include <ebos/equil/initstateequil.hh>
-#include <ebos/equil/equilibrationhelpers.hh>
 
 #include <opm/common/OpmLog/OpmLog.hpp>
 
@@ -45,8 +43,9 @@
 #include <opm/material/fluidmatrixinteractions/EclMaterialLawManager.hpp>
 #include <opm/material/fluidsystems/BlackOilFluidSystem.hpp>
 
+#include <opm/simulators/flow/equil/EquilibrationHelpers.hpp>
+#include <opm/simulators/flow/equil/InitStateEquil.hpp>
 #include <opm/simulators/utils/DeferredLoggingErrorHelpers.hpp>
-#include <dune/grid/common/mcmgmapper.hh>
 
 #include <fmt/format.h>
 
@@ -2013,4 +2012,5 @@ equilibrateHorizontal(const CellRange&  cells,
 }
 } // namespace EQUIL
 } // namespace Opm
-#endif
+
+#endif // OPM_INIT_STATE_EQUIL_IMPL_HPP

tests/test_equil.cpp

@@ -24,7 +24,6 @@
 
 #define BOOST_TEST_MODULE Equil
 
-#include <ebos/equil/equilibrationhelpers.hh>
 #include <ebos/eclproblem.hh>
 #include <ebos/eclgenericvanguard.hh>
 
@@ -36,10 +35,12 @@
 
 #include <opm/input/eclipse/Units/Units.hpp>
 
+#include <opm/models/utils/propertysystem.hh>
 #include <opm/models/utils/start.hh>
-#include <opm/simulators/linalg/parallelbicgstabbackend.hh>
 
 #include <opm/simulators/flow/BlackoilModelParameters.hpp>
+#include <opm/simulators/flow/equil/EquilibrationHelpers.hpp>
+#include <opm/simulators/linalg/parallelbicgstabbackend.hh>
 #include <opm/simulators/wells/BlackoilWellModel.hpp>
 
 #if HAVE_DUNE_FEM

tests/test_glift1.cpp

@@ -26,7 +26,6 @@
 
 #include <opm/models/utils/propertysystem.hh>
 #include <opm/models/utils/parametersystem.hh>
-#include <ebos/equil/equilibrationhelpers.hh>
 #include <ebos/eclproblem.hh>
 #include <ebos/ebos.hh>
 #include <opm/models/utils/start.hh>
@@ -36,6 +35,7 @@
 #include <opm/input/eclipse/Schedule/Well/Well.hpp>
 #include <opm/simulators/utils/DeferredLogger.hpp>
 #include <opm/simulators/flow/BlackoilModel.hpp>
+#include <opm/simulators/flow/equil/EquilibrationHelpers.hpp>
 #include <opm/simulators/wells/BlackoilWellModel.hpp>
 #include <opm/simulators/wells/StandardWell.hpp>
 #include <opm/simulators/wells/GasLiftSingleWell.hpp>