delete existing database file before processing a new fault (#7793)

ApplicationLibCode/Commands/GeoMechCommands/RicRunAdvFaultReactAssessmentFeature.cpp

@@ -107,6 +107,9 @@ void RicRunAdvFaultReactAssessmentFeature::onActionTriggered( bool isChecked )
     addParameterFileForCleanUp( paramfilename );
     addParameterFileForCleanUp( paramfilename2 );
 
+    // remove any existing database file
+    removeFile( fraSettings->advancedMacrisDatabase() );
+
     // run the java macris program in calibrate mode
     QString     command    = RiaPreferencesGeoMech::current()->geomechFRAMacrisCommand();
     QStringList parameters = fraSettings->advancedMacrisParameters( faultID );

ApplicationLibCode/Commands/GeoMechCommands/RicRunBasicFaultReactAssessmentFeature.cpp

@@ -97,6 +97,9 @@ void RicRunBasicFaultReactAssessmentFeature::onActionTriggered( bool isChecked )
 
         addParameterFileForCleanUp( paramfilename );
 
+        // remove any existing database file
+        removeFile( fraSettings->basicMacrisDatabase() );
+
         // run the java macris program in calculate mode
         QString     command    = RiaPreferencesGeoMech::current()->geomechFRAMacrisCommand();
         QStringList parameters = fraSettings->basicMacrisParameters( faultID );

ApplicationLibCode/Commands/GeoMechCommands/RicRunFaultReactAssessmentFeature.cpp

@@ -162,12 +162,20 @@ void RicRunFaultReactAssessmentFeature::cleanUpParameterFiles()
     {
         for ( auto& filename : m_parameterFilesToCleanUp )
         {
-            if ( QFile::exists( filename ) ) QFile::remove( filename );
+            removeFile( filename );
         }
     }
     m_parameterFilesToCleanUp.clear();
 }
 
+//--------------------------------------------------------------------------------------------------
+///
+//--------------------------------------------------------------------------------------------------
+void RicRunFaultReactAssessmentFeature::removeFile( QString filename )
+{
+    if ( QFile::exists( filename ) ) QFile::remove( filename );
+}
+
 //--------------------------------------------------------------------------------------------------
 ///
 //--------------------------------------------------------------------------------------------------

ApplicationLibCode/Commands/GeoMechCommands/RicRunFaultReactAssessmentFeature.h

@@ -45,6 +45,8 @@ protected:
     void addParameterFileForCleanUp( QString filename );
     void cleanUpParameterFiles();
 
+    void removeFile( QString filename );
+
 private:
     std::list<QString> m_parameterFilesToCleanUp;
 };