#7909 : Add helper function to get edge vertices of a cell

This commit is contained in:
Magne Sjaastad
2021-08-27 11:11:49 +02:00
parent 6547ef1525
commit 1afba6c436
4 changed files with 102 additions and 1 deletions

View File

@@ -75,7 +75,8 @@ set(SOURCE_GROUP_SOURCE_FILES
${CMAKE_CURRENT_LIST_DIR}/RifSummaryDataReader-Test.cpp
${CMAKE_CURRENT_LIST_DIR}/RigSlice2D-Test.cpp
${CMAKE_CURRENT_LIST_DIR}/RigSurfaceResampler-Test.cpp
${CMAKE_CURRENT_LIST_DIR}/RigSurfaceStatisticsCalculator-Test.cpp)
${CMAKE_CURRENT_LIST_DIR}/RigSurfaceStatisticsCalculator-Test.cpp
${CMAKE_CURRENT_LIST_DIR}/StructGridInterface-Test.cpp)
if(RESINSIGHT_ENABLE_GRPC)
list(APPEND GPRC_UNIT_TEST_SOURCE_FILES

View File

@@ -0,0 +1,52 @@
/////////////////////////////////////////////////////////////////////////////////
//
// Copyright (C) Statoil ASA
// Copyright (C) Ceetron Solutions AS
//
// ResInsight 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.
//
// ResInsight 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 at <http://www.gnu.org/licenses/gpl.html>
// for more details.
//
/////////////////////////////////////////////////////////////////////////////////
#include "gtest/gtest.h"
#include "cvfStructGrid.h"
using namespace cvf;
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
TEST( StructGridInterfaceTest, TestEdgeVertices )
{
{
// Baseline
StructGridInterface::FaceType face1 = StructGridInterface::NEG_K;
StructGridInterface::FaceType face2 = StructGridInterface::POS_I;
auto indices = StructGridInterface::edgeVertexIndices( face1, face2 );
EXPECT_EQ( indices.first, 2 );
EXPECT_EQ( indices.second, 1 );
}
{
// Opposite order as baseline test
StructGridInterface::FaceType face1 = StructGridInterface::POS_I;
StructGridInterface::FaceType face2 = StructGridInterface::NEG_K;
auto indices = StructGridInterface::edgeVertexIndices( face1, face2 );
EXPECT_EQ( indices.first, 2 );
EXPECT_EQ( indices.second, 1 );
}
}

View File

@@ -153,6 +153,51 @@ void StructGridInterface::cellFaceVertexIndices( FaceType face, cvf::ubyte verte
}
}
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
std::pair<ubyte, ubyte> StructGridInterface::edgeVertexIndices( FaceType face1, FaceType face2 )
{
//
// Return the two shared vertex indices between two faces
// Asserts if the two faces do not have any shared vertices
// The ordering is identical to the ordering in StructGridInterface::cellFaceVertexIndices
//
// Ensure face1 has the largest enum value
if ( face2 > face1 ) std::swap( face1, face2 );
if ( face1 == NEG_K )
{
if ( face2 == NEG_I ) return { 0, 3 };
if ( face2 == POS_I ) return { 2, 1 };
if ( face2 == NEG_J ) return { 1, 0 };
if ( face2 == POS_J ) return { 3, 2 };
}
if ( face1 == POS_K )
{
if ( face2 == NEG_I ) return { 7, 4 };
if ( face2 == POS_I ) return { 5, 6 };
if ( face2 == NEG_J ) return { 4, 5 };
if ( face2 == POS_J ) return { 6, 7 };
}
if ( face1 == NEG_J )
{
if ( face2 == NEG_I ) return { 4, 0 };
if ( face2 == POS_I ) return { 1, 5 };
}
if ( face1 == POS_J )
{
if ( face2 == NEG_I ) return { 3, 7 };
if ( face2 == POS_I ) return { 6, 2 };
}
return {};
}
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------

View File

@@ -120,6 +120,9 @@ public:
static GridAxisType gridAxisFromFace( FaceType face );
static std::pair<ubyte, ubyte> edgeVertexIndices( cvf::StructGridInterface::FaceType face1,
cvf::StructGridInterface::FaceType face2 );
private:
mutable double m_characteristicCellSizeI;
mutable double m_characteristicCellSizeJ;