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

Prefix function to be deleted to easily spot the function in code

Browse Source
This commit is contained in:
Magne Sjaastad
2014-08-09 14:47:36 +02:00
parent 14b5919e59
commit 852afd9318
8 changed files with 22 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
ApplicationCode/ProjectDataModel/RimReservoirView.cpp
View File

@@ -1116,9 +1116,9 @@ void RimReservoirView::appendCellResultInfo(size_t gridIndex, size_t cellIndex,
size_t sgasScalarSetIndex = gridCellResults->findOrLoadScalarResult(RimDefines::DYNAMIC_NATIVE, "SGAS");
size_t swatScalarSetIndex = gridCellResults->findOrLoadScalarResult(RimDefines::DYNAMIC_NATIVE, "SWAT");
cvf::ref<cvf::StructGridScalarDataAccess> dataAccessObjectX = eclipseCase->resultAccessor(grid, porosityModel, m_currentTimeStep, soilScalarSetIndex);
cvf::ref<cvf::StructGridScalarDataAccess> dataAccessObjectY = eclipseCase->resultAccessor(grid, porosityModel, m_currentTimeStep, sgasScalarSetIndex);
cvf::ref<cvf::StructGridScalarDataAccess> dataAccessObjectZ = eclipseCase->resultAccessor(grid, porosityModel, m_currentTimeStep, swatScalarSetIndex);
cvf::ref<cvf::StructGridScalarDataAccess> dataAccessObjectX = eclipseCase->TO_BE_DELETED_resultAccessor(grid, porosityModel, m_currentTimeStep, soilScalarSetIndex);
cvf::ref<cvf::StructGridScalarDataAccess> dataAccessObjectY = eclipseCase->TO_BE_DELETED_resultAccessor(grid, porosityModel, m_currentTimeStep, sgasScalarSetIndex);
cvf::ref<cvf::StructGridScalarDataAccess> dataAccessObjectZ = eclipseCase->TO_BE_DELETED_resultAccessor(grid, porosityModel, m_currentTimeStep, swatScalarSetIndex);
double scalarValue = 0.0;
@@ -1147,9 +1147,9 @@ void RimReservoirView::appendCellResultInfo(size_t gridIndex, size_t cellIndex,
size_t tranX, tranY, tranZ;
if (eclipseCase->results(porosityModel)->findTransmissibilityResults(tranX, tranY, tranZ))
{
cvf::ref<cvf::StructGridScalarDataAccess> dataAccessObjectX = eclipseCase->resultAccessor(grid, porosityModel, 0, tranX);
cvf::ref<cvf::StructGridScalarDataAccess> dataAccessObjectY = eclipseCase->resultAccessor(grid, porosityModel, 0, tranY);
cvf::ref<cvf::StructGridScalarDataAccess> dataAccessObjectZ = eclipseCase->resultAccessor(grid, porosityModel, 0, tranZ);
cvf::ref<cvf::StructGridScalarDataAccess> dataAccessObjectX = eclipseCase->TO_BE_DELETED_resultAccessor(grid, porosityModel, 0, tranX);
cvf::ref<cvf::StructGridScalarDataAccess> dataAccessObjectY = eclipseCase->TO_BE_DELETED_resultAccessor(grid, porosityModel, 0, tranY);
cvf::ref<cvf::StructGridScalarDataAccess> dataAccessObjectZ = eclipseCase->TO_BE_DELETED_resultAccessor(grid, porosityModel, 0, tranZ);
double scalarValue = dataAccessObjectX->cellScalar(cellIndex);
resultInfoText->append(QString("Tran X : %1\n").arg(scalarValue));
@@ -1163,12 +1163,12 @@ void RimReservoirView::appendCellResultInfo(size_t gridIndex, size_t cellIndex,
}
else
{
resultAccessor = eclipseCase->resultAccessor(grid, porosityModel, 0, this->cellResult()->gridScalarIndex());
resultAccessor = eclipseCase->TO_BE_DELETED_resultAccessor(grid, porosityModel, 0, this->cellResult()->gridScalarIndex());
}
}
else
{
resultAccessor = eclipseCase->resultAccessor(grid, porosityModel, m_currentTimeStep, this->cellResult()->gridScalarIndex());
resultAccessor = eclipseCase->TO_BE_DELETED_resultAccessor(grid, porosityModel, m_currentTimeStep, this->cellResult()->gridScalarIndex());
}
if (resultAccessor.notNull())
@@ -1191,7 +1191,7 @@ void RimReservoirView::appendCellResultInfo(size_t gridIndex, size_t cellIndex,
// Cell edge results are static, results are loaded for first time step only
RifReaderInterface::PorosityModelResultType porosityModel = RigCaseCellResultsData::convertFromProjectModelPorosityModel(cellResult()->porosityModel());
cvf::ref<cvf::StructGridScalarDataAccess> resultAccessor = eclipseCase->resultAccessor(grid, porosityModel, 0, resultIndices[idx]);
cvf::ref<cvf::StructGridScalarDataAccess> resultAccessor = eclipseCase->TO_BE_DELETED_resultAccessor(grid, porosityModel, 0, resultIndices[idx]);
if (resultAccessor.notNull())
{
double scalarValue = resultAccessor->cellScalar(cellIndex);

4
ApplicationCode/ProjectDataModel/RimStatisticsCaseEvaluator.cpp
View File

@@ -197,7 +197,7 @@ void RimStatisticsCaseEvaluator::evaluateForResults(const QList<ResSpec>& result
size_t scalarResultIndex = sourceCase->results(poroModel)->findOrLoadScalarResultForTimeStep(resultType, resultName, dataAccessTimeStepIndex);
cvf::ref<cvf::StructGridScalarDataAccess> resultAccessor = sourceCase->reservoirData()->resultAccessor(grid, poroModel, dataAccessTimeStepIndex, scalarResultIndex);
cvf::ref<cvf::StructGridScalarDataAccess> resultAccessor = sourceCase->reservoirData()->TO_BE_DELETED_resultAccessor(grid, poroModel, dataAccessTimeStepIndex, scalarResultIndex);
if (resultAccessor.notNull())
{
sourceDataAccessList.push_back(resultAccessor.p());
@@ -349,7 +349,7 @@ void RimStatisticsCaseEvaluator::debugOutput(RimDefines::ResultCatType resultTyp
size_t scalarResultIndex = m_destinationCase->results(RifReaderInterface::MATRIX_RESULTS)->findScalarResultIndex(resultType, resultName);
cvf::ref<cvf::StructGridScalarDataAccess> resultAccessor = m_destinationCase->resultAccessor(m_destinationCase->mainGrid(), RifReaderInterface::MATRIX_RESULTS, timeStepIdx, scalarResultIndex);
cvf::ref<cvf::StructGridScalarDataAccess> resultAccessor = m_destinationCase->TO_BE_DELETED_resultAccessor(m_destinationCase->mainGrid(), RifReaderInterface::MATRIX_RESULTS, timeStepIdx, scalarResultIndex);
if (resultAccessor.isNull()) return;
for (size_t cellIdx = 0; cellIdx < m_reservoirCellCount; cellIdx++)