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

Vertical Extent: Prune Unneeded 'cellcount' Parameter

Browse Source 
The purpose of this function is to determine the vertical extent of
a set of cells.  Counting the number of cells in the region is not
its responsibility.
This commit is contained in:
Bård Skaflestad
2020-04-13 12:38:40 +02:00
parent 6292855bd5
commit f0ed53a6f1
2 changed files with 9 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
ebos/equil/initstateequil.hh
View File

@@ -1396,7 +1396,6 @@ invertCapPress(const double pc,
template <typename Grid, typename CellRange>
void verticalExtent(const Grid& grid,
const CellRange& cells,
int& cellcount,
std::array<double,2>& span)
{
// This code is only supported in three space dimensions
@@ -1404,7 +1403,6 @@ void verticalExtent(const Grid& grid,
span[0] = std::numeric_limits<double>::max();
span[1] = std::numeric_limits<double>::lowest();
cellcount = 0;
const int nd = Grid::dimensionworld;
@@ -1426,7 +1424,7 @@ void verticalExtent(const Grid& grid,
for (typename CellRange::const_iterator
ci = cells.begin(), ce = cells.end();
ci != ce; ++ci, ++cellcount)
ci != ce; ++ci)
{
for (auto fi = cell2Faces[*ci].begin(),
fe = cell2Faces[*ci].end();
@@ -1687,9 +1685,7 @@ private:
auto ptable = Details::PressureTable<FluidSystem, EquilReg>{ grav };
auto psat = PhaseSat { materialLawManager, this->swatInit_ };
auto vspan = std::array<double, 2>{};
auto ncell = 0;
auto vspan = std::array<double, 2>{};
for (const auto& r : reg.activeRegions()) {
const auto& cells = reg.cells(r);
@@ -1699,7 +1695,7 @@ private:
continue;
}
Details::verticalExtent(grid, cells, ncell, vspan);
Details::verticalExtent(grid, cells, vspan);
const EqReg eqreg(rec[r], rsFunc_[r], rvFunc_[r], regionPvtIdx_[r]);