OilfieldToolsNet/opm-simulators
4
0
Fork 0
mirror of https://github.com/OPM/opm-simulators.git synced 2024-12-19 05:53:28 -06:00
Code Issues Packages Projects Releases Wiki Activity

Fix to make EQLNUM consistent with ACTNUM.

Browse Source 
This should eventually be integrated in the parser.
This commit is contained in:
osae 2014-05-05 11:23:43 +02:00
parent 0cdc32d213
commit bd38a577ae
1 changed files with 15 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
opm/core/simulator/initStateEquil.hpp
View File

@ -314,8 +314,21 @@ namespace Opm
if (newParserDeck->hasKeyword("EQLNUM")) { if (newParserDeck->hasKeyword("EQLNUM")) {
const std::vector<int>& e = newParserDeck->getKeyword("EQLNUM")->getIntData(); const std::vector<int>& e = newParserDeck->getKeyword("EQLNUM")->getIntData();
eqlnum.reserve(e.size()); eqlnum.reserve(e.size());
std::transform(e.begin(), e.end(), std::back_inserter(eqlnum), if (newParserDeck->hasKeyword("ACTNUM")) {
std::bind2nd(std::minus<int>(), 1)); std::vector<int>::const_iterator actnum_begin =
newParserDeck->getKeyword("ACTNUM")->getIntData().begin();
std::transform(e.begin(), e.end(), actnum_begin, std::back_inserter(eqlnum),
[](int eql, int act){ return (act == 0) ? -1 : eql-1;});
eqlnum.erase(std::remove_if(eqlnum.begin(), eqlnum.end(),
std::bind2nd(std::less<int>(), 0)),
eqlnum.end());
}
else {
std::transform(e.begin(), e.end(), std::back_inserter(eqlnum),
std::bind2nd(std::minus<int>(), 1));
}
if (eqlnum.size() != G.number_of_cells)
OPM_THROW(std::runtime_error, "Keyword EQLNUM: inconsistent array size.");
} }
else { else {
// No explicit equilibration region. // No explicit equilibration region.