Skip to content

processEclipseFormat: honour the numerical aquifer mode #1059

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
hnil wants to merge 1 commit into
base: master
Choose a base branch
from
+14 −3
Draft

processEclipseFormat: honour the numerical aquifer mode #1059

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
17 changes: 14 additions & 3 deletions opm/grid/cpgrid/processEclipseFormat.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -459,7 +459,18 @@ namespace cpgrid
int process_ok{};

#if HAVE_OPM_COMMON
if ((ecl_state != nullptr) && ecl_state->aquifer().hasNumericalAquifer()) {
// Whether the numerical aquifers of the deck are represented by taking over grid
// cells. When they are not, the grid must come out exactly as it would without
// the AQUNUM records: no cells kept alive for their sake, no cell volumes
// overridden, and above all no non-neighbour connections generated -- the
// simulator represents those aquifers itself. Not generating them is also what
// makes such a deck usable with edge-conformal processing, which cannot handle
// non-neighbour connections at all.
const bool numAquiferInGrid = (ecl_state != nullptr)
&& ecl_state->aquifer().hasNumericalAquifer()
&& (ecl_state->numericalAquiferMode() == Opm::NumericalAquiferMode::GridCells);

if (numAquiferInGrid) {
const std::size_t global_nc =
static_cast<std::size_t>(input_data.dims[0]) *
static_cast<std::size_t>(input_data.dims[1]) *
Expand Down Expand Up @@ -504,7 +515,7 @@ namespace cpgrid
}

#if HAVE_OPM_COMMON
if ((ecl_state != nullptr) && ecl_state->aquifer().hasNumericalAquifer()) {
if (numAquiferInGrid) {
const std::size_t global_nc =
static_cast<std::size_t>(input_data.dims[0]) *
static_cast<std::size_t>(input_data.dims[1]) *
Expand Down Expand Up @@ -550,7 +561,7 @@ namespace cpgrid
// here we need the cell volumes based on the active index order
std::unordered_map<std::size_t, double> aquifer_cell_volumes_local{};
#if HAVE_OPM_COMMON
if ((ecl_state != nullptr) && ecl_state->aquifer().hasNumericalAquifer()) {
if (numAquiferInGrid) {
const auto& aquifer_cell_volumes = ecl_state->aquifer()
.numericalAquifers().aquiferCellVolumes();

Expand Down