diff --git a/ApplicationCode/Application/RiaApplication.cpp b/ApplicationCode/Application/RiaApplication.cpp index 4e45051b09..ff2a301b19 100644 --- a/ApplicationCode/Application/RiaApplication.cpp +++ b/ApplicationCode/Application/RiaApplication.cpp @@ -642,7 +642,11 @@ bool RiaApplication::openEclipseCase(const QString& caseName, const QString& cas // Select SOIL as default result variable riv->cellResult()->setResultType(RimDefines::DYNAMIC_NATIVE); - riv->cellResult()->setResultVariable("SOIL"); + + if (m_preferences->loadAndShowSoil) + { + riv->cellResult()->setResultVariable("SOIL"); + } riv->animationMode = true; riv->loadDataAndUpdate(); diff --git a/ApplicationCode/Application/RiaPreferences.cpp b/ApplicationCode/Application/RiaPreferences.cpp index 74b51c792c..9e3948d5a0 100644 --- a/ApplicationCode/Application/RiaPreferences.cpp +++ b/ApplicationCode/Application/RiaPreferences.cpp @@ -64,9 +64,11 @@ RiaPreferences::RiaPreferences(void) CAF_PDM_InitFieldNoDefault(&lastUsedProjectFileName,"lastUsedProjectFileName", "Last Used Project File", "", "", ""); lastUsedProjectFileName.setUiHidden(true); - CAF_PDM_InitField(&autocomputeDepthRelatedProperties, "autocomputeDepth", true, "DEPTH related properties", "", "DEPTH, DX, DY, DZ, TOP, BOTTOM", ""); - + CAF_PDM_InitField(&autocomputeDepthRelatedProperties, "autocomputeDepth", true, "Compute DEPTH related properties", "", "DEPTH, DX, DY, DZ, TOP, BOTTOM", ""); autocomputeDepthRelatedProperties.setUiLabelPosition(caf::PdmUiItemInfo::HIDDEN); + + CAF_PDM_InitField(&loadAndShowSoil, "loadAndShowSoil", true, "Load and show SOIL", "", "", ""); + loadAndShowSoil.setUiLabelPosition(caf::PdmUiItemInfo::HIDDEN); readerSettings = new RifReaderSettings; CAF_PDM_InitFieldNoDefault(&readerSettings, "readerSettings", "Reader settings", "", "", ""); @@ -97,7 +99,8 @@ void RiaPreferences::defineEditorAttribute(const caf::PdmFieldHandle* field, QSt } } else if (field == &octaveShowHeaderInfoWhenExecutingScripts || - field == &autocomputeDepthRelatedProperties) + field == &autocomputeDepthRelatedProperties || + field == &loadAndShowSoil ) { caf::PdmUiCheckBoxEditorAttribute* myAttr = static_cast(attribute); if (myAttr) @@ -130,8 +133,9 @@ void RiaPreferences::defineUiOrdering(QString uiConfigName, caf::PdmUiOrdering& defaultSettingsGroup->add(&defaultFaultGridLineColors); defaultSettingsGroup->add(&defaultWellLabelColor); - caf::PdmUiGroup* autoComputeGroup = uiOrdering.addNewGroup("Compute when loading new case"); + caf::PdmUiGroup* autoComputeGroup = uiOrdering.addNewGroup("Behavior when loading new case"); autoComputeGroup->add(&autocomputeDepthRelatedProperties); + autoComputeGroup->add(&loadAndShowSoil); caf::PdmUiGroup* readerSettingsGroup = uiOrdering.addNewGroup("Reader settings"); std::vector readerSettingsFields; @@ -152,6 +156,7 @@ void RiaPreferences::configureForRegressionTests() showHud = false; autocomputeDepthRelatedProperties = true; + loadAndShowSoil = true; CVF_ASSERT(readerSettings); readerSettings->importFaults = false; diff --git a/ApplicationCode/Application/RiaPreferences.h b/ApplicationCode/Application/RiaPreferences.h index 604adf122a..901d1f7d6b 100644 --- a/ApplicationCode/Application/RiaPreferences.h +++ b/ApplicationCode/Application/RiaPreferences.h @@ -65,6 +65,7 @@ public: // Pdm Fields caf::PdmField lastUsedProjectFileName; caf::PdmField autocomputeDepthRelatedProperties; + caf::PdmField loadAndShowSoil; caf::PdmField readerSettings; diff --git a/ApplicationCode/FileInterface/RifReaderEclipseOutput.cpp b/ApplicationCode/FileInterface/RifReaderEclipseOutput.cpp index e98b187f4b..0ddc72b675 100644 --- a/ApplicationCode/FileInterface/RifReaderEclipseOutput.cpp +++ b/ApplicationCode/FileInterface/RifReaderEclipseOutput.cpp @@ -454,7 +454,7 @@ bool RifReaderEclipseOutput::open(const QString& fileName, RigCaseData* eclipseC progInfo.setNextProgressIncrement(8); progInfo.setProgressDescription("Reading Well information"); - readWellCells(mainEclGrid, isSimulationWellDataEnabled()); + readWellCells(mainEclGrid, isImportOfCompleteMswDataEnabled()); progInfo.setProgressDescription("Releasing reader memory"); ecl_grid_free( mainEclGrid ); diff --git a/ApplicationCode/FileInterface/RifReaderInterface.cpp b/ApplicationCode/FileInterface/RifReaderInterface.cpp index 0c2c852827..3d0059a8a2 100644 --- a/ApplicationCode/FileInterface/RifReaderInterface.cpp +++ b/ApplicationCode/FileInterface/RifReaderInterface.cpp @@ -45,11 +45,11 @@ bool RifReaderInterface::isFaultImportEnabled() //-------------------------------------------------------------------------------------------------- /// //-------------------------------------------------------------------------------------------------- -bool RifReaderInterface::isSimulationWellDataEnabled() +bool RifReaderInterface::isImportOfCompleteMswDataEnabled() { if (m_settings.notNull()) { - return m_settings->importSimulationWellData; + return m_settings->importAdvancedMswData; } return false; diff --git a/ApplicationCode/FileInterface/RifReaderInterface.h b/ApplicationCode/FileInterface/RifReaderInterface.h index 8ec215f5de..abf9160268 100644 --- a/ApplicationCode/FileInterface/RifReaderInterface.h +++ b/ApplicationCode/FileInterface/RifReaderInterface.h @@ -56,7 +56,7 @@ public: void setReaderSetting(RifReaderSettings* settings); bool isFaultImportEnabled(); - bool isSimulationWellDataEnabled(); + bool isImportOfCompleteMswDataEnabled(); bool isNNCsEnabled(); virtual bool open(const QString& fileName, RigCaseData* eclipseCase) = 0; diff --git a/ApplicationCode/FileInterface/RifReaderSettings.cpp b/ApplicationCode/FileInterface/RifReaderSettings.cpp index b6d74adaa4..f221b6fdaa 100644 --- a/ApplicationCode/FileInterface/RifReaderSettings.cpp +++ b/ApplicationCode/FileInterface/RifReaderSettings.cpp @@ -34,11 +34,11 @@ RifReaderSettings::RifReaderSettings() CAF_PDM_InitField(&importFaults, "importFaults", true, "Import faults", "", "", ""); importFaults.setUiLabelPosition(caf::PdmUiItemInfo::HIDDEN); - CAF_PDM_InitField(&importSimulationWellData, "importSimulationWellData", true, "Import simulation wells", "", "", ""); - importSimulationWellData.setUiLabelPosition(caf::PdmUiItemInfo::HIDDEN); - CAF_PDM_InitField(&importNNCs, "importSimulationNNCs", true, "Import NNCs", "", "", ""); importNNCs.setUiLabelPosition(caf::PdmUiItemInfo::HIDDEN); + + CAF_PDM_InitField(&importAdvancedMswData, "importAdvancedMswData", false, "Import advanced MSW data", "", "", ""); + importAdvancedMswData.setUiLabelPosition(caf::PdmUiItemInfo::HIDDEN); } //-------------------------------------------------------------------------------------------------- @@ -47,7 +47,7 @@ RifReaderSettings::RifReaderSettings() void RifReaderSettings::defineEditorAttribute(const caf::PdmFieldHandle* field, QString uiConfigName, caf::PdmUiEditorAttribute* attribute) { if (field == &importFaults || - field == &importSimulationWellData || + field == &importAdvancedMswData || field == &importNNCs) { caf::PdmUiCheckBoxEditorAttribute* myAttr = static_cast(attribute); diff --git a/ApplicationCode/FileInterface/RifReaderSettings.h b/ApplicationCode/FileInterface/RifReaderSettings.h index 793495ed3f..8f4a8b7deb 100644 --- a/ApplicationCode/FileInterface/RifReaderSettings.h +++ b/ApplicationCode/FileInterface/RifReaderSettings.h @@ -37,8 +37,8 @@ public: RifReaderSettings(); caf::PdmField importFaults; - caf::PdmField importSimulationWellData; caf::PdmField importNNCs; + caf::PdmField importAdvancedMswData; protected: virtual void defineEditorAttribute(const caf::PdmFieldHandle* field, QString uiConfigName, caf::PdmUiEditorAttribute* attribute);