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

CMakeLists_files.cmake

@@ -426,7 +426,6 @@ list (APPEND PUBLIC_HEADER_FILES
   ebos/eclgenericwriter_impl.hh
   ebos/eclmixingratecontrols.hh
   ebos/eclnewtonmethod.hh
-  ebos/eclpolyhedralgridvanguard.hh
   ebos/eclproblem.hh
   ebos/eclproblem_properties.hh
   ebos/eclsolutioncontainers.hh
@@ -463,6 +462,7 @@ list (APPEND PUBLIC_HEADER_FILES
   opm/simulators/flow/NonlinearSolver.hpp
   opm/simulators/flow/OutputBlackoilModule.hpp
   opm/simulators/flow/partitionCells.hpp
+  opm/simulators/flow/PolyhedralGridVanguard.hpp
   opm/simulators/flow/priVarsPacking.hpp
   opm/simulators/flow/RSTConv.hpp
   opm/simulators/flow/RegionPhasePVAverage.hpp

flow/flow_blackoil_polyhedralgrid.cpp

@@ -18,11 +18,12 @@
 */
 #include <config.h>
 
-#include <ebos/eclpolyhedralgridvanguard.hh>
-
 #include <opm/grid/polyhedralgrid.hh>
+
 #include <opm/models/blackoil/blackoillocalresidualtpfa.hh>
 #include <opm/models/discretization/common/tpfalinearizer.hh>
+
+#include <opm/simulators/flow/PolyhedralGridVanguard.hpp>
 #include <opm/simulators/flow/Main.hpp>
 
 // these are not explicitly instanced in library
@@ -64,7 +65,7 @@ namespace Properties {
 
     template<class TypeTag>
     struct Vanguard<TypeTag, TTag::FlowProblemPoly> {
-        using type = Opm::EclPolyhedralGridVanguard<TypeTag>;
+        using type = Opm::PolyhedralGridVanguard<TypeTag>;
     };
 }
 }

opm/simulators/flow/PolyhedralGridVanguard.hpp

@@ -22,10 +22,10 @@
 */
 /*!
  * \file
- * \copydoc Opm::EclPolyhedralGridVanguard
+ * \copydoc Opm::PolyhedralGridVanguard
  */
-#ifndef EWOMS_ECL_POLYHEDRAL_GRID_VANGUARD_HH
-#define EWOMS_ECL_POLYHEDRAL_GRID_VANGUARD_HH
+#ifndef OPM_POLYHEDRAL_GRID_VANGUARD_HPP
+#define OPM_POLYHEDRAL_GRID_VANGUARD_HPP
 
 #include <ebos/eclbasevanguard.hh>
 #include <ebos/ecltransmissibility.hh>
@@ -42,28 +42,28 @@
 
 namespace Opm {
 template <class TypeTag>
-class EclPolyhedralGridVanguard;
+class PolyhedralGridVanguard;
 }
 
 namespace Opm::Properties {
 
 namespace TTag {
-struct EclPolyhedralGridVanguard {
+struct PolyhedralGridVanguard {
     using InheritsFrom = std::tuple<EclBaseVanguard>;
 };
 }
 
 // declare the properties
 template<class TypeTag>
-struct Vanguard<TypeTag, TTag::EclPolyhedralGridVanguard> {
-    using type = Opm::EclPolyhedralGridVanguard<TypeTag>;
+struct Vanguard<TypeTag, TTag::PolyhedralGridVanguard> {
+    using type = Opm::PolyhedralGridVanguard<TypeTag>;
 };
 template<class TypeTag>
-struct Grid<TypeTag, TTag::EclPolyhedralGridVanguard> {
+struct Grid<TypeTag, TTag::PolyhedralGridVanguard> {
     using type = Dune::PolyhedralGrid<3, 3>;
 };
 template<class TypeTag>
-struct EquilGrid<TypeTag, TTag::EclPolyhedralGridVanguard> {
+struct EquilGrid<TypeTag, TTag::PolyhedralGridVanguard> {
     using type = GetPropType<TypeTag, Properties::Grid>;
 };
 
@@ -72,14 +72,14 @@ struct EquilGrid<TypeTag, TTag::EclPolyhedralGridVanguard> {
 namespace Opm {
 
 /*!
- * \ingroup EclBlackOilSimulator
+ * \ingroup BlackOilSimulator
  *
  * \brief Helper class for grid instantiation of ECL file-format using problems.
  *
  * This class uses Dune::PolyhedralGrid as the simulation grid.
  */
 template <class TypeTag>
-class EclPolyhedralGridVanguard : public EclBaseVanguard<TypeTag>
+class PolyhedralGridVanguard : public EclBaseVanguard<TypeTag>
 {
     friend class EclBaseVanguard<TypeTag>;
     using ParentType = EclBaseVanguard<TypeTag>;
@@ -105,7 +105,7 @@ public:
     using TransmissibilityType = EclTransmissibility<Grid, GridView, ElementMapper,
                                                      CartesianIndexMapper, Scalar>;
 
-    EclPolyhedralGridVanguard(Simulator& simulator)
+    PolyhedralGridVanguard(Simulator& simulator)
         : EclBaseVanguard<TypeTag>(simulator),
           simulator_( simulator )
     {
@@ -119,10 +119,6 @@ public:
         }
     }
 
-    ~EclPolyhedralGridVanguard()
-    {
-    }
-
     /*!
      * \brief Return a reference to the simulation grid.
      */
@@ -257,4 +253,4 @@ protected:
 
 } // namespace Opm
 
-#endif
+#endif // OPM_POLYHEDRAL_GRID_VANGUARD_HPP