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

Updated ERT to SVN revision 4077. Use new folder structure for ThirdParty/Ert, one folder for libs and one folder for includes. Minor application changes to be compatible with API changes in ERT.

Browse Source
This commit is contained in:
Magne Sjaastad
2012-09-13 10:56:39 +02:00
parent 3f96c61c72
commit 748f061a55
102 changed files with 1124 additions and 1146 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
ApplicationCode/FileInterface/RifEclipseOutputFileTools.cpp
View File

@@ -186,9 +186,7 @@ bool RifEclipseOutputFileTools::timeStepsText(QStringList* timeSteps)
if (kwINTEHEAD)
{
// Get date info
time_t stepTime = util_make_date(ecl_kw_iget_int(kwINTEHEAD, INTEHEAD_DAY_INDEX),
ecl_kw_iget_int(kwINTEHEAD, INTEHEAD_MONTH_INDEX),
ecl_kw_iget_int(kwINTEHEAD, INTEHEAD_YEAR_INDEX));
time_t stepTime = ecl_intehead_date(kwINTEHEAD);
// Hack!!! We seem to get 01/01/1970 (time -1) for sub grids!
if (stepTime < 0) continue;
@@ -235,9 +233,7 @@ bool RifEclipseOutputFileTools::timeSteps(QList<QDateTime>* timeSteps)
if (kwINTEHEAD)
{
// Get date info
time_t stepTime = util_make_date(ecl_kw_iget_int(kwINTEHEAD, INTEHEAD_DAY_INDEX),
ecl_kw_iget_int(kwINTEHEAD, INTEHEAD_MONTH_INDEX),
ecl_kw_iget_int(kwINTEHEAD, INTEHEAD_YEAR_INDEX));
time_t stepTime = ecl_intehead_date(kwINTEHEAD);
// Hack!!! We seem to get 01/01/1970 (time -1) for sub grids!
if (stepTime < 0) continue;