Removed extra occurrence of grid.h header file.

Makefile.am

@@ -154,7 +154,6 @@ opm/core/utility/cpgpreprocess/sparsetable.h            \
 opm/core/utility/cpgpreprocess/cgridinterface.h         \
 opm/core/utility/cpgpreprocess/geometry.h               \
 opm/core/utility/cpgpreprocess/facetopology.h           \
-opm/core/utility/cpgpreprocess/grid.h                   \
 opm/core/utility/cpgpreprocess/grdecl.h                 \
 opm/core/utility/cart_grid.h                            \
 opm/core/well.h                                         \

opm/core/utility/cpgpreprocess/cgridinterface.h

@@ -19,8 +19,8 @@
 #ifndef CGRIDINTERFACE_H
 #define CGRIDINTERFACE_H
 
-#include "grid.h"
-#include "preprocess.h"
+#include <opm/core/grid.h>
+#include <opm/core/utility/cpgpreprocess/preprocess.h>
 
 #ifdef __cplusplus
 extern "C" {

opm/core/utility/cpgpreprocess/grid.h

@@ -1,60 +0,0 @@
-/*
-  Copyright 2010 SINTEF ICT, Applied Mathematics.
-
-  This file is part of the Open Porous Media project (OPM).
-
-  OPM is free software: you can redistribute it and/or modify
-  it under the terms of the GNU General Public License as published by
-  the Free Software Foundation, either version 3 of the License, or
-  (at your option) any later version.
-
-  OPM is distributed in the hope that it will be useful,
-  but WITHOUT ANY WARRANTY; without even the implied warranty of
-  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-  GNU General Public License for more details.
-
-  You should have received a copy of the GNU General Public License
-  along with OPM.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#ifndef OPM_GRID_HEADER_INCLUDED
-#define OPM_GRID_HEADER_INCLUDED
-
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-
-struct UnstructuredGrid {
-    int    dimensions;
-
-    int    number_of_cells;
-    int    number_of_faces;
-    int    number_of_nodes;
-
-    int    *face_nodes;
-    int    *face_nodepos;
-    int    *face_cells;
-
-    int    *cell_faces;
-    int    *cell_facepos;
-
-    double *node_coordinates;
-
-    double *face_centroids;
-    double *face_areas;
-    double *face_normals;
-
-    double *cell_centroids;
-    double *cell_volumes;
-};
-
-typedef struct UnstructuredGrid grid_t;
-
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif /* OPM_GRID_HEADER_INCLUDED */