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

Simulator Group Data: Chase Upstream API Update

Browse Source 
This commit makes the 'groupData()' function return a

    map<string, Opm::data::GroupData>

object instead of a

    map<string, Opm::data::GroupConstraints>

object.  The 'GroupData' structure adds a level of indirection to
the current per-group summary quantities that are directly assigned
by the simulator.  While here, also move the assignment of the
current group constraints/control values out to a separate helper
to reduce the body of the per-group loop in 'groupData()'.

This is in preparation of adding support for reporting group-level
production/injection guiderates (Gx[IP]GR) to the summary file.
This commit is contained in:
Bård Skaflestad 2020-07-01 13:52:02 +02:00
parent 6a6f55b099
commit 5bb4321824
4 changed files with 100 additions and 67 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

93
ebos/collecttoiorank.hh
View File

@ -549,41 +549,43 @@ public:
class PackUnPackGroupData : public P2PCommunicatorType::DataHandleInterface class PackUnPackGroupData : public P2PCommunicatorType::DataHandleInterface
{ {
const Opm::data::Group& localGroupData_; const Opm::data::GroupValues& localGroupData_;
Opm::data::Group& globalGroupData_; Opm::data::GroupValues& globalGroupData_;
public: public:
PackUnPackGroupData(const Opm::data::Group& localGroupData, PackUnPackGroupData(const Opm::data::GroupValues& localGroupData,
Opm::data::Group& globalGroupData, Opm::data::GroupValues& globalGroupData,
bool isIORank) const bool isIORank)
: localGroupData_(localGroupData) : localGroupData_ (localGroupData)
, globalGroupData_(globalGroupData) , globalGroupData_(globalGroupData)
{ {
if (isIORank) { if (! isIORank) { return; }
MessageBufferType buffer;
pack(0, buffer);
// pass a dummy_link to satisfy virtual class MessageBufferType buffer;
int dummyLink = -1; this->pack(0, buffer);
unpack(dummyLink, buffer);
} // pass a dummy_link to satisfy virtual class
const int dummyLink = -1;
this->unpack(dummyLink, buffer);
} }
// pack all data associated with link // pack all data associated with link
void pack(int link, MessageBufferType& buffer) void pack(int link, MessageBufferType& buffer)
{ {
// we should only get one link // we should only get one link
if (link != 0) if (link != 0) {
throw std::logic_error("link in method pack is not 0 as expected"); throw std::logic_error {
"link in method pack is not 0 as expected"
};
}
// write all group data // write all group data
localGroupData_.write(buffer); this->localGroupData_.write(buffer);
} }
// unpack all data associated with link // unpack all data associated with link
void unpack(int /*link*/, MessageBufferType& buffer) void unpack(int /*link*/, MessageBufferType& buffer)
{ globalGroupData_.read(buffer); } { this->globalGroupData_.read(buffer); }
}; };
@ -649,7 +651,7 @@ public:
void collect(const Opm::data::Solution& localCellData, void collect(const Opm::data::Solution& localCellData,
const std::map<std::pair<std::string, int>, double>& localBlockData, const std::map<std::pair<std::string, int>, double>& localBlockData,
const Opm::data::Wells& localWellData, const Opm::data::Wells& localWellData,
const Opm::data::Group& localGroupData) const Opm::data::GroupValues& localGroupData)
{ {
globalCellData_ = {}; globalCellData_ = {};
globalBlockData_.clear(); globalBlockData_.clear();
@ -660,34 +662,39 @@ public:
if(!needsReordering && !isParallel()) if(!needsReordering && !isParallel())
return; return;
// this also packs and unpacks the local buffers one ioRank
PackUnPackCellData
packUnpackCellData(localCellData,
globalCellData_,
localIndexMap_,
indexMaps_,
numCells(),
isIORank());
if (!isParallel()) // this also linearises the local buffers on ioRank
PackUnPackCellData packUnpackCellData {
localCellData,
this->globalCellData_,
this->localIndexMap_,
this->indexMaps_,
this->numCells(),
this->isIORank()
};
if (! isParallel()) {
// no need to collect anything. // no need to collect anything.
return; return;
}
PackUnPackWellData PackUnPackWellData packUnpackWellData {
packUnpackWellData(localWellData, localWellData,
globalWellData_, this->globalWellData_,
isIORank()); this->isIORank()
};
PackUnPackGroupData PackUnPackGroupData packUnpackGroupData {
packUnpackGroupData(localGroupData, localGroupData,
globalGroupData_, this->globalGroupData_,
isIORank()); this->isIORank()
};
PackUnPackBlockData packUnpackBlockData {
PackUnPackBlockData localBlockData,
packUnpackBlockData(localBlockData, this->globalBlockData_,
globalBlockData_, this->isIORank()
isIORank()); };
toIORankComm_.exchange(packUnpackCellData); toIORankComm_.exchange(packUnpackCellData);
toIORankComm_.exchange(packUnpackWellData); toIORankComm_.exchange(packUnpackWellData);
@ -711,7 +718,7 @@ public:
const Opm::data::Wells& globalWellData() const const Opm::data::Wells& globalWellData() const
{ return globalWellData_; } { return globalWellData_; }
const Opm::data::Group& globalGroupData() const const Opm::data::GroupValues& globalGroupData() const
{ return globalGroupData_; } { return globalGroupData_; }
bool isIORank() const bool isIORank() const
@ -760,7 +767,7 @@ protected:
Opm::data::Solution globalCellData_; Opm::data::Solution globalCellData_;
std::map<std::pair<std::string, int>, double> globalBlockData_; std::map<std::pair<std::string, int>, double> globalBlockData_;
Opm::data::Wells globalWellData_; Opm::data::Wells globalWellData_;
Opm::data::Group globalGroupData_; Opm::data::GroupValues globalGroupData_;
std::vector<int> localIdxToGlobalIdx_; std::vector<int> localIdxToGlobalIdx_;
}; };

