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

Make ParallelDebugOutput constructable with global or distributed grid view.

Browse Source 
That makes coding a little more me/fool proof.
This commit is contained in:
Markus Blatt
2017-01-27 12:33:19 +01:00
parent 03cb9f4afa
commit 35ff439ee1
1 changed files with 14 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
opm/autodiff/ParallelDebugOutput.hpp
View File

@@ -242,7 +242,7 @@ namespace Opm
enum { ioRank = 0 }; enum { ioRank = 0 };
/// \brief Constructor /// \brief Constructor
/// \param otherGrid The grid with the distributed(!) view activated. /// \param otherGrid The grid after loadbalance was run.
/// \param eclipseState The eclipse file parser output /// \param eclipseState The eclipse file parser output
/// \param numPhases The number of active phases. /// \param numPhases The number of active phases.
/// \param permeability The permeabilities for the global(!) view. /// \param permeability The permeabilities for the global(!) view.
@@ -252,16 +252,22 @@ namespace Opm
const Opm::PhaseUsage& phaseUsage) const Opm::PhaseUsage& phaseUsage)
: grid_(), : grid_(),
eclipseState_( eclipseState ), eclipseState_( eclipseState ),
toIORankComm_( otherGrid.comm() ),
globalCellData_(new data::Solution), globalCellData_(new data::Solution),
isIORank_( otherGrid.comm().rank() == ioRank ), isIORank_(true),
phaseUsage_(phaseUsage) phaseUsage_(phaseUsage)
{ {
// Switch to distributed view unconditionally for safety.
Dune::CpGrid distributed_grid = otherGrid;
const CollectiveCommunication& comm = otherGrid.comm(); const CollectiveCommunication& comm = otherGrid.comm();
if( comm.size() > 1 ) if( comm.size() > 1 )
{ {
std::set< int > send, recv; std::set< int > send, recv;
distributed_grid.switchToDistributedView();
toIORankComm_ = distributed_grid.comm();
isIORank_ = (distributed_grid.comm().rank() == ioRank);
// the I/O rank receives from all other ranks // the I/O rank receives from all other ranks
if( isIORank() ) if( isIORank() )
{ {
@@ -301,10 +307,10 @@ namespace Opm
} }
localIndexMap_.clear(); localIndexMap_.clear();
localIndexMap_.reserve( otherGrid.size( 0 ) ); localIndexMap_.reserve( distributed_grid.size( 0 ) );
unsigned int index = 0; unsigned int index = 0;
auto localView = otherGrid.leafGridView(); auto localView = distributed_grid.leafGridView();
for( auto it = localView.begin< 0 >(), for( auto it = localView.begin< 0 >(),
end = localView.end< 0 >(); it != end; ++it, ++index ) end = localView.end< 0 >(); it != end; ++it, ++index )
{ {
@@ -327,13 +333,13 @@ namespace Opm
} }
// 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( globalIndex_, otherGrid.globalCell(), localIndexMap_, indexMaps_ ); DistributeIndexMapping distIndexMapping( globalIndex_, distributed_grid.globalCell(), localIndexMap_, indexMaps_ );
toIORankComm_.exchange( distIndexMapping ); toIORankComm_.exchange( distIndexMapping );
} }
else // serial run else // serial run
{ {
// copy global cartesian index // copy global cartesian index
globalIndex_ = otherGrid.globalCell(); globalIndex_ = distributed_grid.globalCell();
} }
} }
@@ -702,7 +708,7 @@ namespace Opm
// this needs to be revised // this needs to be revised
WellStateFullyImplicitBlackoil globalWellState_; WellStateFullyImplicitBlackoil globalWellState_;
// true if we are on I/O rank // true if we are on I/O rank
const bool isIORank_; bool isIORank_;
// Phase usage needed to convert solution to simulation data container // Phase usage needed to convert solution to simulation data container
Opm::PhaseUsage phaseUsage_; Opm::PhaseUsage phaseUsage_;
}; };