OilfieldToolsNet/opm-simulators
4
0
Fork 0
mirror of https://github.com/OPM/opm-simulators.git synced 2025-02-25 18:55:30 -06:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #319 from blattms/removes-uggridhelpers-cpgrid

Browse Source 
Moves Opm::UgGridHelpers from opm-autodiff to dune-cornerpoint
This commit is contained in:
Atgeirr Flø Rasmussen 2015-03-02 10:10:26 +01:00
commit 09f6e8aacb
2 changed files with 5 additions and 538 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

116
opm/autodiff/GridHelpers.cpp
View File

@ -26,23 +26,6 @@ namespace Opm
{
namespace AutoDiffGrid
{
// Interface functions using Unstructured grid
/*
int numCells(const UnstructuredGrid& grid)
{
return grid.number_of_cells;
}
int numFaces(const UnstructuredGrid& grid)
{
return grid.number_of_faces;
}
int dimensions(const UnstructuredGrid& grid)
{
return grid.dimensions;
}
*/
Eigen::Array<int, Eigen::Dynamic, 2, Eigen::RowMajor>
faceCellsToEigen(const UnstructuredGrid& grid)
{
@ -118,103 +101,6 @@ void extractInternalFaces(const UnstructuredGrid& grid,
} // end namespace AutoDiffGrid
#ifdef HAVE_DUNE_CORNERPOINT
// Interface functions using CpGrid
namespace UgGridHelpers
{
int numCells(const Dune::CpGrid& grid)
{
return grid.numCells();
}
int numFaces(const Dune::CpGrid& grid)
{
return grid.numFaces();
}
int dimensions(const Dune::CpGrid&)
{
return Dune::CpGrid::dimension;
}
int numCellFaces(const Dune::CpGrid& grid)
{
return grid.numCellFaces();
}
const int* cartDims(const Dune::CpGrid& grid)
{
return &(grid.logicalCartesianSize()[0]);
}
const int* globalCell(const Dune::CpGrid& grid)
{
return &(grid.globalCell()[0]);
}
CellCentroidTraits<Dune::CpGrid>::IteratorType
beginCellCentroids(const Dune::CpGrid& grid)
{
return CellCentroidTraits<Dune::CpGrid>::IteratorType(grid, 0);
}
double cellCentroidCoordinate(const Dune::CpGrid& grid, int cell_index,
int coordinate)
{
return grid.cellCentroid(cell_index)[coordinate];
}
FaceCentroidTraits<Dune::CpGrid>::IteratorType
beginFaceCentroids(const Dune::CpGrid& grid)
{
return FaceCentroidTraits<Dune::CpGrid>::IteratorType(grid, 0);
}
FaceCentroidTraits<Dune::CpGrid>::ValueType
faceCentroid(const Dune::CpGrid& grid, int face_index)
{
return grid.faceCentroid(face_index);
}
Opm::AutoDiffGrid::Cell2FacesContainer cell2Faces(const Dune::CpGrid& grid)
{
return Opm::AutoDiffGrid::Cell2FacesContainer(&grid);
}
FaceCellTraits<Dune::CpGrid>::Type
faceCells(const Dune::CpGrid& grid)
{
return Opm::AutoDiffGrid::FaceCellsContainerProxy(&grid);
}
Face2VerticesTraits<Dune::CpGrid>::Type
face2Vertices(const Dune::CpGrid& grid)
{
return Opm::AutoDiffGrid::FaceVerticesContainerProxy(&grid);
}
const double* vertexCoordinates(const Dune::CpGrid& grid, int index)
{
return &(grid.vertexPosition(index)[0]);
}
const double* faceNormal(const Dune::CpGrid& grid, int face_index)
{
return &(grid.faceNormal(face_index)[0]);
}
double faceArea(const Dune::CpGrid& grid, int face_index)
{
return grid.faceArea(face_index);
}
int faceTag(const Dune::CpGrid& grid,
const Opm::AutoDiffGrid::Cell2FacesRow::iterator& cell_face)
{
return grid.faceTag(cell_face);
}
} // end namespace UgGridHelpers
namespace AutoDiffGrid
{
@ -222,7 +108,7 @@ namespace AutoDiffGrid
ADFaceCellTraits<Dune::CpGrid>::Type
faceCellsToEigen(const Dune::CpGrid& grid)
{
return Opm::AutoDiffGrid::FaceCellsContainerProxy(&grid);
return Dune::cpgrid::FaceCellsContainerProxy(&grid);
}
Eigen::Array<double, Eigen::Dynamic, 1>

427
opm/autodiff/GridHelpers.hpp
View File

@ -18,8 +18,8 @@
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_GRIDHELPERS_HEADER_INCLUDED
#define OPM_GRIDHELPERS_HEADER_INCLUDED
#ifndef OPM_AUTODIFF_GRIDHELPERS_HEADER_INCLUDED
#define OPM_AUTODIFF_GRIDHELPERS_HEADER_INCLUDED
#include <functional>
@ -34,6 +34,7 @@
#ifdef HAVE_DUNE_CORNERPOINT
#include <dune/grid/CpGrid.hpp>
#include <dune/grid/cpgrid/GridHelpers.hpp>
#endif
#include <opm/core/utility/platform_dependent/reenable_warnings.h>
@ -118,426 +119,6 @@ void extractInternalFaces(const UnstructuredGrid& grid,
namespace Opm
{
namespace AutoDiffGrid
{
/// \brief A proxy class representing a row of FaceCellsContainer.
class FaceCellsProxy
{
public:
/// \brief Constructor.
/// \param grid The grid whose face to cell mapping we represent.
/// \param cell_index The index of the cell we repesent.
FaceCellsProxy(const Dune::CpGrid* grid, int cell_index)
: grid_(grid), cell_index_(cell_index)
{}
/// \brief Get the index of the cell associated with a local_index.
int operator[](int local_index)
{
return grid_->faceCell(cell_index_, local_index);
}
private:
const Dune::CpGrid* grid_;
int cell_index_;
};
/// \brief A class representing the face to cells mapping similar to the
/// way done in UnstructuredGrid.
class FaceCellsContainerProxy
{
public:
typedef FaceCellsProxy row_type;
/// \brief Constructor.
/// \param grid The grid whose information we represent.
explicit FaceCellsContainerProxy(const Dune::CpGrid* grid)
: grid_(grid)
{}
/// \brief Get the mapping for a cell.
/// \param cell_index The index of the cell.
FaceCellsProxy operator[](int cell_index) const
{
return FaceCellsProxy(grid_, cell_index);
}
/// \brief Get a face associated with a cell.
/// \param cell_index The index of the cell.
/// \param local_index The local index of the cell, either 0 or 1.
/// \param The index of the face or -1 if it is not present because of
/// a boundary.
int operator()(int cell_index, int local_index) const
{
return grid_->faceCell(cell_index, local_index);
}
private:
const Dune::CpGrid* grid_;
};
class IndexIterator
{
public:
explicit IndexIterator(int index)
: index_(index)
{}
void increment()
{
++index_;
}
void decrement()
{
--index_;
}
void advance(int n)
{
index_+=n;
}
int distanceTo(const IndexIterator& o)const
{
return o.index_-index_;
}
bool equals(const IndexIterator& o) const
{
return index_==o.index_;
}
protected:
int index_;
};
/// \brief A proxy class representing a row of LocalIndexContainerProxy.
/// \tparam AccessMethod Function pointer to access the values of a sparse
/// row (e.g. the faces attached to a cell.
/// \tparam SizeMethod Fuction pointer to access the size of the sparse row
/// (e.g. the number of faces attached to a cell.
template<int (Dune::CpGrid::*AccessMethod)(int,int)const,
int (Dune::CpGrid::*SizeMethod)(int)const>
class LocalIndexProxy
{
public:
class iterator
: public Dune::RandomAccessIteratorFacade<iterator,int, int, int>,
public IndexIterator
{
public:
iterator(const Dune::CpGrid* grid, int outer_index, int inner_index)
: IndexIterator(inner_index), grid_(grid), outer_index_(outer_index)
{}
int dereference() const
{
return std::mem_fn(AccessMethod)(*grid_, outer_index_, this->index_);
}
int elementAt(int n) const
{
return std::mem_fn(AccessMethod)(*grid_, outer_index_, n);
}
private:
int outer_index_;
const Dune::CpGrid* grid_;
};
typedef iterator const_iterator;
/// \brief Constructor.
/// \param grid The grid whose face to cell mapping we represent.
/// \param cell_index The index of the cell we repesent.
LocalIndexProxy(const Dune::CpGrid* grid, int cell_index)
: grid_(grid), cell_index_(cell_index)
{}
/// \brief Get the index of the cell associated with a local_index.
int operator[](int local_index)
{
return std::mem_fn(AccessMethod)(*grid_, cell_index_, local_index);
}
const_iterator begin()
{
return const_iterator(grid_, cell_index_, 0);
}
const_iterator end()
{
return const_iterator(grid_, cell_index_,
std::mem_fn(SizeMethod)(*grid_, cell_index_));
}
private:
const Dune::CpGrid* grid_;
int cell_index_;
};
/// \brief A class representing the sparse mapping of entity relations (e.g. vertices of faces).
/// \tparam AccessMethod Function pointer to access the values of a sparse
/// row (e.g. the vertices attached to a face.
/// \tparam SizeMethod Fuction pointer to access the size of the sparse row
/// (e.g. the number of vertices attached to a face.
template<int (Dune::CpGrid::*AccessMethod)(int,int)const,
int (Dune::CpGrid::*SizeMethod)(int)const>
class LocalIndexContainerProxy
{
public:
typedef LocalIndexProxy<AccessMethod, SizeMethod> row_type;
/// \brief Constructor.
/// \param grid The grid whose information we represent.
explicit LocalIndexContainerProxy(const Dune::CpGrid* grid)
: grid_(grid)
{}
/// \brief Get the mapping for a cell.
/// \param cell_index The index of the cell.
row_type operator[](int cell_index) const
{
return row_type(grid_, cell_index);
}
/// \brief Get a face associated with a cell.
/// \param cell_index The index of the cell.
/// \param local_index The local index of the cell, either 0 or 1.
/// \param The index of the face or -1 if it is not present because of
/// a boundary.
int operator()(int cell_index, int local_index) const
{
return std::mem_fn(AccessMethod)(*grid_, cell_index, local_index);
}
private:
const Dune::CpGrid* grid_;
};
/// \brief A class representing the face to vertices mapping similar to the
/// way done in UnstructuredGrid.
class FaceVerticesContainerProxy
: public LocalIndexContainerProxy<&Dune::CpGrid::faceVertex, &Dune::CpGrid::numFaceVertices>
{
public:
/// \brief Constructor.
/// \param grid The grid whose information we represent.
FaceVerticesContainerProxy(const Dune::CpGrid* grid)
: LocalIndexContainerProxy<&Dune::CpGrid::faceVertex, &Dune::CpGrid::numFaceVertices>(grid)
{}
};
class Cell2FacesRow
{
public:
class iterator
: public Dune::RandomAccessIteratorFacade<iterator,int, int, int>,
public IndexIterator
{
public:
iterator(const Dune::cpgrid::OrientedEntityTable<0,1>::row_type* row,
int index, int cell_index)
: IndexIterator(index), row_(row), cell_index_(cell_index)
{}
int dereference() const
{
return row_->operator[](this->index_).index();
}
int elementAt(int n) const
{
return row_->operator[](n).index();
}
int getCellIndex()const
{
return cell_index_;
}
private:
const Dune::cpgrid::OrientedEntityTable<0,1>::row_type* row_;
int cell_index_;
};
typedef iterator const_iterator;
Cell2FacesRow(const Dune::cpgrid::OrientedEntityTable<0,1>::row_type row,
const int cell_index)
: row_(row), cell_index_(cell_index)
{}
const_iterator begin() const
{
return const_iterator(&row_, 0, cell_index_);
}
const_iterator end() const
{
return const_iterator(&row_, row_.size(), cell_index_);
}
private:
const Dune::cpgrid::OrientedEntityTable<0,1>::row_type row_;
const int cell_index_;
};
class Cell2FacesContainer
{
public:
typedef Cell2FacesRow row_type;
explicit Cell2FacesContainer(const Dune::CpGrid* grid)
: grid_(grid)
{};
Cell2FacesRow operator[](int cell_index) const
{
auto& row=grid_->cellFaceRow(cell_index);
return Cell2FacesRow(row, cell_index);
}
/// \brief Get the number of non-zero entries.
std::size_t noEntries() const
{
return grid_->numCellFaces();
}
private:
const Dune::CpGrid* grid_;
};
}
namespace UgGridHelpers
{
template<>
struct Cell2FacesTraits<Dune::CpGrid>
{
typedef Opm::AutoDiffGrid::Cell2FacesContainer Type;
};
/// \brief An iterator over the cell volumes.
template<const Dune::FieldVector<double, 3>& (Dune::CpGrid::*Method)(int)const>
class CpGridCentroidIterator
: public Dune::RandomAccessIteratorFacade<CpGridCentroidIterator<Method>, Dune::FieldVector<double, 3>,
const Dune::FieldVector<double, 3>&, int>
{
public:
/// \brief Creates an iterator.
/// \param grid The grid the iterator belongs to.
/// \param cell_index The position of the iterator.
CpGridCentroidIterator(const Dune::CpGrid& grid, int cell_index)
: grid_(&grid), cell_index_(cell_index)
{}
const Dune::FieldVector<double, 3>& dereference() const
{
return std::mem_fn(Method)(*grid_, cell_index_);
}
void increment()
{
++cell_index_;
}
const Dune::FieldVector<double, 3>& elementAt(int n) const
{
return std::mem_fn(Method)(*grid_, n);
}
void advance(int n)
{
cell_index_+=n;
}
void decrement()
{
--cell_index_;
}
int distanceTo(const CpGridCentroidIterator& o) const
{
return o.cell_index_-cell_index_;
}
bool equals(const CpGridCentroidIterator& o) const
{
return o.grid_==grid_ && o.cell_index_==cell_index_;
}
private:
const Dune::CpGrid* grid_;
int cell_index_;
};
template<>
struct CellCentroidTraits<Dune::CpGrid>
{
typedef CpGridCentroidIterator<&Dune::CpGrid::cellCentroid> IteratorType;
typedef const double* ValueType;
};
/// \brief Get the number of cells of a grid.
int numCells(const Dune::CpGrid& grid);
/// \brief Get the number of faces of a grid.
int numFaces(const Dune::CpGrid& grid);
/// \brief Get the dimensions of a grid
int dimensions(const Dune::CpGrid& grid);
/// \brief Get the number of faces, where each face counts as many times as there are adjacent faces
int numCellFaces(const Dune::CpGrid& grid);
/// \brief Get the cartesion dimension of the underlying structured grid.
const int* cartDims(const Dune::CpGrid& grid);
/// \brief Get the local to global index mapping.
///
/// The global index is the index of the active cell
/// in the underlying structured grid.
const int* globalCell(const Dune::CpGrid&);
CellCentroidTraits<Dune::CpGrid>::IteratorType
beginCellCentroids(const Dune::CpGrid& grid);
/// \brief Get a coordinate of a specific cell centroid.
/// \brief grid The grid.
/// \brief cell_index The index of the specific cell.
/// \breif coordinate The coordinate index.
double cellCentroidCoordinate(const Dune::CpGrid& grid, int cell_index,
int coordinate);
template<>
struct FaceCentroidTraits<Dune::CpGrid>
{
typedef CpGridCentroidIterator<&Dune::CpGrid::faceCentroid> IteratorType;
typedef const Dune::CpGrid::Vector ValueType;
};
/// \brief Get an iterator over the face centroids positioned at the first cell.
FaceCentroidTraits<Dune::CpGrid>::IteratorType
beginFaceCentroids(const Dune::CpGrid& grid);
/// \brief Get a coordinate of a specific face centroid.
/// \param grid The grid.
/// \param face_index The index of the specific face.
/// \param coordinate The coordinate index.
FaceCentroidTraits<Dune::CpGrid>::ValueType
faceCentroid(const Dune::CpGrid& grid, int face_index);
template<>
struct FaceCellTraits<Dune::CpGrid>
{
typedef Opm::AutoDiffGrid::FaceCellsContainerProxy Type;
};
/// \brief Get the cell to faces mapping of a grid.
Opm::AutoDiffGrid::Cell2FacesContainer cell2Faces(const Dune::CpGrid& grid);
/// \brief Get the face to cell mapping of a grid.
FaceCellTraits<Dune::CpGrid>::Type
faceCells(const Dune::CpGrid& grid);
template<>
struct Face2VerticesTraits<Dune::CpGrid>
{
typedef Opm::AutoDiffGrid::FaceVerticesContainerProxy Type;
};
/// \brief Get the face to vertices mapping of a grid.
Face2VerticesTraits<Dune::CpGrid>::Type
face2Vertices(const Dune::CpGrid& grid);
/// \brief Get the coordinates of a vertex of the grid.
/// \param grid The grid the vertex is part of.
/// \param index The index identifying the vertex.
const double* vertexCoordinates(const Dune::CpGrid& grid, int index);
const double* faceNormal(const Dune::CpGrid& grid, int face_index);
double faceArea(const Dune::CpGrid& grid, int face_index);
/// \brief Get Eclipse Cartesian tag of a face
/// \param grid The grid that the face is part of.
/// \param cell_face The face attached to a cell. Usually obtained from face2Cells.
/// \return 0, 1, 2, 3, 4, 5 for I-, I+, J-, J+, K-, K+
int faceTag(const Dune::CpGrid& grid,
const Opm::AutoDiffGrid::Cell2FacesRow::iterator& cell_face);
} // end namespace UgGridHelperHelpers
namespace AutoDiffGrid
{
@ -559,7 +140,7 @@ const double* faceCentroid(const Dune::CpGrid& grid, int face_index);
template<>
struct ADCell2FacesTraits<Dune::CpGrid>
{
typedef Cell2FacesContainer Type;
typedef Dune::cpgrid::Cell2FacesContainer Type;
};
/// \brief Get the volume of a cell.