From e5b1feb2d5d5b56670d0fc2effe95f39c61ed814 Mon Sep 17 00:00:00 2001 From: Markus Blatt Date: Thu, 20 Feb 2014 10:45:08 +0100 Subject: [PATCH] Assume begin_cell_centroid to what the name tells us: an iterator over then centroids. Therfore we do not need to call center() in getCoordinate. This is done in the iterator class returned from CpGrid. --- opm/core/grid/GridHelpers.hpp | 2 +- opm/core/props/satfunc/SaturationPropsFromDeck_impl.hpp | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/opm/core/grid/GridHelpers.hpp b/opm/core/grid/GridHelpers.hpp index 3464d18d..939275ba 100644 --- a/opm/core/grid/GridHelpers.hpp +++ b/opm/core/grid/GridHelpers.hpp @@ -215,7 +215,7 @@ double getCoordinate(T* cc, int i) template double getCoordinate(T t, int i) { - return t->center()[i]; + return (*t)[i]; } } // end namespace UGGridHelpers diff --git a/opm/core/props/satfunc/SaturationPropsFromDeck_impl.hpp b/opm/core/props/satfunc/SaturationPropsFromDeck_impl.hpp index f180662b..0715d174 100644 --- a/opm/core/props/satfunc/SaturationPropsFromDeck_impl.hpp +++ b/opm/core/props/satfunc/SaturationPropsFromDeck_impl.hpp @@ -494,7 +494,7 @@ namespace template double getCoordinate(T t, int i) { - return t->center()[i]; + return (*t)[i]; }