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

Adjust Whitespace and Rewrap Comments

Browse Source 
In preparation of distributing the 'removed_cells' to all ranks.
This commit is contained in:
Bård Skaflestad 2021-10-05 13:36:40 +02:00
parent f2ce097b4b
commit f01777610f
1 changed files with 20 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
ebos/eclgenericcpgridvanguard.cc
View File

@ -222,16 +222,17 @@ void EclGenericCpGridVanguard<ElementMapper,GridView,Scalar>::doCreateGrids_(Ecl
} }
#if HAVE_MPI #if HAVE_MPI
grid_.reset(new Dune::CpGrid(EclGenericVanguard::comm())); this->grid_ = std::make_unique<Dune::CpGrid>(EclGenericVanguard::comm());
#else #else
grid_.reset(new Dune::CpGrid()); this->grid_ = std::make_unique<Dune::CpGrid>();
#endif #endif
const auto& removed_cells = grid_->processEclipseFormat(input_grid, const auto& removed_cells =
&eclState, this->grid_->processEclipseFormat(input_grid,
/*isPeriodic=*/false, &eclState,
/*flipNormals=*/false, /*isPeriodic=*/false,
/*clipZ=*/false); /*flipNormals=*/false,
/*clipZ=*/false);
if (mpiRank == 0) { if (mpiRank == 0) {
const auto& active_porv = eclState.fieldProps().porv(false); const auto& active_porv = eclState.fieldProps().porv(false);
@ -252,7 +253,6 @@ void EclGenericCpGridVanguard<ElementMapper,GridView,Scalar>::doCreateGrids_(Ecl
volume_unit, volume_unit,
100 * removed_pore_volume / total_pore_volume)); 100 * removed_pore_volume / total_pore_volume));
} }
} }
cartesianIndexMapper_ = std::make_unique<CartesianIndexMapper>(*grid_); cartesianIndexMapper_ = std::make_unique<CartesianIndexMapper>(*grid_);
@ -262,8 +262,10 @@ void EclGenericCpGridVanguard<ElementMapper,GridView,Scalar>::doCreateGrids_(Ecl
const bool has_numerical_aquifer = eclState.aquifer().hasNumericalAquifer(); const bool has_numerical_aquifer = eclState.aquifer().hasNumericalAquifer();
int mpiSize = 1; int mpiSize = 1;
MPI_Comm_size(grid_->comm(), &mpiSize); MPI_Comm_size(grid_->comm(), &mpiSize);
// when there is numerical aquifers, new NNC are generated during grid processing
// we need to pass the NNC from root process to other processes // when there is numerical aquifers, new NNC are generated during
// grid processing we need to pass the NNC from root process to
// other processes
if (has_numerical_aquifer && mpiSize > 1) { if (has_numerical_aquifer && mpiSize > 1) {
auto nnc_input = eclState.getInputNNC(); auto nnc_input = eclState.getInputNNC();
EclMpiSerializer ser(grid_->comm()); EclMpiSerializer ser(grid_->comm());
@ -275,12 +277,14 @@ void EclGenericCpGridVanguard<ElementMapper,GridView,Scalar>::doCreateGrids_(Ecl
} }
#endif #endif
// we use separate grid objects: one for the calculation of the initial condition // We use separate grid objects: one for the calculation of the initial
// via EQUIL and one for the actual simulation. The reason is that the EQUIL code // condition via EQUIL and one for the actual simulation. The reason is
// is allergic to distributed grids and the simulation grid is distributed before // that the EQUIL code is allergic to distributed grids and the
// the initial condition is calculated. // simulation grid is distributed before the initial condition is
// After loadbalance grid_ will contain a global and distribute view. // calculated.
// equilGrid_being a shallow copy only the global view. //
// After loadbalance, grid_ will contain a global and distribute view.
// equilGrid_ being a shallow copy only the global view.
if (mpiRank == 0) if (mpiRank == 0)
{ {
equilGrid_.reset(new Dune::CpGrid(*grid_)); equilGrid_.reset(new Dune::CpGrid(*grid_));