Moves functions that do not depend on Eigen to Opm::UgGridHelpers.

As a result we only have one faceCentroid(int) function the returns const double* and
FieldVector<double,3> for UnstructuredGrid and CpGrid, respectively. The codes is
adapted to this.

opm/autodiff/GeoProps.hpp

@@ -156,7 +156,7 @@ namespace Opm
                     typedef typename Cell2Faces::row_type::iterator Iter;
 
                     for (Iter f=faces.begin(), end=faces.end(); f!=end; ++f, ++i) {
-                        const double* const fc = AutoDiffGrid::faceCentroid(grid, *f);
+                        auto fc = AutoDiffGrid::faceCentroid(grid, *f);
 
                         for (typename Vector::Index d = 0; d < nd; ++d) {
                             gpot_[i] += grav[d] * (fc[d] - cc[d]);

opm/autodiff/GridHelpers.cpp

@@ -40,35 +40,12 @@ cellCentroidsZToEigen(const UnstructuredGrid& grid)
         (grid.cell_centroids, grid.number_of_cells, grid.dimensions).rightCols<1>();
 }
 
-const double*
-cellCentroid(const UnstructuredGrid& grid, int cell_index)
-{
-    return grid.cell_centroids+(cell_index*grid.dimensions);
-}
-
-const double* faceCentroid(const UnstructuredGrid& grid, int face_index)
-{
-    return grid.face_centroids+(face_index*grid.dimensions);
-}
 /*
 SparseTableView cell2Faces(const UnstructuredGrid& grid)
 {
     return SparseTableView(grid.cell_faces, grid.cell_facepos, numCells(grid));
 }
 */
-double cellVolume(const UnstructuredGrid& grid, int cell_index)
-{
-    return grid.cell_volumes[cell_index];
-}
-
-const double* beginCellVolumes(const UnstructuredGrid& grid)
-{
-    return grid.cell_volumes;
-}
-const double* endCellVolumes(const UnstructuredGrid& grid)
-{
-    return grid.cell_volumes+numCells(grid);
-}
 
 void extractInternalFaces(const UnstructuredGrid& grid,
                           Eigen::Array<int, Eigen::Dynamic, 1>& internal_faces,
@@ -119,24 +96,10 @@ cellCentroidsZToEigen(const Dune::CpGrid& grid)
     Eigen::Array<double, Eigen::Dynamic, 1> array(rows);
     // Fill it with the z coordinate of the cell centroids.
     for (int i=0; i<rows; ++i)
-        array[i]=cellCentroid(grid, i)[2];
+        array[i]=Opm::UgGridHelpers::cellCentroid(grid, i)[2];
     return array;
 }
 
-const double* cellCentroid(const Dune::CpGrid& grid, int cell_index)
-{
-    return &(grid.cellCentroid(cell_index)[0]);
-}
-
-const double* faceCentroid(const Dune::CpGrid& grid, int face_index)
-{
-    return &(grid.faceCentroid(face_index)[0]);
-}
-
-double cellVolume(const  Dune::CpGrid& grid, int cell_index)
-{
-    return grid.cellVolume(cell_index);
-}
 
 void extractInternalFaces(const Dune::CpGrid& grid,
                           Eigen::Array<int, Eigen::Dynamic, 1>& internal_faces,
@@ -167,16 +130,6 @@ void extractInternalFaces(const Dune::CpGrid& grid,
     }
 }
 
-
-CellVolumeIterator beginCellVolumes(const Dune::CpGrid& grid)
-{
-    return CellVolumeIterator(grid, 0);
-}
-
-CellVolumeIterator endCellVolumes(const Dune::CpGrid& grid)
-{
-    return CellVolumeIterator(grid, numCells(grid));
-}
 }       // end namespace AutoDiffGrid
 #endif  // HAVE_DUNE_CORNERPOINT
 }       // end namespace Opm

opm/autodiff/GridHelpers.hpp

@@ -58,16 +58,6 @@ struct ADFaceCellTraits
 Eigen::Array<double, Eigen::Dynamic, 1>
 cellCentroidsZToEigen(const UnstructuredGrid& grid);
 
-/// \brief Get the centroid of a cell.
-/// \param grid The grid whose cell centroid we query.
-/// \param cell_index The index of the corresponding cell.
-const double* cellCentroid(const UnstructuredGrid& grid, int cell_index);
-
-/// \brief Get the cell centroid of a face.
-/// \param grid The grid whose cell centroid we query.
-/// \param face_index The index of the corresponding face.
-const double* faceCentroid(const UnstructuredGrid& grid, int face_index);
-
 /// \brief Mapping of the grid type to the type of the cell to faces mapping.
 template<class T>
 struct ADCell2FacesTraits
