mirror of
https://github.com/OPM/opm-simulators.git
synced 2025-02-25 18:55:30 -06:00
Constructors of *FromDeck classes now take an UnstructuredGrid.
This is a change from taking a vector containing the mapping to deck-consistent logical cartesian indices. The mapping is contained in the UnstructuredGrid::global_cell member, and may be null. The change therefore saves the overhead of constructing a vector as a copy of the data in the grid or (if null) as an identity mapping.
This commit is contained in:
@@ -38,19 +38,8 @@ int main(int argc, char** argv)
|
|||||||
// Finally handle the wells
|
// Finally handle the wells
|
||||||
WellsManager wells(parser, *grid.c_grid(), NULL);
|
WellsManager wells(parser, *grid.c_grid(), NULL);
|
||||||
|
|
||||||
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)};
|
double gravity[3] = {0.0, 0.0, parameters.getDefault<double>("gravity", 0.0)};
|
||||||
IncompPropertiesFromDeck incomp_properties(parser, global_cells);
|
IncompPropertiesFromDeck incomp_properties(parser, *grid.c_grid());
|
||||||
|
|
||||||
RockCompressibility rock_comp(parser);
|
RockCompressibility rock_comp(parser);
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user