OilfieldToolsNet/opm-common
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #2711 from totto82/wtest_ref

Browse Source 
return unique vector of names and not a map with wells and reason
This commit is contained in:
Bård Skaflestad 2021-09-28 11:30:36 +02:00 committed by GitHub
commit 3c23f90cfe
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 9 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
opm/parser/eclipse/EclipseState/Schedule/Well/WellTestState.hpp
View File

@ -82,9 +82,9 @@ public:
update method will update the internal state of the object by counting up
the openiing attempts, and also set the time for the last attempt to open.
*/
std::vector<std::pair<std::string, WellTestConfig::Reason>> updateWells(const WellTestConfig& config,
const std::vector<Well>& wells_ecl,
double sim_time);
std::vector<std::string> updateWells(const WellTestConfig& config,
const std::vector<Well>& wells_ecl,
double sim_time);
/*
The update will consult the WellTestConfig object and return a list of

9
src/opm/parser/eclipse/EclipseState/Schedule/Well/WellTestState.cpp
View File

@ -100,11 +100,11 @@ namespace Opm {
return this->wells.size();
}
std::vector<std::pair<std::string, WellTestConfig::Reason>>
std::vector<std::string>
WellTestState::updateWells(const WellTestConfig& config,
const std::vector<Well>& wells_ecl,
double sim_time) {
std::vector<std::pair<std::string, WellTestConfig::Reason>> output;
std::vector<std::string> output;
updateForNewWTEST(config);
@ -130,7 +130,7 @@ namespace Opm {
if (well_config.num_test == 0 || (well.num_attempt < well_config.num_test)) {
well.last_test = sim_time;
well.num_attempt ++;
output.emplace_back(std::make_pair(well.name, well.reason));
output.emplace_back(well.name);
if ( (well_config.num_test != 0) && (well.num_attempt >= well_config.num_test) ) {
OpmLog::info(well.name + " will be tested for " + WellTestConfig::reasonToString(well.reason)
+ " reason for the last time! " );
@ -138,6 +138,9 @@ namespace Opm {
}
}
}
std::sort(output.begin(), output.end());
auto last = std::unique(output.begin(), output.end());
output.erase(last, output.end());
return output;
}