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

eclalucartesianindexmapper: some modernization

Browse Source 
- typedef -> using
- use constexpr
This commit is contained in:
Arne Morten Kvarving 2022-08-10 12:29:49 +02:00
parent 93ce28e9a2
commit 7b74c75f7c
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
ebos/alucartesianindexmapper.hh
View File

@ -85,7 +85,7 @@ public:
int idx_; int idx_;
}; };
typedef typename Dune::PersistentContainer<Grid, GlobalCellIndex> GlobalIndexContainer; using GlobalIndexContainer = typename Dune::PersistentContainer<Grid, GlobalCellIndex>;
public: public:
// constructor copying cartesian index to persistent container // constructor copying cartesian index to persistent container
@ -174,7 +174,7 @@ public:
public: public:
/** \brief dimension of the grid */ /** \brief dimension of the grid */
static const int dimension = Grid::dimension ; static constexpr int dimension = Grid::dimension ;
/** \brief constructor taking grid */ /** \brief constructor taking grid */
CartesianIndexMapper(const Grid& grid, CartesianIndexMapper(const Grid& grid,
@ -222,17 +222,17 @@ public:
void cartesianCoordinate(const int compressedElementIndex, std::array<int, dimension>& coords) const void cartesianCoordinate(const int compressedElementIndex, std::array<int, dimension>& coords) const
{ {
int gc = cartesianIndex(compressedElementIndex); int gc = cartesianIndex(compressedElementIndex);
if (dimension == 3) { if constexpr (dimension == 3) {
coords[0] = gc % cartesianDimensions()[0]; coords[0] = gc % cartesianDimensions()[0];
gc /= cartesianDimensions()[0]; gc /= cartesianDimensions()[0];
coords[1] = gc % cartesianDimensions()[1]; coords[1] = gc % cartesianDimensions()[1];
coords[2] = gc / cartesianDimensions()[1]; coords[2] = gc / cartesianDimensions()[1];
} }
else if (dimension == 2) { else if constexpr (dimension == 2) {
coords[0] = gc % cartesianDimensions()[0]; coords[0] = gc % cartesianDimensions()[0];
coords[1] = gc / cartesianDimensions()[0]; coords[1] = gc / cartesianDimensions()[0];
} }
else if (dimension == 1) else if constexpr (dimension == 1)
coords[0] = gc ; coords[0] = gc ;
else else
throw std::invalid_argument("cartesianCoordinate not implemented for dimension " + std::to_string(dimension)); throw std::invalid_argument("cartesianCoordinate not implemented for dimension " + std::to_string(dimension));
@ -241,7 +241,7 @@ public:
template <class GridView> template <class GridView>
std::unique_ptr<GlobalIndexDataHandle<GridView> > dataHandle(const GridView& gridView) std::unique_ptr<GlobalIndexDataHandle<GridView> > dataHandle(const GridView& gridView)
{ {
typedef GlobalIndexDataHandle<GridView> DataHandle ; using DataHandle = GlobalIndexDataHandle<GridView>;
assert(&grid_ == &gridView.grid()); assert(&grid_ == &gridView.grid());
return std::make_unique<DataHandle>(gridView, cartesianIndex_); return std::make_unique<DataHandle>(gridView, cartesianIndex_);
} }