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

Fix parameter file name. Do not clean up tmp parameter files while we test FaultRA.

Browse Source
This commit is contained in:
jonjenssen 2021-05-21 12:35:28 +02:00 committed by jonjenssen
parent 304ba4dedc
commit 9cd4edb025
4 changed files with 11 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
ApplicationLibCode/Commands/GeoMechCommands/RicNewFaultReactAssessmentFeature.cpp
View File

@ -278,10 +278,10 @@ void RicNewFaultReactAssessmentFeature::addParameterFileForCleanUp( QString file
void RicNewFaultReactAssessmentFeature::cleanUpParameterFiles() void RicNewFaultReactAssessmentFeature::cleanUpParameterFiles()
{ {
#ifndef DEBUG #ifndef DEBUG
for ( auto& filename : m_parameterFilesToCleanUp ) // for ( auto& filename : m_parameterFilesToCleanUp )
{ //{
if ( QFile::exists( filename ) ) QFile::remove( filename ); // if ( QFile::exists( filename ) ) QFile::remove( filename );
} //}
#endif #endif
m_parameterFilesToCleanUp.clear(); m_parameterFilesToCleanUp.clear();
} }

8
ApplicationLibCode/Commands/GeoMechCommands/RicRunFaultReactAssessmentFeature.cpp
View File

@ -155,10 +155,10 @@ void RicRunFaultReactAssessmentFeature::addParameterFileForCleanUp( QString file
void RicRunFaultReactAssessmentFeature::cleanUpParameterFiles() void RicRunFaultReactAssessmentFeature::cleanUpParameterFiles()
{ {
#ifndef DEBUG #ifndef DEBUG
for ( auto& filename : m_parameterFilesToCleanUp ) // for ( auto& filename : m_parameterFilesToCleanUp )
{ //{
if ( QFile::exists( filename ) ) QFile::remove( filename ); // if ( QFile::exists( filename ) ) QFile::remove( filename );
} //}
#endif #endif
m_parameterFilesToCleanUp.clear(); m_parameterFilesToCleanUp.clear();
} }

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

@ -198,22 +198,6 @@ RimGeoMechCase* RimFaultRASettings::geomechCase() const
return m_geomechCase; return m_geomechCase;
} }
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
QString RimFaultRASettings::basicCalcParameterFilename() const
{
return m_baseDir + "/calc_parameters.xml";
}
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
QString RimFaultRASettings::advancedCalcParameterFilename() const
{
return m_baseDir + "/calib_parameters.xml";
}
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
/// ///
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
@ -553,7 +537,7 @@ QStringList RimFaultRASettings::basicMacrisParameters( int faultID ) const
QStringList retlist; QStringList retlist;
retlist << "calculate"; retlist << "calculate";
retlist << basicCalcParameterFilename(); retlist << basicParameterXMLFilename( faultID );
retlist << m_baseDir(); retlist << m_baseDir();
retlist << "-i"; retlist << "-i";
retlist << loadStepStart(); retlist << loadStepStart();
@ -570,8 +554,8 @@ QStringList RimFaultRASettings::advancedMacrisParameters( int faultID ) const
QStringList retlist; QStringList retlist;
retlist << "calibrate"; retlist << "calibrate";
retlist << basicCalcParameterFilename(); retlist << basicParameterXMLFilename( faultID );
retlist << advancedCalcParameterFilename(); retlist << advancedParameterXMLFilename( faultID );
retlist << m_baseDir(); retlist << m_baseDir();
return retlist; return retlist;

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

@ -53,9 +53,6 @@ public:
void setOutputBaseDirectory( QString baseDir ); void setOutputBaseDirectory( QString baseDir );
QString outputBaseDirectory() const; QString outputBaseDirectory() const;
QString basicCalcParameterFilename() const;
QString advancedCalcParameterFilename() const;
int startTimeStepGeoMechIndex() const; int startTimeStepGeoMechIndex() const;
QString startTimeStepGeoMech() const; QString startTimeStepGeoMech() const;
int endTimeStepGeoMechIndex() const; int endTimeStepGeoMechIndex() const;