Clean up default name handling in Opm Flow jobs (#13291)

* Clean up default name handling

ApplicationLibCode/Commands/ExportCommands/RicExportSectorModelFeature.cpp

@@ -46,6 +46,7 @@
 #include "opm/input/eclipse/Deck/DeckRecord.hpp"
 
 #include <QAction>
+#include <QDir>
 #include <QFileInfo>
 
 CAF_CMD_SOURCE_INIT( RicExportSectorModelFeature, "RicExportSectorModelFeature" );
@@ -137,6 +138,9 @@ void RicExportSectorModelFeature::doExport( RicExportSectorModelUi* exportSettin
         job->setName( exportSettings->newSimulationJobName() );
         job->setWorkingDirectory( exportSettings->newSimulationJobFolder() );
 
+        QDir d;
+        d.mkpath( exportSettings->newSimulationJobFolder() );
+
         jobColl->addNewJob( job );
 
         Riu3DMainWindowTools::selectAsCurrentItem( job );

ApplicationLibCode/Commands/ExportCommands/RicExportSectorModelUi.cpp

@@ -211,8 +211,7 @@ void RicExportSectorModelUi::defineUiOrdering( QString uiConfigName, caf::PdmUiO
         simGrp->add( &m_createSimulationJob );
         if ( m_createSimulationJob() )
         {
-            if ( m_simulationJobName().isEmpty() ) m_simulationJobName = m_exportDeckName();
-            if ( m_simulationJobFolder().path().isEmpty() ) m_simulationJobFolder = defaultFolder();
+            if ( m_simulationJobName().isEmpty() ) m_simulationJobName = m_exportDeckName().trimmed();
             simGrp->add( &m_simulationJobName );
             simGrp->add( &m_simulationJobFolder );
         }
@@ -244,6 +243,9 @@ const QStringList& RicExportSectorModelUi::pageSubTitles() const
 void RicExportSectorModelUi::setEclipseView( RimEclipseView* view )
 {
     m_eclipseView = view;
+
+    if ( view->eclipseCase() != m_eclipseCase() ) m_exportDeckName = "";
+
     m_eclipseCase = view->eclipseCase();
 
     cvf::UByteArray cellVisibility;
@@ -270,9 +272,12 @@ void RicExportSectorModelUi::setEclipseView( RimEclipseView* view )
         m_bcpropKeywords.push_back( keyword );
     }
 
-    if ( ( m_eclipseCase != nullptr ) && m_exportDeckName().isEmpty() ) m_exportDeckName = m_eclipseCase->caseUserDescription();
+    if ( ( m_eclipseCase != nullptr ) && m_exportDeckName().isEmpty() )
+        m_exportDeckName = m_eclipseCase->caseUserDescription().toUpper() + +"_SECTOR";
 
     m_createSimulationJob = false;
+
+    if ( m_exportFolder().path().isEmpty() ) m_exportFolder = defaultFolder();
 }
 
 //--------------------------------------------------------------------------------------------------
@@ -467,6 +472,14 @@ void RicExportSectorModelUi::fieldChangedByUi( const caf::PdmFieldHandle* change
     {
         updateConnectedEditors();
     }
+    else if ( changedField == &m_exportFolder )
+    {
+        if ( m_simulationJobFolder().path().isEmpty() )
+        {
+            m_simulationJobFolder = m_exportFolder().path() + "/job";
+        }
+        updateConnectedEditors();
+    }
 }
 
 //--------------------------------------------------------------------------------------------------

ApplicationLibCode/Commands/JobCommands/RicNewOpmFlowJobFeature.cpp

@@ -68,7 +68,8 @@ void RicNewOpmFlowJobFeature::onActionTriggered( bool isChecked )
     if ( !inDataFile.isEmpty() )
     {
         job->setInputDataFile( inDataFile );
-        job->setName( job->deckName() );
+        QFileInfo fi( inDataFile );
+        job->setName( fi.baseName().toUpper() );
     }
     else
     {

ApplicationLibCode/ProjectDataModel/Jobs/RimOpmFlowJob.cpp

@@ -505,11 +505,7 @@ std::vector<QDateTime> RimOpmFlowJob::addedDateTimes()
 //--------------------------------------------------------------------------------------------------
 void RimOpmFlowJob::fieldChangedByUi( const caf::PdmFieldHandle* changedField, const QVariant& oldValue, const QVariant& newValue )
 {
-    if ( ( changedField == &m_deckFileName ) || ( changedField == &m_addToEnsemble ) )
-    {
-        m_deckName = "";
-    }
-    else if ( changedField == &m_wellPath )
+    if ( changedField == &m_wellPath )
     {
         if ( ( m_wellPath() != nullptr ) && ( m_wellPath->completionSettings() != nullptr ) )
         {
@@ -543,7 +539,6 @@ QString RimOpmFlowJob::mainWorkingDirectory() const
 //--------------------------------------------------------------------------------------------------
 void RimOpmFlowJob::setEclipseCase( RimEclipseCase* eCase )
 {
-    m_deckName = "";
     if ( eCase == nullptr )
     {
         m_deckFileName.setValue( QString() );
@@ -563,7 +558,6 @@ void RimOpmFlowJob::setEclipseCase( RimEclipseCase* eCase )
 //--------------------------------------------------------------------------------------------------
 void RimOpmFlowJob::setInputDataFile( QString filename )
 {
-    m_deckName = "";
     m_deckFileName.setValue( filename );
     closeDeckFile();
     openDeckFile();
@@ -653,16 +647,13 @@ QString RimOpmFlowJob::workingDirectory() const
 //--------------------------------------------------------------------------------------------------
 QString RimOpmFlowJob::deckName()
 {
-    if ( m_deckName.isEmpty() )
+    auto deckName = baseDeckName();
+    if ( m_addToEnsemble() )
     {
-        m_deckName = baseDeckName();
-        if ( m_addToEnsemble() )
-        {
-            m_deckName = m_deckName + "-" + QString::number( m_currentRunId() );
-        }
+        deckName = deckName + "-" + QString::number( m_currentRunId() );
     }
 
-    return m_deckName;
+    return deckName;
 }
 
 //--------------------------------------------------------------------------------------------------
@@ -670,13 +661,10 @@ QString RimOpmFlowJob::deckName()
 //--------------------------------------------------------------------------------------------------
 QString RimOpmFlowJob::baseDeckName()
 {
-    if ( m_deckName.isEmpty() )
-    {
-        m_deckName = name();
-        m_deckName.replace( ' ', '_' );
-        m_deckName = m_deckName.toUpper();
-    }
-    return m_deckName;
+    auto baseName = name();
+    baseName.replace( ' ', '_' );
+    baseName = baseName.toUpper();
+    return baseName;
 }
 
 //--------------------------------------------------------------------------------------------------
@@ -969,7 +957,6 @@ void RimOpmFlowJob::onCompleted( bool success )
         }
 
         m_currentRunId = m_currentRunId + 1;
-        m_deckName     = "";
     }
     else
     {

ApplicationLibCode/ProjectDataModel/Jobs/RimOpmFlowJob.h

@@ -143,7 +143,6 @@ private:
 
     caf::PdmField<QString> m_wellOpenKeyword;
 
-    QString                             m_deckName;
     std::unique_ptr<RifOpmFlowDeckFile> m_deckFile;
     bool                                m_fileDeckHasDates;
     bool                                m_fileDeckIsRestart;