@@ -75,33 +65,6 @@ struct ADCell2FacesTraits
 {
 };
 
-/// \brief Get the volume of a cell.
-/// \param grid The grid the cell belongs to.
-/// \param cell_index The index of the cell.
-double cellVolume(const UnstructuredGrid& grid, int cell_index);
-
-/// \brief The mapping of the grid type to type of the iterator over
-/// the cell volumes.
-///
-/// The value of the mapping is stored in nested type IteratorType
-/// \tparam T The type of the grid.
-template<class T>
-struct ADCellVolumesTraits
-{
-};
-
-template<>
-struct ADCellVolumesTraits<UnstructuredGrid>
-{
-    typedef const double* IteratorType;
-};
-
-/// \brief Get an iterator over the cell volumes of a grid positioned at the first cell.
-const double* beginCellVolumes(const UnstructuredGrid& grid);
-
-/// \brief Get an iterator over the cell volumes of a grid positioned after the last cell.
-const double* endCellVolumes(const UnstructuredGrid& grid);
-
 /// \brief extracts the internal faces of a grid.
 /// \param[in] The grid whose internal faces we query.
 /// \param[out] internal_faces The internal faces.
@@ -127,85 +90,12 @@ namespace AutoDiffGrid
 Eigen::Array<double, Eigen::Dynamic, 1>
 cellCentroidsZToEigen(const  Dune::CpGrid& grid);
 
-/// \brief Get the centroid of a cell.
-/// \param grid The grid whose cell centroid we query.
-/// \param cell_index The index of the corresponding cell.
-const double* cellCentroid(const Dune::CpGrid& grid, int cell_index);
-
-/// \brief Get the cell centroid of a face.
-/// \param grid The grid whose cell centroid we query.
-/// \param face_index The index of the corresponding face.
-const double* faceCentroid(const Dune::CpGrid& grid, int face_index);
-
 template<>
 struct ADCell2FacesTraits<Dune::CpGrid>
 {
     typedef Dune::cpgrid::Cell2FacesContainer Type;
 };
 
-/// \brief Get the volume of a cell.
-/// \param grid The grid the cell belongs to.
-/// \param cell_index The index of the cell.
-double cellVolume(const  Dune::CpGrid& grid, int cell_index);
-
-/// \brief An iterator over the cell volumes.
-class CellVolumeIterator
-    : public Dune::RandomAccessIteratorFacade<CellVolumeIterator, double, double, int>
-{
-public:
-    /// \brief Creates an iterator.
-    /// \param grid The grid the iterator belongs to.
-    /// \param cell_index The position of the iterator.
-    CellVolumeIterator(const  Dune::CpGrid& grid, int cell_index)
-        : grid_(&grid), cell_index_(cell_index)
-    {}
-
-    double dereference() const
-    {
-        return grid_->cellVolume(cell_index_);
-    }
-    void increment()
-    {
-        ++cell_index_;
-    }
-    double elementAt(int n) const
-    {
-        return grid_->cellVolume(n);
-    }
-    void advance(int n)
-    {
-        cell_index_+=n;
-    }
-    void decrement()
-    {
-        --cell_index_;
-    }
-    int distanceTo(const CellVolumeIterator& o) const
-    {
-        return o.cell_index_-cell_index_;
-    }
-    bool equals(const CellVolumeIterator& o) const
-    {
-        return o.grid_==grid_ && o.cell_index_==cell_index_;
-    }
-    
-private:
-    const Dune::CpGrid* grid_;
-    int cell_index_;
-};
-
-template<>
-struct ADCellVolumesTraits<Dune::CpGrid>
-{
-    typedef CellVolumeIterator IteratorType;
-};
-
-/// \brief Get an iterator over the cell volumes of a grid positioned at the first cell.
-CellVolumeIterator beginCellVolumes(const Dune::CpGrid& grid);
-
-/// \brief Get an iterator over the cell volumes of a grid positioned one after the last cell.
-CellVolumeIterator endCellVolumes(const Dune::CpGrid& grid);
-
 /// \brief extracts the internal faces of a grid.
 /// \param[in] The grid whose internal faces we query.
 /// \param[out] internal_faces The internal faces.
@@ -243,6 +133,10 @@ using Opm::UgGridHelpers::getCoordinate;
 using Opm::UgGridHelpers::numCellFaces;
 using Opm::UgGridHelpers::beginFaceCentroids;
 using Opm::UgGridHelpers::beginCellCentroids;
+using Opm::UgGridHelpers::cellCentroid;
+using Opm::UgGridHelpers::faceCentroid;
+using Opm::UgGridHelpers::beginCellVolumes;
+using Opm::UgGridHelpers::cellVolume;
 
 template<>
 struct ADFaceCellTraits<UnstructuredGrid>