diff --git a/ApplicationLibCode/FileInterface/RifEnsembleImportConfig.cpp b/ApplicationLibCode/FileInterface/RifEnsembleImportConfig.cpp index 1c33078efa..6eaa6690bb 100644 --- a/ApplicationLibCode/FileInterface/RifEnsembleImportConfig.cpp +++ b/ApplicationLibCode/FileInterface/RifEnsembleImportConfig.cpp @@ -27,14 +27,6 @@ #include -//-------------------------------------------------------------------------------------------------- -/// -//-------------------------------------------------------------------------------------------------- -bool RifEnsembleImportConfig::shouldCreateEsmryFile() const -{ - return m_shouldCreateEsmryFile; -} - //-------------------------------------------------------------------------------------------------- /// //-------------------------------------------------------------------------------------------------- @@ -75,8 +67,6 @@ void RifEnsembleImportConfig::computePatternsFromSummaryFilePaths( const QString computeRestartPatternsFromTwoRealizations( restartFileNames1, restartFileNames2 ); computeParameterFilePathPattern( { paramFilePath1, paramFilePath2 } ); - m_shouldCreateEsmryFile = RifOpmSummaryTools::isEsmryConversionRequired( filePath1 ); - m_useConfigValues = true; } diff --git a/ApplicationLibCode/FileInterface/RifEnsembleImportConfig.h b/ApplicationLibCode/FileInterface/RifEnsembleImportConfig.h index 04745b4e9e..b6f4198555 100644 --- a/ApplicationLibCode/FileInterface/RifEnsembleImportConfig.h +++ b/ApplicationLibCode/FileInterface/RifEnsembleImportConfig.h @@ -29,7 +29,6 @@ public: std::vector restartFilesForRealization( int realizationNumber ) const; QString pathToParameterFile( int realizationNumber ) const; - bool shouldCreateEsmryFile() const; bool useConfigValues() const; private: @@ -41,8 +40,7 @@ private: static QString placeholderText(); private: - bool m_useConfigValues = false; - bool m_shouldCreateEsmryFile = false; + bool m_useConfigValues = false; std::vector m_restartFileNamePatterns; QString m_parameterFilePathPattern; }; diff --git a/ApplicationLibCode/FileInterface/RifOpmCommonSummary.cpp b/ApplicationLibCode/FileInterface/RifOpmCommonSummary.cpp index d18cb8b69c..b7db82c99f 100644 --- a/ApplicationLibCode/FileInterface/RifOpmCommonSummary.cpp +++ b/ApplicationLibCode/FileInterface/RifOpmCommonSummary.cpp @@ -132,8 +132,7 @@ bool RifOpmCommonEclipseSummary::open( const QString& fileName, bool includeRest auto startTime = RiaLogging::currentTime(); - bool isEsmryConversionRequired = m_ensembleImportState.useConfigValues() ? m_ensembleImportState.shouldCreateEsmryFile() - : RifOpmSummaryTools::isEsmryConversionRequired( fileName ); + bool isEsmryConversionRequired = RifOpmSummaryTools::isEsmryConversionRequired( fileName ); bool isLoggingEnabled = RiaPreferencesSystem::current()->isLoggingActivatedForKeyword( "OpmSummaryImport" ); if ( isLoggingEnabled ) RiaLogging::logElapsedTime( "Check if conversion from SMSPEC to ESMRY is required", startTime );