diff --git a/ApplicationLibCode/FileInterface/RifFaultRAJsonWriter.cpp b/ApplicationLibCode/FileInterface/RifFaultRAJsonWriter.cpp index 355739ef34..23630bcf28 100644 --- a/ApplicationLibCode/FileInterface/RifFaultRAJsonWriter.cpp +++ b/ApplicationLibCode/FileInterface/RifFaultRAJsonWriter.cpp @@ -36,7 +36,7 @@ bool RifFaultRAJSonWriter::writeToPreprocFile( RimFaultRAPreprocSettings& settin outErrorText = "Unable to write to file \"" + filename + "\" - "; QFile file( filename ); - if ( file.open( QIODevice::ReadWrite ) ) + if ( file.open( QIODevice::ReadWrite | QIODevice::Truncate | QIODevice::Text ) ) { QTextStream stream( &file ); @@ -69,7 +69,7 @@ bool RifFaultRAJSonWriter::writeToPostprocFile( int faultID, RimFaultRAPostprocS outErrorText = "Unable to write to file \"" + filename + "\" - "; QFile file( filename ); - if ( file.open( QIODevice::ReadWrite ) ) + if ( file.open( QIODevice::ReadWrite | QIODevice::Truncate | QIODevice::Text ) ) { QTextStream stream( &file ); diff --git a/ApplicationLibCode/ProjectDataModel/Faults/RimFaultRASettings.cpp b/ApplicationLibCode/ProjectDataModel/Faults/RimFaultRASettings.cpp index da4adbf5b7..c43cae66d1 100644 --- a/ApplicationLibCode/ProjectDataModel/Faults/RimFaultRASettings.cpp +++ b/ApplicationLibCode/ProjectDataModel/Faults/RimFaultRASettings.cpp @@ -415,7 +415,8 @@ std::list RimFaultRASettings::basicParameters( int faultID //-------------------------------------------------------------------------------------------------- std::list RimFaultRASettings::advancedParameters( int faultID ) { - m_advancedParametersRI->setParameterValue( "eclipse_loadstep_start", loadStepStart() ); + bool advanced = true; + m_advancedParametersRI->setParameterValue( "eclipse_loadstep_start", loadStepStart( advanced ) ); m_advancedParametersRI->setParameterValue( "eclipse_loadstep_end", loadStepEnd() ); m_advancedParametersRI->setParameterValue( "faultid_calibration", faultID ); m_advancedParametersRI->setParameterValue( "abaqus_elastic_properties", elasticPropertiesFilename() ); @@ -505,9 +506,25 @@ QString RimFaultRASettings::advancedMacrisDatabase() const //-------------------------------------------------------------------------------------------------- /// //-------------------------------------------------------------------------------------------------- -QString RimFaultRASettings::loadStepStart() const +int RimFaultRASettings::timeStepDigits() const { - QString retval = QString( "PRESSURE_%1" ).arg( startTimeStepEclipseIndex(), 2, 10, QChar( '0' ) ); + if ( m_eclipseCase == nullptr ) return 1; + + int timesteps = m_eclipseCase->timeStepStrings().size(); + if ( timesteps <= 0 ) return 1; + + return 1 + (int)( std::log10( 1.0 * timesteps ) ); +} + +//-------------------------------------------------------------------------------------------------- +/// +//-------------------------------------------------------------------------------------------------- +QString RimFaultRASettings::loadStepStart( bool advanced /* = false */ ) const +{ + int startStep = 0; + if ( !advanced ) startStep = startTimeStepEclipseIndex(); + + QString retval = QString( "PRESSURE_%1" ).arg( startStep, timeStepDigits(), 10, QChar( '0' ) ); return retval; } @@ -516,7 +533,7 @@ QString RimFaultRASettings::loadStepStart() const //-------------------------------------------------------------------------------------------------- QString RimFaultRASettings::loadStepEnd() const { - QString retval = QString( "PRESSURE_%1" ).arg( endTimeStepEclipseIndex(), 2, 10, QChar( '0' ) ); + QString retval = QString( "PRESSURE_%1" ).arg( endTimeStepEclipseIndex(), timeStepDigits(), 10, QChar( '0' ) ); return retval; } diff --git a/ApplicationLibCode/ProjectDataModel/Faults/RimFaultRASettings.h b/ApplicationLibCode/ProjectDataModel/Faults/RimFaultRASettings.h index e928b672db..bc5e683eba 100644 --- a/ApplicationLibCode/ProjectDataModel/Faults/RimFaultRASettings.h +++ b/ApplicationLibCode/ProjectDataModel/Faults/RimFaultRASettings.h @@ -64,7 +64,7 @@ public: int startTimeStepEclipseIndex() const; QString startTimeStepEclipse() const; - QString loadStepStart() const; + QString loadStepStart( bool advanced = false ) const; int endTimeStepEclipseIndex() const; QString endTimeStepEclipse() const; QString loadStepEnd() const; @@ -95,6 +95,7 @@ protected: private: void setupResInsightParameters(); + int timeStepDigits() const; private: caf::PdmPtrField m_eclipseFRAGeneratedCase;