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

CMakeLists_files.cmake

@@ -411,7 +411,6 @@ list (APPEND TEST_DATA_FILES
 # find opm -name '*.h*' -a ! -name '*-pch.hpp' -printf '\t%p\n' | sort
 list (APPEND PUBLIC_HEADER_FILES
   ebos/eclnewtonmethod.hh
-  ebos/eclproblem.hh
   opm/simulators/flow/ActionHandler.hpp
   opm/simulators/flow/AluGridCartesianIndexMapper.hpp
   opm/simulators/flow/AluGridVanguard.hpp
@@ -438,6 +437,7 @@ list (APPEND PUBLIC_HEADER_FILES
   opm/simulators/flow/FlowGenericProblem_impl.hpp
   opm/simulators/flow/FlowGenericVanguard.hpp
   opm/simulators/flow/FlowMain.hpp
+  opm/simulators/flow/FlowProblem.hpp
   opm/simulators/flow/FlowProblemProperties.hpp
   opm/simulators/flow/FlowUtils.hpp
   opm/simulators/flow/FlowsData.hpp

opm/simulators/flow/BlackoilModel.hpp

@@ -26,8 +26,6 @@
 
 #include <fmt/format.h>
 
-#include <ebos/eclproblem.hh>
-
 #include <opm/common/ErrorMacros.hpp>
 #include <opm/common/Exceptions.hpp>
 #include <opm/common/OpmLog/OpmLog.hpp>
@@ -42,6 +40,7 @@
 #include <opm/simulators/flow/BlackoilModelNldd.hpp>
 #include <opm/simulators/flow/BlackoilModelParameters.hpp>
 #include <opm/simulators/flow/countGlobalCells.hpp>
+#include <opm/simulators/flow/FlowProblem.hpp>
 #include <opm/simulators/flow/NonlinearSolver.hpp>
 #include <opm/simulators/flow/RSTConv.hpp>
 #include <opm/simulators/timestepping/AdaptiveTimeStepping.hpp>

opm/simulators/flow/FlowGenericProblem.hpp

@@ -263,7 +263,7 @@ public:
     /*!
      * \brief Direct indexed access to the porosity.
      *
-     * For the EclProblem, this method is identical to referencePorosity(). The intensive
+     * For the FlowProblem, this method is identical to referencePorosity(). The intensive
      * quantities object may apply various multipliers (e.g. ones which model rock
      * compressibility and water induced rock compaction) to it which depend on the
      * current physical conditions.
@@ -303,7 +303,7 @@ protected:
     /*!
      * \brief Returns true if an eWoms restart file should be written to disk.
      *
-     * The EclProblem does not write any restart files using the ad-hoc format, only ones
+     * The FlowProblem does not write any restart files using the ad-hoc format, only ones
      * using the ECL format.
      */
     bool shouldWriteRestartFile() const

opm/simulators/flow/FlowProblem.hpp

@@ -25,10 +25,10 @@
 /*!
  * \file
  *
- * \copydoc Opm::EclProblem
+ * \copydoc Opm::FlowProblem
  */
-#ifndef EWOMS_ECL_PROBLEM_HH
+#ifndef OPM_FLOW_PROBLEM_HPP
-#define EWOMS_ECL_PROBLEM_HH
+#define OPM_FLOW_PROBLEM_HPP
 
 #include <dune/common/version.hh>
 #include <dune/common/fvector.hh>
@@ -102,16 +102,16 @@
 namespace Opm {
 
 /*!
- * \ingroup EclBlackOilSimulator
+ * \ingroup BlackOilSimulator
  *
  * \brief This problem simulates an input file given in the data format used by the
  *        commercial ECLiPSE simulator.
  */
 template <class TypeTag>
-class EclProblem : public GetPropType<TypeTag, Properties::BaseProblem>
+class FlowProblem : public GetPropType<TypeTag, Properties::BaseProblem>
-                 , public FlowGenericProblem<GetPropType<TypeTag, Properties::GridView>,
+                  , public FlowGenericProblem<GetPropType<TypeTag, Properties::GridView>,
-                                             GetPropType<TypeTag, Properties::FluidSystem>,
+                                              GetPropType<TypeTag, Properties::FluidSystem>,
-                                             GetPropType<TypeTag, Properties::Scalar>>
+                                              GetPropType<TypeTag, Properties::Scalar>>
 {
     using BaseType = FlowGenericProblem<GetPropType<TypeTag, Properties::GridView>,
                                         GetPropType<TypeTag, Properties::FluidSystem>,
@@ -270,7 +270,7 @@ public:
     /*!
      * \copydoc Doxygen::defaultProblemConstructor
      */
-    EclProblem(Simulator& simulator)
+    FlowProblem(Simulator& simulator)
         : ParentType(simulator)
         , FlowGenericProblem<GridView,FluidSystem,Scalar>(simulator.vanguard().eclState(),
                                                           simulator.vanguard().schedule(),
@@ -933,7 +933,7 @@ public:
     /*!
      * \copydoc FvBaseMultiPhaseProblem::porosity
      *
-     * For the EclProblem, this method is identical to referencePorosity(). The intensive
+     * For the FlowProblem, this method is identical to referencePorosity(). The intensive
      * quantities object may apply various multipliers (e.g. ones which model rock
      * compressibility and water induced rock compaction) to it which depend on the
      * current physical conditions.
@@ -1262,7 +1262,7 @@ public:
      *        term for the solution of the previous time step.
      *
      * For quite technical reasons, the storage term cannot be recycled if either DRSDT
-     * or DRVDT are active in ebos. Nor if the porosity is changes between timesteps
+     * or DRVDT are active. Nor if the porosity is changes between timesteps
      * using a pore volume multiplier (i.e., poreVolumeMultiplier() != 1.0)
      */
     bool recycleFirstIterationStorage() const
@@ -1876,7 +1876,7 @@ protected:
             return;
         }
 
-        this->updateProperty_("EclProblem::updateCompositionChangeLimits_()) failed:",
+        this->updateProperty_("FlowProblem::updateCompositionChangeLimits_()) failed:",
                               [this,episodeIdx,active](unsigned compressedDofIdx,
                                                        const IntensiveQuantities& iq)
                               {
@@ -1902,7 +1902,7 @@ protected:
 
         // we use VAPPARS
         if (this->vapparsActive(episodeIdx)) {
-            this->updateProperty_("EclProblem::updateMaxOilSaturation_() failed:",
+            this->updateProperty_("FlowProblem::updateMaxOilSaturation_() failed:",
                                   [this](unsigned compressedDofIdx, const IntensiveQuantities& iq)
                                   {
                                       this->updateMaxOilSaturation_(compressedDofIdx,iq);
@@ -1935,7 +1935,7 @@ protected:
             return false;
 
         this->maxWaterSaturation_[/*timeIdx=*/1] = this->maxWaterSaturation_[/*timeIdx=*/0];
-        this->updateProperty_("EclProblem::updateMaxWaterSaturation_() failed:",
+        this->updateProperty_("FlowProblem::updateMaxWaterSaturation_() failed:",
                               [this](unsigned compressedDofIdx, const IntensiveQuantities& iq)
                               {
                                   this->updateMaxWaterSaturation_(compressedDofIdx,iq);
@@ -1965,7 +1965,7 @@ protected:
         if (this->minRefPressure_.empty())
             return false;
 
-        this->updateProperty_("EclProblem::updateMinPressure_() failed:",
+        this->updateProperty_("FlowProblem::updateMinPressure_() failed:",
                               [this](unsigned compressedDofIdx, const IntensiveQuantities& iq)
                               {
                                   this->updateMinPressure_(compressedDofIdx,iq);
@@ -2486,7 +2486,7 @@ protected:
 
         // we need to update the hysteresis data for _all_ elements (i.e., not just the
         // interior ones) to avoid desynchronization of the processes in the parallel case!
-        this->updateProperty_("EclProblem::updateHysteresis_() failed:",
+        this->updateProperty_("FlowProblem::updateHysteresis_() failed:",
                               [this](unsigned compressedDofIdx, const IntensiveQuantities& iq)
                               {
                                   materialLawManager_->updateHysteresis(iq.fluidState(), compressedDofIdx);
@@ -2506,7 +2506,7 @@ protected:
     void updateMaxPolymerAdsorption_()
     {
         // we need to update the max polymer adsoption data for all elements
-        this->updateProperty_("EclProblem::updateMaxPolymerAdsorption_() failed:",
+        this->updateProperty_("FlowProblem::updateMaxPolymerAdsorption_() failed:",
                               [this](unsigned compressedDofIdx, const IntensiveQuantities& iq)
                               {
                                   this->updateMaxPolymerAdsorption_(compressedDofIdx,iq);
@@ -2822,4 +2822,4 @@ private:
 
 } // namespace Opm
 
-#endif
+#endif // OPM_FLOW_PROBLEM_HPP

opm/simulators/flow/FlowProblemProperties.hpp

@@ -55,7 +55,7 @@
 
 namespace Opm {
 template <class TypeTag>
-class EclProblem;
+class FlowProblem;
 }
 
 namespace Opm::Properties {
@@ -141,7 +141,7 @@ struct ExplicitRockCompaction {
 // Set the problem property
 template<class TypeTag>
 struct Problem<TypeTag, TTag::FlowBaseProblem> {
-    using type = EclProblem<TypeTag>;
+    using type = FlowProblem<TypeTag>;
 };
 
 template<class TypeTag>

opm/simulators/wells/BlackoilWellModel.hpp

@@ -24,7 +24,6 @@
 #ifndef OPM_BLACKOILWELLMODEL_HEADER_INCLUDED
 #define OPM_BLACKOILWELLMODEL_HEADER_INCLUDED
 
-#include <ebos/eclproblem.hh>
 #include <opm/common/OpmLog/OpmLog.hpp>
 
 #include <cassert>
@@ -44,6 +43,7 @@
 #include <opm/input/eclipse/Schedule/Well/WellTestState.hpp>
 
 #include <opm/simulators/flow/countGlobalCells.hpp>
+#include <opm/simulators/flow/FlowProblem.hpp>
 #include <opm/simulators/flow/SubDomain.hpp>
 
 #include <opm/simulators/wells/BlackoilWellModelGeneric.hpp>

tests/TestTypeTag.hpp

@@ -47,7 +47,7 @@ struct TestTypeTag {
 // Set the problem class
 template<class TypeTag>
 struct Problem<TypeTag, TTag::TestTypeTag> {
-    using type = EclProblem<TypeTag>;
+    using type = FlowProblem<TypeTag>;
 };
 
 // Enable experimental features for ebos: ebos is the research simulator of the OPM

tests/test_equil.cpp

@@ -24,8 +24,6 @@
 
 #define BOOST_TEST_MODULE Equil
 
-#include <ebos/eclproblem.hh>
-
 #include <opm/grid/UnstructuredGrid.h>
 #include <opm/grid/GridManager.hpp>
 #include <opm/grid/cpgrid/GridHelpers.hpp>
@@ -39,6 +37,7 @@
 
 #include <opm/simulators/flow/BlackoilModelParameters.hpp>
 #include <opm/simulators/flow/FlowGenericVanguard.hpp>
+#include <opm/simulators/flow/FlowProblem.hpp>
 #include <opm/simulators/flow/equil/EquilibrationHelpers.hpp>
 #include <opm/simulators/linalg/parallelbicgstabbackend.hh>
 #include <opm/simulators/wells/BlackoilWellModel.hpp>

tests/test_glift1.cpp

@@ -27,7 +27,6 @@
 
 #include <opm/models/utils/propertysystem.hh>
 #include <opm/models/utils/parametersystem.hh>
-#include <ebos/eclproblem.hh>
 #include <opm/models/utils/start.hh>
 
 #include <opm/input/eclipse/EclipseState/SummaryConfig/SummaryConfig.hpp>
@@ -35,6 +34,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/FlowProblem.hpp>
 #include <opm/simulators/flow/equil/EquilibrationHelpers.hpp>
 #include <opm/simulators/wells/BlackoilWellModel.hpp>
 #include <opm/simulators/wells/StandardWell.hpp>

tests/test_wellmodel.cpp

@@ -43,8 +43,8 @@
 #include <opm/grid/GridHelpers.hpp>
 #include <opm/simulators/flow/FlowMain.hpp>
 #include <opm/simulators/flow/BlackoilModel.hpp>
+#include <opm/simulators/flow/FlowProblem.hpp>
 
-#include <ebos/eclproblem.hh>
 #include <opm/models/utils/start.hh>
 
 #include <opm/simulators/wells/StandardWell.hpp>