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

Merge remote-tracking branch 'origin/dev' into hdf-prototype

Browse Source
This commit is contained in:
Magne Sjaastad 2017-08-15 15:34:23 +02:00
commit c0e3349632
2 changed files with 14 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
ApplicationCode/FileInterface/RifWellPathImporter.cpp
View File

@ -166,6 +166,7 @@ RifWellPathImporter::WellData RifWellPathImporter::readJsonWellData(const QStrin
double datumElevation = jsonMap["datumElevation"].toDouble(); double datumElevation = jsonMap["datumElevation"].toDouble();
QList<QVariant> pathList = jsonMap["path"].toList(); QList<QVariant> pathList = jsonMap["path"].toList();
WellData wellData; WellData wellData;
wellData.m_wellPathGeometry = new RigWellPath;
wellData.m_wellPathGeometry->setDatumElevation(datumElevation); wellData.m_wellPathGeometry->setDatumElevation(datumElevation);
wellData.m_name = jsonMap["name"].toString(); wellData.m_name = jsonMap["name"].toString();

19
ApplicationCode/ReservoirDataModel/RigSingleWellResultsData.cpp
View File

@ -60,17 +60,24 @@ void RigSingleWellResultsData::computeMappingFromResultTimeIndicesToWellTimeIndi
} }
} }
for (size_t resultTimeStepIndex = 0; resultTimeStepIndex< simulationTimeSteps.size(); resultTimeStepIndex++) size_t wellTimeStepIndex = 0;
for (size_t resultTimeStepIndex = 0; resultTimeStepIndex < simulationTimeSteps.size(); resultTimeStepIndex++)
{ {
size_t wellTimeStepIndex = 0; while ( wellTimeStepIndex < m_wellCellsTimeSteps.size() &&
m_wellCellsTimeSteps[wellTimeStepIndex].m_timestamp < simulationTimeSteps[resultTimeStepIndex])
while (wellTimeStepIndex < m_wellCellsTimeSteps.size() &&
m_wellCellsTimeSteps[wellTimeStepIndex].m_timestamp < simulationTimeSteps[resultTimeStepIndex])
{ {
wellTimeStepIndex++; wellTimeStepIndex++;
} }
m_resultTimeStepIndexToWellTimeStepIndex[resultTimeStepIndex] = wellTimeStepIndex; if ( wellTimeStepIndex < m_wellCellsTimeSteps.size()
&& m_wellCellsTimeSteps[wellTimeStepIndex].m_timestamp == simulationTimeSteps[resultTimeStepIndex])
{
m_resultTimeStepIndexToWellTimeStepIndex[resultTimeStepIndex] = wellTimeStepIndex;
}
else
{
m_resultTimeStepIndexToWellTimeStepIndex[resultTimeStepIndex] = cvf::UNDEFINED_SIZE_T;
}
} }
} }