Merge fix for fishbone export into dev #2451

This commit is contained in:
Magne Sjaastad
2018-02-08 10:31:51 +01:00
2 changed files with 1 additions and 6 deletions

View File

@@ -106,7 +106,7 @@ std::vector<RigCompletionData> RicFishbonesTransmissibilityCalculationFeatureImp
std::map<size_t, std::vector<WellBorePartForTransCalc> > wellBorePartsInCells; //wellBore = main bore or fishbone lateral
findFishboneLateralsWellBoreParts(wellBorePartsInCells, wellPath, settings);
findFishboneImportedLateralsWellBoreParts(wellBorePartsInCells, wellPath, settings);
if (!wellBorePartsInCells.empty())
if (!wellBorePartsInCells.empty() && !settings.excludeMainBoreForFishbones)
{
findMainWellBoreParts(wellBorePartsInCells, wellPath, settings);
}

View File

@@ -384,11 +384,6 @@ RigCompletionData
return resultCompletion; // Returning empty completion, should not be exported
}
if (settings.excludeMainBoreForFishbones && completionType == RigCompletionData::FISHBONES && completion.isMainBore())
{
continue;
}
totalTrans = totalTrans + completion.transmissibility();
}