OilfieldToolsNet/ResInsight
4
0
Fork 0
mirror of https://github.com/OPM/ResInsight.git synced 2025-02-10 15:36:09 -06:00
Code Issues Packages Projects Releases Wiki Activity

#1091 - pre-proto - Adding function for finding an "average" z direction, as the vector normal to the vectors between face centers in i and j.

Browse Source
This commit is contained in:
astridkbjorke 2017-01-24 11:03:07 +01:00
parent 4a37d988a2
commit 030b405d7f
3 changed files with 58 additions and 123 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
ApplicationCode/ReservoirDataModel/RigCellGeometryTools.cpp
View File

@ -138,4 +138,36 @@ void RigCellGeometryTools::createPolygonFromLineSegments(std::list<std::pair<cvf
}
//--------------------------------------------------------------------------------------------------
/// Returns the a vector normal to the vectors between face centers in I and J direction
///
//--------------------------------------------------------------------------------------------------
void RigCellGeometryTools::findCellAverageZdirection(cvf::Vec3d * hexCorners, cvf::Vec3d &averageZdirection)
{
cvf::ubyte faceVertexIndices[4];
cvf::StructGridInterface::FaceEnum face;
face = cvf::StructGridInterface::NEG_I;
cvf::StructGridInterface::cellFaceVertexIndices(face, faceVertexIndices);
cvf::Vec3d faceCenterNegI = cvf::GeometryTools::computeFaceCenter(hexCorners[faceVertexIndices[0]], hexCorners[faceVertexIndices[1]], hexCorners[faceVertexIndices[2]], hexCorners[faceVertexIndices[3]]);
face = cvf::StructGridInterface::POS_I;
cvf::StructGridInterface::cellFaceVertexIndices(face, faceVertexIndices);
cvf::Vec3d faceCenterPosI = cvf::GeometryTools::computeFaceCenter(hexCorners[faceVertexIndices[0]], hexCorners[faceVertexIndices[1]], hexCorners[faceVertexIndices[2]], hexCorners[faceVertexIndices[3]]);
face = cvf::StructGridInterface::NEG_J;
cvf::StructGridInterface::cellFaceVertexIndices(face, faceVertexIndices);
cvf::Vec3d faceCenterNegJ = cvf::GeometryTools::computeFaceCenter(hexCorners[faceVertexIndices[0]], hexCorners[faceVertexIndices[1]], hexCorners[faceVertexIndices[2]], hexCorners[faceVertexIndices[3]]);
face = cvf::StructGridInterface::POS_J;
cvf::StructGridInterface::cellFaceVertexIndices(face, faceVertexIndices);
cvf::Vec3d faceCenterPosJ = cvf::GeometryTools::computeFaceCenter(hexCorners[faceVertexIndices[0]], hexCorners[faceVertexIndices[1]], hexCorners[faceVertexIndices[2]], hexCorners[faceVertexIndices[3]]);
cvf::Vec3d faceCenterCenterVectorI = faceCenterPosI - faceCenterNegI;
cvf::Vec3d faceCenterCenterVectorJ = faceCenterPosJ - faceCenterNegJ;
averageZdirection.cross(faceCenterCenterVectorI, faceCenterCenterVectorJ);
averageZdirection.normalize();
}

2
ApplicationCode/ReservoirDataModel/RigCellGeometryTools.h
View File

@ -37,4 +37,6 @@ public:
static void createPolygonFromLineSegments(std::list<std::pair<cvf::Vec3d, cvf::Vec3d>> &intersectionLineSegments, std::vector<std::vector<cvf::Vec3d>> &polygons);
static void findCellAverageZdirection(cvf::Vec3d * hexCorners, cvf::Vec3d &averageZdirection);
};

147
ApplicationCode/UnitTests/RigCellGeometryTools-Test.cpp
View File

