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

#3485 Temp LGR. Ensure unique LGR names

Browse Source
This commit is contained in:
Bjørn Erik Jensen 2018-10-19 11:33:57 +02:00
parent fd1df547f9
commit abc25b833f
1 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
ApplicationCode/Commands/ExportCommands/RicExportLgrFeature.cpp
View File

@ -200,7 +200,10 @@ std::vector<LgrInfo> RicExportLgrFeature::buildOneLgrPerMainCell(RimEclipseCase*
cvf::ref<RigResultAccessor> poroAccessObject =
RigResultAccessorFactory::createFromUiResultName(eclipseCase->eclipseCaseData(), 0, RiaDefines::MATRIX_MODEL, 0, "PORO");
int firstLgrId = firstAvailableLgrId(eclipseCase->mainGrid());
bool poroExists = !poroAccessObject.isNull();
int lgrCount = 0;
for (const auto& intersectingCell : intersectingCells)
{
size_t globCellIndex = intersectingCell.globalCellIndex();
@ -219,7 +222,6 @@ std::vector<LgrInfo> RicExportLgrFeature::buildOneLgrPerMainCell(RimEclipseCase*
}
}
int lgrId = firstAvailableLgrId(eclipseCase->mainGrid());
caf::VecIjk mainGridFirstCell(intersectingCell.localCellIndexI(),
intersectingCell.localCellIndexJ(),
intersectingCell.localCellIndexK());
@ -227,7 +229,8 @@ std::vector<LgrInfo> RicExportLgrFeature::buildOneLgrPerMainCell(RimEclipseCase*
intersectingCell.localCellIndexJ(),
intersectingCell.localCellIndexK());
LgrInfo lgrInfo(lgrId, QString("LGR_%1").arg(lgrId), lgrSizes, mainGridFirstCell, mainGridEndCell);
int currLgrId = firstLgrId + lgrCount++;
LgrInfo lgrInfo(currLgrId, QString("LGR_%1").arg(currLgrId), lgrSizes, mainGridFirstCell, mainGridEndCell);
if(poroExists) lgrInfo.values = lgrValues;
lgrs.push_back(lgrInfo);
}