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

Merge pull request #3301 from joakim-hove/simplify-comm

Browse Source 
Communicate well rates by directly iterating over container
This commit is contained in:
Joakim Hove 2021-05-26 10:16:47 +02:00 committed by GitHub
commit d83b06c74b
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 25 additions and 42 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

65
opm/simulators/wells/WellState.cpp
View File

@ -238,7 +238,7 @@ void WellState::init(const std::vector<double>& cellPressures,
this->global_well_info = std::make_optional<GlobalWellInfo>( schedule, report_step, wells_ecl ); this->global_well_info = std::make_optional<GlobalWellInfo>( schedule, report_step, wells_ecl );
for (const auto& winfo: parallel_well_info) for (const auto& winfo: parallel_well_info)
{ {
well_rates.insert({winfo->name(), std::make_pair(winfo->isOwner(), std::vector<double>())}); well_rates.insert({winfo->name(), std::make_pair(winfo->isOwner(), std::vector<double>(this->numPhases()))});
} }
const int nw = wells_ecl.size(); const int nw = wells_ecl.size();
@ -1095,66 +1095,49 @@ void WellState::updateStatus(int well_index, Well::Status status)
template<class Comm> template<class Comm>
void WellState::communicateGroupRates(const Comm& comm) void WellState::communicateGroupRates(const Comm& comm)
{ {
// Note that injection_group_vrep_rates is handled separate from
// the forAllGroupData() function, since it contains single doubles,
// not vectors.
// Create a function that calls some function
// for all the individual data items to simplify
// the further code.
auto iterateRatesContainer = [](auto& container, auto& func) {
for (auto& x : container) {
if (x.second.first)
{
func(x.second.second);
}
else
{
// We might actually store non-zero values for
// distributed wells even if they are not owned.
std::vector<double> dummyRate;
dummyRate.assign(x.second.second.size(), 0);
func(dummyRate);
}
}
};
// Compute the size of the data. // Compute the size of the data.
std::size_t sz = 0; std::size_t sz = 0;
auto computeSize = [&sz](const auto& v) { for (const auto& [_, owner_rates] : this->well_rates) {
sz += v.size(); (void)_;
}; const auto& [__, rates] = owner_rates;
iterateRatesContainer(this->well_rates, computeSize); (void)__;
sz += rates.size();
}
sz += this->alq_state.pack_size(); sz += this->alq_state.pack_size();
// Make a vector and collect all data into it. // Make a vector and collect all data into it.
std::vector<double> data(sz); std::vector<double> data(sz);
std::size_t pos = 0; std::size_t pos = 0;
auto collect = [&data, &pos](const auto& v) { for (const auto& [_, owner_rates] : this->well_rates) {
for (const auto& x : v) { (void)_;
data[pos++] = x; const auto& [owner, rates] = owner_rates;
for (const auto& value : rates) {
if (owner)
data[pos++] = value;
else
data[pos++] = 0;
}
} }
};
iterateRatesContainer(this->well_rates, collect);
pos += this->alq_state.pack_data(&data[pos]); pos += this->alq_state.pack_data(&data[pos]);
assert(pos == sz); assert(pos == sz);
// Communicate it with a single sum() call. // Communicate it with a single sum() call.
comm.sum(data.data(), data.size()); comm.sum(data.data(), data.size());
// Distribute the summed vector to the data items.
pos = 0; pos = 0;
auto distribute = [&data, &pos](auto& v) { for (auto& [_, owner_rates] : this->well_rates) {
for (auto& x : v) { (void)_;
x = data[pos++]; auto& [__, rates] = owner_rates;
(void)__;
for (auto& value : rates)
value = data[pos++];
} }
};
iterateRatesContainer(this->well_rates, distribute);
pos += this->alq_state.unpack_data(&data[pos]); pos += this->alq_state.unpack_data(&data[pos]);
assert(pos == sz); assert(pos == sz);
} }
template<class Comm> template<class Comm>
void WellState::updateGlobalIsGrup(const Comm& comm) void WellState::updateGlobalIsGrup(const Comm& comm)
{ {