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

#3650 Temp LGR. Fix some issues for split types cell and well

Browse Source
This commit is contained in:
Bjørn Erik Jensen
2018-11-13 08:32:19 +01:00
parent cfb082fb98
commit 1215235255
1 changed files with 12 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -413,9 +413,16 @@ void RicExportLgrFeature::exportLgrsForWellPaths(const QString& expor
for (const auto& wellPath : wellPaths) for (const auto& wellPath : wellPaths)
{ {
std::vector<LgrInfo> expLgrs;
for (const auto& lgr : lgrs)
{
if (lgr.associatedWellPathName == wellPath->name())
expLgrs.push_back(lgr);
}
if (!lgrs.empty()) if (!lgrs.empty())
{ {
exportLgrs(exportFolder, wellPath->name(), lgrs); exportLgrs(exportFolder, wellPath->name(), expLgrs);
} }
} }
} }
@@ -456,7 +463,6 @@ std::vector<LgrInfo> RicExportLgrFeature::buildLgrsForWellPaths(std::vector<RimW
wellsIntersectingOtherLgrs->clear(); wellsIntersectingOtherLgrs->clear();
bool isIntersectingOtherLgrs = false; bool isIntersectingOtherLgrs = false;
std::vector<LgrInfo> newLgrs;
int firstLgrId = firstAvailableLgrId(eclipseCase->mainGrid()); int firstLgrId = firstAvailableLgrId(eclipseCase->mainGrid());
@@ -466,7 +472,7 @@ std::vector<LgrInfo> RicExportLgrFeature::buildLgrsForWellPaths(std::vector<RimW
{ {
auto intersectingCells = auto intersectingCells =
cellsIntersectingCompletions(eclipseCase, wellPath, timeStep, completionTypes, &isIntersectingOtherLgrs); cellsIntersectingCompletions(eclipseCase, wellPath, timeStep, completionTypes, &isIntersectingOtherLgrs);
newLgrs = buildLgrsPerMainCell(firstLgrId + (int)lgrs.size(), eclipseCase, wellPath, intersectingCells, lgrCellCounts, lgrNameFactory); auto newLgrs = buildLgrsPerMainCell(firstLgrId + (int)lgrs.size(), eclipseCase, wellPath, intersectingCells, lgrCellCounts, lgrNameFactory);
lgrs.insert(lgrs.end(), newLgrs.begin(), newLgrs.end()); lgrs.insert(lgrs.end(), newLgrs.begin(), newLgrs.end());
if (isIntersectingOtherLgrs) wellsIntersectingOtherLgrs->push_back(wellPath->name()); if (isIntersectingOtherLgrs) wellsIntersectingOtherLgrs->push_back(wellPath->name());
@@ -477,21 +483,20 @@ std::vector<LgrInfo> RicExportLgrFeature::buildLgrsForWellPaths(std::vector<RimW
auto intersectingCells = cellsIntersectingCompletions_PerCompletion( auto intersectingCells = cellsIntersectingCompletions_PerCompletion(
eclipseCase, wellPaths, timeStep, completionTypes, wellsIntersectingOtherLgrs); eclipseCase, wellPaths, timeStep, completionTypes, wellsIntersectingOtherLgrs);
newLgrs = buildLgrsPerCompletion(firstLgrId + (int)lgrs.size(), eclipseCase, intersectingCells, lgrCellCounts, lgrNameFactory); auto newLgrs = buildLgrsPerCompletion(firstLgrId + (int)lgrs.size(), eclipseCase, intersectingCells, lgrCellCounts, lgrNameFactory);
lgrs.insert(lgrs.end(), newLgrs.begin(), newLgrs.end()); lgrs.insert(lgrs.end(), newLgrs.begin(), newLgrs.end());
} }
else if (splitType == Lgr::LGR_PER_WELL) else if (splitType == Lgr::LGR_PER_WELL)
{ {
for (const auto& wellPath : wellPaths) for (const auto& wellPath : wellPaths)
{ {
int lgrId = firstLgrId + (int)newLgrs.size(); int lgrId = firstLgrId + (int)lgrs.size();
auto lgrName = lgrNameFactory.newName("WELL", lgrId); auto lgrName = lgrNameFactory.newName("WELL", lgrId);
auto intersectingCells = auto intersectingCells =
cellsIntersectingCompletions(eclipseCase, wellPath, timeStep, completionTypes, &isIntersectingOtherLgrs); cellsIntersectingCompletions(eclipseCase, wellPath, timeStep, completionTypes, &isIntersectingOtherLgrs);
newLgrs.push_back(buildLgr(lgrId, lgrName, eclipseCase, wellPath->name(), intersectingCells, lgrCellCounts)); lgrs.push_back(buildLgr(lgrId, lgrName, eclipseCase, wellPath->name(), intersectingCells, lgrCellCounts));
lgrs.insert(lgrs.end(), newLgrs.begin(), newLgrs.end());
if (isIntersectingOtherLgrs) wellsIntersectingOtherLgrs->push_back(wellPath->name()); if (isIntersectingOtherLgrs) wellsIntersectingOtherLgrs->push_back(wellPath->name());
} }
} }