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

#3268 MSW Fracture Export : Add activeFishbonesSubs

Browse Source
This commit is contained in:
Magne Sjaastad
2018-09-07 12:41:04 +02:00
parent 32e6a409b7
commit eefb131701
8 changed files with 43 additions and 41 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
ApplicationCode/Commands/CompletionExportCommands/RicExportFishbonesWellSegmentsFeature.cpp
View File

@@ -89,13 +89,10 @@ void RicExportFishbonesWellSegmentsFeature::onActionTriggered(bool isChecked)
{
RiaApplication::instance()->setLastUsedDialogDirectory("COMPLETIONS", QFileInfo(exportSettings.folder).absolutePath());
std::vector<RimFishbonesMultipleSubs*> fishbonesSubs;
for (RimFishbonesMultipleSubs* subs : fishbonesCollection->fishbonesSubs())
if (!fishbonesCollection->activeFishbonesSubs().empty())
{
fishbonesSubs.push_back(subs);
exportWellSegments(wellPath, fishbonesCollection->activeFishbonesSubs(), exportSettings);
}
exportWellSegments(wellPath, fishbonesSubs, exportSettings);
}
}

23
ApplicationCode/Commands/CompletionExportCommands/RicFishbonesTransmissibilityCalculationFeatureImp.cpp
View File

@@ -168,8 +168,8 @@ void RicFishbonesTransmissibilityCalculationFeatureImp::findFishboneLateralsWell
if (!wellPath) return;
// Generate data
const RigEclipseCaseData* caseData = settings.caseToApply()->eclipseCaseData();
RicMswExportInfo exportInfo =
const RigEclipseCaseData* caseData = settings.caseToApply()->eclipseCaseData();
RicMswExportInfo exportInfo =
RicWellPathExportCompletionDataFeatureImpl::generateFishbonesMswExportInfo(settings.caseToApply(), wellPath);
RiaEclipseUnitTools::UnitSystem unitSystem = caseData->unitsType();
@@ -209,18 +209,15 @@ void RicFishbonesTransmissibilityCalculationFeatureImp::findFishboneLateralsWell
double holeRadius = wellPath->fishbonesCollection()->mainBoreDiameter(unitSystem) / 2.0;
double skinFactor = wellPath->fishbonesCollection()->mainBoreSkinFactor();
for (const auto& fishboneDefinition : wellPath->fishbonesCollection()->fishbonesSubs())
for (const auto& fishboneDefinition : wellPath->fishbonesCollection()->activeFishbonesSubs())
{
if (fishboneDefinition->isActive())
{
appendMainWellBoreParts(wellBorePartsInCells,
wellPath,
settings,
skinFactor,
holeRadius,
fishboneDefinition->startOfSubMD(),
fishboneDefinition->endOfSubMD());
}
appendMainWellBoreParts(wellBorePartsInCells,
wellPath,
settings,
skinFactor,
holeRadius,
fishboneDefinition->startOfSubMD(),
fishboneDefinition->endOfSubMD());
}
}
}

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

@@ -384,7 +384,7 @@ void RicWellPathExportCompletionDataFeatureImpl::exportCompletions(const std::ve
for (const auto wellPath : wellPaths)
{
auto fishbones = wellPath->fishbonesCollection()->fishbonesSubs();
auto fishbones = wellPath->fishbonesCollection()->activeFishbonesSubs();
exportWellSegments(exportSettings.caseToApply,
exportFile,
wellPath, fishbones);
@@ -1561,18 +1561,7 @@ std::vector<RigCompletionData> RicWellPathExportCompletionDataFeatureImpl::gener
RicMswExportInfo RicWellPathExportCompletionDataFeatureImpl::generateFishbonesMswExportInfo(const RimEclipseCase* caseToApply,
const RimWellPath* wellPath)
{
std::vector<RimFishbonesMultipleSubs*> fishbonesSubs;
if (wellPath->fishbonesCollection()->isChecked())
{
for (RimFishbonesMultipleSubs* subs : wellPath->fishbonesCollection()->fishbonesSubs())
{
if (subs->isActive())
{
fishbonesSubs.push_back(subs);
}
}
}
std::vector<RimFishbonesMultipleSubs*> fishbonesSubs = wellPath->fishbonesCollection()->activeFishbonesSubs();
return generateFishbonesMswExportInfo(caseToApply, wellPath, fishbonesSubs);
}