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

System : Removed unused variables

Browse Source
This commit is contained in:
Magne Sjaastad
2015-10-26 10:13:34 +01:00
parent 14dedf5d4a
commit 01224dd5e6
26 changed files with 15 additions and 76 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
ApplicationCode/ReservoirDataModel/RigCell.cpp
View File

@@ -106,8 +106,6 @@ bool RigCell::isLongPyramidCell(double maxHeightFactor, double nodeNearTolerance
const std::vector<cvf::Vec3d>& nodes = m_hostGrid->mainGrid()->nodes();
bool isPyramidCell = false;
int face;
for ( face = 0; face < 6 ; ++face)
{
@@ -228,7 +226,6 @@ bool RigCell::isCollapsedCell(double nodeNearTolerance) const
{
const std::vector<cvf::Vec3d>& nodes = m_hostGrid->mainGrid()->nodes();
bool isPyramidCell = false;
cvf::ubyte faceVertexIndices[4];
cvf::ubyte oppFaceVertexIndices[4];

3
ApplicationCode/ReservoirDataModel/RigEclipseWellLogExtractor.cpp
View File

@@ -81,7 +81,8 @@ void RigEclipseWellLogExtractor::calculateIntersection()
hexCorners[6] = nodeCoords[cornerIndices[6]];
hexCorners[7] = nodeCoords[cornerIndices[7]];
int intersectionCount = RigHexIntersector::lineHexCellIntersection(p1, p2, hexCorners, closeCells[cIdx], &intersections);
//int intersectionCount = RigHexIntersector::lineHexCellIntersection(p1, p2, hexCorners, closeCells[cIdx], &intersections);
RigHexIntersector::lineHexCellIntersection(p1, p2, hexCorners, closeCells[cIdx], &intersections);
}
if (!isCellFaceNormalsOut)

3
ApplicationCode/ReservoirDataModel/RigGeoMechWellLogExtractor.cpp
View File

@@ -154,7 +154,8 @@ void RigGeoMechWellLogExtractor::calculateIntersection()
hexCorners[6] = cvf::Vec3d(nodeCoords[cornerIndices[6]]);
hexCorners[7] = cvf::Vec3d(nodeCoords[cornerIndices[7]]);
int intersectionCount = RigHexIntersector::lineHexCellIntersection(p1, p2, hexCorners, closeCells[ccIdx], &intersections);
//int intersectionCount = RigHexIntersector::lineHexCellIntersection(p1, p2, hexCorners, closeCells[ccIdx], &intersections);
RigHexIntersector::lineHexCellIntersection(p1, p2, hexCorners, closeCells[ccIdx], &intersections);
}
// Now, with all the intersections of this piece of line, we need to

2
ApplicationCode/ReservoirDataModel/RigGridManager.cpp
View File

@@ -35,8 +35,6 @@ void RigGridManager::addCase(RigCaseData* eclipseCase)
//--------------------------------------------------------------------------------------------------
void RigGridManager::removeCase(RigCaseData* eclipseCase)
{
size_t indexToErase = cvf::UNDEFINED_SIZE_T;
for (size_t i = 0; i < m_caseToGrid.size(); i++)
{
if (m_caseToGrid[i]->m_eclipseCase == eclipseCase)

8
ApplicationCode/ReservoirDataModel/RigReservoirBuilderMock.cpp
View File

@@ -136,7 +136,6 @@ void RigReservoirBuilderMock::appendCubeNodes(const cvf::Vec3d& min, const cvf::
//--------------------------------------------------------------------------------------------------
void RigReservoirBuilderMock::appendCells(size_t nodeStartIndex, size_t cellCount, RigGridBase* hostGrid, std::vector<RigCell>& cells)
{
size_t activeCellIndex = 0;
long long i;
size_t cellIndexStart = cells.size();
@@ -347,11 +346,8 @@ bool RigReservoirBuilderMock::dynamicResult(RigCaseData* eclipseCase, const QStr
#pragma omp parallel for
for (long long k = 0; k < static_cast<long long>(eclipseCase->mainGrid()->cells().size()); k++)
{
RigCell& cell = eclipseCase->mainGrid()->cells()[k];
{
double val = offsetValue + scaleValue * ( (stepIndex * 1000 + k) % eclipseCase->mainGrid()->cells().size() );
values->at(k) = val;
}
double val = offsetValue + scaleValue * ( (stepIndex * 1000 + k) % eclipseCase->mainGrid()->cells().size() );
values->at(k) = val;
}
// Set result size to zero for some timesteps

4
ApplicationCode/ReservoirDataModel/RigSingleWellResultsData.cpp
View File

@@ -155,8 +155,6 @@ void RigSingleWellResultsData::computeStaticWellCellPath()
std::vector<RigWellResultPoint>& resBranch = m_wellCellsTimeSteps[tIdx].m_wellResultBranches[bIdx].m_branchResultPoints;
std::list< RigWellResultPoint >& stBranch = staticWellBranches[branchId];
std::list< RigWellResultPoint >::iterator it;
std::list< RigWellResultPoint >::iterator sStartIt;
std::list< RigWellResultPoint >::iterator sEndIt;
size_t rStartIdx;
size_t rEndIdx;
@@ -190,7 +188,6 @@ void RigSingleWellResultsData::computeStaticWellCellPath()
rEndIdx = 0;
}
sStartIt = sEndIt;
rStartIdx = rEndIdx;
}
@@ -227,7 +224,6 @@ void RigSingleWellResultsData::computeStaticWellCellPath()
rEndIdx = rStartIdx;
}
sStartIt = sEndIt;
rStartIdx = rEndIdx;
}

1
ApplicationCode/ReservoirDataModel/RigWellLogFile.cpp
View File

@@ -105,7 +105,6 @@ bool RigWellLogFile::open(const QString& fileName, QString* errorMessage)
QStringList wellLogNames;
const std::map<std::string, std::vector<double> >& contLogs = well->GetContLog();
std::vector<std::string> contLogNames;
std::map<std::string, std::vector<double> >::const_iterator itCL;
for (itCL = contLogs.begin(); itCL != contLogs.end(); itCL++)
{