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

#2880 export completions if the the well path name is explictly provided even if unchecked

Browse Source
This commit is contained in:
Gaute Lindkvist
2018-05-09 12:40:57 +02:00
parent 43bb955ba2
commit 5310d28433
3 changed files with 22 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
ApplicationCode/CommandFileInterface/RicfExportSimWellFractureCompletions.cpp
View File

@@ -109,9 +109,13 @@ void RicfExportSimWellFractureCompletions::execute()
{
for (RimEclipseView* view : views)
{
std::copy(view->wellCollection()->wells.begin(),
view->wellCollection()->wells.end(),
std::back_inserter(simWells));
for (auto simWell : view->wellCollection()->wells)
{
if (simWell->showWell())
{
simWells.push_back(simWell);
}
}
}
}
else

10
ApplicationCode/CommandFileInterface/RicfExportWellPathCompletions.cpp
View File

@@ -112,9 +112,13 @@ void RicfExportWellPathCompletions::execute()
std::vector<RimWellPath*> wellPaths;
if (m_wellPathNames().empty())
{
std::copy(RiaApplication::instance()->project()->activeOilField()->wellPathCollection->wellPaths().begin(),
RiaApplication::instance()->project()->activeOilField()->wellPathCollection->wellPaths().end(),
std::back_inserter(wellPaths));
for (auto wellPath : RiaApplication::instance()->project()->activeOilField()->wellPathCollection->wellPaths())
{
if (wellPath->showWellPath())
{
wellPaths.push_back(wellPath);
}
}
}
else
{

22
ApplicationCode/Commands/CompletionExportCommands/RicWellPathExportCompletionDataFeatureImpl.cpp
View File

@@ -63,8 +63,8 @@
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
void RicWellPathExportCompletionDataFeatureImpl::exportCompletions(const std::vector<RimWellPath*>& wellPaths,
const std::vector<RimSimWellInView*>& simWells,
void RicWellPathExportCompletionDataFeatureImpl::exportCompletions(const std::vector<RimWellPath*>& usedWellPaths,
const std::vector<RimSimWellInView*>& usedSimWells,
const RicExportCompletionDataSettingsUi& exportSettings)
{
if (exportSettings.caseToApply() == nullptr)
@@ -73,14 +73,6 @@ void RicWellPathExportCompletionDataFeatureImpl::exportCompletions(const std::ve
return;
}
std::vector<RimWellPath*> usedWellPaths;
for (auto wellPath : wellPaths)
{
if (wellPath->showWellPath)
{
usedWellPaths.push_back(wellPath);
}
}
{
bool unitSystemMismatch = false;
@@ -93,7 +85,7 @@ void RicWellPathExportCompletionDataFeatureImpl::exportCompletions(const std::ve
}
}
for (const RimSimWellInView* simWell : simWells)
for (const RimSimWellInView* simWell : usedSimWells)
{
RimEclipseCase* eclipseCase;
simWell->firstAncestorOrThisOfType(eclipseCase);
@@ -137,13 +129,13 @@ void RicWellPathExportCompletionDataFeatureImpl::exportCompletions(const std::ve
}
}
size_t maxProgress = usedWellPaths.size() * 3 + simWells.size() +
size_t maxProgress = usedWellPaths.size() * 3 + usedSimWells.size() +
(exportSettings.fileSplit == RicExportCompletionDataSettingsUi::SPLIT_ON_WELL
? usedWellPaths.size()
: exportSettings.fileSplit == RicExportCompletionDataSettingsUi::SPLIT_ON_WELL_AND_COMPLETION_TYPE
? usedWellPaths.size() * 3
: 1) +
simWells.size();
usedSimWells.size();
caf::ProgressInfo progress(maxProgress, "Export Completions");
@@ -219,7 +211,7 @@ void RicWellPathExportCompletionDataFeatureImpl::exportCompletions(const std::ve
progress.incrementProgress();
}
for (auto simWell : simWells)
for (auto simWell : usedSimWells)
{
std::map<RigCompletionDataGridCell, std::vector<RigCompletionData>> completionsPerEclipseCell;
@@ -307,7 +299,7 @@ void RicWellPathExportCompletionDataFeatureImpl::exportCompletions(const std::ve
if (exportSettings.fileSplit == RicExportCompletionDataSettingsUi::SPLIT_ON_WELL ||
exportSettings.fileSplit == RicExportCompletionDataSettingsUi::SPLIT_ON_WELL_AND_COMPLETION_TYPE)
{
for (auto simWell : simWells)
for (auto simWell : usedSimWells)
{
std::vector<RigCompletionData> wellCompletions;
for (const auto& completion : completions)