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

#3043 Implement Time step filtering on import for Geomech

Browse Source
This commit is contained in:
Gaute Lindkvist
2018-06-11 13:47:21 +02:00
parent 62792b59c4
commit 280656ca26
23 changed files with 616 additions and 209 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
ApplicationCode/ProjectDataModel/RimEclipseCase.cpp
View File

@@ -823,11 +823,12 @@ QStringList RimEclipseCase::timeStepStrings() const
QString RimEclipseCase::timeStepName(int frameIdx) const
{
std::vector<QDateTime> timeStepDates = this->timeStepDates();
CVF_ASSERT(frameIdx < static_cast<int>(timeStepDates.size()));
QDateTime date = timeStepDates.at(frameIdx);
return date.toString(m_timeStepFormatString);
if (frameIdx < static_cast<int>(timeStepDates.size()))
{
QDateTime date = timeStepDates.at(frameIdx);
return date.toString(m_timeStepFormatString);
}
return QString("");
}
//--------------------------------------------------------------------------------------------------
@@ -929,5 +930,9 @@ void RimEclipseCase::setFormationNames(RimFormationNames* formationNames)
//--------------------------------------------------------------------------------------------------
std::vector<QDateTime> RimEclipseCase::timeStepDates() const
{
return results(RiaDefines::MATRIX_MODEL)->timeStepDates();
if (results(RiaDefines::MATRIX_MODEL))
{
return results(RiaDefines::MATRIX_MODEL)->timeStepDates();
}
return std::vector<QDateTime>();
}