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

#3420 Result info. Fix cordinate system translations. Renaming to improve readability

Browse Source
This commit is contained in:
Bjørn Erik Jensen
2018-09-27 14:47:15 +02:00
parent a3d8fc1fb3
commit 0c05c93a72
14 changed files with 63 additions and 56 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
ApplicationCode/GeoMech/GeoMechDataModel/RigFemPartResultsCollection.cpp
View File

@@ -2625,7 +2625,7 @@ RigFemClosestResultIndexCalculator::RigFemClosestResultIndexCalculator(RigFemPar
RigFemResultPosEnum resultPosition,
int elementIndex,
int m_face,
const cvf::Vec3d& m_intersectionPoint)
const cvf::Vec3d& intersectionPointInDomain)
{
m_resultIndexToClosestResult = -1;
m_closestNodeId = -1;
@@ -2643,8 +2643,8 @@ RigFemClosestResultIndexCalculator::RigFemClosestResultIndexCalculator(RigFemPar
for ( int lNodeIdx = 0; lNodeIdx < elmNodeCount; ++lNodeIdx )
{
int nodeIdx = elmentConn[lNodeIdx];
cvf::Vec3f nodePos = femPart->nodes().coordinates[nodeIdx];
float dist = (nodePos - cvf::Vec3f(m_intersectionPoint)).lengthSquared();
cvf::Vec3f nodePosInDomain = femPart->nodes().coordinates[nodeIdx];
float dist = (nodePosInDomain - cvf::Vec3f(intersectionPointInDomain)).lengthSquared();
if ( dist < minDist )
{
closestLocalNode = lNodeIdx;
@@ -2694,8 +2694,8 @@ RigFemClosestResultIndexCalculator::RigFemClosestResultIndexCalculator(RigFemPar
for ( int faceNodIdx = 0; faceNodIdx < faceNodeCount; ++faceNodIdx )
{
int nodeIdx = elmNodeIndices[localElmNodeIndicesForFace[faceNodIdx]];
cvf::Vec3f nodePos = femPart->nodes().coordinates[nodeIdx];
float dist = (nodePos - cvf::Vec3f(m_intersectionPoint)).lengthSquared();
cvf::Vec3f nodePosInDomain = femPart->nodes().coordinates[nodeIdx];
float dist = (nodePosInDomain - cvf::Vec3f(intersectionPointInDomain)).lengthSquared();
if ( dist < minDist )
{
closestLocFaceNode = faceNodIdx;

2
ApplicationCode/GeoMech/GeoMechDataModel/RigFemPartResultsCollection.h
View File

@@ -159,7 +159,7 @@ public:
RigFemResultPosEnum resultPosition,
int elementIndex,
int m_face,
const cvf::Vec3d& m_intersectionPoint);
const cvf::Vec3d& intersectionPointInDomain);
int resultIndexToClosestResult() { return m_resultIndexToClosestResult; }
int closestNodeId() { return m_closestNodeId; }

2
ApplicationCode/GeoMech/GeoMechDataModel/RimGeoMechGeometrySelectionItem.cpp
View File

@@ -69,7 +69,7 @@ void RimGeoMechGeometrySelectionItem::setFromSelectionItem(const RiuGeoMechSelec
m_intersectionTriangle_1 = cvf::Vec3d(selectionItem->m_intersectionTriangle[1]);
m_intersectionTriangle_2 = cvf::Vec3d(selectionItem->m_intersectionTriangle[2]);
m_localIntersectionPoint = selectionItem->m_localIntersectionPoint;
m_localIntersectionPoint = selectionItem->m_localIntersectionPointInDisplay;
}
//--------------------------------------------------------------------------------------------------