OilfieldToolsNet/opm-simulators
4
0
Fork 0
mirror of https://github.com/OPM/opm-simulators.git synced 2024-11-23 01:36:25 -06:00
Code Issues Packages Projects Releases Wiki Activity

clean up after rebase

Browse Source
This commit is contained in:
Tor Harald Sandve 2018-02-09 09:22:38 +01:00
parent 932527d772
commit 76edfa7789
2 changed files with 28 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
ebos/collecttoiorank.hh
View File

@ -25,6 +25,7 @@
#include <opm/output/data/Cells.hpp>
#include <opm/output/data/Solution.hpp>
#include <opm/output/data/Wells.hpp>
//#if HAVE_OPM_GRID
#include <opm/grid/common/p2pcommunicator.hh>
@ -283,6 +284,9 @@ namespace Ewoms
const std::map<std::pair<std::string, int>, double>& localBlockData_;
std::map<std::pair<std::string, int>, double>& globalBlockValues_;
const Opm::data::Wells& localWellData_;
Opm::data::Wells& globalWellData_;
const IndexMapType& localIndexMap_;
const IndexMapStorageType& indexMaps_;
@ -291,6 +295,8 @@ namespace Ewoms
Opm::data::Solution& globalCellData,
const std::map<std::pair<std::string, int>, double>& localBlockData,
std::map<std::pair<std::string, int>, double>& globalBlockValues,
const Opm::data::Wells& localWellData,
Opm::data::Wells& globalWellData,
const IndexMapType& localIndexMap,
const IndexMapStorageType& indexMaps,
const size_t globalSize,
@ -299,6 +305,8 @@ namespace Ewoms
globalCellData_( globalCellData ),
localBlockData_( localBlockData ),
globalBlockValues_( globalBlockValues ),
localWellData_( localWellData ),
globalWellData_( globalWellData ),
localIndexMap_( localIndexMap ),
indexMaps_( indexMaps )
{
@ -338,6 +346,8 @@ namespace Ewoms
write( buffer, localIndexMap_, data);
}
localWellData_.write(buffer);
// write all block data
unsigned int size = localBlockData_.size();
buffer.write( size );
@ -359,6 +369,7 @@ namespace Ewoms
//write all data from local cell data to buffer
read( buffer, indexMap, data);
}
globalWellData_.read(buffer);
// read all block data
unsigned int size = 0;
@ -420,10 +431,12 @@ namespace Ewoms
};
// gather solution to rank 0 for EclipseWriter
void collect( const Opm::data::Solution& localCellData, const std::map<std::pair<std::string, int>, double>& localBlockValues)
void collect( const Opm::data::Solution& localCellData, const std::map<std::pair<std::string, int>, double>& localBlockValues, const Opm::data::Wells& localWellData)
{
globalCellData_ = {};
globalBlockValues_.clear();
globalWellData_.clear();
// index maps only have to be build when reordering is needed
if( ! needsReordering && ! isParallel() )
{
@ -436,6 +449,8 @@ namespace Ewoms
globalCellData_,
localBlockValues,
globalBlockValues_,
localWellData,
globalWellData_,
localIndexMap_,
indexMaps_,
numCells(),
@ -466,6 +481,11 @@ namespace Ewoms
return globalCellData_;
}
const Opm::data::Wells& globalWellData() const
{
return globalWellData_;
}
bool isIORank() const
{
return toIORankComm_.rank() == ioRank;
@ -522,6 +542,7 @@ namespace Ewoms
std::vector<int> globalRanks_;
Opm::data::Solution globalCellData_;
std::map<std::pair<std::string, int>, double> globalBlockValues_;
Opm::data::Wells globalWellData_;
};
} // end namespace Opm

12
ebos/ecloutputblackoilmodule.hh
View File

@ -170,10 +170,10 @@ public:
// Well RFT data
if (!substep) {
for ( const auto& well : simulator_.gridManager().schedule().getWells( reportStepNum )) {
for ( const auto& well : simulator_.vanguard().schedule().getWells( reportStepNum )) {
// don't bother with wells not on this process
const auto& defunct_well_names = simulator_.gridManager().defunctWellNames();
const auto& defunct_well_names = simulator_.vanguard().defunctWellNames();
if ( defunct_well_names.find(well->name()) != defunct_well_names.end() ) {
continue;
}
@ -186,7 +186,7 @@ public:
const size_t i = size_t( completion.getI() );
const size_t j = size_t( completion.getJ() );
const size_t k = size_t( completion.getK() );
const size_t index = simulator_.gridManager().eclState().getInputGrid().getGlobalIndex( i, j, k );
const size_t index = simulator_.vanguard().eclState().getInputGrid().getGlobalIndex( i, j, k );
oilCompletionPressures_.emplace(std::make_pair(index, 0.0));
waterCompletionSaturations_.emplace(std::make_pair(index, 0.0));
@ -644,10 +644,10 @@ public:
void addRftDataToWells(Opm::data::Wells& wellDatas, size_t reportStepNum)
{
for ( const auto& well : simulator_.gridManager().schedule().getWells( reportStepNum )) {
for ( const auto& well : simulator_.vanguard().schedule().getWells( reportStepNum )) {
// don't bother with wells not on this process
const auto& defunct_well_names = simulator_.gridManager().defunctWellNames();
const auto& defunct_well_names = simulator_.vanguard().defunctWellNames();
if ( defunct_well_names.find(well->name()) != defunct_well_names.end() ) {
continue;
}
@ -667,7 +667,7 @@ public:
const size_t j = size_t( completion.getJ() );
const size_t k = size_t( completion.getK() );
const size_t index = simulator_.gridManager().eclState().getInputGrid().getGlobalIndex( i, j, k );
const size_t index = simulator_.vanguard().eclState().getInputGrid().getGlobalIndex( i, j, k );
auto& completionData = wellData.completions[ count ];
completionData.index = index;
count++;