From 9cd4edb0254a843805d584bc9c6e248401ee95f9 Mon Sep 17 00:00:00 2001
From: jonjenssen <jon@soundsoft.no>
Date: Fri, 21 May 2021 12:35:28 +0200
Subject: [PATCH] Fix parameter file name. Do not clean up tmp parameter files
 while we test FaultRA.

---
 .../RicNewFaultReactAssessmentFeature.cpp     |  8 +++----
 .../RicRunFaultReactAssessmentFeature.cpp     |  8 +++----
 .../Faults/RimFaultRASettings.cpp             | 22 +++----------------
 .../Faults/RimFaultRASettings.h               |  3 ---
 4 files changed, 11 insertions(+), 30 deletions(-)

diff --git a/ApplicationLibCode/Commands/GeoMechCommands/RicNewFaultReactAssessmentFeature.cpp b/ApplicationLibCode/Commands/GeoMechCommands/RicNewFaultReactAssessmentFeature.cpp
index 9de3065623..497c0c9bbe 100644
--- a/ApplicationLibCode/Commands/GeoMechCommands/RicNewFaultReactAssessmentFeature.cpp
+++ b/ApplicationLibCode/Commands/GeoMechCommands/RicNewFaultReactAssessmentFeature.cpp
@@ -278,10 +278,10 @@ void RicNewFaultReactAssessmentFeature::addParameterFileForCleanUp( QString file
 void RicNewFaultReactAssessmentFeature::cleanUpParameterFiles()
 {
 #ifndef DEBUG
-    for ( auto& filename : m_parameterFilesToCleanUp )
-    {
-        if ( QFile::exists( filename ) ) QFile::remove( filename );
-    }
+    // for ( auto& filename : m_parameterFilesToCleanUp )
+    //{
+    //    if ( QFile::exists( filename ) ) QFile::remove( filename );
+    //}
 #endif
     m_parameterFilesToCleanUp.clear();
 }
diff --git a/ApplicationLibCode/Commands/GeoMechCommands/RicRunFaultReactAssessmentFeature.cpp b/ApplicationLibCode/Commands/GeoMechCommands/RicRunFaultReactAssessmentFeature.cpp
index 6c59653c13..de9d87cd10 100644
--- a/ApplicationLibCode/Commands/GeoMechCommands/RicRunFaultReactAssessmentFeature.cpp
+++ b/ApplicationLibCode/Commands/GeoMechCommands/RicRunFaultReactAssessmentFeature.cpp
@@ -155,10 +155,10 @@ void RicRunFaultReactAssessmentFeature::addParameterFileForCleanUp( QString file
 void RicRunFaultReactAssessmentFeature::cleanUpParameterFiles()
 {
 #ifndef DEBUG
-    for ( auto& filename : m_parameterFilesToCleanUp )
-    {
-        if ( QFile::exists( filename ) ) QFile::remove( filename );
-    }
+    // for ( auto& filename : m_parameterFilesToCleanUp )
+    //{
+    //    if ( QFile::exists( filename ) ) QFile::remove( filename );
+    //}
 #endif
     m_parameterFilesToCleanUp.clear();
 }
diff --git a/ApplicationLibCode/ProjectDataModel/Faults/RimFaultRASettings.cpp b/ApplicationLibCode/ProjectDataModel/Faults/RimFaultRASettings.cpp
index 409bd16a65..2d7322ca93 100644
--- a/ApplicationLibCode/ProjectDataModel/Faults/RimFaultRASettings.cpp
+++ b/ApplicationLibCode/ProjectDataModel/Faults/RimFaultRASettings.cpp
@@ -198,22 +198,6 @@ RimGeoMechCase* RimFaultRASettings::geomechCase() const
     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;
 
     retlist << "calculate";
-    retlist << basicCalcParameterFilename();
+    retlist << basicParameterXMLFilename( faultID );
     retlist << m_baseDir();
     retlist << "-i";
     retlist << loadStepStart();
@@ -570,8 +554,8 @@ QStringList RimFaultRASettings::advancedMacrisParameters( int faultID ) const
     QStringList retlist;
 
     retlist << "calibrate";
-    retlist << basicCalcParameterFilename();
-    retlist << advancedCalcParameterFilename();
+    retlist << basicParameterXMLFilename( faultID );
+    retlist << advancedParameterXMLFilename( faultID );
     retlist << m_baseDir();
 
     return retlist;
diff --git a/ApplicationLibCode/ProjectDataModel/Faults/RimFaultRASettings.h b/ApplicationLibCode/ProjectDataModel/Faults/RimFaultRASettings.h
index ee03cd1944..de85b71cdb 100644
--- a/ApplicationLibCode/ProjectDataModel/Faults/RimFaultRASettings.h
+++ b/ApplicationLibCode/ProjectDataModel/Faults/RimFaultRASettings.h
@@ -53,9 +53,6 @@ public:
     void    setOutputBaseDirectory( QString baseDir );
     QString outputBaseDirectory() const;
 
-    QString basicCalcParameterFilename() const;
-    QString advancedCalcParameterFilename() const;
-
     int     startTimeStepGeoMechIndex() const;
     QString startTimeStepGeoMech() const;
     int     endTimeStepGeoMechIndex() const;