From 492c8c74a0f9cb3d5a68992298ee069d54e4322a Mon Sep 17 00:00:00 2001
From: Robert Kloefkorn <robert.kloefkorn@iris.no>
Date: Mon, 26 Oct 2015 17:58:16 +0100
Subject: [PATCH] CartesianIndexMapper: fix computation of cartesianCoordinate.

---
 ewoms/common/cartesianindexmapper.hh | 23 ++++++++++++++---------
 1 file changed, 14 insertions(+), 9 deletions(-)

diff --git a/ewoms/common/cartesianindexmapper.hh b/ewoms/common/cartesianindexmapper.hh
index 1494b429a..a6999bde1 100644
--- a/ewoms/common/cartesianindexmapper.hh
+++ b/ewoms/common/cartesianindexmapper.hh
@@ -200,18 +200,23 @@ namespace Dune
         void cartesianCoordinate(const int compressedElementIndex, std::array<int,dimension>& coords) const
         {
           int gc = cartesianIndex( compressedElementIndex );
-          if( dimension >=2 )
+          if( dimension == 3 )
           {
-              for( int d=0; d<dimension-2; ++d )
-              {
-                coords[d] = gc % cartesianDimensions()[d];  gc /= cartesianDimensions()[d];
-              }
-
-              coords[dimension-2] = gc % cartesianDimensions()[dimension-2];
-              coords[dimension-1] = gc / cartesianDimensions()[dimension-1];
+             coords[0] = gc % cartesianDimensions()[0];  gc /= cartesianDimensions()[0];
+             coords[1] = gc % cartesianDimensions()[1];
+             coords[2] = gc / cartesianDimensions()[1];
+          }
+          else if( dimension == 2 )
+          {
+             coords[0] = gc % cartesianDimensions()[0];
+             coords[1] = gc / cartesianDimensions()[0];
+          }
+          else if( dimension == 1 )
+          {
+              coords[ 0 ] = gc ;
           }
           else
-              coords[ 0 ] = gc ;
+            OPM_THROW(Opm::NotImplemented,"cartesianCoordinate not implemented for dimension " << dimension );
         }
 
         template <class GridView>