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
Download Patch File Download Diff File Expand all files Collapse all files

2
ApplicationCode/FileInterface/RifReaderEclipseOutput.cpp
View File

@@ -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 );

4
ApplicationCode/FileInterface/RifReaderInterface.cpp
View File

@@ -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;

2
ApplicationCode/FileInterface/RifReaderInterface.h
View File

@@ -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;

8
ApplicationCode/FileInterface/RifReaderSettings.cpp
View File

@@ -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<caf::PdmUiCheckBoxEditorAttribute*>(attribute);

2
ApplicationCode/FileInterface/RifReaderSettings.h
View File

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