From 66852c4dad2908bd120283f543b6dd3564e52dcf Mon Sep 17 00:00:00 2001 From: jonjenssen <69144954+jonjenssen@users.noreply.github.com> Date: Tue, 28 Sep 2021 12:39:54 +0200 Subject: [PATCH] WellIA: Load results after external computations script has completed (#8062) * Load result after modeling has completed. * Select new geomech view in project tree when importing a new geomech case --- ApplicationLibCode/Application/RiaApplication.cpp | 1 + .../RicRunWellIntegrityAnalysisFeature.cpp | 9 ++++++++- .../ProjectDataModel/WellPath/RimWellIASettings.cpp | 8 ++++++++ .../ProjectDataModel/WellPath/RimWellIASettings.h | 1 + 4 files changed, 18 insertions(+), 1 deletion(-) diff --git a/ApplicationLibCode/Application/RiaApplication.cpp b/ApplicationLibCode/Application/RiaApplication.cpp index 98b8a58a18..857a4c7674 100644 --- a/ApplicationLibCode/Application/RiaApplication.cpp +++ b/ApplicationLibCode/Application/RiaApplication.cpp @@ -891,6 +891,7 @@ bool RiaApplication::openOdbCaseFromFile( const QString& fileName, bool applyTim m_project->updateConnectedEditors(); Riu3DMainWindowTools::setExpanded( riv ); + Riu3DMainWindowTools::selectAsCurrentItem( riv ); return true; } diff --git a/ApplicationLibCode/Commands/GeoMechCommands/RicRunWellIntegrityAnalysisFeature.cpp b/ApplicationLibCode/Commands/GeoMechCommands/RicRunWellIntegrityAnalysisFeature.cpp index f027153f58..54f82f5e2a 100644 --- a/ApplicationLibCode/Commands/GeoMechCommands/RicRunWellIntegrityAnalysisFeature.cpp +++ b/ApplicationLibCode/Commands/GeoMechCommands/RicRunWellIntegrityAnalysisFeature.cpp @@ -93,7 +93,14 @@ void RicRunWellIntegrityAnalysisFeature::onActionTriggered( bool isChecked ) runProgress.incrementProgress(); runProgress.setProgressDescription( "Loading modeling results." ); - // TODO - load results from Abaqus modeling here. + RiaApplication* app = RiaApplication::instance(); + if ( !app->openOdbCaseFromFile( modelSettings->outputOdbFilename() ) ) + { + QMessageBox::critical( nullptr, + wiaTitle, + "Failed to load modeling results. Check log window for additional information." ); + return; + } } //-------------------------------------------------------------------------------------------------- diff --git a/ApplicationLibCode/ProjectDataModel/WellPath/RimWellIASettings.cpp b/ApplicationLibCode/ProjectDataModel/WellPath/RimWellIASettings.cpp index f24e42e5f0..dfe0d2015d 100644 --- a/ApplicationLibCode/ProjectDataModel/WellPath/RimWellIASettings.cpp +++ b/ApplicationLibCode/ProjectDataModel/WellPath/RimWellIASettings.cpp @@ -317,6 +317,14 @@ QString RimWellIASettings::outputBaseDirectory() const return m_baseDir(); } +//-------------------------------------------------------------------------------------------------- +/// +//-------------------------------------------------------------------------------------------------- +QString RimWellIASettings::outputOdbFilename() const +{ + return m_baseDir() + "/" + name() + ".odb"; +} + //-------------------------------------------------------------------------------------------------- /// //-------------------------------------------------------------------------------------------------- diff --git a/ApplicationLibCode/ProjectDataModel/WellPath/RimWellIASettings.h b/ApplicationLibCode/ProjectDataModel/WellPath/RimWellIASettings.h index cc5b00b1f8..cef67ba775 100644 --- a/ApplicationLibCode/ProjectDataModel/WellPath/RimWellIASettings.h +++ b/ApplicationLibCode/ProjectDataModel/WellPath/RimWellIASettings.h @@ -62,6 +62,7 @@ public: void setOutputBaseDirectory( QString baseDir ); QString outputBaseDirectory() const; + QString outputOdbFilename() const; bool showBox() const; void setShowBox( bool show );