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

Moved Faluts to MainGrid. New fault calculation

Browse Source 
Now finding the uncovered geometrical faults and adds them to a separate
generated fault.
This commit is contained in:
Jacob Støren
2013-12-12 22:15:14 +01:00
parent b23490106e
commit bf6fba191e
10 changed files with 189 additions and 133 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
ApplicationCode/ProjectDataModel/RimAnalysisModels.cpp
View File

@@ -182,15 +182,8 @@ RigMainGrid* RimAnalysisModels::registerCaseInGridCollection(RigCaseData* rigEcl
// This is the first insertion of this grid, compute cached data
rigEclipseCase->mainGrid()->computeCachedData();
std::vector<RigGridBase*> grids;
rigEclipseCase->allGrids(&grids);
size_t i;
for (i = 0; i < grids.size(); i++)
{
grids[i]->computeFaults();
}
rigEclipseCase->mainGrid()->calculateFaults();
equalGrid = rigEclipseCase->mainGrid();
}

10
ApplicationCode/ProjectDataModel/RimCase.cpp
View File

@@ -315,15 +315,7 @@ void RimCase::computeCachedData()
rigEclipseCase->computeActiveCellBoundingBoxes();
rigEclipseCase->mainGrid()->computeCachedData();
std::vector<RigGridBase*> grids;
rigEclipseCase->allGrids(&grids);
size_t i;
for (i = 0; i < grids.size(); i++)
{
grids[i]->computeFaults();
}
rigEclipseCase->mainGrid()->calculateFaults();
}
}

7
ApplicationCode/ProjectDataModel/RimReservoirView.cpp
View File

@@ -1096,7 +1096,7 @@ bool RimReservoirView::pickInfo(size_t gridIndex, size_t cellIndex, const cvf::V
}
//--------------------------------------------------------------------------------------------------
/// Get the current scalar value for the display face at the given index
/// Append fault name and result value for the given cell to the string
//--------------------------------------------------------------------------------------------------
void RimReservoirView::appendCellResultInfo(size_t gridIndex, size_t cellIndex, QString* resultInfoText)
{
@@ -1172,12 +1172,13 @@ void RimReservoirView::appendCellResultInfo(size_t gridIndex, size_t cellIndex,
if (gridIndex == 0)
{
bool foundFault = false;
RigMainGrid* mainGrid = grid->mainGrid();
for (size_t i = 0; i < grid->faults().size(); i++)
for (size_t i = 0; i < mainGrid->faults().size(); i++)
{
if (foundFault) continue;
const RigFault* rigFault = grid->faults().at(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++)