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

Preferences framework

Browse Source 
Add preferences for HPC/Batch scheduler
Add slurm and LSF support
Add batch job monitor
Support launcher specific user settings
Use internal timer, not global view timer
Add some more options to batch monitor
Improve naming
Add tests for job lists
This commit is contained in:
Jon Jenssen authored and jonjenssen committed 2026-10-19 12:09:52 +02:00
1 parent 8dc1d56bd3
commit d9d7507bcd
61 files changed
+2735 -165
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

ApplicationLibCode/ProjectDataModel/Jobs/RimOpmFlowJob.cpp
+19 -16
View File
@@ -159,9 +159,6 @@ RimOpmFlowJob::RimOpmFlowJob()
CAF_PDM_InitField( &m_autoLoadResults, "AutoLoadResults", true, "Automatic loading of results from job" );
m_autoLoadResults.uiCapability()->setUiHidden( true );
CAF_PDM_InitField( &m_isChildJob, "IsChildJob", false, "Is Child Job" );
m_isChildJob.uiCapability()->setUiHidden( true );
caf::PdmUiNativeCheckBoxEditor::configureFieldForEditor( &m_addToEnsemble );
caf::PdmUiNativeCheckBoxEditor::configureFieldForEditor( &m_pauseBeforeRun );
caf::PdmUiNativeCheckBoxEditor::configureFieldForEditor( &m_useRestart );
@@ -272,7 +269,7 @@ void RimOpmFlowJob::defineUiOrdering( QString uiConfigName, caf::PdmUiOrdering&
return;
}
if ( m_isChildJob() )
if ( isChildJob() )
{
m_workDir.uiCapability()->setUiReadOnly( true );
uiOrdering.add( &m_workDir );
@@ -698,6 +695,15 @@ QString RimOpmFlowJob::deckExtension() const
return ".DATA";
}
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
int RimOpmFlowJob::numberOfProcesses()
{
if ( !RiaPreferencesOpm::current()->useMpi() ) return 1;
return m_jobSettings()->mpiProcesses();
}
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
@@ -714,9 +720,6 @@ QStringList RimOpmFlowJob::command()
auto opmPref = RiaPreferencesOpm::current();
if ( opmPref->useWsl() )
{
cmd.append( RiaWslTools::wslCommand() );
cmd.append( opmPref->wslOptions() );
workDir = RiaWslTools::convertToWslPath( workDir );
dataFile = RiaWslTools::convertToWslPath( dataFile );
}
@@ -725,7 +728,7 @@ QStringList RimOpmFlowJob::command()
{
cmd.append( opmPref->mpirunCommand() );
cmd.append( QString( "-np" ) );
cmd.append( QString( "%1" ).arg( m_jobSettings->mpiProcesses() ) );
cmd.append( QString( "%1" ).arg( numberOfProcesses() ) );
}
cmd.append( opmPref->opmFlowCommand() );
@@ -924,6 +927,14 @@ void RimOpmFlowJob::onProgress( double percentageDone )
progressUpdate.send( percentageDone );
}
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
bool RimOpmFlowJob::shouldUseWsl()
{
return RiaPreferencesOpm::current()->useWsl();
}
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
@@ -1340,11 +1351,3 @@ void RimOpmFlowJob::setAutoLoadResults( bool autoLoadResults )
{
m_autoLoadResults = autoLoadResults;
}
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
void RimOpmFlowJob::setIsChildJob( bool isChildJob )
{
m_isChildJob = isChildJob;
}