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

Adapt to possibility for Cartesian grids from deck input.

Browse Source 
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 1de03f017c
commit 193d4d3921
4 changed files with 37 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
examples/sim_2p_incomp_reorder.cpp
View File

@ -81,8 +81,16 @@ main(int argc, char** argv)
// Grid init
grid.reset(new GridManager(*deck));
// Rock and fluid init
int nc = grid->c_grid()->number_of_cells;
std::vector<int> global_cell(nc);
const int* gc = grid->c_grid()->global_cell;
std::vector<int> global_cell(gc, gc + grid->c_grid()->number_of_cells);
if (gc != 0) {
std::copy(gc, gc + nc, global_cell.begin());
} else {
for (int cell = 0; cell < nc; ++cell) {
global_cell[cell] = cell;
}
}
props.reset(new IncompPropertiesFromDeck(*deck, global_cell));
// check_well_controls = param.getDefault("check_well_controls", false);
// max_well_control_iterations = param.getDefault("max_well_control_iterations", 10);

10
examples/sim_wateroil.cpp
View File

@ -178,8 +178,16 @@ main(int argc, char** argv)
// Grid init
grid.reset(new Opm::GridManager(deck));
// Rock and fluid init
int nc = grid->c_grid()->number_of_cells;
std::vector<int> global_cell(nc);
const int* gc = grid->c_grid()->global_cell;
std::vector<int> global_cell(gc, gc + grid->c_grid()->number_of_cells);
if (gc != 0) {
std::copy(gc, gc + nc, global_cell.begin());
} else {
for (int cell = 0; cell < nc; ++cell) {
global_cell[cell] = cell;
}
}
props.reset(new Opm::BlackoilPropertiesFromDeck(deck, global_cell));
// Wells init.
wells.reset(new Opm::WellsManager(deck, *grid->c_grid(), props->permeability()));

10
examples/spu_2p.cpp
View File

@ -309,8 +309,16 @@ main(int argc, char** argv)
// Grid init
grid.reset(new Opm::GridManager(deck));
// Rock and fluid init
int nc = grid->c_grid()->number_of_cells;
std::vector<int> global_cell(nc);
const int* gc = grid->c_grid()->global_cell;
std::vector<int> global_cell(gc, gc + grid->c_grid()->number_of_cells);
if (gc != 0) {
std::copy(gc, gc + nc, global_cell.begin());
} else {
for (int cell = 0; cell < nc; ++cell) {
global_cell[cell] = cell;
}
}
props.reset(new Opm::IncompPropertiesFromDeck(deck, global_cell));
// Wells init.
wells.reset(new Opm::WellsManager(deck, *grid->c_grid(), props->permeability()));

11
examples/wells_example.cpp
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);