OilfieldToolsNet/opm-simulators
4
0
Fork 0
mirror of https://github.com/OPM/opm-simulators.git synced 2024-12-19 05:53:28 -06:00
Code Issues Packages Projects Releases Wiki Activity

Removed superfluous parameter cartdims from initStateFromDeck.

Browse Source 
The parameter was unused and would cause trouble in initBlackoilStateFromDeck.
This commit is contained in:
Markus Blatt 2014-04-09 14:26:40 +02:00
parent ab5e011f34
commit 07ef14f181
2 changed files with 1 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
opm/core/simulator/initState.hpp
View File

@ -180,7 +180,6 @@ namespace Opm
template <class FaceCells, class FCI, class CCI, class Props, class State> template <class FaceCells, class FCI, class CCI, class Props, class State>
void initStateFromDeck(int number_of_cells, void initStateFromDeck(int number_of_cells,
const int* global_cell, const int* global_cell,
const int* cartdims,
int number_of_faces, int number_of_faces,
FaceCells face_cells, FaceCells face_cells,
FCI begin_face_centroids, FCI begin_face_centroids,

3
opm/core/simulator/initState_impl.hpp
View File

@ -557,7 +557,7 @@ namespace Opm
const double gravity, const double gravity,
State& state) State& state)
{ {
initStateFromDeck(grid.number_of_cells, grid.global_cell, grid.cartdims, initStateFromDeck(grid.number_of_cells, grid.global_cell,
grid.number_of_faces, UgGridHelpers::faceCells(grid), grid.number_of_faces, UgGridHelpers::faceCells(grid),
grid.face_centroids, grid.cell_centroids, grid.dimensions, grid.face_centroids, grid.cell_centroids, grid.dimensions,
props, newParserDeck, gravity, state); props, newParserDeck, gravity, state);
@ -566,7 +566,6 @@ namespace Opm
template <class FaceCells, class FCI, class CCI, class Props, class State> template <class FaceCells, class FCI, class CCI, class Props, class State>
void initStateFromDeck(int number_of_cells, void initStateFromDeck(int number_of_cells,
const int* global_cell, const int* global_cell,
const int* cartdims,
int number_of_faces, int number_of_faces,
FaceCells face_cells, FaceCells face_cells,
FCI begin_face_centroids, FCI begin_face_centroids,