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

#3958 Refactoring: Fix after update from dev

Browse Source
This commit is contained in:
Jacob Støren
2019-01-23 10:38:45 +01:00
parent 42afa063d5
commit 1d8e31fe91
1 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
ApplicationCode/ProjectDataModel/RimEclipseContourMapProjection.cpp
View File

@@ -203,7 +203,7 @@ std::vector<double> RimEclipseContourMapProjection::generateResults(int timeStep
{
m_currentResultName = cellColors->resultVariable();
size_t resultIndex = resultData->findScalarResultIndex(cellColors->resultType(), cellColors->resultVariable());
gridResultValues = resultData->cellScalarResults(resultIndex)[timeStep];
gridResultValues = resultData->cellScalarResults(RigEclipseResultAddress( resultIndex), timeStep);
}
if (!gridResultValues.empty())
@@ -259,9 +259,9 @@ std::vector<double> RimEclipseContourMapProjection::calculateColumnResult(Result
return std::vector<double>();
}
const std::vector<double>& poroResults = resultData->cellScalarResults(poroResultIndex)[0];
const std::vector<double>& ntgResults = resultData->cellScalarResults(ntgResultIndex)[0];
const std::vector<double>& dzResults = resultData->cellScalarResults(dzResultIndex)[0];
const std::vector<double>& poroResults = resultData->cellScalarResults(RigEclipseResultAddress(poroResultIndex), 0);
const std::vector<double>& ntgResults = resultData->cellScalarResults(RigEclipseResultAddress(ntgResultIndex), 0);
const std::vector<double>& dzResults = resultData->cellScalarResults(RigEclipseResultAddress(dzResultIndex), 0);
CVF_ASSERT(poroResults.size() == ntgResults.size() && ntgResults.size() == dzResults.size());
int timeStep = view()->currentTimeStep();
@@ -270,7 +270,7 @@ std::vector<double> RimEclipseContourMapProjection::calculateColumnResult(Result
if (resultAggregation == RESULTS_OIL_COLUMN || resultAggregation == RESULTS_HC_COLUMN)
{
size_t soilResultIndex = resultData->findScalarResultIndex(RiaDefines::DYNAMIC_NATIVE, "SOIL");
const std::vector<double>& soilResults = resultData->cellScalarResults(soilResultIndex)[timeStep];
const std::vector<double>& soilResults = resultData->cellScalarResults(RigEclipseResultAddress(soilResultIndex), timeStep);
for (size_t cellResultIdx = 0; cellResultIdx < resultValues.size(); ++cellResultIdx)
{
resultValues[cellResultIdx] = soilResults[cellResultIdx];
@@ -279,7 +279,7 @@ std::vector<double> RimEclipseContourMapProjection::calculateColumnResult(Result
if (resultAggregation == RESULTS_GAS_COLUMN || resultAggregation == RESULTS_HC_COLUMN)
{
size_t sgasResultIndex = resultData->findScalarResultIndex(RiaDefines::DYNAMIC_NATIVE, "SGAS");
const std::vector<double>& sgasResults = resultData->cellScalarResults(sgasResultIndex)[timeStep];
const std::vector<double>& sgasResults = resultData->cellScalarResults(RigEclipseResultAddress(sgasResultIndex), timeStep);
for (size_t cellResultIdx = 0; cellResultIdx < resultValues.size(); ++cellResultIdx)
{
resultValues[cellResultIdx] += sgasResults[cellResultIdx];