Skip to content

Use depth from eclGrid instead of recomputing it. #7327

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
totto82 wants to merge 1 commit into
base: master
Choose a base branch
from
+4 −28
Draft

Use depth from eclGrid instead of recomputing it. #7327

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
32 changes: 4 additions & 28 deletions opm/simulators/flow/FlowBaseVanguard.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -361,21 +361,12 @@ class FlowBaseVanguard : public BaseVanguard<TypeTag>,
cellCenterDepth_.resize(numCells);

ElementMapper elemMapper(this->gridView(), Dune::mcmgElementLayout());
const auto& inputGrid = this->eclState().getInputGrid();

const auto num_aqu_cells = this->allAquiferCells();

for(const auto& element : elements(this->gridView())) {
for (const auto& element : elements(this->gridView())) {
const unsigned int elemIdx = elemMapper.index(element);
cellCenterDepth_[elemIdx] = cellCenterDepth(element);

if (!num_aqu_cells.empty()) {
const unsigned int global_index = cartesianIndex(elemIdx);
const auto search = num_aqu_cells.find(global_index);
if (search != num_aqu_cells.end()) {
// updating the cell depth using aquifer cell depth
cellCenterDepth_[elemIdx] = search->second->depth;
}
}
const unsigned int global_index = cartesianIndex(elemIdx);
cellCenterDepth_[elemIdx] = inputGrid.getCellDepth(global_index);
}
}
void updateCellThickness_()
Expand All @@ -395,21 +386,6 @@ class FlowBaseVanguard : public BaseVanguard<TypeTag>,
}

private:
// computed from averaging cell corner depths
Scalar cellCenterDepth(const Element& element) const
{
typedef typename Element::Geometry Geometry;
static constexpr int zCoord = Element::dimension - 1;
Scalar zz = 0.0;

const Geometry& geometry = element.geometry();
const int corners = geometry.corners();
for (int i=0; i < corners; ++i)
zz += geometry.corner(i)[zCoord];

return zz/Scalar(corners);
}

Scalar computeCellThickness(const typename GridView::template Codim<0>::Entity& element) const
{
typedef typename Element::Geometry Geometry;
Expand Down