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

Initialisation of EGLNUM (analogous to e.g SATNUM)

Browse Source
This commit is contained in:
osae 2014-05-06 12:47:24 +02:00
parent 2beb0631b2
commit 6cd46c5585
1 changed files with 8 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -311,24 +311,15 @@ namespace Opm
const UnstructuredGrid& G )
{
std::vector<int> eqlnum;
if (newParserDeck->hasKeyword("EQLNUM")) {
const std::vector<int>& e = newParserDeck->getKeyword("EQLNUM")->getIntData();
eqlnum.reserve(e.size());
if (newParserDeck->hasKeyword("ACTNUM")) {
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());
if (newParserDeck->hasKeyword("EQLNUM")) {
eqlnum.resize(G.number_of_cells);
const std::vector<int>& e =
newParserDeck->getKeyword("EQLNUM")->getIntData();
const int* gc = G.global_cell;
for (int cell = 0; cell < G.number_of_cells; ++cell) {
const int deck_pos = (gc == NULL) ? cell : gc[cell];
eqlnum[cell] = e[deck_pos] - 1;
}
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 {
// No explicit equilibration region.