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

CMakeLists_files.cmake

@@ -421,7 +421,6 @@ list (APPEND PUBLIC_HEADER_FILES
   ebos/eclnewtonmethod.hh
   ebos/eclproblem.hh
   ebos/eclproblem_properties.hh
-  ebos/eclthresholdpressure.hh
   ebos/ecltransmissibility.hh
   ebos/ecltransmissibility_impl.hh
   opm/simulators/flow/ActionHandler.hpp
@@ -446,6 +445,7 @@ list (APPEND PUBLIC_HEADER_FILES
   opm/simulators/flow/FlowMain.hpp
   opm/simulators/flow/FlowUtils.hpp
   opm/simulators/flow/FlowsData.hpp
+  opm/simulators/flow/FlowThresholdPressure.hpp
   opm/simulators/flow/GenericOutputBlackoilModule.hpp
   opm/simulators/flow/GenericThresholdPressure.hpp
   opm/simulators/flow/GenericThresholdPressure_impl.hpp

ebos/eclproblem.hh

@@ -40,7 +40,6 @@
 #include <ebos/eclgenericproblem.hh>
 #include <ebos/eclnewtonmethod.hh>
 #include <ebos/eclproblem_properties.hh>
-#include <ebos/eclthresholdpressure.hh>
 #include <ebos/ecltransmissibility.hh>
 #if HAVE_DAMARIS
 #include <ebos/damariswriter.hh>
@@ -80,6 +79,7 @@
 #include <opm/simulators/flow/DummyGradientCalculator.hpp>
 #include <opm/simulators/flow/EclWriter.hpp>
 #include <opm/simulators/flow/FIBlackoilModel.hpp>
+#include <opm/simulators/flow/FlowThresholdPressure.hpp>
 #include <opm/simulators/flow/OutputBlackoilModule.hpp>
 #include <opm/simulators/flow/TracerModel.hpp>
 #include <opm/simulators/flow/VtkTracerModule.hpp>
@@ -917,10 +917,10 @@ public:
     Scalar thresholdPressure(unsigned elem1Idx, unsigned elem2Idx) const
     { return thresholdPressures_.thresholdPressure(elem1Idx, elem2Idx); }
 
-    const EclThresholdPressure<TypeTag>& thresholdPressure() const
+    const FlowThresholdPressure<TypeTag>& thresholdPressure() const
     { return thresholdPressures_; }
 
-    EclThresholdPressure<TypeTag>& thresholdPressure()
+    FlowThresholdPressure<TypeTag>& thresholdPressure()
     { return thresholdPressures_; }
 
     const TracerModel& tracerModel() const
@@ -2764,7 +2764,7 @@ private:
     std::shared_ptr<EclMaterialLawManager> materialLawManager_;
     std::shared_ptr<EclThermalLawManager> thermalLawManager_;
 
-    EclThresholdPressure<TypeTag> thresholdPressures_;
+    FlowThresholdPressure<TypeTag> thresholdPressures_;
 
     std::vector<InitialFluidState> initialFluidStates_;
 

opm/simulators/flow/FlowThresholdPressure.hpp

@@ -23,10 +23,10 @@
 /*!
  * \file
  *
- * \copydoc Opm::EclThresholdPressure
+ * \copydoc Opm::FlowThresholdPressure
  */
-#ifndef EWOMS_ECL_THRESHOLD_PRESSURE_HH
-#define EWOMS_ECL_THRESHOLD_PRESSURE_HH
+#ifndef OPM_FLOW_THRESHOLD_PRESSURE_HPP
+#define OPM_FLOW_THRESHOLD_PRESSURE_HPP
 
 #include <opm/material/densead/Evaluation.hpp>
 #include <opm/material/densead/Math.hpp>
@@ -42,7 +42,7 @@
 namespace Opm {
 
 /*!
- * \ingroup EclBlackOilSimulator
+ * \ingroup BlackOilSimulator
  *
  * \brief This class calculates the threshold pressure for grid faces according to the
  *        Eclipse Reference Manual.
@@ -52,10 +52,10 @@ namespace Opm {
  * than the threshold pressure, it is reduced by the threshold pressure.
  */
 template <class TypeTag>
-class EclThresholdPressure : public GenericThresholdPressure<GetPropType<TypeTag, Properties::Grid>,
-                                                             GetPropType<TypeTag, Properties::GridView>,
-                                                             GetPropType<TypeTag, Properties::ElementMapper>,
-                                                             GetPropType<TypeTag, Properties::Scalar>>
+class FlowThresholdPressure : public GenericThresholdPressure<GetPropType<TypeTag, Properties::Grid>,
+                                                              GetPropType<TypeTag, Properties::GridView>,
+                                                              GetPropType<TypeTag, Properties::ElementMapper>,
+                                                              GetPropType<TypeTag, Properties::Scalar>>
 {
     using BaseType = GenericThresholdPressure<GetPropType<TypeTag, Properties::Grid>,
                                               GetPropType<TypeTag, Properties::GridView>,
@@ -70,7 +70,7 @@ class EclThresholdPressure : public GenericThresholdPressure<GetPropType<TypeTag
     enum { numPhases = FluidSystem::numPhases };
 
 public:
-    EclThresholdPressure(const Simulator& simulator)
+    FlowThresholdPressure(const Simulator& simulator)
         : BaseType(simulator.vanguard().cartesianIndexMapper(),
                    simulator.vanguard().gridView(),
                    simulator.model().elementMapper(),
@@ -163,4 +163,4 @@ private:
 
 } // namespace Opm
 
-#endif
+#endif // OPM_FLOW_THRESHOLD_PRESSURE_HPP