OilfieldToolsNet/opm-core
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Rename vertexNeighbours() -> cellNeighboursAcrossVertices().

Browse Source
This commit is contained in:
Atgeirr Flø Rasmussen
2014-12-01 11:37:49 +01:00
parent e7bdb72ce3
commit 3eb3000248
3 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
opm/core/grid/GridUtilities.cpp
View File

@@ -29,7 +29,7 @@ namespace Opm
/// For each cell, find indices of all other cells sharing a vertex with it.
/// \param[in] grid A grid object.
/// \return A table of neighbour cell-indices by cell.
SparseTable<int> vertexNeighbours(const UnstructuredGrid& grid)
SparseTable<int> cellNeighboursAcrossVertices(const UnstructuredGrid& grid)
{
// 1. Create vertex->cell mapping. We do this by iterating
// over all faces, and adding both its cell neighbours

2
opm/core/grid/GridUtilities.hpp
View File

@@ -29,7 +29,7 @@ namespace Opm
/// For each cell, find indices of all cells sharing a vertex with it.
/// \param[in] grid A grid object.
/// \return A table of neighbour cell-indices by cell.
SparseTable<int> vertexNeighbours(const UnstructuredGrid& grid);
SparseTable<int> cellNeighboursAcrossVertices(const UnstructuredGrid& grid);
/// For each cell, order the (cell) neighbours counterclockwise.
/// \param[in] grid A 2d grid object.

10
tests/test_gridutilities.cpp
View File

@@ -33,11 +33,11 @@
using namespace Opm;
BOOST_AUTO_TEST_CASE(cartesian_2d_vertexNeighbours)
BOOST_AUTO_TEST_CASE(cartesian_2d_cellNeighboursAcrossVertices)
{
const GridManager gm(2, 2);
const UnstructuredGrid& grid = *gm.c_grid();
const SparseTable<int> vnb = vertexNeighbours(grid);
const SparseTable<int> vnb = cellNeighboursAcrossVertices(grid);
const int num_elem = 12;
const int elem[num_elem] = { 1, 2, 3, 0, 2, 3, 0, 1, 3, 0, 1, 2 };
@@ -47,11 +47,11 @@ BOOST_AUTO_TEST_CASE(cartesian_2d_vertexNeighbours)
BOOST_CHECK(vnb == truth);
}
BOOST_AUTO_TEST_CASE(cartesian_3d_vertexNeighbours)
BOOST_AUTO_TEST_CASE(cartesian_3d_cellNeighboursAcrossVertices)
{
const GridManager gm(3, 2, 2);
const UnstructuredGrid& grid = *gm.c_grid();
const SparseTable<int> vnb = vertexNeighbours(grid);
const SparseTable<int> vnb = cellNeighboursAcrossVertices(grid);
BOOST_CHECK_EQUAL(int(vnb.size()), grid.number_of_cells);
BOOST_REQUIRE(!vnb.empty());
@@ -65,7 +65,7 @@ BOOST_AUTO_TEST_CASE(cartesian_2d_orderCounterClockwise)
{
const GridManager gm(2, 2);
const UnstructuredGrid& grid = *gm.c_grid();
SparseTable<int> vnb = vertexNeighbours(grid);
SparseTable<int> vnb = cellNeighboursAcrossVertices(grid);
orderCounterClockwise(grid, vnb);
BOOST_REQUIRE(!vnb.empty());