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

Adapt writeInitial call to use integer vectors for printing ranks

Browse Source 
This adapts to the new function signature as of PR 216 in opm-output. It uses the
newly introduced map of integer vectors to print the MPI ranks in a parallel run.
This commit is contained in:
Markus Blatt
2017-11-20 15:15:33 +01:00
parent f2a51d29e7
commit 073f63ac4c
3 changed files with 82 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
opm/autodiff/FlowMainEbos.hpp
View File

@@ -481,6 +481,7 @@ namespace Opm
// Writes to:
// state_
// threshold_pressures_
// fluidprops_ (if SWATINIT is used)
void setupState()
{
const PhaseUsage pu = Opm::phaseUsageFromDeck(deck());
@@ -623,6 +624,8 @@ namespace Opm
{
bool output = ( output_ > OUTPUT_LOG_ONLY );
bool output_ecl = param_.getDefault("output_ecl", true);
auto int_vectors = computeCellRanks(output, output_ecl);
if( output && output_ecl && grid().comm().rank() == 0 )
{
exportNncStructure_();
@@ -632,7 +635,7 @@ namespace Opm
UgGridHelpers::createEclipseGrid( this->globalGrid() , inputGrid ),
schedule(),
summaryConfig()));
eclIO_->writeInitial(computeLegacySimProps_(), nnc_);
eclIO_->writeInitial(computeLegacySimProps_(), int_vectors, nnc_);
}
}
@@ -805,6 +808,28 @@ namespace Opm
Scalar gravity() const
{ return ebosProblem().gravity()[2]; }
std::map<std::string, std::vector<int> > computeCellRanks(bool output, bool output_ecl)
{
std::map<std::string, std::vector<int> > integerVectors;
if( output && output_ecl && grid().comm().size() > 1 )
{
// Get the owner rank number for each cell
using ElementMapper = Dune::MultipleCodimMultipleGeomTypeMapper<GridView, Dune::MCMGElementLayout>;
using Handle = CellOwnerDataHandle<ElementMapper>;
ElementMapper globalMapper(this->globalGrid().leafGridView());
const auto* dims = UgGridHelpers::cartDims(grid());
const auto globalSize = dims[0]*dims[1]*dims[2];
std::vector<int> ranks(globalSize, -1);
Handle handle(globalMapper, ranks,
this->globalGrid().globalCell());
this->grid().gatherData(handle);
integerVectors.emplace("MPI_RANKS", ranks);
}
return integerVectors;
}
data::Solution computeLegacySimProps_()
{
const int* dims = UgGridHelpers::cartDims(grid());