diff --git a/ApplicationCode/Commands/CompletionExportCommands/RicWellPathExportCompletionDataFeatureImpl.cpp b/ApplicationCode/Commands/CompletionExportCommands/RicWellPathExportCompletionDataFeatureImpl.cpp index 120e80d2b2..6f98e92a52 100644 --- a/ApplicationCode/Commands/CompletionExportCommands/RicWellPathExportCompletionDataFeatureImpl.cpp +++ b/ApplicationCode/Commands/CompletionExportCommands/RicWellPathExportCompletionDataFeatureImpl.cpp @@ -608,49 +608,6 @@ void RicWellPathExportCompletionDataFeatureImpl::exportCompdatAndWpimultTables( RiaLogging::info(QString("Successfully exported completion data to %1").arg(filePath)); } -//-------------------------------------------------------------------------------------------------- -/// -//-------------------------------------------------------------------------------------------------- -std::vector RicWellPathExportCompletionDataFeatureImpl::getCompletionsForWellAndCompletionType( - const std::vector& completions, - const QString& wellName, - RigCompletionData::CompletionType completionType) -{ - std::vector filteredCompletions; - for (const auto& completion : completions) - { - if (completion.wellName() == wellName && completion.completionType() == completionType) - { - filteredCompletions.push_back(completion); - } - } - return filteredCompletions; -} - -//-------------------------------------------------------------------------------------------------- -/// -//-------------------------------------------------------------------------------------------------- -std::map> - RicWellPathExportCompletionDataFeatureImpl::getCompletionsForWell( - const std::map>& cellToCompletionMap, - const QString& wellName) -{ - std::map> wellCompletions; - - for (const auto& it : cellToCompletionMap) - { - for (auto& completion : it.second) - { - if (completion.wellName() == wellName) - { - wellCompletions[it.first].push_back(completion); - } - } - } - - return wellCompletions; -} - //-------------------------------------------------------------------------------------------------- /// //-------------------------------------------------------------------------------------------------- diff --git a/ApplicationCode/Commands/CompletionExportCommands/RicWellPathExportCompletionDataFeatureImpl.h b/ApplicationCode/Commands/CompletionExportCommands/RicWellPathExportCompletionDataFeatureImpl.h index 3991caceac..0836e4c073 100644 --- a/ApplicationCode/Commands/CompletionExportCommands/RicWellPathExportCompletionDataFeatureImpl.h +++ b/ApplicationCode/Commands/CompletionExportCommands/RicWellPathExportCompletionDataFeatureImpl.h @@ -173,14 +173,6 @@ private: const std::map>& completionsPerGrid, RicExportCompletionDataSettingsUi::CompdatExportType exportType); - static std::vector getCompletionsForWellAndCompletionType(const std::vector& completions, - const QString& wellName, - RigCompletionData::CompletionType completionType); - - static std::map > - getCompletionsForWell(const std::map>& cellToCompletionMap, - const QString& wellName); - static void exportCompdatTableUsingFormatter(RifEclipseDataTableFormatter& formatter, const QString& gridName, const std::vector& completionData); diff --git a/ApplicationCode/ReservoirDataModel/RigEclipseWellLogExtractor.cpp b/ApplicationCode/ReservoirDataModel/RigEclipseWellLogExtractor.cpp index aed14a0f77..5b5079c5bb 100644 --- a/ApplicationCode/ReservoirDataModel/RigEclipseWellLogExtractor.cpp +++ b/ApplicationCode/ReservoirDataModel/RigEclipseWellLogExtractor.cpp @@ -53,7 +53,6 @@ void RigEclipseWellLogExtractor::calculateIntersection() { std::map uniqueIntersections; - const std::vector& nodeCoords = m_caseData->mainGrid()->nodes(); bool isCellFaceNormalsOut = m_caseData->mainGrid()->isFaceNormalsOutwards(); if (m_wellPath->m_wellPathPoints.empty()) return; diff --git a/ApplicationCode/ReservoirDataModel/RigWellPathIntersectionTools.cpp b/ApplicationCode/ReservoirDataModel/RigWellPathIntersectionTools.cpp index fb23d14f8b..ed05ffae6c 100644 --- a/ApplicationCode/ReservoirDataModel/RigWellPathIntersectionTools.cpp +++ b/ApplicationCode/ReservoirDataModel/RigWellPathIntersectionTools.cpp @@ -144,14 +144,3 @@ cvf::Vec3d RigWellPathIntersectionTools::calculateLengthInCell(const RigMainGrid return calculateLengthInCell(hexCorners, startPoint, endPoint); } - -//-------------------------------------------------------------------------------------------------- -/// -//-------------------------------------------------------------------------------------------------- -std::vector RigWellPathIntersectionTools::findCloseCells(const RigMainGrid* grid, const cvf::BoundingBox& bb) -{ - std::vector closeCells; - grid->findIntersectingCells(bb, &closeCells); - return closeCells; -} - diff --git a/ApplicationCode/ReservoirDataModel/RigWellPathIntersectionTools.h b/ApplicationCode/ReservoirDataModel/RigWellPathIntersectionTools.h index 413d72e1e6..c5f8cf3b81 100644 --- a/ApplicationCode/ReservoirDataModel/RigWellPathIntersectionTools.h +++ b/ApplicationCode/ReservoirDataModel/RigWellPathIntersectionTools.h @@ -55,7 +55,4 @@ public: size_t cellIndex, const cvf::Vec3d& startPoint, const cvf::Vec3d& endPoint); - -private: - static std::vector findCloseCells(const RigMainGrid* grid, const cvf::BoundingBox& bb); }; diff --git a/ApplicationCode/UserInterface/RiuViewerCommands.cpp b/ApplicationCode/UserInterface/RiuViewerCommands.cpp index df5e9e2b90..714ebf12f5 100644 --- a/ApplicationCode/UserInterface/RiuViewerCommands.cpp +++ b/ApplicationCode/UserInterface/RiuViewerCommands.cpp @@ -639,7 +639,6 @@ void RiuViewerCommands::handlePickAction(int winPosX, int winPosY, Qt::KeyboardM bool allowActiveViewChange = dynamic_cast(m_viewer->ownerViewWindow()) == nullptr; size_t globalCellIndex = wellConnectionSourceInfo->globalCellIndexFromTriangleIndex(firstPartTriangleIndex); - double connectionFactor = wellConnectionSourceInfo->connectionFactorFromTriangleIndex(firstPartTriangleIndex); RimEclipseView* eclipseView = dynamic_cast(m_reservoirView.p()); if (eclipseView)