From d87e20578c8ea6393f53b811c778ea1bde7ac251 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Atgeirr=20Fl=C3=B8=20Rasmussen?= <atgeirr@sintef.no>
Date: Tue, 24 Nov 2015 14:25:37 +0100
Subject: [PATCH] Change return type from tuple to array for getCellCenter().

---
 opm/parser/eclipse/EclipseState/Grid/EclipseGrid.cpp | 8 ++++----
 opm/parser/eclipse/EclipseState/Grid/EclipseGrid.hpp | 4 ++--
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/opm/parser/eclipse/EclipseState/Grid/EclipseGrid.cpp b/opm/parser/eclipse/EclipseState/Grid/EclipseGrid.cpp
index 0832d5d95..858827563 100644
--- a/opm/parser/eclipse/EclipseState/Grid/EclipseGrid.cpp
+++ b/opm/parser/eclipse/EclipseState/Grid/EclipseGrid.cpp
@@ -619,22 +619,22 @@ namespace Opm {
         return ecl_grid_get_cell_thickness1( c_ptr() , static_cast<int>(globalIndex));
     }
 
-    std::tuple<double,double,double> EclipseGrid::getCellCenter(size_t globalIndex) const {
+    std::array<double, 3> EclipseGrid::getCellCenter(size_t globalIndex) const {
         assertGlobalIndex( globalIndex );
         {
             double x,y,z;
             ecl_grid_get_xyz1( c_ptr() , static_cast<int>(globalIndex) , &x , &y , &z);
-            return std::tuple<double,double,double> {x,y,z};
+            return std::array<double, 3>{{x,y,z}};
         }
     }
 
 
-    std::tuple<double,double,double> EclipseGrid::getCellCenter(size_t i,size_t j, size_t k) const {
+    std::array<double, 3> EclipseGrid::getCellCenter(size_t i,size_t j, size_t k) const {
         assertIJK(i,j,k);
         {
             double x,y,z;
             ecl_grid_get_xyz3( c_ptr() , static_cast<int>(i),static_cast<int>(j),static_cast<int>(k), &x , &y , &z);
-            return std::tuple<double,double,double> {x,y,z};
+            return std::array<double, 3>{{x,y,z}};
         }
     }
 
diff --git a/opm/parser/eclipse/EclipseState/Grid/EclipseGrid.hpp b/opm/parser/eclipse/EclipseState/Grid/EclipseGrid.hpp
index 34b650a89..f6f433122 100644
--- a/opm/parser/eclipse/EclipseState/Grid/EclipseGrid.hpp
+++ b/opm/parser/eclipse/EclipseState/Grid/EclipseGrid.hpp
@@ -91,8 +91,8 @@ namespace Opm {
         size_t getGlobalIndex(size_t i, size_t j, size_t k) const;
         void assertGlobalIndex(size_t globalIndex) const;
         void assertIJK(size_t i , size_t j , size_t k) const;
-        std::tuple<double,double,double> getCellCenter(size_t i,size_t j, size_t k) const;
-        std::tuple<double,double,double> getCellCenter(size_t globalIndex) const;
+        std::array<double, 3> getCellCenter(size_t i,size_t j, size_t k) const;
+        std::array<double, 3> getCellCenter(size_t globalIndex) const;
         double getCellVolume(size_t globalIndex) const;
         double getCellVolume(size_t i , size_t j , size_t k) const;
         double getCellThicknes(size_t globalIndex) const;