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

eclpolyhedralgridvanguard: cleanup headers

Browse Source 
also fix missing template parameter and inherited dimensionworld
reference
This commit is contained in:
Arne Morten Kvarving 2023-08-02 12:18:32 +02:00
parent 715df5be35
commit 78f5e329d7
1 changed files with 14 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
ebos/eclpolyhedralgridvanguard.hh
View File

@ -27,13 +27,19 @@
#ifndef EWOMS_ECL_POLYHEDRAL_GRID_VANGUARD_HH
#define EWOMS_ECL_POLYHEDRAL_GRID_VANGUARD_HH
#include <opm/models/common/multiphasebaseproperties.hh>
#include "eclbasevanguard.hh"
#include "ecltransmissibility.hh"
#include <ebos/eclbasevanguard.hh>
#include <ebos/ecltransmissibility.hh>
#include <opm/grid/polyhedralgrid.hh>
#include <opm/models/common/multiphasebaseproperties.hh>
#include <array>
#include <functional>
#include <string>
#include <tuple>
#include <unordered_set>
namespace Opm {
template <class TypeTag>
class EclPolyhedralGridVanguard;
@ -86,7 +92,6 @@ public:
using Grid = GetPropType<TypeTag, Properties::Grid>;
using EquilGrid = GetPropType<TypeTag, Properties::EquilGrid>;
using GridView = GetPropType<TypeTag, Properties::GridView>;
using TransmissibilityType = EclTransmissibility<Grid, GridView, ElementMapper, Scalar>;
private:
using GridPointer = Grid*;
@ -95,6 +100,9 @@ private:
using CartesianIndexMapperPointer = std::unique_ptr<CartesianIndexMapper>;
public:
using TransmissibilityType = EclTransmissibility<Grid, GridView, ElementMapper,
CartesianIndexMapper, Scalar>;
EclPolyhedralGridVanguard(Simulator& simulator)
: EclBaseVanguard<TypeTag>(simulator),
simulator_( simulator )
@ -190,7 +198,7 @@ public:
* It is a function return the centroid for the given element
* index.
*/
std::function<std::array<double,dimensionworld>(int)>
std::function<std::array<double,EclBaseVanguard<TypeTag>::dimensionworld>(int)>
cellCentroids() const
{
return this->cellCentroids_(this->cartesianIndexMapper());