OilfieldToolsNet/opm-simulators
4
0
Fork 0
mirror of https://github.com/OPM/opm-simulators.git synced 2026-09-05 04:40:19 -05:00
Code Issues Packages Projects Releases Wiki Activity

CollectDataToIoRank: don't require the elements of a dune grid to be traversed in consecutive order

Browse Source
This commit is contained in:
Andreas Lauser
2016-12-05 13:56:32 +01:00
parent 4921f7d817
commit 9460177f17
1 changed files with 6 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
ebos/collecttoiorank.hh
+6 -10
View File
@@ -193,22 +193,19 @@ namespace Ewoms
// 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();
globalCartesianIndex_.resize(globalSize, -1);
// loop over all elements (global grid) and store Cartesian index
auto elemIt = gridManager.equilGrid().leafGridView().template begin<0>();
const auto& elemEndIt = gridManager.equilGrid().leafGridView().template end<0>();
int count = 0;
for (; elemIt != elemEndIt; ++elemIt, ++count) {
for (; elemIt != elemEndIt; ++elemIt) {
#if DUNE_VERSION_NEWER(DUNE_COMMON, 2,4)
int elemIdx = elemMapper.index(*elemIt );
#else
int elemIdx = elemMapper.map(*elemIt );
#endif
assert( count == elemIdx );
int cartElemIdx = gridManager.equilCartesianIndexMapper().cartesianIndex(elemIdx);
globalCartesianIndex_.push_back( cartElemIdx );
globalCartesianIndex_[elemIdx] = cartElemIdx;
}
for(int i=0; i<comm.size(); ++i)
@@ -230,12 +227,11 @@ namespace Ewoms
// store the local Cartesian index
IndexMapType distributedCartesianIndex;
distributedCartesianIndex.reserve( gridSize );
distributedCartesianIndex.resize(gridSize, -1);
unsigned int index = 0;
auto localView = gridManager.grid().leafGridView();
for( auto it = localView.template begin< 0 >(),
end = localView.template end< 0 >(); it != end; ++it, ++index )
end = localView.template end< 0 >(); it != end; ++it )
{
const auto element = *it ;
#if DUNE_VERSION_NEWER(DUNE_COMMON, 2,4)
@@ -248,7 +244,7 @@ namespace Ewoms
// only store interior element for collection
if( element.partitionType() == Dune :: InteriorEntity )
{
localIndexMap_.push_back( index );
localIndexMap_[elemIdx] = elemIdx;
}
}