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

Performance : Now possible to disable load of SOIL on load

Browse Source
This commit is contained in:
Magne Sjaastad 2014-10-24 11:38:47 +02:00
parent a5e4e756af
commit 2509fa974f
8 changed files with 24 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
ApplicationCode/Application/RiaApplication.cpp
View File

@ -642,7 +642,11 @@ bool RiaApplication::openEclipseCase(const QString& caseName, const QString& cas
// Select SOIL as default result variable // Select SOIL as default result variable
riv->cellResult()->setResultType(RimDefines::DYNAMIC_NATIVE); riv->cellResult()->setResultType(RimDefines::DYNAMIC_NATIVE);
riv->cellResult()->setResultVariable("SOIL");
if (m_preferences->loadAndShowSoil)
{
riv->cellResult()->setResultVariable("SOIL");
}
riv->animationMode = true; riv->animationMode = true;
riv->loadDataAndUpdate(); riv->loadDataAndUpdate();

13
ApplicationCode/Application/RiaPreferences.cpp
View File

@ -64,10 +64,12 @@ RiaPreferences::RiaPreferences(void)
CAF_PDM_InitFieldNoDefault(&lastUsedProjectFileName,"lastUsedProjectFileName", "Last Used Project File", "", "", ""); CAF_PDM_InitFieldNoDefault(&lastUsedProjectFileName,"lastUsedProjectFileName", "Last Used Project File", "", "", "");
lastUsedProjectFileName.setUiHidden(true); 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); autocomputeDepthRelatedProperties.setUiLabelPosition(caf::PdmUiItemInfo::HIDDEN);
CAF_PDM_InitField(&loadAndShowSoil, "loadAndShowSoil", true, "Load and show SOIL", "", "", "");
loadAndShowSoil.setUiLabelPosition(caf::PdmUiItemInfo::HIDDEN);
readerSettings = new RifReaderSettings; readerSettings = new RifReaderSettings;
CAF_PDM_InitFieldNoDefault(&readerSettings, "readerSettings", "Reader settings", "", "", ""); CAF_PDM_InitFieldNoDefault(&readerSettings, "readerSettings", "Reader settings", "", "", "");
} }
@ -97,7 +99,8 @@ void RiaPreferences::defineEditorAttribute(const caf::PdmFieldHandle* field, QSt
} }
} }
else if (field == &octaveShowHeaderInfoWhenExecutingScripts || else if (field == &octaveShowHeaderInfoWhenExecutingScripts ||
field == &autocomputeDepthRelatedProperties) field == &autocomputeDepthRelatedProperties ||
field == &loadAndShowSoil )
{ {
caf::PdmUiCheckBoxEditorAttribute* myAttr = static_cast<caf::PdmUiCheckBoxEditorAttribute*>(attribute); caf::PdmUiCheckBoxEditorAttribute* myAttr = static_cast<caf::PdmUiCheckBoxEditorAttribute*>(attribute);
if (myAttr) if (myAttr)
@ -130,8 +133,9 @@ void RiaPreferences::defineUiOrdering(QString uiConfigName, caf::PdmUiOrdering&
defaultSettingsGroup->add(&defaultFaultGridLineColors); defaultSettingsGroup->add(&defaultFaultGridLineColors);
defaultSettingsGroup->add(&defaultWellLabelColor); 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(&autocomputeDepthRelatedProperties);
autoComputeGroup->add(&loadAndShowSoil);
caf::PdmUiGroup* readerSettingsGroup = uiOrdering.addNewGroup("Reader settings"); caf::PdmUiGroup* readerSettingsGroup = uiOrdering.addNewGroup("Reader settings");
std::vector<caf::PdmFieldHandle*> readerSettingsFields; std::vector<caf::PdmFieldHandle*> readerSettingsFields;
@ -152,6 +156,7 @@ void RiaPreferences::configureForRegressionTests()
showHud = false; showHud = false;
autocomputeDepthRelatedProperties = true; autocomputeDepthRelatedProperties = true;
loadAndShowSoil = true;
CVF_ASSERT(readerSettings); CVF_ASSERT(readerSettings);
readerSettings->importFaults = false; readerSettings->importFaults = false;

1
ApplicationCode/Application/RiaPreferences.h
View File

@ -65,6 +65,7 @@ public: // Pdm Fields
caf::PdmField<QString> lastUsedProjectFileName; caf::PdmField<QString> lastUsedProjectFileName;
caf::PdmField<bool> autocomputeDepthRelatedProperties; caf::PdmField<bool> autocomputeDepthRelatedProperties;
caf::PdmField<bool> loadAndShowSoil;
caf::PdmField<RifReaderSettings*> readerSettings; caf::PdmField<RifReaderSettings*> readerSettings;

2
ApplicationCode/FileInterface/RifReaderEclipseOutput.cpp
View File

@ -454,7 +454,7 @@ bool RifReaderEclipseOutput::open(const QString& fileName, RigCaseData* eclipseC
progInfo.setNextProgressIncrement(8); progInfo.setNextProgressIncrement(8);
progInfo.setProgressDescription("Reading Well information"); progInfo.setProgressDescription("Reading Well information");
readWellCells(mainEclGrid, isSimulationWellDataEnabled()); readWellCells(mainEclGrid, isImportOfCompleteMswDataEnabled());
progInfo.setProgressDescription("Releasing reader memory"); progInfo.setProgressDescription("Releasing reader memory");
ecl_grid_free( mainEclGrid ); ecl_grid_free( mainEclGrid );

4
ApplicationCode/FileInterface/RifReaderInterface.cpp
View File

@ -45,11 +45,11 @@ bool RifReaderInterface::isFaultImportEnabled()
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
/// ///
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
bool RifReaderInterface::isSimulationWellDataEnabled() bool RifReaderInterface::isImportOfCompleteMswDataEnabled()
{ {
if (m_settings.notNull()) if (m_settings.notNull())
{ {
return m_settings->importSimulationWellData; return m_settings->importAdvancedMswData;
} }
return false; return false;

2
ApplicationCode/FileInterface/RifReaderInterface.h
View File

@ -56,7 +56,7 @@ public:
void setReaderSetting(RifReaderSettings* settings); void setReaderSetting(RifReaderSettings* settings);
bool isFaultImportEnabled(); bool isFaultImportEnabled();
bool isSimulationWellDataEnabled(); bool isImportOfCompleteMswDataEnabled();
bool isNNCsEnabled(); bool isNNCsEnabled();
virtual bool open(const QString& fileName, RigCaseData* eclipseCase) = 0; virtual bool open(const QString& fileName, RigCaseData* eclipseCase) = 0;

8
ApplicationCode/FileInterface/RifReaderSettings.cpp
View File

@ -34,11 +34,11 @@ RifReaderSettings::RifReaderSettings()
CAF_PDM_InitField(&importFaults, "importFaults", true, "Import faults", "", "", ""); CAF_PDM_InitField(&importFaults, "importFaults", true, "Import faults", "", "", "");
importFaults.setUiLabelPosition(caf::PdmUiItemInfo::HIDDEN); 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", "", "", ""); CAF_PDM_InitField(&importNNCs, "importSimulationNNCs", true, "Import NNCs", "", "", "");
importNNCs.setUiLabelPosition(caf::PdmUiItemInfo::HIDDEN); 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) void RifReaderSettings::defineEditorAttribute(const caf::PdmFieldHandle* field, QString uiConfigName, caf::PdmUiEditorAttribute* attribute)
{ {
if (field == &importFaults || if (field == &importFaults ||
field == &importSimulationWellData || field == &importAdvancedMswData ||
field == &importNNCs) field == &importNNCs)
{ {
caf::PdmUiCheckBoxEditorAttribute* myAttr = static_cast<caf::PdmUiCheckBoxEditorAttribute*>(attribute); caf::PdmUiCheckBoxEditorAttribute* myAttr = static_cast<caf::PdmUiCheckBoxEditorAttribute*>(attribute);

2
ApplicationCode/FileInterface/RifReaderSettings.h
View File

@ -37,8 +37,8 @@ public:
RifReaderSettings(); RifReaderSettings();
caf::PdmField<bool> importFaults; caf::PdmField<bool> importFaults;
caf::PdmField<bool> importSimulationWellData;
caf::PdmField<bool> importNNCs; caf::PdmField<bool> importNNCs;
caf::PdmField<bool> importAdvancedMswData;
protected: protected:
virtual void defineEditorAttribute(const caf::PdmFieldHandle* field, QString uiConfigName, caf::PdmUiEditorAttribute* attribute); virtual void defineEditorAttribute(const caf::PdmFieldHandle* field, QString uiConfigName, caf::PdmUiEditorAttribute* attribute);