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

Rename and whitespace changes

Browse Source
This commit is contained in:
Jacob Støren
2017-10-06 12:36:21 +02:00
parent f938827523
commit 6f82f0f614
8 changed files with 36 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -185,7 +185,7 @@ void RicFishbonesTransmissibilityCalculationFeatureImp::findFishboneImportedLate
fishbonesPath->measuredDepths());
for (auto& cell : intersectedCells)
{
if (std::find(wellPathCells.begin(), wellPathCells.end(), cell.cellIndex) != wellPathCells.end()) continue;
if (std::find(wellPathCells.begin(), wellPathCells.end(), cell.globCellIndex) != wellPathCells.end()) continue;
double skinFactor = wellPath->fishbonesCollection()->wellPathCollection()->skinFactor();
QString completionMetaData = fishbonesPath->name();
@@ -194,7 +194,7 @@ void RicFishbonesTransmissibilityCalculationFeatureImp::findFishboneImportedLate
skinFactor,
isMainBore,
completionMetaData);
wellBorePartsInCells[cell.cellIndex].push_back(wellBorePart);
wellBorePartsInCells[cell.globCellIndex].push_back(wellBorePart);
}
}
}
@@ -231,6 +231,6 @@ void RicFishbonesTransmissibilityCalculationFeatureImp::findMainWellBoreParts(st
isMainBore,
completionMetaData);
wellBorePartsInCells[cell.cellIndex].push_back(wellBorePart);
wellBorePartsInCells[cell.globCellIndex].push_back(wellBorePart);
}
}

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

