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

(#743) Removed input property collection

Browse Source
This commit is contained in:
Magne Sjaastad 2016-06-24 11:42:15 +02:00
parent 6a4ef00c41
commit 04a12ce592
2 changed files with 0 additions and 35 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
ApplicationCode/ProjectDataModel/RimEclipseInputCaseOpm.cpp
View File

@ -48,10 +48,6 @@ RimEclipseInputCaseOpm::RimEclipseInputCaseOpm()
CAF_PDM_InitField(&m_gridFileName, "GridFileName", QString(), "Case grid filename", "", "" ,"");
m_gridFileName.uiCapability()->setUiReadOnly(true);
CAF_PDM_InitFieldNoDefault(&m_inputPropertyCollection, "InputPropertyCollection", "", "", "", "");
m_inputPropertyCollection = new RimEclipseInputPropertyCollection;
m_inputPropertyCollection->parentField()->uiCapability()->setUiHidden(true);
}
//--------------------------------------------------------------------------------------------------
@ -59,7 +55,6 @@ RimEclipseInputCaseOpm::RimEclipseInputCaseOpm()
//--------------------------------------------------------------------------------------------------
RimEclipseInputCaseOpm::~RimEclipseInputCaseOpm()
{
delete m_inputPropertyCollection;
}
//--------------------------------------------------------------------------------------------------
@ -126,33 +121,6 @@ void RimEclipseInputCaseOpm::importEclipseGridAndProperties(const QString& fileN
return;
}
for (auto inputProperty : m_inputPropertyCollection->inputProperties)
{
inputProperty->resolvedState = RimEclipseInputProperty::KEYWORD_NOT_IN_FILE;
}
for (auto it = mapUiNameToKeyword.begin(); it != mapUiNameToKeyword.end(); ++it)
{
RimEclipseInputProperty* inputProperty = m_inputPropertyCollection->findInputProperty(it->first);
if (!inputProperty)
{
inputProperty = new RimEclipseInputProperty;
inputProperty->resultName = it->first;
inputProperty->eclipseKeyword = it->second;
inputProperty->fileName = fileName;
inputProperty->resolvedState = RimEclipseInputProperty::RESOLVED;
m_inputPropertyCollection->inputProperties.push_back(inputProperty);
}
else
{
inputProperty->resolvedState = RimEclipseInputProperty::RESOLVED;
}
}
this->reservoirData()->mainGrid()->setFlipAxis(flipXAxis, flipYAxis);
computeCachedData();

3
ApplicationCode/ProjectDataModel/RimEclipseInputCaseOpm.h
View File

@ -43,9 +43,6 @@ public:
RimEclipseInputCaseOpm();
virtual ~RimEclipseInputCaseOpm();
// Fields
caf::PdmChildField<RimEclipseInputPropertyCollection*> m_inputPropertyCollection;
void importNewEclipseGridAndProperties(const QString& fileName);
// RimCase overrides