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] fix global, distributed and local mappings.

Browse Source
This commit is contained in:
Robert Kloefkorn
2016-11-22 14:28:07 +01:00
parent 0062a0e18f
commit deed854a20
1 changed files with 26 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files

59
ebos/collecttoiorank.hh
View File

@@ -183,44 +183,32 @@ namespace Ewoms
ElementMapper; ElementMapper;
const CollectiveCommunication& comm = gridManager.grid().comm(); const CollectiveCommunication& comm = gridManager.grid().comm();
ElementMapper elemMapper(gridManager.gridView());
{ {
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
if( isIORank() ) if( isIORank() )
{ {
const auto& eclGrid = gridManager.eclGrid(); // the I/O rank needs a picture of the global grid, here we
// use equilGrid which represents a view on the global grid
const size_t globalSize = gridManager.equilGrid().leafGridView().size( 0 );
// reserve memory
globalCartesianIndex_.reserve( globalSize );
globalCartesianIndex_.clear();
// create the ACTNUM array based on the "real" grid which is used for // loop over all elements (global grid) and store Cartesian index
// simulation. Note that this is still an approximation because the simulation auto elemIt = gridManager.equilGrid().leafGridView().template begin<0>();
// grid may also modify the geometry of cells (e.g. because of the PINCH const auto& elemEndIt = gridManager.equilGrid().leafGridView().template end<0>();
// keyword), but at least the number of cells is correct, so all values are int count = 0;
// hopefully displayed at approximately the correct location. for (; elemIt != elemEndIt; ++elemIt, ++count) {
std::vector<int> actnumData(eclGrid->getCartesianSize(), 0);
ElementMapper elemMapper(gridManager.gridView());
auto elemIt = gridManager.gridView().template begin<0>();
const auto& elemEndIt = gridManager.gridView().template end<0>();
for (; elemIt != elemEndIt; ++elemIt) {
#if DUNE_VERSION_NEWER(DUNE_COMMON, 2,4) #if DUNE_VERSION_NEWER(DUNE_COMMON, 2,4)
int elemIdx = elemMapper.index(*elemIt ); int elemIdx = elemMapper.index(*elemIt );
#else #else
int elemIdx = elemMapper.map(*elemIt ); int elemIdx = elemMapper.map(*elemIt );
#endif #endif
int cartElemIdx = gridManager.cartesianIndex(elemIdx); assert( count == elemIdx );
actnumData[cartElemIdx] = 1; int cartElemIdx = gridManager.equilCartesianIndexMapper().cartesianIndex(elemIdx);
} globalCartesianIndex_.push_back( cartElemIdx );
// the I/O rank needs a picture of the global grid
const size_t cartesianSize = eclGrid->getCartesianSize();
// reserve memory
globalCartesianIndex_.reserve( cartesianSize );
globalCartesianIndex_.clear();
// get a global cartesian index for each active cell in the eclipse grid
for( size_t cartIndex=0; cartIndex<cartesianSize; ++cartIndex )
{
if( actnumData[cartIndex] > 0 )
{
globalCartesianIndex_.push_back( cartIndex );
}
} }
for(int i=0; i<comm.size(); ++i) for(int i=0; i<comm.size(); ++i)
@@ -240,12 +228,23 @@ namespace Ewoms
const size_t gridSize = gridManager.grid().size( 0 ); const size_t gridSize = gridManager.grid().size( 0 );
localIndexMap_.reserve( gridSize ); localIndexMap_.reserve( gridSize );
// store the local Cartesian index
IndexMapType distributedCartesianIndex;
distributedCartesianIndex.reserve( gridSize );
unsigned int index = 0; unsigned int index = 0;
auto localView = gridManager.grid().leafGridView(); auto localView = gridManager.grid().leafGridView();
for( auto it = localView.template begin< 0 >(), for( auto it = localView.template begin< 0 >(),
end = localView.template end< 0 >(); it != end; ++it, ++index ) end = localView.template end< 0 >(); it != end; ++it, ++index )
{ {
const auto element = *it ; const auto element = *it ;
#if DUNE_VERSION_NEWER(DUNE_COMMON, 2,4)
int elemIdx = elemMapper.index( element );
#else
int elemIdx = elemMapper.map( element );
#endif
distributedCartesianIndex.push_back( gridManager.cartesianIndex( elemIdx ) );
// only store interior element for collection // only store interior element for collection
if( element.partitionType() == Dune :: InteriorEntity ) if( element.partitionType() == Dune :: InteriorEntity )
{ {
@@ -263,12 +262,6 @@ namespace Ewoms
indexMaps_.resize( comm.size() ); indexMaps_.resize( comm.size() );
} }
// store the local cartesian index
IndexMapType distributedCartesianIndex;
distributedCartesianIndex.reserve( gridSize );
for( size_t cell = 0 ; cell<gridSize; ++cell )
distributedCartesianIndex.push_back( gridManager.cartesianIndex( cell ) );
// distribute global id's to io rank for later association of dof's // distribute global id's to io rank for later association of dof's
DistributeIndexMapping distIndexMapping( globalCartesianIndex_, distributedCartesianIndex, localIndexMap_, indexMaps_ ); DistributeIndexMapping distIndexMapping( globalCartesianIndex_, distributedCartesianIndex, localIndexMap_, indexMaps_ );
toIORankComm_.exchange( distIndexMapping ); toIORankComm_.exchange( distIndexMapping );