@@ -723,20 +723,20 @@ std::vector<RigCompletionData> RicWellPathExportCompletionDataFeature::generateP
perforationPointsAndMD.second);
for (auto& cell : intersectedCells)
{
bool cellIsActive = activeCellInfo->isActive(cell.cellIndex);
bool cellIsActive = activeCellInfo->isActive(cell.globCellIndex);
if (!cellIsActive) continue;
size_t i, j, k;
settings.caseToApply->eclipseCaseData()->mainGrid()->ijkFromCellIndex(cell.cellIndex, &i, &j, &k);
settings.caseToApply->eclipseCaseData()->mainGrid()->ijkFromCellIndex(cell.globCellIndex, &i, &j, &k);
RigCompletionData completion(wellPath->completions()->wellNameForExport(), IJKCellIndex(i, j, k));
CellDirection direction = calculateDirectionInCell(settings.caseToApply, cell.cellIndex, cell.internalCellLengths);
CellDirection direction = calculateDirectionInCell(settings.caseToApply, cell.globCellIndex, cell.internalCellLengths);
double transmissibility = RicWellPathExportCompletionDataFeature::calculateTransmissibility(settings.caseToApply,
wellPath,
cell.internalCellLengths,
interval->skinFactor(),
interval->diameter(unitSystem) / 2,
cell.cellIndex,
cell.globCellIndex,
settings.useLateralNTG);
@@ -898,7 +898,7 @@ void RicWellPathExportCompletionDataFeature::calculateLateralIntersections(const
WellSegmentLateralIntersection lateralIntersection( ++(*segmentNum),
attachedSegmentNumber,
intersection->cellIndex,
intersection->globCellIndex,
length,
depth);

6
ApplicationCode/ReservoirDataModel/RigEclipseWellLogExtractor.cpp
View File

@@ -125,7 +125,7 @@ void RigEclipseWellLogExtractor::curveData(const RigResultAccessor* resultAccess
for (size_t cpIdx = 0; cpIdx < m_intersections.size(); ++cpIdx)
{
size_t cellIdx = m_intersectedCells[cpIdx];
size_t cellIdx = m_intersectedCellsGlobIdx[cpIdx];
cvf::StructGridInterface::FaceType cellFace = m_intersectedCellFaces[cpIdx];
(*values)[cpIdx] = resultAccessor->cellFaceScalarGlobIdx(cellIdx, cellFace);
}
@@ -145,8 +145,8 @@ std::vector<WellPathCellIntersectionInfo> RigEclipseWellLogExtractor::cellInters
for (size_t cpIdx = 0; cpIdx < m_intersections.size()-1; ++cpIdx)
{
size_t cellIdx1 = m_intersectedCells[cpIdx];
size_t cellIdx2 = m_intersectedCells[cpIdx+1];
size_t cellIdx1 = m_intersectedCellsGlobIdx[cpIdx];
size_t cellIdx2 = m_intersectedCellsGlobIdx[cpIdx+1];
if (cellIdx1 == cellIdx2)
{

2
ApplicationCode/ReservoirDataModel/RigGeoMechWellLogExtractor.cpp
View File

@@ -64,7 +64,7 @@ void RigGeoMechWellLogExtractor::curveData(const RigFemResultAddress& resAddr, i
for (size_t cpIdx = 0; cpIdx < m_intersections.size(); ++cpIdx)
{
size_t elmIdx = m_intersectedCells[cpIdx];
size_t elmIdx = m_intersectedCellsGlobIdx[cpIdx];
RigElementType elmType = femPart->elementType(elmIdx);
if (!(elmType == HEX8 || elmType == HEX8P)) continue;

2
ApplicationCode/ReservoirDataModel/RigWellLogExtractor.cpp
View File

@@ -234,6 +234,6 @@ void RigWellLogExtractor::appendIntersectionToArrays(double measuredDepth, const
m_measuredDepth.push_back (measuredDepth);
m_trueVerticalDepth.push_back (fabs(intersection.m_intersectionPoint[2]));
m_intersections.push_back (intersection.m_intersectionPoint);
m_intersectedCells.push_back (intersection.m_hexIndex);
m_intersectedCellsGlobIdx.push_back (intersection.m_hexIndex);
m_intersectedCellFaces.push_back(intersection.m_face);
}

4
ApplicationCode/ReservoirDataModel/RigWellLogExtractor.h
View File

@@ -44,7 +44,7 @@ public:
virtual ~RigWellLogExtractor();
const std::vector<double>& measuredDepth() { return m_measuredDepth; }
const std::vector<double>& trueVerticalDepth() {return m_trueVerticalDepth;}
const std::vector<double>& trueVerticalDepth() { return m_trueVerticalDepth; }
const RigWellPath* wellPathData() { return m_wellPath.p();}
@@ -63,7 +63,7 @@ protected:
std::vector<double> m_trueVerticalDepth;
std::vector<cvf::Vec3d> m_intersections;
std::vector<size_t> m_intersectedCells;
std::vector<size_t> m_intersectedCellsGlobIdx;
std::vector<cvf::StructGridInterface::FaceType>
m_intersectedCellFaces;

12
ApplicationCode/ReservoirDataModel/RigWellPathIntersectionTools.h
View File

@@ -33,15 +33,19 @@ class RigEclipseCaseData;
//==================================================================================================
///
//==================================================================================================
struct WellPathCellIntersectionInfo {
WellPathCellIntersectionInfo(size_t cellIndex, cvf::Vec3d startPoint, cvf::Vec3d endPoint, cvf::Vec3d internalCellLengths)
: cellIndex(cellIndex),
struct WellPathCellIntersectionInfo
{
WellPathCellIntersectionInfo(size_t globReservoirCellIndex,
cvf::Vec3d startPoint,
cvf::Vec3d endPoint,
cvf::Vec3d internalCellLengths)
: globCellIndex(globReservoirCellIndex),
startPoint(startPoint),
endPoint(endPoint),
internalCellLengths(internalCellLengths)
{}
size_t cellIndex;
size_t globCellIndex;
cvf::Vec3d startPoint;
cvf::Vec3d endPoint;
cvf::Vec3d internalCellLengths; // intersectionLengthsInCellCS