Adapt to possibility for Cartesian grids from deck input.

Now we may have a grid generated from deck input using the
keywords DXV, DYV, DZV, which will have a null pointer for
the global_cell mapping. We check if this pointer is null,
and create an identity mapping in this case. The mapping is
needed by the *PropertiesFromDeck classes (and helpers).
This commit is contained in:
Atgeirr Flø Rasmussen 2012-08-09 14:35:00 +02:00
parent 67c13e794a
commit ffdf7ed4f7

View File

@ -38,7 +38,16 @@ int main(int argc, char** argv)
// Finally handle the wells
WellsManager wells(parser, *grid.c_grid(), NULL);
std::vector<int> global_cells(grid.c_grid()->global_cell, grid.c_grid()->global_cell + grid.c_grid()->number_of_cells);
int nc = grid.c_grid()->number_of_cells;
std::vector<int> global_cells(nc);
const int* gc = grid.c_grid()->global_cell;
if (gc != 0) {
std::copy(gc, gc + nc, global_cells.begin());
} else {
for (int cell = 0; cell < nc; ++cell) {
global_cells[cell] = cell;
}
}
double gravity[3] = {0.0, 0.0, parameters.getDefault<double>("gravity", 0.0)};
IncompPropertiesFromDeck incomp_properties(parser, global_cells);