5
ebos/eclwellmanager.hh
View File

@ -562,7 +562,10 @@ public:
return wellDat; return wellDat;
} }
Opm::data::Group groupData(const int /* reportStepIdx */, Opm::Schedule& /* sched */) const { Opm::data::GroupValues
groupData(const int /* reportStepIdx */,
const Opm::Schedule& /* sched */) const
{
return {}; return {};
} }

34
opm/simulators/wells/BlackoilWellModel.hpp
View File

@ -187,30 +187,19 @@ namespace Opm {
void initFromRestartFile(const RestartValue& restartValues); void initFromRestartFile(const RestartValue& restartValues);
Opm::data::Group groupData(const int reportStepIdx, Opm::Schedule& sched) const Opm::data::GroupValues
groupData(const int reportStepIdx, const Opm::Schedule& sched) const
{ {
Opm::data::Group dw; auto gvalues = ::Opm::data::GroupValues{};
for (const std::string gname : sched.groupNames(reportStepIdx)) {
for (const auto& gname : sched.groupNames(reportStepIdx)) {
const auto& grup = sched.getGroup(gname, reportStepIdx); const auto& grup = sched.getGroup(gname, reportStepIdx);
const auto& grup_type = grup.getGroupType();
Opm::data::currentGroupConstraints cgc; auto& gdata = gvalues[gname];
cgc.currentProdConstraint = Opm::Group::ProductionCMode::NONE; this->assignGroupControl(grup, gdata);
cgc.currentGasInjectionConstraint = Opm::Group::InjectionCMode::NONE;
cgc.currentWaterInjectionConstraint = Opm::Group::InjectionCMode::NONE;
if (this->well_state_.hasProductionGroupControl(gname)) {
cgc.currentProdConstraint = this->well_state_.currentProductionGroupControl(gname);
}
if ((grup_type == Opm::Group::GroupType::INJECTION) || (grup_type == Opm::Group::GroupType::MIXED)) {
if (this->well_state_.hasInjectionGroupControl(Opm::Phase::WATER, gname)) {
cgc.currentWaterInjectionConstraint = this->well_state_.currentInjectionGroupControl(Opm::Phase::WATER, gname);
}
if (this->well_state_.hasInjectionGroupControl(Opm::Phase::GAS, gname)) {
cgc.currentGasInjectionConstraint = this->well_state_.currentInjectionGroupControl(Opm::Phase::GAS, gname);
}
}
dw.emplace(gname, cgc);
} }
return dw;
return gvalues;
} }
Opm::data::Wells wellData() const Opm::data::Wells wellData() const
@ -443,8 +432,7 @@ namespace Opm {
void setWsolvent(const Group& group, const Schedule& schedule, const int reportStepIdx, double wsolvent); void setWsolvent(const Group& group, const Schedule& schedule, const int reportStepIdx, double wsolvent);
void assignGroupControl(const Group& group, data::GroupData& gdata) const;
}; };

35
opm/simulators/wells/BlackoilWellModel_impl.hpp
View File

@ -2430,5 +2430,40 @@ namespace Opm {
} }
} }
template<typename TypeTag>
void
BlackoilWellModel<TypeTag>::
assignGroupControl(const Group& group, data::GroupData& gdata) const
{
const auto& gname = group.name();
const auto grup_type = group.getGroupType();
auto& cgc = gdata.currentControl;
cgc.currentProdConstraint =
::Opm::Group::ProductionCMode::NONE;
cgc.currentGasInjectionConstraint =
cgc.currentWaterInjectionConstraint =
::Opm::Group::InjectionCMode::NONE;
if (this->well_state_.hasProductionGroupControl(gname)) {
cgc.currentProdConstraint = this->well_state_
.currentProductionGroupControl(gname);
}
if ((grup_type == ::Opm::Group::GroupType::INJECTION) ||
(grup_type == ::Opm::Group::GroupType::MIXED))
{
if (this->well_state_.hasInjectionGroupControl(::Opm::Phase::WATER, gname)) {
cgc.currentWaterInjectionConstraint = this->well_state_
.currentInjectionGroupControl(::Opm::Phase::WATER, gname);
}
if (this->well_state_.hasInjectionGroupControl(::Opm::Phase::GAS, gname)) {
cgc.currentGasInjectionConstraint = this->well_state_
.currentInjectionGroupControl(::Opm::Phase::GAS, gname);
}
}
}
} // namespace Opm } // namespace Opm