OilfieldToolsNet/opm-simulators
4
0
Fork 0
mirror of https://github.com/OPM/opm-simulators.git synced 2025-02-25 18:55:30 -06:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Arne Morten Kvarving
2024-02-05 19:22:15 +01:00
parent e168066003
commit e7094558ef
3 changed files with 18 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
CMakeLists_files.cmake
View File

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

7
flow/flow_blackoil_polyhedralgrid.cpp
View File

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

30
ebos/eclpolyhedralgridvanguard.hh → opm/simulators/flow/PolyhedralGridVanguard.hpp
View File

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