From 07ef14f1812d34fb878377800a17419f61ec1928 Mon Sep 17 00:00:00 2001 From: Markus Blatt Date: Wed, 9 Apr 2014 14:26:40 +0200 Subject: [PATCH] Removed superfluous parameter cartdims from initStateFromDeck. The parameter was unused and would cause trouble in initBlackoilStateFromDeck. --- opm/core/simulator/initState.hpp | 1 - opm/core/simulator/initState_impl.hpp | 3 +-- 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/opm/core/simulator/initState.hpp b/opm/core/simulator/initState.hpp index 6bdbbef5d..7f323d009 100644 --- a/opm/core/simulator/initState.hpp +++ b/opm/core/simulator/initState.hpp @@ -180,7 +180,6 @@ namespace Opm template void initStateFromDeck(int number_of_cells, const int* global_cell, - const int* cartdims, int number_of_faces, FaceCells face_cells, FCI begin_face_centroids, diff --git a/opm/core/simulator/initState_impl.hpp b/opm/core/simulator/initState_impl.hpp index 886532cea..1ee3c56f6 100644 --- a/opm/core/simulator/initState_impl.hpp +++ b/opm/core/simulator/initState_impl.hpp @@ -557,7 +557,7 @@ namespace Opm const double gravity, 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.face_centroids, grid.cell_centroids, grid.dimensions, props, newParserDeck, gravity, state); @@ -566,7 +566,6 @@ namespace Opm template void initStateFromDeck(int number_of_cells, const int* global_cell, - const int* cartdims, int number_of_faces, FaceCells face_cells, FCI begin_face_centroids,