diff --git a/ApplicationCode/Commands/CompletionCommands/RicFishbonesTransmissibilityCalculationFeatureImp.cpp b/ApplicationCode/Commands/CompletionCommands/RicFishbonesTransmissibilityCalculationFeatureImp.cpp index 0db211a755..d17e9a606e 100644 --- a/ApplicationCode/Commands/CompletionCommands/RicFishbonesTransmissibilityCalculationFeatureImp.cpp +++ b/ApplicationCode/Commands/CompletionCommands/RicFishbonesTransmissibilityCalculationFeatureImp.cpp @@ -182,7 +182,7 @@ void RicFishbonesTransmissibilityCalculationFeatureImp::findFishboneImportedLate double diameter = wellPath->fishbonesCollection()->wellPathCollection()->holeDiameter(unitSystem); for (const RimFishboneWellPath* fishbonesPath : wellPath->fishbonesCollection()->wellPathCollection()->wellPaths()) { - std::vector intersectedCells = RigWellPathIntersectionTools::findCellsIntersectedByPath(settings.caseToApply->eclipseCaseData(), + std::vector intersectedCells = RigWellPathIntersectionTools::findCellsIntersectedByPath(settings.caseToApply->eclipseCaseData(), fishbonesPath->coordinates(), fishbonesPath->measuredDepths()); for (auto& cell : intersectedCells) @@ -219,7 +219,7 @@ void RicFishbonesTransmissibilityCalculationFeatureImp::findMainWellBoreParts(st std::pair< std::vector, std::vector > fishbonePerfWellPathCoords = wellPath->wellPathGeometry()->clippedPointSubset(wellPath->fishbonesCollection()->startMD(), wellPathEndMD); - std::vector intersectedCellsIntersectionInfo = RigWellPathIntersectionTools::findCellsIntersectedByPath(settings.caseToApply->eclipseCaseData(), + std::vector intersectedCellsIntersectionInfo = RigWellPathIntersectionTools::findCellsIntersectedByPath(settings.caseToApply->eclipseCaseData(), fishbonePerfWellPathCoords.first, fishbonePerfWellPathCoords.second); diff --git a/ApplicationCode/Commands/CompletionCommands/RicWellPathExportCompletionDataFeature.cpp b/ApplicationCode/Commands/CompletionCommands/RicWellPathExportCompletionDataFeature.cpp index a5ec9c4f40..81cd170821 100644 --- a/ApplicationCode/Commands/CompletionCommands/RicWellPathExportCompletionDataFeature.cpp +++ b/ApplicationCode/Commands/CompletionCommands/RicWellPathExportCompletionDataFeature.cpp @@ -718,7 +718,7 @@ std::vector RicWellPathExportCompletionDataFeature::generateP using namespace std; pair, vector > perforationPointsAndMD = wellPath->wellPathGeometry()->clippedPointSubset(interval->startMD(), interval->endMD()); - std::vector intersectedCells = RigWellPathIntersectionTools::findCellsIntersectedByPath(settings.caseToApply->eclipseCaseData(), + std::vector intersectedCells = RigWellPathIntersectionTools::findCellsIntersectedByPath(settings.caseToApply->eclipseCaseData(), perforationPointsAndMD.first, perforationPointsAndMD.second); for (auto& cell : intersectedCells) @@ -880,7 +880,7 @@ void RicWellPathExportCompletionDataFeature::assignLateralIntersections(const Ri lateralMDs.push_back(coordMD.second); } - std::vector intersections = RigWellPathIntersectionTools::findCellsIntersectedByPath(caseToApply->eclipseCaseData(), + std::vector intersections = RigWellPathIntersectionTools::findCellsIntersectedByPath(caseToApply->eclipseCaseData(), lateralCoords, lateralMDs); diff --git a/ApplicationCode/ProjectDataModel/Flow/RimWellPltPlot.cpp b/ApplicationCode/ProjectDataModel/Flow/RimWellPltPlot.cpp index 82d540bfe8..2c060df6a2 100644 --- a/ApplicationCode/ProjectDataModel/Flow/RimWellPltPlot.cpp +++ b/ApplicationCode/ProjectDataModel/Flow/RimWellPltPlot.cpp @@ -360,7 +360,7 @@ public: RigEclipseWellLogExtractor* eclExtractor = findWellLogExtractor(wellPathName, eclCase); if (!eclExtractor) return; - std::vector intersections = eclExtractor->intersectionInfo(); + std::vector intersections = eclExtractor->intersectionInfo(); for (size_t wpExIdx = 0; wpExIdx < intersections.size(); wpExIdx++) { @@ -452,7 +452,7 @@ public: if (!eclExtractor) return; - std::vector intersections = eclExtractor->intersectionInfo(); + std::vector intersections = eclExtractor->intersectionInfo(); for (size_t wpExIdx = 0; wpExIdx < intersections.size(); wpExIdx++) { diff --git a/ApplicationCode/ProjectDataModel/RimWellLogRftCurve.cpp b/ApplicationCode/ProjectDataModel/RimWellLogRftCurve.cpp index 42ae4fbc3c..c199ea0ff4 100644 --- a/ApplicationCode/ProjectDataModel/RimWellLogRftCurve.cpp +++ b/ApplicationCode/ProjectDataModel/RimWellLogRftCurve.cpp @@ -556,7 +556,7 @@ bool RimWellLogRftCurve::createWellPathIdxToRftFileIdxMapping() if (!eclExtractor) return false; - std::vector intersections = eclExtractor->intersectionInfo(); + std::vector intersections = eclExtractor->intersectionInfo(); if (intersections.empty()) return false; std::map globCellIndicesToIndexInWell; diff --git a/ApplicationCode/ReservoirDataModel/RigEclipseWellLogExtractor.cpp b/ApplicationCode/ReservoirDataModel/RigEclipseWellLogExtractor.cpp index 7f55a2aa4c..78c3f07a85 100644 --- a/ApplicationCode/ReservoirDataModel/RigEclipseWellLogExtractor.cpp +++ b/ApplicationCode/ReservoirDataModel/RigEclipseWellLogExtractor.cpp @@ -137,9 +137,21 @@ void RigEclipseWellLogExtractor::curveData(const RigResultAccessor* resultAccess //-------------------------------------------------------------------------------------------------- /// //-------------------------------------------------------------------------------------------------- -std::vector RigEclipseWellLogExtractor::cellIntersectionInfo() +std::vector RigEclipseWellLogExtractor::cellIntersectionInfo() { - std::vector cellIntersectionInfos; + //std::vector intersectionInfos = this->intersectionInfo(); + // + //for (const auto& cellIntersectInfo: intersectionInfos) + //{ + // cvf::Vec3d internalCellLengths; + // internalCellLengths = RigWellPathIntersectionTools::calculateLengthInCell(m_caseData->mainGrid(), + // cellIntersectInfo.globCellIndex, + // cellIntersectInfo.startPoint, + // cellIntersectInfo.endPoint); + // + //} + + std::vector cellIntersectionInfos; if (m_intersections.size() > 1) { @@ -158,7 +170,7 @@ std::vector RigEclipseWellLogExtractor::cellInters m_intersections[cpIdx], m_intersections[cpIdx+1]); - cellIntersectionInfos.push_back(WellPathCellIntersectionInfo(cellIdx1, + cellIntersectionInfos.push_back(EclipseWellPathCellIntersectionInfo(cellIdx1, m_intersections[cpIdx], m_intersections[cpIdx+1], internalCellLengths)); diff --git a/ApplicationCode/ReservoirDataModel/RigEclipseWellLogExtractor.h b/ApplicationCode/ReservoirDataModel/RigEclipseWellLogExtractor.h index a0cec006a2..fc65b1f9c9 100644 --- a/ApplicationCode/ReservoirDataModel/RigEclipseWellLogExtractor.h +++ b/ApplicationCode/ReservoirDataModel/RigEclipseWellLogExtractor.h @@ -25,7 +25,7 @@ class RigEclipseCaseData; class RigWellPath; class RigResultAccessor; -struct WellPathCellIntersectionInfo; +struct EclipseWellPathCellIntersectionInfo; namespace cvf { class BoundingBox; @@ -42,7 +42,7 @@ public: void curveData(const RigResultAccessor* resultAccessor, std::vector* values ); const RigEclipseCaseData* caseData() { return m_caseData.p();} - std::vector cellIntersectionInfo(); + std::vector cellIntersectionInfo(); const std::vector& intersectedCellsGlobIdx(); protected: diff --git a/ApplicationCode/ReservoirDataModel/RigWellLogExtractor.cpp b/ApplicationCode/ReservoirDataModel/RigWellLogExtractor.cpp index ee9472bd79..14d345c3bd 100644 --- a/ApplicationCode/ReservoirDataModel/RigWellLogExtractor.cpp +++ b/ApplicationCode/ReservoirDataModel/RigWellLogExtractor.cpp @@ -43,16 +43,16 @@ RigWellLogExtractor::~RigWellLogExtractor() //-------------------------------------------------------------------------------------------------- /// //-------------------------------------------------------------------------------------------------- -std::vector RigWellLogExtractor::intersectionInfo() const +std::vector RigWellLogExtractor::intersectionInfo() const { - std::vector infoVector; + std::vector infoVector; if (m_intersectedCellsGlobIdx.empty()) return infoVector; for (size_t i = 0; i < m_intersectedCellsGlobIdx.size() - 1; i=i+2) { CVF_ASSERT(m_intersectedCellsGlobIdx[i] == m_intersectedCellsGlobIdx[i + 1]); - CellIntersectionInfo cellInfo; + WellPathCellIntersectionInfo cellInfo; cellInfo.globCellIndex = m_intersectedCellsGlobIdx[i]; cellInfo.startPoint = m_intersections[i]; diff --git a/ApplicationCode/ReservoirDataModel/RigWellLogExtractor.h b/ApplicationCode/ReservoirDataModel/RigWellLogExtractor.h index 3e462162e6..1a60da6b87 100644 --- a/ApplicationCode/ReservoirDataModel/RigWellLogExtractor.h +++ b/ApplicationCode/ReservoirDataModel/RigWellLogExtractor.h @@ -35,7 +35,7 @@ //================================================================================================== /// //================================================================================================== -struct CellIntersectionInfo +struct WellPathCellIntersectionInfo { size_t globCellIndex; cvf::Vec3d startPoint; @@ -63,7 +63,7 @@ public: const RigWellPath* wellPathData() { return m_wellPath.p();} - std::vector intersectionInfo() const; + std::vector intersectionInfo() const; protected: static void insertIntersectionsInMap(const std::vector &intersections, diff --git a/ApplicationCode/ReservoirDataModel/RigWellPathIntersectionTools.cpp b/ApplicationCode/ReservoirDataModel/RigWellPathIntersectionTools.cpp index 9fc2c99f82..ded66c2f76 100644 --- a/ApplicationCode/ReservoirDataModel/RigWellPathIntersectionTools.cpp +++ b/ApplicationCode/ReservoirDataModel/RigWellPathIntersectionTools.cpp @@ -34,11 +34,11 @@ //-------------------------------------------------------------------------------------------------- /// //-------------------------------------------------------------------------------------------------- -std::vector RigWellPathIntersectionTools::findCellsIntersectedByPath(const RigEclipseCaseData* caseData, +std::vector RigWellPathIntersectionTools::findCellsIntersectedByPath(const RigEclipseCaseData* caseData, const std::vector& pathCoords, const std::vector& pathMds) { - std::vector intersectionInfos; + std::vector intersectionInfos; const RigMainGrid* grid = caseData->mainGrid(); if (pathCoords.size() < 2) return intersectionInfos; diff --git a/ApplicationCode/ReservoirDataModel/RigWellPathIntersectionTools.h b/ApplicationCode/ReservoirDataModel/RigWellPathIntersectionTools.h index be1baf32f1..35d310a24c 100644 --- a/ApplicationCode/ReservoirDataModel/RigWellPathIntersectionTools.h +++ b/ApplicationCode/ReservoirDataModel/RigWellPathIntersectionTools.h @@ -33,9 +33,9 @@ class RigEclipseCaseData; //================================================================================================== /// //================================================================================================== -struct WellPathCellIntersectionInfo +struct EclipseWellPathCellIntersectionInfo { - WellPathCellIntersectionInfo(size_t globReservoirCellIndex, + EclipseWellPathCellIntersectionInfo(size_t globReservoirCellIndex, cvf::Vec3d startPoint, cvf::Vec3d endPoint, cvf::Vec3d internalCellLengths) @@ -57,7 +57,7 @@ struct WellPathCellIntersectionInfo class RigWellPathIntersectionTools { public: - static std::vector findCellsIntersectedByPath(const RigEclipseCaseData* caseData, + static std::vector findCellsIntersectedByPath(const RigEclipseCaseData* caseData, const std::vector& pathCoords, const std::vector& pathMds);