OilfieldToolsNet/ResInsight
4
0
Fork 0
mirror of https://github.com/OPM/ResInsight.git synced 2025-02-25 18:55:39 -06:00
Code Issues Packages Projects Releases Wiki Activity

Grid preferences update (#11547)

Browse Source 
* Refactor RifReaderSettings and grid preferences tab
This commit is contained in:
jonjenssen
2024-07-04 12:38:41 +02:00
committed by GitHub
parent 899fdba5db
commit 868e9916bc
32 changed files with 566 additions and 388 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
ApplicationLibCode/ProjectDataModel/RimEclipseCase.cpp
View File

@@ -25,14 +25,13 @@
#include "RiaDefines.h"
#include "RiaFieldHandleTools.h"
#include "RiaLogging.h"
#include "RiaPreferences.h"
#include "RiaPreferencesGrid.h"
#include "RiaQDateTimeTools.h"
#include "CompletionExportCommands/RicWellPathExportCompletionDataFeatureImpl.h"
#include "RicfCommandObject.h"
#include "RifInputPropertyLoader.h"
#include "RifReaderSettings.h"
#include "RigActiveCellInfo.h"
#include "RigCaseCellResultsData.h"
@@ -129,6 +128,8 @@ RimEclipseCase::RimEclipseCase()
m_fractureModelResults.uiCapability()->setUiTreeChildrenHidden( true );
setReservoirData( nullptr );
m_readerSettings = RiaPreferencesGrid::current()->readerSettings();
}
//--------------------------------------------------------------------------------------------------
@@ -184,15 +185,6 @@ void RimEclipseCase::ensureDeckIsParsedForEquilData()
{
if ( m_rigEclipseCase.notNull() )
{
QString includeFileAbsolutePathPrefix;
{
RiaPreferences* prefs = RiaPreferences::current();
if ( prefs->readerSettings() )
{
includeFileAbsolutePathPrefix = prefs->readerSettings()->includeFileAbsolutePathPrefix();
}
}
QString dataDeckFile;
{
QFileInfo fi( gridFileName() );
@@ -200,7 +192,7 @@ void RimEclipseCase::ensureDeckIsParsedForEquilData()
dataDeckFile = caf::Utils::constructFullFileName( fi.absolutePath(), fi.baseName(), ".DATA" );
}
m_rigEclipseCase->ensureDeckIsParsedForEquilData( dataDeckFile, includeFileAbsolutePathPrefix );
m_rigEclipseCase->ensureDeckIsParsedForEquilData( dataDeckFile, m_readerSettings.includeFileAbsolutePathPrefix );
}
}
@@ -730,9 +722,7 @@ void RimEclipseCase::ensureFaultDataIsComputed()
RigEclipseCaseData* rigEclipseCase = eclipseCaseData();
if ( rigEclipseCase )
{
bool computeFaults = ( m_readerSettings && m_readerSettings->importFaults() ) ||
( !m_readerSettings && RiaPreferences::current()->readerSettings()->importFaults() );
if ( computeFaults )
if ( m_readerSettings.importFaults )
{
RigActiveCellInfo* actCellInfo = rigEclipseCase->activeCellInfo( RiaDefines::PorosityModelType::MATRIX_MODEL );
rigEclipseCase->mainGrid()->calculateFaults( actCellInfo );
@@ -1179,7 +1169,7 @@ bool RimEclipseCase::importAsciiInputProperties( const QStringList& fileNames )
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
void RimEclipseCase::setReaderSettings( std::shared_ptr<RifReaderSettings> readerSettings )
void RimEclipseCase::setReaderSettings( RifReaderSettings& readerSettings )
{
m_readerSettings = readerSettings;
}