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

#1834 Many Timesteps: Add preference option to control import of well data

Browse Source
This commit is contained in:
Magne Sjaastad 2017-08-29 14:28:17 +02:00
parent 921b7fcb60
commit 279080fc4a
3 changed files with 18 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
ApplicationCode/FileInterface/RifReaderEclipseOutput.cpp
View File

@ -20,11 +20,14 @@
#include "RifReaderEclipseOutput.h" #include "RifReaderEclipseOutput.h"
#include "RiaApplication.h"
#include "RiaLogging.h" #include "RiaLogging.h"
#include "RiaPreferences.h"
#include "RifEclipseInputFileTools.h" #include "RifEclipseInputFileTools.h"
#include "RifEclipseOutputFileTools.h" #include "RifEclipseOutputFileTools.h"
#include "RifHdf5ReaderInterface.h" #include "RifHdf5ReaderInterface.h"
#include "RifReaderSettings.h"
#ifdef USE_HDF5 #ifdef USE_HDF5
#include "RifHdf5Reader.h" #include "RifHdf5Reader.h"
@ -436,8 +439,11 @@ bool RifReaderEclipseOutput::open(const QString& fileName, RigEclipseCaseData* e
} }
progInfo.setNextProgressIncrement(8); progInfo.setNextProgressIncrement(8);
progInfo.setProgressDescription("Reading Well information"); if (!RiaApplication::instance()->preferences()->readerSettings()->skipWellData())
readWellCells(mainEclGrid, isImportOfCompleteMswDataEnabled()); {
progInfo.setProgressDescription("Reading Well information");
readWellCells(mainEclGrid, isImportOfCompleteMswDataEnabled());
}
progInfo.incrementProgress(); progInfo.incrementProgress();
progInfo.setProgressDescription("Releasing reader memory"); progInfo.setProgressDescription("Releasing reader memory");

14
ApplicationCode/FileInterface/RifReaderSettings.cpp
View File

@ -43,6 +43,9 @@ RifReaderSettings::RifReaderSettings()
CAF_PDM_InitField(&useResultIndexFile, "useResultIndexFile", false, "Use Result Index File", "", "", ""); CAF_PDM_InitField(&useResultIndexFile, "useResultIndexFile", false, "Use Result Index File", "", "", "");
useResultIndexFile.uiCapability()->setUiLabelPosition(caf::PdmUiItemInfo::HIDDEN); useResultIndexFile.uiCapability()->setUiLabelPosition(caf::PdmUiItemInfo::HIDDEN);
CAF_PDM_InitField(&skipWellData, "skipWellData", false, "Skip Import of Simulation Well Data", "", "", "");
skipWellData.uiCapability()->setUiLabelPosition(caf::PdmUiItemInfo::HIDDEN);
CAF_PDM_InitField(&faultIncludeFileAbsolutePathPrefix, "faultIncludeFileAbsolutePathPrefix", QString(), "Fault Include File Absolute Path Prefix", "", "Path used to prefix absolute UNIX paths in fault include statements on Windows", ""); CAF_PDM_InitField(&faultIncludeFileAbsolutePathPrefix, "faultIncludeFileAbsolutePathPrefix", QString(), "Fault Include File Absolute Path Prefix", "", "Path used to prefix absolute UNIX paths in fault include statements on Windows", "");
} }
@ -54,7 +57,8 @@ void RifReaderSettings::defineEditorAttribute(const caf::PdmFieldHandle* field,
if (field == &importFaults || if (field == &importFaults ||
field == &importAdvancedMswData || field == &importAdvancedMswData ||
field == &importNNCs || field == &importNNCs ||
field == &useResultIndexFile) field == &useResultIndexFile ||
field == &skipWellData)
{ {
caf::PdmUiCheckBoxEditorAttribute* myAttr = dynamic_cast<caf::PdmUiCheckBoxEditorAttribute*>(attribute); caf::PdmUiCheckBoxEditorAttribute* myAttr = dynamic_cast<caf::PdmUiCheckBoxEditorAttribute*>(attribute);
if (myAttr) if (myAttr)
@ -67,11 +71,11 @@ void RifReaderSettings::defineEditorAttribute(const caf::PdmFieldHandle* field,
void RifReaderSettings::defineUiOrdering(QString uiConfigName, caf::PdmUiOrdering& uiOrdering) void RifReaderSettings::defineUiOrdering(QString uiConfigName, caf::PdmUiOrdering& uiOrdering)
{ {
uiOrdering.add(&importFaults); uiOrdering.add(&importFaults);
uiOrdering.add(&importNNCs);
uiOrdering.add(&importAdvancedMswData);
uiOrdering.add(&useResultIndexFile);
#ifdef WIN32 #ifdef WIN32
uiOrdering.add(&faultIncludeFileAbsolutePathPrefix); uiOrdering.add(&faultIncludeFileAbsolutePathPrefix);
#endif #endif
uiOrdering.add(&importNNCs);
uiOrdering.add(&importAdvancedMswData);
uiOrdering.add(&useResultIndexFile);
uiOrdering.add(&skipWellData);
} }

1
ApplicationCode/FileInterface/RifReaderSettings.h
View File

@ -41,6 +41,7 @@ public:
caf::PdmField<bool> importAdvancedMswData; caf::PdmField<bool> importAdvancedMswData;
caf::PdmField<QString> faultIncludeFileAbsolutePathPrefix; caf::PdmField<QString> faultIncludeFileAbsolutePathPrefix;
caf::PdmField<bool> useResultIndexFile; caf::PdmField<bool> useResultIndexFile;
caf::PdmField<bool> skipWellData;
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);