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

Update after review

Browse Source
This commit is contained in:
Gaute Lindkvist 2018-08-16 10:07:10 +02:00
parent 16560a7d81
commit 4011caec64
4 changed files with 67 additions and 67 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -78,9 +78,9 @@ void RicFishbonesTransmissibilityCalculationFeatureImp::findFishboneLateralsWell
{ {
for (const RicWellSegmentCompletion& lateral : location.completions()) for (const RicWellSegmentCompletion& lateral : location.completions())
{ {
for (const RicWellSegmentSubSegment& segment : lateral.subSegments()) for (const RicWellSubSegment& segment : lateral.subSegments())
{ {
for (const RicWellSegmentSubSegmentIntersection& intersection : segment.intersections()) for (const RicWellSubSegmentCellIntersection& intersection : segment.intersections())
{ {
double diameter = location.holeDiameter(); double diameter = location.holeDiameter();
QString completionMetaData = (location.label() + QString(": Sub: %1 Lateral: %2").arg(location.subIndex()).arg(lateral.index())); QString completionMetaData = (location.label() + QString(": Sub: %1 Lateral: %2").arg(location.subIndex()).arg(lateral.index()));

40
ApplicationCode/Commands/CompletionExportCommands/RicMultiSegmentWellExportInfo.cpp
View File

@ -10,7 +10,7 @@
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
/// ///
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
RicWellSegmentSubSegmentIntersection::RicWellSegmentSubSegmentIntersection(const QString& gridName, RicWellSubSegmentCellIntersection::RicWellSubSegmentCellIntersection(const QString& gridName,
size_t globalCellIndex, size_t globalCellIndex,
const cvf::Vec3st& gridLocalCellIJK, const cvf::Vec3st& gridLocalCellIJK,
const cvf::Vec3d& lengthsInCell) const cvf::Vec3d& lengthsInCell)
@ -25,7 +25,7 @@ RicWellSegmentSubSegmentIntersection::RicWellSegmentSubSegmentIntersection(const
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
/// ///
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
const QString& RicWellSegmentSubSegmentIntersection::gridName() const const QString& RicWellSubSegmentCellIntersection::gridName() const
{ {
return m_gridName; return m_gridName;
} }
@ -33,7 +33,7 @@ const QString& RicWellSegmentSubSegmentIntersection::gridName() const
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
/// ///
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
size_t RicWellSegmentSubSegmentIntersection::globalCellIndex() const size_t RicWellSubSegmentCellIntersection::globalCellIndex() const
{ {
return m_globalCellIndex; return m_globalCellIndex;
} }
@ -41,7 +41,7 @@ size_t RicWellSegmentSubSegmentIntersection::globalCellIndex() const
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
/// ///
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
cvf::Vec3st RicWellSegmentSubSegmentIntersection::gridLocalCellIJK() const cvf::Vec3st RicWellSubSegmentCellIntersection::gridLocalCellIJK() const
{ {
return m_gridLocalCellIJK; return m_gridLocalCellIJK;
} }
@ -49,7 +49,7 @@ cvf::Vec3st RicWellSegmentSubSegmentIntersection::gridLocalCellIJK() const
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
/// ///
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
const cvf::Vec3d& RicWellSegmentSubSegmentIntersection::lengthsInCell() const const cvf::Vec3d& RicWellSubSegmentCellIntersection::lengthsInCell() const
{ {
return m_lengthsInCell; return m_lengthsInCell;
} }
@ -57,7 +57,7 @@ const cvf::Vec3d& RicWellSegmentSubSegmentIntersection::lengthsInCell() const
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
/// ///
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
RicWellSegmentSubSegment::RicWellSegmentSubSegment(double startMD, RicWellSubSegment::RicWellSubSegment(double startMD,
double deltaMD, double deltaMD,
double startTVD, double startTVD,
double deltaTVD) double deltaTVD)
@ -73,7 +73,7 @@ RicWellSegmentSubSegment::RicWellSegmentSubSegment(double startMD,
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
/// ///
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
double RicWellSegmentSubSegment::startMD() const double RicWellSubSegment::startMD() const
{ {
return m_startMD; return m_startMD;
} }
@ -81,7 +81,7 @@ double RicWellSegmentSubSegment::startMD() const
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
/// ///
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
double RicWellSegmentSubSegment::deltaMD() const double RicWellSubSegment::deltaMD() const
{ {
return m_deltaMD; return m_deltaMD;
} }
@ -89,7 +89,7 @@ double RicWellSegmentSubSegment::deltaMD() const
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
/// ///
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
double RicWellSegmentSubSegment::startTVD() const double RicWellSubSegment::startTVD() const
{ {
return m_startTVD; return m_startTVD;
} }
@ -97,7 +97,7 @@ double RicWellSegmentSubSegment::startTVD() const
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
/// ///
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
double RicWellSegmentSubSegment::deltaTVD() const double RicWellSubSegment::deltaTVD() const
{ {
return m_deltaTVD; return m_deltaTVD;
} }
@ -105,7 +105,7 @@ double RicWellSegmentSubSegment::deltaTVD() const
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
/// ///
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
int RicWellSegmentSubSegment::segmentNumber() const int RicWellSubSegment::segmentNumber() const
{ {
return m_segmentNumber; return m_segmentNumber;
} }
@ -113,7 +113,7 @@ int RicWellSegmentSubSegment::segmentNumber() const
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
/// ///
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
int RicWellSegmentSubSegment::attachedSegmentNumber() const int RicWellSubSegment::attachedSegmentNumber() const
{ {
return m_attachedSegmentNumber; return m_attachedSegmentNumber;
} }
@ -121,7 +121,7 @@ int RicWellSegmentSubSegment::attachedSegmentNumber() const
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
/// ///
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
void RicWellSegmentSubSegment::setSegmentNumber(int segmentNumber) void RicWellSubSegment::setSegmentNumber(int segmentNumber)
{ {
m_segmentNumber = segmentNumber; m_segmentNumber = segmentNumber;
} }
@ -129,7 +129,7 @@ void RicWellSegmentSubSegment::setSegmentNumber(int segmentNumber)
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
/// ///
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
void RicWellSegmentSubSegment::setAttachedSegmentNumber(int attachedSegmentNumber) void RicWellSubSegment::setAttachedSegmentNumber(int attachedSegmentNumber)
{ {
m_attachedSegmentNumber = attachedSegmentNumber; m_attachedSegmentNumber = attachedSegmentNumber;
} }
@ -137,7 +137,7 @@ void RicWellSegmentSubSegment::setAttachedSegmentNumber(int attachedSegmentNumbe
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
/// ///
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
void RicWellSegmentSubSegment::addIntersection(const RicWellSegmentSubSegmentIntersection& intersection) void RicWellSubSegment::addIntersection(const RicWellSubSegmentCellIntersection& intersection)
{ {
m_intersections.push_back(intersection); m_intersections.push_back(intersection);
} }
@ -145,7 +145,7 @@ void RicWellSegmentSubSegment::addIntersection(const RicWellSegmentSubSegmentInt
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
/// ///
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
const std::vector<RicWellSegmentSubSegmentIntersection>& RicWellSegmentSubSegment::intersections() const const std::vector<RicWellSubSegmentCellIntersection>& RicWellSubSegment::intersections() const
{ {
return m_intersections; return m_intersections;
} }
@ -153,7 +153,7 @@ const std::vector<RicWellSegmentSubSegmentIntersection>& RicWellSegmentSubSegmen
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
/// ///
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
std::vector<RicWellSegmentSubSegmentIntersection>& RicWellSegmentSubSegment::intersections() std::vector<RicWellSubSegmentCellIntersection>& RicWellSubSegment::intersections()
{ {
return m_intersections; return m_intersections;
} }
@ -205,7 +205,7 @@ void RicWellSegmentCompletion::setBranchNumber(int branchNumber)
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
/// ///
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
void RicWellSegmentCompletion::addSubSegment(const RicWellSegmentSubSegment& subSegment) void RicWellSegmentCompletion::addSubSegment(const RicWellSubSegment& subSegment)
{ {
m_subSegments.push_back(subSegment); m_subSegments.push_back(subSegment);
} }
@ -213,7 +213,7 @@ void RicWellSegmentCompletion::addSubSegment(const RicWellSegmentSubSegment& sub
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
/// ///
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
std::vector<RicWellSegmentSubSegment>& RicWellSegmentCompletion::subSegments() std::vector<RicWellSubSegment>& RicWellSegmentCompletion::subSegments()
{ {
return m_subSegments; return m_subSegments;
} }
@ -221,7 +221,7 @@ std::vector<RicWellSegmentSubSegment>& RicWellSegmentCompletion::subSegments()
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
/// ///
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
const std::vector<RicWellSegmentSubSegment>& RicWellSegmentCompletion::subSegments() const const std::vector<RicWellSubSegment>& RicWellSegmentCompletion::subSegments() const
{ {
return m_subSegments; return m_subSegments;
} }

24
ApplicationCode/Commands/CompletionExportCommands/RicMultiSegmentWellExportInfo.h
View File

@ -33,10 +33,10 @@ class RimFishbonesMultipleSubs;
//================================================================================================== //==================================================================================================
/// ///
//================================================================================================== //==================================================================================================
class RicWellSegmentSubSegmentIntersection class RicWellSubSegmentCellIntersection
{ {
public: public:
RicWellSegmentSubSegmentIntersection(const QString& gridName, // Pass in empty string for main grid RicWellSubSegmentCellIntersection(const QString& gridName, // Pass in empty string for main grid
size_t globalCellIndex, size_t globalCellIndex,
const cvf::Vec3st& gridLocalCellIJK, const cvf::Vec3st& gridLocalCellIJK,
const cvf::Vec3d& lengthsInCell); const cvf::Vec3d& lengthsInCell);
@ -54,10 +54,10 @@ private:
//================================================================================================== //==================================================================================================
/// ///
//================================================================================================== //==================================================================================================
class RicWellSegmentSubSegment class RicWellSubSegment
{ {
public: public:
RicWellSegmentSubSegment(double startMD, RicWellSubSegment(double startMD,
double deltaMD, double deltaMD,
double startTVD, double startTVD,
double deltaTVD); double deltaTVD);
@ -72,10 +72,10 @@ public:
void setSegmentNumber(int segmentNumber); void setSegmentNumber(int segmentNumber);
void setAttachedSegmentNumber(int attachedSegmentNumber); void setAttachedSegmentNumber(int attachedSegmentNumber);
void addIntersection(const RicWellSegmentSubSegmentIntersection& intersection); void addIntersection(const RicWellSubSegmentCellIntersection& intersection);
const std::vector<RicWellSegmentSubSegmentIntersection>& intersections() const; const std::vector<RicWellSubSegmentCellIntersection>& intersections() const;
std::vector<RicWellSegmentSubSegmentIntersection>& intersections(); std::vector<RicWellSubSegmentCellIntersection>& intersections();
private: private:
@ -86,7 +86,7 @@ private:
int m_segmentNumber; int m_segmentNumber;
int m_attachedSegmentNumber; int m_attachedSegmentNumber;
std::vector<RicWellSegmentSubSegmentIntersection> m_intersections; std::vector<RicWellSubSegmentCellIntersection> m_intersections;
}; };
//================================================================================================== //==================================================================================================
@ -102,15 +102,15 @@ public:
int branchNumber() const; int branchNumber() const;
void setBranchNumber(int branchNumber); void setBranchNumber(int branchNumber);
void addSubSegment(const RicWellSegmentSubSegment& subSegment); void addSubSegment(const RicWellSubSegment& subSegment);
std::vector<RicWellSegmentSubSegment>& subSegments(); std::vector<RicWellSubSegment>& subSegments();
const std::vector<RicWellSegmentSubSegment>& subSegments() const; const std::vector<RicWellSubSegment>& subSegments() const;
private: private:
RigCompletionData::CompletionType m_completionType; RigCompletionData::CompletionType m_completionType;
size_t m_index; size_t m_index;
int m_branchNumber; int m_branchNumber;
std::vector<RicWellSegmentSubSegment> m_subSegments; std::vector<RicWellSubSegment> m_subSegments;
}; };
//================================================================================================== //==================================================================================================

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

@ -497,14 +497,14 @@ void RicWellPathExportCompletionDataFeatureImpl::generateWelsegsTable(RifEclipse
continue; continue;
} }
for (const RicWellSegmentCompletion& lateral : location.completions()) for (const RicWellSegmentCompletion& completion : location.completions())
{ {
if (lateral.completionType() == RigCompletionData::ICD) // Found ICD if (completion.completionType() == RigCompletionData::ICD) // Found ICD
{ {
formatter.comment("ICD"); formatter.comment("ICD");
formatter.add(lateral.subSegments().front().segmentNumber()); formatter.add(completion.subSegments().front().segmentNumber());
formatter.add(lateral.subSegments().front().segmentNumber()); formatter.add(completion.subSegments().front().segmentNumber());
formatter.add(lateral.branchNumber()); formatter.add(completion.branchNumber());
formatter.add(location.segmentNumber()); formatter.add(location.segmentNumber());
formatter.add(0.1); // ICDs have 0.1 length formatter.add(0.1); // ICDs have 0.1 length
formatter.add(0); // Depth change formatter.add(0); // Depth change
@ -513,18 +513,18 @@ void RicWellPathExportCompletionDataFeatureImpl::generateWelsegsTable(RifEclipse
formatter.rowCompleted(); formatter.rowCompleted();
} }
else { else {
if (lateral.completionType() == RigCompletionData::FISHBONES) if (completion.completionType() == RigCompletionData::FISHBONES)
{ {
formatter.comment(QString("%1 : Sub index %2 - Lateral %3") formatter.comment(QString("%1 : Sub index %2 - Lateral %3")
.arg(location.label()) .arg(location.label())
.arg(location.subIndex()) .arg(location.subIndex())
.arg(lateral.index())); .arg(completion.index()));
} }
else if (lateral.completionType() == RigCompletionData::FRACTURE) else if (completion.completionType() == RigCompletionData::FRACTURE)
{ {
formatter.comment(QString("%1").arg(location.label())); formatter.comment(QString("%1").arg(location.label()));
} }
for (const RicWellSegmentSubSegment& subSegment : lateral.subSegments()) for (const RicWellSubSegment& subSegment : completion.subSegments())
{ {
double depth = 0; double depth = 0;
double length = 0; double length = 0;
@ -542,7 +542,7 @@ void RicWellPathExportCompletionDataFeatureImpl::generateWelsegsTable(RifEclipse
double diameter = location.effectiveDiameter(); double diameter = location.effectiveDiameter();
formatter.add(subSegment.segmentNumber()); formatter.add(subSegment.segmentNumber());
formatter.add(subSegment.segmentNumber()); formatter.add(subSegment.segmentNumber());
formatter.add(lateral.branchNumber()); formatter.add(completion.branchNumber());
formatter.add(subSegment.attachedSegmentNumber()); formatter.add(subSegment.attachedSegmentNumber());
formatter.add(length); formatter.add(length);
formatter.add(depth); formatter.add(depth);
@ -622,9 +622,9 @@ void RicWellPathExportCompletionDataFeatureImpl::generateCompsegTable(RifEclipse
{ {
aggregatedLength = location.measuredDepth(); aggregatedLength = location.measuredDepth();
} }
for (const RicWellSegmentSubSegment& segment : completion.subSegments()) for (const RicWellSubSegment& segment : completion.subSegments())
{ {
for (const RicWellSegmentSubSegmentIntersection& intersection : segment.intersections()) for (const RicWellSubSegmentCellIntersection& intersection : segment.intersections())
{ {
bool isSubGridIntersection = !intersection.gridName().isEmpty(); bool isSubGridIntersection = !intersection.gridName().isEmpty();
if (isSubGridIntersection == exportSubGridIntersections) if (isSubGridIntersection == exportSubGridIntersections)
@ -670,13 +670,13 @@ void RicWellPathExportCompletionDataFeatureImpl::generateWsegvalvTable(RifEclips
} }
for (const RicWellSegmentLocation& location : exportInfo.wellSegmentLocations()) for (const RicWellSegmentLocation& location : exportInfo.wellSegmentLocations())
{ {
for (const RicWellSegmentCompletion& lateral : location.completions()) for (const RicWellSegmentCompletion& completion : location.completions())
{ {
if (lateral.completionType() == RigCompletionData::ICD) if (completion.completionType() == RigCompletionData::ICD)
{ {
CVF_ASSERT(lateral.subSegments().size() == 1u); CVF_ASSERT(completion.subSegments().size() == 1u);
formatter.add(exportInfo.wellPath()->name()); formatter.add(exportInfo.wellPath()->name());
formatter.add(lateral.subSegments().front().segmentNumber()); formatter.add(completion.subSegments().front().segmentNumber());
formatter.add(location.icdFlowCoefficient()); formatter.add(location.icdFlowCoefficient());
formatter.add(location.icdArea()); formatter.add(location.icdArea());
formatter.rowCompleted(); formatter.rowCompleted();
@ -1276,11 +1276,11 @@ RicMultiSegmentWellExportInfo RicWellPathExportCompletionDataFeatureImpl::genera
double icdOrificeRadius = subs->icdOrificeDiameter(unitSystem) / 2; double icdOrificeRadius = subs->icdOrificeDiameter(unitSystem) / 2;
location.setIcdArea(icdOrificeRadius * icdOrificeRadius * cvf::PI_D * subs->icdCount()); location.setIcdArea(icdOrificeRadius * icdOrificeRadius * cvf::PI_D * subs->icdCount());
// Add lateral for ICD // Add completion for ICD
RicWellSegmentCompletion icdLateral(RigCompletionData::ICD); RicWellSegmentCompletion icdCompletion(RigCompletionData::ICD);
RicWellSegmentSubSegment icdSegment(measuredDepth, 0.1, -position.z(), 0.0); RicWellSubSegment icdSegment(measuredDepth, 0.1, -position.z(), 0.0);
icdLateral.addSubSegment(icdSegment); icdCompletion.addSubSegment(icdSegment);
location.addCompletion(icdLateral); location.addCompletion(icdCompletion);
for (size_t lateralIndex : sub.lateralIndices) for (size_t lateralIndex : sub.lateralIndices)
{ {
@ -1414,15 +1414,15 @@ void RicWellPathExportCompletionDataFeatureImpl::assignFishbonesLateralIntersect
const RigMainGrid* grid = caseToApply->eclipseCaseData()->mainGrid(); const RigMainGrid* grid = caseToApply->eclipseCaseData()->mainGrid();
for (RicWellSegmentCompletion& lateral : location->completions()) for (RicWellSegmentCompletion& completion : location->completions())
{ {
if (lateral.index() == cvf::UNDEFINED_SIZE_T) if (completion.completionType() != RigCompletionData::FISHBONES)
{ {
continue; continue;
} }
std::vector<std::pair<cvf::Vec3d, double>> lateralCoordMDPairs = std::vector<std::pair<cvf::Vec3d, double>> lateralCoordMDPairs =
fishbonesSubs->coordsAndMDForLateral(location->subIndex(), lateral.index()); fishbonesSubs->coordsAndMDForLateral(location->subIndex(), completion.index());
if (lateralCoordMDPairs.empty()) if (lateralCoordMDPairs.empty())
{ {
@ -1460,17 +1460,17 @@ void RicWellPathExportCompletionDataFeatureImpl::assignFishbonesLateralIntersect
size_t i = 0u, j = 0u, k = 0u; size_t i = 0u, j = 0u, k = 0u;
localGrid->ijkFromCellIndex(localGridIdx, &i, &j, &k); localGrid->ijkFromCellIndex(localGridIdx, &i, &j, &k);
RicWellSegmentSubSegment subSegment (previousExitMD, RicWellSubSegment subSegment (previousExitMD,
cellIntInfo.endMD - previousExitMD, cellIntInfo.endMD - previousExitMD,
previousExitTVD, previousExitTVD,
cellIntInfo.endPoint.z() - previousExitTVD); cellIntInfo.endPoint.z() - previousExitTVD);
RicWellSegmentSubSegmentIntersection intersection(gridName, RicWellSubSegmentCellIntersection intersection(gridName,
cellIntInfo.globCellIndex, cellIntInfo.globCellIndex,
cvf::Vec3st(i, j, k), cvf::Vec3st(i, j, k),
cellIntInfo.intersectionLengthsInCellCS); cellIntInfo.intersectionLengthsInCellCS);
subSegment.addIntersection(intersection); subSegment.addIntersection(intersection);
lateral.addSubSegment(subSegment); completion.addSubSegment(subSegment);
previousExitMD = cellIntInfo.endMD; previousExitMD = cellIntInfo.endMD;
previousExitTVD = cellIntInfo.endPoint.z(); previousExitTVD = cellIntInfo.endPoint.z();
@ -1491,8 +1491,8 @@ void RicWellPathExportCompletionDataFeatureImpl::assignFractureIntersections(con
const RigMainGrid* grid = caseToApply->eclipseCaseData()->mainGrid(); const RigMainGrid* grid = caseToApply->eclipseCaseData()->mainGrid();
double fractureMD = fracture->fractureMD(); double fractureMD = fracture->fractureMD();
RicWellSegmentCompletion lateral(RigCompletionData::FRACTURE); RicWellSegmentCompletion fractureCompletion(RigCompletionData::FRACTURE);
RicWellSegmentSubSegment subSegment(fracture->fractureMD(), RicWellSubSegment subSegment(fracture->fractureMD(),
fracture->fractureTemplate()->computeFractureWidth(fracture), fracture->fractureTemplate()->computeFractureWidth(fracture),
0.0, 0.0,
0.0); 0.0);
@ -1502,14 +1502,14 @@ void RicWellPathExportCompletionDataFeatureImpl::assignFractureIntersections(con
const RigCompletionDataGridCell& cell = compIntersection.completionDataGridCell(); const RigCompletionDataGridCell& cell = compIntersection.completionDataGridCell();
cvf::Vec3st localIJK(cell.localCellIndexI(), cell.localCellIndexJ(), cell.localCellIndexK()); cvf::Vec3st localIJK(cell.localCellIndexI(), cell.localCellIndexJ(), cell.localCellIndexK());
RicWellSegmentSubSegmentIntersection intersection(cell.lgrName(), RicWellSubSegmentCellIntersection intersection(cell.lgrName(),
cell.globalCellIndex(), cell.globalCellIndex(),
localIJK, localIJK,
cvf::Vec3d::ZERO); cvf::Vec3d::ZERO);
subSegment.addIntersection(intersection); subSegment.addIntersection(intersection);
} }
lateral.addSubSegment(subSegment); fractureCompletion.addSubSegment(subSegment);
location->addCompletion(lateral); location->addCompletion(fractureCompletion);
} }
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
@ -1576,7 +1576,7 @@ void RicWellPathExportCompletionDataFeatureImpl::assignBranchAndSegmentNumbers(c
} }
} }
// Then assign branch and segment numbers to each lateral parts // Then assign branch and segment numbers to each completion sub segment
for (RicWellSegmentLocation& location : exportInfo->wellSegmentLocations()) for (RicWellSegmentLocation& location : exportInfo->wellSegmentLocations())
{ {
assignBranchAndSegmentNumbers(caseToApply, &location, &branchNumber, &segmentNumber); assignBranchAndSegmentNumbers(caseToApply, &location, &branchNumber, &segmentNumber);