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

#4850 Bugfix for E300 : Detect when to use days since simulation start

Browse Source
This commit is contained in:
Magne Sjaastad 2020-01-12 18:10:13 +01:00
parent 8d40d5034f
commit 9426a881f2
1 changed files with 29 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

44
ApplicationCode/FileInterface/RifEclipseOutputFileTools.cpp
View File

@ -151,13 +151,12 @@ void RifEclipseOutputFileTools::timeSteps( const ecl_file_type* ecl_file,
} }
} }
bool allTimeStepsOnSameDate = true; bool useStartOfSimulationDate = true;
{ {
// See https://github.com/OPM/ResInsight/issues/4770 // See https://github.com/OPM/ResInsight/issues/4770
std::set<int> days; std::set<std::tuple<int, int, int>> uniqueDays;
std::set<int> months;
std::set<int> years;
for ( int i = 0; i < numINTEHEAD; i++ ) for ( int i = 0; i < numINTEHEAD; i++ )
{ {
ecl_kw_type* kwINTEHEAD = ecl_file_iget_named_kw( ecl_file, INTEHEAD_KW, i ); ecl_kw_type* kwINTEHEAD = ecl_file_iget_named_kw( ecl_file, INTEHEAD_KW, i );
@ -167,9 +166,7 @@ void RifEclipseOutputFileTools::timeSteps( const ecl_file_type* ecl_file,
int year = 0; int year = 0;
getDayMonthYear( kwINTEHEAD, &day, &month, &year ); getDayMonthYear( kwINTEHEAD, &day, &month, &year );
days.insert( day ); uniqueDays.insert( std::make_tuple( day, month, year ) );
months.insert( month );
years.insert( year );
} }
std::set<double> uniqueDayValues; std::set<double> uniqueDayValues;
@ -178,10 +175,15 @@ void RifEclipseOutputFileTools::timeSteps( const ecl_file_type* ecl_file,
uniqueDayValues.insert( dayValue ); uniqueDayValues.insert( dayValue );
} }
if ( days.size() == 1 && months.size() == 1 && years.size() == 1 && uniqueDayValues.size() == 1 ) if ( uniqueDays.size() == 1 && uniqueDayValues.size() == 1 )
{ {
QDateTime reportDateTime = RiaQDateTimeTools::createUtcDateTime( int day = 0;
QDate( *years.begin(), *months.begin(), *days.begin() ) ); int month = 0;
int year = 0;
std::tie( day, month, year ) = *( uniqueDays.begin() );
QDateTime reportDateTime = RiaQDateTimeTools::createUtcDateTime( QDate( year, month, day ) );
timeSteps->push_back( reportDateTime ); timeSteps->push_back( reportDateTime );
daysSinceSimulationStart->push_back( *uniqueDayValues.begin() ); daysSinceSimulationStart->push_back( *uniqueDayValues.begin() );
@ -193,15 +195,26 @@ void RifEclipseOutputFileTools::timeSteps( const ecl_file_type* ecl_file,
return; return;
} }
if ( days.size() > 1 ) allTimeStepsOnSameDate = false; // Some simulations might end up with wrong data reported for day/month/year. If this situation is detected,
if ( months.size() > 1 ) allTimeStepsOnSameDate = false; // base all time step on double values and use start of simulation as first date
if ( years.size() > 1 ) allTimeStepsOnSameDate = false; // See https://github.com/OPM/ResInsight/issues/4850
if ( uniqueDays.size() == dayValues.size() ) useStartOfSimulationDate = false;
} }
std::set<QDateTime> existingTimesteps; std::set<QDateTime> existingTimesteps;
for ( int i = 0; i < numINTEHEAD; i++ ) for ( int i = 0; i < numINTEHEAD; i++ )
{ {
ecl_kw_type* kwINTEHEAD = ecl_file_iget_named_kw( ecl_file, INTEHEAD_KW, i ); ecl_kw_type* kwINTEHEAD = nullptr;
if ( useStartOfSimulationDate )
{
kwINTEHEAD = ecl_file_iget_named_kw( ecl_file, INTEHEAD_KW, 0 );
}
else
{
kwINTEHEAD = ecl_file_iget_named_kw( ecl_file, INTEHEAD_KW, i );
}
CVF_ASSERT( kwINTEHEAD ); CVF_ASSERT( kwINTEHEAD );
int day = 0; int day = 0;
int month = 0; int month = 0;
@ -213,7 +226,7 @@ void RifEclipseOutputFileTools::timeSteps( const ecl_file_type* ecl_file,
double dayDoubleValue = dayValues[i]; double dayDoubleValue = dayValues[i];
int dayValue = cvf::Math::floor( dayDoubleValue ); int dayValue = cvf::Math::floor( dayDoubleValue );
if ( allTimeStepsOnSameDate ) if ( useStartOfSimulationDate )
{ {
reportDateTime = reportDateTime.addDays( dayValue ); reportDateTime = reportDateTime.addDays( dayValue );
} }
@ -222,6 +235,7 @@ void RifEclipseOutputFileTools::timeSteps( const ecl_file_type* ecl_file,
double milliseconds = dayFraction * 24.0 * 60.0 * 60.0 * 1000.0; double milliseconds = dayFraction * 24.0 * 60.0 * 60.0 * 1000.0;
reportDateTime = reportDateTime.addMSecs( milliseconds ); reportDateTime = reportDateTime.addMSecs( milliseconds );
if ( existingTimesteps.insert( reportDateTime ).second ) if ( existingTimesteps.insert( reportDateTime ).second )
{ {
timeSteps->push_back( reportDateTime ); timeSteps->push_back( reportDateTime );