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

#1776 CVS data parser. Made parsing more generic. Handle error result columns

Browse Source
This commit is contained in:
Bjørn Erik Jensen
2018-05-23 12:26:37 +02:00
parent 8f5c3436ce
commit 22c71b60dd
16 changed files with 78 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
ApplicationCode/ProjectDataModel/Summary/RimSummaryAddress.cpp
View File

@@ -67,6 +67,7 @@ RimSummaryAddress::RimSummaryAddress()
CAF_PDM_InitFieldNoDefault(&m_cellJ, "SummaryCellJ", "J", "", "", "");
CAF_PDM_InitFieldNoDefault(&m_cellK, "SummaryCellK", "K", "", "", "");
CAF_PDM_InitFieldNoDefault(&m_aquiferNumber, "SummaryAquifer", "Aquifer", "", "", "");
CAF_PDM_InitFieldNoDefault(&m_isErrorResult, "IsErrorResult", "Is Error Result", "", "", "");
m_category = RifEclipseSummaryAddress::SUMMARY_INVALID;
m_regionNumber = -1;
@@ -76,6 +77,7 @@ RimSummaryAddress::RimSummaryAddress()
m_cellJ = -1;
m_cellK = -1;
m_aquiferNumber = -1;
m_isErrorResult = false;
}
//--------------------------------------------------------------------------------------------------
@@ -100,6 +102,7 @@ void RimSummaryAddress::setAddress(const RifEclipseSummaryAddress& addr)
m_wellSegmentNumber = addr.wellSegmentNumber();
m_lgrName = addr.lgrName().c_str();
m_aquiferNumber = addr.aquiferNumber();
m_isErrorResult = addr.isErrorResult();
m_cellI = addr.cellI(); m_cellJ = addr.cellJ(); m_cellK = addr.cellK();
}
@@ -118,6 +121,7 @@ RifEclipseSummaryAddress RimSummaryAddress::address()
m_wellSegmentNumber(),
m_lgrName().toStdString(),
m_cellI(), m_cellJ(), m_cellK(),
m_aquiferNumber);
m_aquiferNumber,
m_isErrorResult);
}

1
ApplicationCode/ProjectDataModel/Summary/RimSummaryAddress.h
View File

@@ -63,5 +63,6 @@ private:
caf::PdmField<int> m_cellJ;
caf::PdmField<int> m_cellK;
caf::PdmField<int> m_aquiferNumber;
caf::PdmField<bool> m_isErrorResult;
};