@ -105,129 +105,30 @@ TEST(RigCellGeometryTools, planeHexCellIntersectionTest)
}
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
TEST(RigCellGeometryTools, findCellAverageZTest)
{
cvf::Vec3d hexCorners[8];
hexCorners[0] = cvf::Vec3d(0, 0, 0);
hexCorners[1] = cvf::Vec3d(1, 0, 0);
hexCorners[2] = cvf::Vec3d(0, 1, 0);
hexCorners[3] = cvf::Vec3d(1, 1, 0);
hexCorners[4] = cvf::Vec3d(0, 0, 1);
hexCorners[5] = cvf::Vec3d(1, 0, 1);
hexCorners[6] = cvf::Vec3d(1, 1, 1);
hexCorners[7] = cvf::Vec3d(1, 0, 1);
cvf::Vec3d averageZdirection;
RigCellGeometryTools::findCellAverageZdirection(hexCorners, averageZdirection);
EXPECT_DOUBLE_EQ(averageZdirection[0], 0);
EXPECT_DOUBLE_EQ(averageZdirection[1], 0);
EXPECT_DOUBLE_EQ(averageZdirection[2], 1);
}
//
// //--------------------------------------------------------------------------------------------------
// ///
// //--------------------------------------------------------------------------------------------------
// TEST(RigStatisticsMath, RankPercentiles)
// {
// std::vector<double> values;
// values.push_back(HUGE_VAL);
// values.push_back(2788.2723335651900);
// values.push_back(-22481.0927881701000);
// values.push_back(68778.6851686236000);
// values.push_back(-76092.8157632591000);
// values.push_back(6391.97999909729003);
// values.push_back(65930.1200169780000);
// values.push_back(-27696.2320267235000);
// values.push_back(HUGE_VAL);
// values.push_back(HUGE_VAL);
// values.push_back(96161.7546348456000);
// values.push_back(73875.6716288563000);
// values.push_back(80720.4378655615000);
// values.push_back(-98649.8109937874000);
// values.push_back(99372.9362079615000);
// values.push_back(HUGE_VAL);
// values.push_back(-57020.4389966513000);
//
// std::vector<double> pValPos;
// pValPos.push_back(10);
// pValPos.push_back(40);
// pValPos.push_back(50);
// pValPos.push_back(90);
// std::vector<double> pVals = RigStatisticsMath::calculateNearestRankPercentiles(values, pValPos);
//
// EXPECT_DOUBLE_EQ( -76092.8157632591000, pVals[0]);
// EXPECT_DOUBLE_EQ( 2788.2723335651900 , pVals[1]);
// EXPECT_DOUBLE_EQ( 6391.979999097290 , pVals[2]);
// EXPECT_DOUBLE_EQ( 96161.7546348456000 , pVals[3]);
// }
//
//
//
//
// //--------------------------------------------------------------------------------------------------
// ///
// //--------------------------------------------------------------------------------------------------
// TEST(RigStatisticsMath, HistogramPercentiles)
// {
// std::vector<double> values;
// values.push_back(HUGE_VAL);
// values.push_back(2788.2723335651900);
// values.push_back(-22481.0927881701000);
// values.push_back(68778.6851686236000);
// values.push_back(-76092.8157632591000);
// values.push_back(6391.97999909729003);
// values.push_back(65930.1200169780000);
// values.push_back(-27696.2320267235000);
// values.push_back(HUGE_VAL);
// values.push_back(HUGE_VAL);
// values.push_back(96161.7546348456000);
// values.push_back(73875.6716288563000);
// values.push_back(80720.4378655615000);
// values.push_back(-98649.8109937874000);
// values.push_back(99372.9362079615000);
// values.push_back(HUGE_VAL);
// values.push_back(-57020.4389966513000);
//
//
// double min, max, range, mean, stdev;
// RigStatisticsMath::calculateBasicStatistics(values, &min, &max, NULL, &range, &mean, &stdev);
//
// std::vector<size_t> histogram;
// RigHistogramCalculator histCalc(min, max, 100, &histogram);
// histCalc.addData(values);
// std::vector<double> pVals;
// double p10, p50, p90;
// p10 = histCalc.calculatePercentil(0.1);
// p50 = histCalc.calculatePercentil(0.5);
// p90 = histCalc.calculatePercentil(0.9);
//
// EXPECT_DOUBLE_EQ( -76273.240559989776, p10);
// EXPECT_DOUBLE_EQ( 5312.1312871307755 , p50);
// EXPECT_DOUBLE_EQ( 94818.413022321271 , p90);
// }
//
//
// //--------------------------------------------------------------------------------------------------
// ///
// //--------------------------------------------------------------------------------------------------
// TEST(RigStatisticsMath, InterpolatedPercentiles)
// {
// std::vector<double> values;
// values.push_back(HUGE_VAL);
// values.push_back(2788.2723335651900);
// values.push_back(-22481.0927881701000);
// values.push_back(68778.6851686236000);
// values.push_back(-76092.8157632591000);
// values.push_back(6391.97999909729003);
// values.push_back(65930.1200169780000);
// values.push_back(-27696.2320267235000);
// values.push_back(HUGE_VAL);
// values.push_back(HUGE_VAL);
// values.push_back(96161.7546348456000);
// values.push_back(73875.6716288563000);
// values.push_back(80720.4378655615000);
// values.push_back(-98649.8109937874000);
// values.push_back(99372.9362079615000);
// values.push_back(HUGE_VAL);
// values.push_back(-57020.4389966513000);
//
//
// std::vector<double> pValPos;
// pValPos.push_back(10);
// pValPos.push_back(40);
// pValPos.push_back(50);
// pValPos.push_back(90);
// std::vector<double> pVals = RigStatisticsMath::calculateInterpolatedPercentiles(values, pValPos);
//
// EXPECT_DOUBLE_EQ( -72278.340409937548, pVals[0]);
// EXPECT_DOUBLE_EQ( -2265.6006907818719, pVals[1]);
// EXPECT_DOUBLE_EQ( 6391.9799990972897, pVals[2]);
// EXPECT_DOUBLE_EQ( 93073.49128098879, pVals[3]);
// }