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

Do not require ACTNUM presence to construct grid.

Browse Source
This commit is contained in:
Atgeirr Flø Rasmussen 2012-03-26 13:35:19 +02:00
parent 5c2cc54ecc
commit f5d33f4602
1 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
opm/core/GridManager.cpp
View File

@ -36,7 +36,10 @@ namespace Opm
// Extract data from deck. // Extract data from deck.
const std::vector<double>& zcorn = deck.getFloatingPointValue("ZCORN"); const std::vector<double>& zcorn = deck.getFloatingPointValue("ZCORN");
const std::vector<double>& coord = deck.getFloatingPointValue("COORD"); const std::vector<double>& coord = deck.getFloatingPointValue("COORD");
const std::vector<int>& actnum = deck.getIntegerValue("ACTNUM"); const int* actnum = 0;
if (deck.hasField("ACTNUM")) {
actnum = &(deck.getIntegerValue("ACTNUM")[0]);
}
std::vector<int> dims; std::vector<int> dims;
if (deck.hasField("DIMENS")) { if (deck.hasField("DIMENS")) {
dims = deck.getIntegerValue("DIMENS"); dims = deck.getIntegerValue("DIMENS");
@ -50,7 +53,7 @@ namespace Opm
struct grdecl grdecl; struct grdecl grdecl;
grdecl.zcorn = &zcorn[0]; grdecl.zcorn = &zcorn[0];
grdecl.coord = &coord[0]; grdecl.coord = &coord[0];
grdecl.actnum = actnum.empty() ? 0 : &actnum[0]; grdecl.actnum = actnum;
grdecl.dims[0] = dims[0]; grdecl.dims[0] = dims[0];
grdecl.dims[1] = dims[1]; grdecl.dims[1] = dims[1];
grdecl.dims[2] = dims[2]; grdecl.dims[2] = dims[2];