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 #1362 from GitPaean/fixing_history_mode

Browse Source 
Fixing history mode
This commit is contained in:
Joakim Hove
2019-01-11 18:05:01 +01:00
committed by GitHub
parent 4cd8eba331 60e5a95972
commit 848072f658
3 changed files with 22 additions and 119 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
opm/autodiff/SimFIBODetails.hpp
View File

@@ -69,42 +69,14 @@ namespace Opm
return (0 <= resv_control(wells.ctrls[w]));
}
inline bool
is_resv(const WellMap& wmap,
const std::string& name,
const std::size_t step)
{
bool match = false;
WellMap::const_iterator i = wmap.find(name);
if (i != wmap.end()) {
const Well* wp = i->second;
match = (wp->isProducer(step) &&
wp->getProductionProperties(step)
.hasProductionControl(WellProducer::RESV))
|| (wp->isInjector(step) &&
wp->getInjectionProperties(step)
.hasInjectionControl(WellInjector::RESV));
}
return match;
}
inline std::vector<int>
resvWells(const Wells* wells,
const std::size_t step,
const WellMap& wmap)
resvWells(const Wells* wells)
{
std::vector<int> resv_wells;
if( wells )
{
for (int w = 0, nw = wells->number_of_wells; w < nw; ++w) {
if (is_resv(*wells, w) ||
((wells->name[w] != 0) &&
is_resv(wmap, wells->name[w], step)))
{
if ( is_resv(*wells, w) ) {
resv_wells.push_back(w);
}
}