OilfieldToolsNet/ResInsight
4
0 Fork 0
mirror of https://github.com/OPM/ResInsight.git synced 2026-10-25 06:38:13 -05:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source 
* Clean up default name handling
This commit is contained in:
JJ authored and GitHub committed 2025-12-07 03:43:48 +01:00
1 parent 6043265686
commit 13f7ee039a
5 files changed
+31 -27
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

ApplicationLibCode/ProjectDataModel/Jobs/RimOpmFlowJob.cpp
+9 -22
View File
@@ -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
-1
View File
@@ -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;