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

Show fault name in Result Info when picking NNC

Browse Source
This commit is contained in:
Magne Sjaastad 2014-01-23 07:53:17 +01:00
parent 209919c651
commit 8f56fa6ad4
2 changed files with 44 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

69
ApplicationCode/ProjectDataModel/RimReservoirView.cpp
View File

@ -1190,32 +1190,7 @@ void RimReservoirView::appendCellResultInfo(size_t gridIndex, size_t cellIndex,
} }
} }
appendFaultName(grid, cellIndex, resultInfoText);
if (gridIndex == 0)
{
bool foundFault = false;
RigMainGrid* mainGrid = grid->mainGrid();
for (size_t i = 0; i < mainGrid->faults().size(); i++)
{
if (foundFault) continue;
const RigFault* rigFault = mainGrid->faults().at(i);
const std::vector<RigFault::FaultFace>& faultFaces = rigFault->faultFaces();
for (size_t fIdx = 0; fIdx < faultFaces.size(); fIdx++)
{
if (foundFault) continue;
if (faultFaces[fIdx].m_nativeGlobalCellIndex == cellIndex ||
faultFaces[fIdx].m_oppositeGlobalCellIndex == cellIndex)
{
resultInfoText->append(QString("Fault Name: %1\n").arg(rigFault->name()));
foundFault = true;
}
}
}
}
} }
} }
@ -1825,9 +1800,10 @@ void RimReservoirView::appendNNCResultInfo(size_t nncIndex, QString* resultInfo)
const RigConnection& conn = nncData->connections()[nncIndex]; const RigConnection& conn = nncData->connections()[nncIndex];
cvf::StructGridInterface::FaceEnum face(conn.m_c1Face); cvf::StructGridInterface::FaceEnum face(conn.m_c1Face);
QString faultName;
resultInfo->append(QString("NNC Transmissibility : %1\n").arg(conn.m_transmissibility)); resultInfo->append(QString("NNC Transmissibility : %1\n").arg(conn.m_transmissibility));
{ {
CVF_ASSERT(conn.m_c1GlobIdx < grid->cells().size()); CVF_ASSERT(conn.m_c1GlobIdx < grid->cells().size());
const RigCell& cell = grid->cells()[conn.m_c1GlobIdx]; const RigCell& cell = grid->cells()[conn.m_c1GlobIdx];
@ -1844,6 +1820,8 @@ void RimReservoirView::appendNNCResultInfo(size_t nncIndex, QString* resultInfo)
QString gridName = QString::fromStdString(hostGrid->gridName()); QString gridName = QString::fromStdString(hostGrid->gridName());
resultInfo->append(QString("NNC 1 : cell [%1, %2, %3] face %4 (%5)\n").arg(i).arg(j).arg(k).arg(face.text()).arg(gridName)); resultInfo->append(QString("NNC 1 : cell [%1, %2, %3] face %4 (%5)\n").arg(i).arg(j).arg(k).arg(face.text()).arg(gridName));
appendFaultName(hostGrid, conn.m_c1GlobIdx, &faultName);
} }
} }
@ -1867,10 +1845,20 @@ void RimReservoirView::appendNNCResultInfo(size_t nncIndex, QString* resultInfo)
QString faceText = oppositeFaceEnum.text(); QString faceText = oppositeFaceEnum.text();
resultInfo->append(QString("NNC 2 : cell [%1, %2, %3] face %4 (%5)\n").arg(i).arg(j).arg(k).arg(faceText).arg(gridName)); resultInfo->append(QString("NNC 2 : cell [%1, %2, %3] face %4 (%5)\n").arg(i).arg(j).arg(k).arg(faceText).arg(gridName));
if (faultName.isEmpty())
{
appendFaultName(hostGrid, conn.m_c2GlobIdx, &faultName);
}
} }
} }
resultInfo->append(QString("Face: %2\n").arg(face.text())); resultInfo->append(QString("Face: %2\n").arg(face.text()));
if (!faultName.isEmpty())
{
resultInfo->append(faultName);
}
} }
} }
} }
@ -1993,3 +1981,30 @@ void RimReservoirView::updateFaultColors()
m_reservoirGridPartManager->updateFaultColors(faultGeometriesToRecolor[i], m_currentTimeStep, this->cellResult()); m_reservoirGridPartManager->updateFaultColors(faultGeometriesToRecolor[i], m_currentTimeStep, this->cellResult());
} }
} }
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
void RimReservoirView::appendFaultName(RigGridBase* grid, size_t cellIndex, QString* resultInfoText)
{
if (grid->isMainGrid())
{
RigMainGrid* mainGrid = grid->mainGrid();
for (size_t i = 0; i < mainGrid->faults().size(); i++)
{
const RigFault* rigFault = mainGrid->faults().at(i);
const std::vector<RigFault::FaultFace>& faultFaces = rigFault->faultFaces();
for (size_t fIdx = 0; fIdx < faultFaces.size(); fIdx++)
{
if (faultFaces[fIdx].m_nativeGlobalCellIndex == cellIndex ||
faultFaces[fIdx].m_oppositeGlobalCellIndex == cellIndex)
{
resultInfoText->append(QString("Fault Name: %1\n").arg(rigFault->name()));
return;
}
}
}
}
}

2
ApplicationCode/ProjectDataModel/RimReservoirView.h
View File

@ -181,6 +181,8 @@ public:
// Display model generation // Display model generation
private: private:
void appendFaultName(RigGridBase* grid, size_t cellIndex, QString* resultInfoText);
void createDisplayModel(); void createDisplayModel();
void updateDisplayModelVisibility(); void updateDisplayModelVisibility();
void updateCurrentTimeStep(); void updateCurrentTimeStep();