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

[bugfix] index maps need to be created in any case to account for

Browse Source 
possible reordering of element numbering.
This commit is contained in:
Robert Kloefkorn 2017-06-23 13:02:42 +02:00
parent f1da775f41
commit 06280c9062
1 changed files with 15 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
ebos/collecttoiorank.hh
View File

@ -179,13 +179,10 @@ namespace Ewoms
isIORank_( gridManager.grid().comm().rank() == ioRank ), isIORank_( gridManager.grid().comm().rank() == ioRank ),
isParallel_( gridManager.grid().comm().size() > 1 ) isParallel_( gridManager.grid().comm().size() > 1 )
{ {
if ( !isParallel_ )
{
// no need to collect anything.
return;
}
const CollectiveCommunication& comm = gridManager.grid().comm(); const CollectiveCommunication& comm = gridManager.grid().comm();
// create global and local index maps
// this is needed even in serial run for possible remapping of data
{ {
std::set< int > send, recv; std::set< int > send, recv;
// the I/O rank receives from all other ranks // the I/O rank receives from all other ranks
@ -259,10 +256,9 @@ namespace Ewoms
distributedCartesianIndex[elemIdx] = gridManager.cartesianIndex( elemIdx ); distributedCartesianIndex[elemIdx] = gridManager.cartesianIndex( elemIdx );
// only store interior element for collection // only store interior element for collection
if( element.partitionType() == Dune :: InteriorEntity ) assert( element.partitionType() == Dune :: InteriorEntity );
{
localIndexMap_.push_back( elemIdx ); localIndexMap_.push_back( elemIdx );
}
} }
// insert send and recv linkage to communicator // insert send and recv linkage to communicator
@ -308,9 +304,9 @@ namespace Ewoms
{ {
it->second->resize( globalSize ); it->second->resize( globalSize );
} }
// the last index map is the local one // the last index map is the local one
doUnpack( indexMaps.back(), buffer ); doUnpack( indexMaps.back(), buffer );
} }
} }
@ -319,7 +315,7 @@ namespace Ewoms
{ {
// we should only get one link // we should only get one link
if( link != 0 ) { if( link != 0 ) {
OPM_THROW(std::logic_error,"link in method pack is not 0 as execpted"); OPM_THROW(std::logic_error,"link in method pack is not 0 as expected");
} }
size_t buffers = bufferList_.size(); size_t buffers = bufferList_.size();
@ -399,11 +395,7 @@ namespace Ewoms
template <class BufferList> template <class BufferList>
void collect( BufferList& bufferList ) const void collect( BufferList& bufferList ) const
{ {
if ( !isParallel_ ) // this also packs and unpacks the local buffers one ioRank
{
// no need to collect anything.
return;
}
PackUnPackOutputBuffers< BufferList > PackUnPackOutputBuffers< BufferList >
packUnpack( bufferList, packUnpack( bufferList,
localIndexMap_, localIndexMap_,
@ -411,8 +403,15 @@ namespace Ewoms
numCells(), numCells(),
isIORank() ); isIORank() );
if ( !isParallel_ )
{
// no need to collect anything.
return;
}
//toIORankComm_.exchangeCached( packUnpack ); //toIORankComm_.exchangeCached( packUnpack );
toIORankComm_.exchange( packUnpack ); toIORankComm_.exchange( packUnpack );
#ifndef NDEBUG #ifndef NDEBUG
// mkae sure every process is on the same page // mkae sure every process is on the same page
toIORankComm_.barrier(); toIORankComm_.barrier();