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

#1858 Rename WellPathIntersectionInfo classes

Browse Source
This commit is contained in:
Jacob Støren 2017-12-12 13:53:02 +01:00
parent 3a1939d460
commit b15664cfc5
10 changed files with 34 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -182,7 +182,7 @@ void RicFishbonesTransmissibilityCalculationFeatureImp::findFishboneImportedLate
double diameter = wellPath->fishbonesCollection()->wellPathCollection()->holeDiameter(unitSystem); double diameter = wellPath->fishbonesCollection()->wellPathCollection()->holeDiameter(unitSystem);
for (const RimFishboneWellPath* fishbonesPath : wellPath->fishbonesCollection()->wellPathCollection()->wellPaths()) for (const RimFishboneWellPath* fishbonesPath : wellPath->fishbonesCollection()->wellPathCollection()->wellPaths())
{ {
std::vector<WellPathCellIntersectionInfo> intersectedCells = RigWellPathIntersectionTools::findCellsIntersectedByPath(settings.caseToApply->eclipseCaseData(), std::vector<EclipseWellPathCellIntersectionInfo> intersectedCells = RigWellPathIntersectionTools::findCellsIntersectedByPath(settings.caseToApply->eclipseCaseData(),
fishbonesPath->coordinates(), fishbonesPath->coordinates(),
fishbonesPath->measuredDepths()); fishbonesPath->measuredDepths());
for (auto& cell : intersectedCells) for (auto& cell : intersectedCells)
@ -219,7 +219,7 @@ void RicFishbonesTransmissibilityCalculationFeatureImp::findMainWellBoreParts(st
std::pair< std::vector<cvf::Vec3d>, std::vector<double> > fishbonePerfWellPathCoords = wellPath->wellPathGeometry()->clippedPointSubset(wellPath->fishbonesCollection()->startMD(), std::pair< std::vector<cvf::Vec3d>, std::vector<double> > fishbonePerfWellPathCoords = wellPath->wellPathGeometry()->clippedPointSubset(wellPath->fishbonesCollection()->startMD(),
wellPathEndMD); wellPathEndMD);
std::vector<WellPathCellIntersectionInfo> intersectedCellsIntersectionInfo = RigWellPathIntersectionTools::findCellsIntersectedByPath(settings.caseToApply->eclipseCaseData(), std::vector<EclipseWellPathCellIntersectionInfo> intersectedCellsIntersectionInfo = RigWellPathIntersectionTools::findCellsIntersectedByPath(settings.caseToApply->eclipseCaseData(),
fishbonePerfWellPathCoords.first, fishbonePerfWellPathCoords.first,
fishbonePerfWellPathCoords.second); fishbonePerfWellPathCoords.second);

4
ApplicationCode/Commands/CompletionCommands/RicWellPathExportCompletionDataFeature.cpp
View File

@ -718,7 +718,7 @@ std::vector<RigCompletionData> RicWellPathExportCompletionDataFeature::generateP
using namespace std; using namespace std;
pair<vector<cvf::Vec3d>, vector<double> > perforationPointsAndMD = wellPath->wellPathGeometry()->clippedPointSubset(interval->startMD(), interval->endMD()); pair<vector<cvf::Vec3d>, vector<double> > perforationPointsAndMD = wellPath->wellPathGeometry()->clippedPointSubset(interval->startMD(), interval->endMD());
std::vector<WellPathCellIntersectionInfo> intersectedCells = RigWellPathIntersectionTools::findCellsIntersectedByPath(settings.caseToApply->eclipseCaseData(), std::vector<EclipseWellPathCellIntersectionInfo> intersectedCells = RigWellPathIntersectionTools::findCellsIntersectedByPath(settings.caseToApply->eclipseCaseData(),
perforationPointsAndMD.first, perforationPointsAndMD.first,
perforationPointsAndMD.second); perforationPointsAndMD.second);
for (auto& cell : intersectedCells) for (auto& cell : intersectedCells)
@ -880,7 +880,7 @@ void RicWellPathExportCompletionDataFeature::assignLateralIntersections(const Ri
lateralMDs.push_back(coordMD.second); lateralMDs.push_back(coordMD.second);
} }
std::vector<WellPathCellIntersectionInfo> intersections = RigWellPathIntersectionTools::findCellsIntersectedByPath(caseToApply->eclipseCaseData(), std::vector<EclipseWellPathCellIntersectionInfo> intersections = RigWellPathIntersectionTools::findCellsIntersectedByPath(caseToApply->eclipseCaseData(),
lateralCoords, lateralCoords,
lateralMDs); lateralMDs);

4
ApplicationCode/ProjectDataModel/Flow/RimWellPltPlot.cpp
View File

@ -360,7 +360,7 @@ public:
RigEclipseWellLogExtractor* eclExtractor = findWellLogExtractor(wellPathName, eclCase); RigEclipseWellLogExtractor* eclExtractor = findWellLogExtractor(wellPathName, eclCase);
if (!eclExtractor) return; if (!eclExtractor) return;
std::vector<CellIntersectionInfo> intersections = eclExtractor->intersectionInfo(); std::vector<WellPathCellIntersectionInfo> intersections = eclExtractor->intersectionInfo();
for (size_t wpExIdx = 0; wpExIdx < intersections.size(); wpExIdx++) for (size_t wpExIdx = 0; wpExIdx < intersections.size(); wpExIdx++)
{ {
@ -452,7 +452,7 @@ public:
if (!eclExtractor) return; if (!eclExtractor) return;
std::vector<CellIntersectionInfo> intersections = eclExtractor->intersectionInfo(); std::vector<WellPathCellIntersectionInfo> intersections = eclExtractor->intersectionInfo();
for (size_t wpExIdx = 0; wpExIdx < intersections.size(); wpExIdx++) for (size_t wpExIdx = 0; wpExIdx < intersections.size(); wpExIdx++)
{ {

2
ApplicationCode/ProjectDataModel/RimWellLogRftCurve.cpp
View File

@ -556,7 +556,7 @@ bool RimWellLogRftCurve::createWellPathIdxToRftFileIdxMapping()
if (!eclExtractor) return false; if (!eclExtractor) return false;
std::vector<CellIntersectionInfo> intersections = eclExtractor->intersectionInfo(); std::vector<WellPathCellIntersectionInfo> intersections = eclExtractor->intersectionInfo();
if (intersections.empty()) return false; if (intersections.empty()) return false;
std::map<size_t, size_t> globCellIndicesToIndexInWell; std::map<size_t, size_t> globCellIndicesToIndexInWell;

18
ApplicationCode/ReservoirDataModel/RigEclipseWellLogExtractor.cpp
View File

@ -137,9 +137,21 @@ void RigEclipseWellLogExtractor::curveData(const RigResultAccessor* resultAccess
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
/// ///
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
std::vector<WellPathCellIntersectionInfo> RigEclipseWellLogExtractor::cellIntersectionInfo() std::vector<EclipseWellPathCellIntersectionInfo> RigEclipseWellLogExtractor::cellIntersectionInfo()
{ {
std::vector<WellPathCellIntersectionInfo> cellIntersectionInfos; //std::vector<CellIntersectionInfo> 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<EclipseWellPathCellIntersectionInfo> cellIntersectionInfos;
if (m_intersections.size() > 1) if (m_intersections.size() > 1)
{ {
@ -158,7 +170,7 @@ std::vector<WellPathCellIntersectionInfo> RigEclipseWellLogExtractor::cellInters
m_intersections[cpIdx], m_intersections[cpIdx],
m_intersections[cpIdx+1]); m_intersections[cpIdx+1]);
cellIntersectionInfos.push_back(WellPathCellIntersectionInfo(cellIdx1, cellIntersectionInfos.push_back(EclipseWellPathCellIntersectionInfo(cellIdx1,
m_intersections[cpIdx], m_intersections[cpIdx],
m_intersections[cpIdx+1], m_intersections[cpIdx+1],
internalCellLengths)); internalCellLengths));

4
ApplicationCode/ReservoirDataModel/RigEclipseWellLogExtractor.h
View File

@ -25,7 +25,7 @@ class RigEclipseCaseData;
class RigWellPath; class RigWellPath;
class RigResultAccessor; class RigResultAccessor;
struct WellPathCellIntersectionInfo; struct EclipseWellPathCellIntersectionInfo;
namespace cvf { namespace cvf {
class BoundingBox; class BoundingBox;
@ -42,7 +42,7 @@ public:
void curveData(const RigResultAccessor* resultAccessor, std::vector<double>* values ); void curveData(const RigResultAccessor* resultAccessor, std::vector<double>* values );
const RigEclipseCaseData* caseData() { return m_caseData.p();} const RigEclipseCaseData* caseData() { return m_caseData.p();}
std::vector<WellPathCellIntersectionInfo> cellIntersectionInfo(); std::vector<EclipseWellPathCellIntersectionInfo> cellIntersectionInfo();
const std::vector<size_t>& intersectedCellsGlobIdx(); const std::vector<size_t>& intersectedCellsGlobIdx();
protected: protected:

6
ApplicationCode/ReservoirDataModel/RigWellLogExtractor.cpp
View File

@ -43,16 +43,16 @@ RigWellLogExtractor::~RigWellLogExtractor()
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
/// ///
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
std::vector<CellIntersectionInfo> RigWellLogExtractor::intersectionInfo() const std::vector<WellPathCellIntersectionInfo> RigWellLogExtractor::intersectionInfo() const
{ {
std::vector<CellIntersectionInfo> infoVector; std::vector<WellPathCellIntersectionInfo> infoVector;
if (m_intersectedCellsGlobIdx.empty()) return infoVector; if (m_intersectedCellsGlobIdx.empty()) return infoVector;
for (size_t i = 0; i < m_intersectedCellsGlobIdx.size() - 1; i=i+2) for (size_t i = 0; i < m_intersectedCellsGlobIdx.size() - 1; i=i+2)
{ {
CVF_ASSERT(m_intersectedCellsGlobIdx[i] == m_intersectedCellsGlobIdx[i + 1]); CVF_ASSERT(m_intersectedCellsGlobIdx[i] == m_intersectedCellsGlobIdx[i + 1]);
CellIntersectionInfo cellInfo; WellPathCellIntersectionInfo cellInfo;
cellInfo.globCellIndex = m_intersectedCellsGlobIdx[i]; cellInfo.globCellIndex = m_intersectedCellsGlobIdx[i];
cellInfo.startPoint = m_intersections[i]; cellInfo.startPoint = m_intersections[i];

4
ApplicationCode/ReservoirDataModel/RigWellLogExtractor.h
View File

@ -35,7 +35,7 @@
//================================================================================================== //==================================================================================================
/// ///
//================================================================================================== //==================================================================================================
struct CellIntersectionInfo struct WellPathCellIntersectionInfo
{ {
size_t globCellIndex; size_t globCellIndex;
cvf::Vec3d startPoint; cvf::Vec3d startPoint;
@ -63,7 +63,7 @@ public:
const RigWellPath* wellPathData() { return m_wellPath.p();} const RigWellPath* wellPathData() { return m_wellPath.p();}
std::vector<CellIntersectionInfo> intersectionInfo() const; std::vector<WellPathCellIntersectionInfo> intersectionInfo() const;
protected: protected:
static void insertIntersectionsInMap(const std::vector<HexIntersectionInfo> &intersections, static void insertIntersectionsInMap(const std::vector<HexIntersectionInfo> &intersections,

4
ApplicationCode/ReservoirDataModel/RigWellPathIntersectionTools.cpp
View File

@ -34,11 +34,11 @@
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
/// ///
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
std::vector<WellPathCellIntersectionInfo> RigWellPathIntersectionTools::findCellsIntersectedByPath(const RigEclipseCaseData* caseData, std::vector<EclipseWellPathCellIntersectionInfo> RigWellPathIntersectionTools::findCellsIntersectedByPath(const RigEclipseCaseData* caseData,
const std::vector<cvf::Vec3d>& pathCoords, const std::vector<cvf::Vec3d>& pathCoords,
const std::vector<double>& pathMds) const std::vector<double>& pathMds)
{ {
std::vector<WellPathCellIntersectionInfo> intersectionInfos; std::vector<EclipseWellPathCellIntersectionInfo> intersectionInfos;
const RigMainGrid* grid = caseData->mainGrid(); const RigMainGrid* grid = caseData->mainGrid();
if (pathCoords.size() < 2) return intersectionInfos; if (pathCoords.size() < 2) return intersectionInfos;

6
ApplicationCode/ReservoirDataModel/RigWellPathIntersectionTools.h
View File

@ -33,9 +33,9 @@ class RigEclipseCaseData;
//================================================================================================== //==================================================================================================
/// ///
//================================================================================================== //==================================================================================================
struct WellPathCellIntersectionInfo struct EclipseWellPathCellIntersectionInfo
{ {
WellPathCellIntersectionInfo(size_t globReservoirCellIndex, EclipseWellPathCellIntersectionInfo(size_t globReservoirCellIndex,
cvf::Vec3d startPoint, cvf::Vec3d startPoint,
cvf::Vec3d endPoint, cvf::Vec3d endPoint,
cvf::Vec3d internalCellLengths) cvf::Vec3d internalCellLengths)
@ -57,7 +57,7 @@ struct WellPathCellIntersectionInfo
class RigWellPathIntersectionTools class RigWellPathIntersectionTools
{ {
public: public:
static std::vector<WellPathCellIntersectionInfo> findCellsIntersectedByPath(const RigEclipseCaseData* caseData, static std::vector<EclipseWellPathCellIntersectionInfo> findCellsIntersectedByPath(const RigEclipseCaseData* caseData,
const std::vector<cvf::Vec3d>& pathCoords, const std::vector<cvf::Vec3d>& pathCoords,
const std::vector<double>& pathMds); const std::vector<double>& pathMds);