OilfieldToolsNet/ResInsight
4
0
Fork 0
mirror of https://github.com/OPM/ResInsight.git synced 2025-02-10 07:26:03 -06:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #7767 from OPM/faultra_updates4

Browse Source 
Fault RA: minor parameter changes
This commit is contained in:
Magne Sjaastad 2021-06-14 09:49:46 +02:00 committed by GitHub
commit 516d1c0084
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 25 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
ApplicationLibCode/FileInterface/RifFaultRAJsonWriter.cpp
View File

@ -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 );

25
ApplicationLibCode/ProjectDataModel/Faults/RimFaultRASettings.cpp
View File

@ -415,7 +415,8 @@ std::list<RimGenericParameter*> RimFaultRASettings::basicParameters( int faultID
//--------------------------------------------------------------------------------------------------
std::list<RimGenericParameter*> 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;
}

3
ApplicationLibCode/ProjectDataModel/Faults/RimFaultRASettings.h
View File

@ -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<RimEclipseInputCase*> m_eclipseFRAGeneratedCase;