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

#4266 Updates related to libecl API changes

Browse Source
This commit is contained in:
Magne Sjaastad 2019-05-09 08:35:12 +02:00
parent abe292024c
commit 1ac2429f62
1 changed files with 51 additions and 51 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

102
ApplicationCode/FileInterface/RifReaderEclipseSummary.cpp
View File

@ -17,10 +17,8 @@
///////////////////////////////////////////////////////////////////////////////// /////////////////////////////////////////////////////////////////////////////////
#include "RifReaderEclipseSummary.h" #include "RifReaderEclipseSummary.h"
#include "RiaFilePathTools.h" #include "RiaFilePathTools.h"
#include "RiaStringEncodingTools.h" #include "RiaStringEncodingTools.h"
#include "RifEclipseSummaryTools.h" #include "RifEclipseSummaryTools.h"
#include "RifReaderEclipseOutput.h" #include "RifReaderEclipseOutput.h"
@ -36,11 +34,8 @@
#include "ert/ecl/ecl_kw.h" #include "ert/ecl/ecl_kw.h"
#include "ert/ecl/ecl_kw_magic.h" #include "ert/ecl/ecl_kw_magic.h"
#include "ert/ecl/ecl_sum.h" #include "ert/ecl/ecl_sum.h"
#include "ert/ecl/smspec_node.h" #include "ert/ecl/smspec_node.hpp"
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
std::vector<time_t> getTimeSteps(ecl_sum_type* ecl_sum) std::vector<time_t> getTimeSteps(ecl_sum_type* ecl_sum)
{ {
std::vector<time_t> timeSteps; std::vector<time_t> timeSteps;
@ -246,7 +241,7 @@ std::string stringFromPointer(const char* pointerToChar)
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
/// ///
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
std::string wellNameFromNode(const smspec_node_type* ertSumVarNode) std::string wellNameFromNode(const ecl::smspec_node* ertSumVarNode)
{ {
return stringFromPointer(smspec_node_get_wgname(ertSumVarNode)); return stringFromPointer(smspec_node_get_wgname(ertSumVarNode));
} }
@ -254,7 +249,7 @@ std::string wellNameFromNode(const smspec_node_type* ertSumVarNode)
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
/// ///
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
std::string lgrNameFromNode(const smspec_node_type* ertSumVarNode) std::string lgrNameFromNode(const ecl::smspec_node* ertSumVarNode)
{ {
return stringFromPointer(smspec_node_get_lgr_name(ertSumVarNode)); return stringFromPointer(smspec_node_get_lgr_name(ertSumVarNode));
} }
@ -262,9 +257,9 @@ std::string lgrNameFromNode(const smspec_node_type* ertSumVarNode)
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
/// ///
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
RifEclipseSummaryAddress addressFromErtSmSpecNode(const smspec_node_type* ertSumVarNode) RifEclipseSummaryAddress addressFromErtSmSpecNode(const ecl::smspec_node& ertSumVarNode)
{ {
if (smspec_node_get_var_type(ertSumVarNode) == ECL_SMSPEC_INVALID_VAR) if (ertSumVarNode.get_var_type() == ECL_SMSPEC_INVALID_VAR)
{ {
return RifEclipseSummaryAddress(); return RifEclipseSummaryAddress();
} }
@ -283,23 +278,23 @@ RifEclipseSummaryAddress addressFromErtSmSpecNode(const smspec_node_type* ertSum
int aquiferNumber(-1); int aquiferNumber(-1);
bool isErrorResult(false); bool isErrorResult(false);
quantityName = smspec_node_get_keyword(ertSumVarNode); quantityName = stringFromPointer(ertSumVarNode.get_keyword());
switch (smspec_node_get_var_type(ertSumVarNode)) switch (ertSumVarNode.get_var_type())
{ {
case ECL_SMSPEC_AQUIFER_VAR: { case ECL_SMSPEC_AQUIFER_VAR: {
sumCategory = RifEclipseSummaryAddress::SUMMARY_AQUIFER; sumCategory = RifEclipseSummaryAddress::SUMMARY_AQUIFER;
aquiferNumber = smspec_node_get_num(ertSumVarNode); aquiferNumber = ertSumVarNode.get_num();
} }
break; break;
case ECL_SMSPEC_WELL_VAR: { case ECL_SMSPEC_WELL_VAR: {
sumCategory = RifEclipseSummaryAddress::SUMMARY_WELL; sumCategory = RifEclipseSummaryAddress::SUMMARY_WELL;
wellName = wellNameFromNode(ertSumVarNode); wellName = stringFromPointer(ertSumVarNode.get_wgname());
} }
break; break;
case ECL_SMSPEC_REGION_VAR: { case ECL_SMSPEC_REGION_VAR: {
sumCategory = RifEclipseSummaryAddress::SUMMARY_REGION; sumCategory = RifEclipseSummaryAddress::SUMMARY_REGION;
regionNumber = smspec_node_get_num(ertSumVarNode); regionNumber = ertSumVarNode.get_num();
} }
break; break;
case ECL_SMSPEC_FIELD_VAR: { case ECL_SMSPEC_FIELD_VAR: {
@ -308,50 +303,53 @@ RifEclipseSummaryAddress addressFromErtSmSpecNode(const smspec_node_type* ertSum
break; break;
case ECL_SMSPEC_GROUP_VAR: { case ECL_SMSPEC_GROUP_VAR: {
sumCategory = RifEclipseSummaryAddress::SUMMARY_WELL_GROUP; sumCategory = RifEclipseSummaryAddress::SUMMARY_WELL_GROUP;
wellGroupName = wellNameFromNode(ertSumVarNode); wellGroupName = stringFromPointer(ertSumVarNode.get_wgname());
} }
break; break;
case ECL_SMSPEC_BLOCK_VAR: { case ECL_SMSPEC_BLOCK_VAR: {
sumCategory = RifEclipseSummaryAddress::SUMMARY_BLOCK; sumCategory = RifEclipseSummaryAddress::SUMMARY_BLOCK;
const int* ijk = smspec_node_get_ijk(ertSumVarNode); auto ijk = ertSumVarNode.get_ijk();
cellI = ijk[0]; cellI = ijk[0];
cellJ = ijk[1]; cellJ = ijk[1];
cellK = ijk[2]; cellK = ijk[2];
} }
break; break;
case ECL_SMSPEC_COMPLETION_VAR: { case ECL_SMSPEC_COMPLETION_VAR: {
sumCategory = RifEclipseSummaryAddress::SUMMARY_WELL_COMPLETION; sumCategory = RifEclipseSummaryAddress::SUMMARY_WELL_COMPLETION;
wellName = wellNameFromNode(ertSumVarNode); wellName = stringFromPointer(ertSumVarNode.get_wgname());
const int* ijk = smspec_node_get_ijk(ertSumVarNode);
cellI = ijk[0]; auto ijk = ertSumVarNode.get_ijk();
cellJ = ijk[1]; cellI = ijk[0];
cellK = ijk[2]; cellJ = ijk[1];
cellK = ijk[2];
} }
break; break;
case ECL_SMSPEC_LOCAL_BLOCK_VAR: { case ECL_SMSPEC_LOCAL_BLOCK_VAR: {
sumCategory = RifEclipseSummaryAddress::SUMMARY_BLOCK_LGR; sumCategory = RifEclipseSummaryAddress::SUMMARY_BLOCK_LGR;
lgrName = lgrNameFromNode(ertSumVarNode); lgrName = stringFromPointer(ertSumVarNode.get_lgr_name());
const int* ijk = smspec_node_get_lgr_ijk(ertSumVarNode);
cellI = ijk[0]; auto ijk = ertSumVarNode.get_lgr_ijk();
cellJ = ijk[1]; cellI = ijk[0];
cellK = ijk[2]; cellJ = ijk[1];
cellK = ijk[2];
} }
break; break;
case ECL_SMSPEC_LOCAL_COMPLETION_VAR: { case ECL_SMSPEC_LOCAL_COMPLETION_VAR: {
sumCategory = RifEclipseSummaryAddress::SUMMARY_WELL_COMPLETION_LGR; sumCategory = RifEclipseSummaryAddress::SUMMARY_WELL_COMPLETION_LGR;
wellName = wellNameFromNode(ertSumVarNode); wellName = stringFromPointer(ertSumVarNode.get_wgname());
lgrName = lgrNameFromNode(ertSumVarNode); lgrName = stringFromPointer(ertSumVarNode.get_lgr_name());
const int* ijk = smspec_node_get_lgr_ijk(ertSumVarNode);
cellI = ijk[0]; auto ijk = ertSumVarNode.get_lgr_ijk();
cellJ = ijk[1]; cellI = ijk[0];
cellK = ijk[2]; cellJ = ijk[1];
cellK = ijk[2];
} }
break; break;
case ECL_SMSPEC_LOCAL_WELL_VAR: { case ECL_SMSPEC_LOCAL_WELL_VAR: {
sumCategory = RifEclipseSummaryAddress::SUMMARY_WELL_LGR; sumCategory = RifEclipseSummaryAddress::SUMMARY_WELL_LGR;
wellName = wellNameFromNode(ertSumVarNode); wellName = stringFromPointer(ertSumVarNode.get_wgname());
lgrName = lgrNameFromNode(ertSumVarNode); lgrName = stringFromPointer(ertSumVarNode.get_lgr_name());
} }
break; break;
case ECL_SMSPEC_NETWORK_VAR: { case ECL_SMSPEC_NETWORK_VAR: {
@ -360,14 +358,14 @@ RifEclipseSummaryAddress addressFromErtSmSpecNode(const smspec_node_type* ertSum
break; break;
case ECL_SMSPEC_REGION_2_REGION_VAR: { case ECL_SMSPEC_REGION_2_REGION_VAR: {
sumCategory = RifEclipseSummaryAddress::SUMMARY_REGION_2_REGION; sumCategory = RifEclipseSummaryAddress::SUMMARY_REGION_2_REGION;
regionNumber = smspec_node_get_R1(ertSumVarNode); regionNumber = ertSumVarNode.get_R1();
regionNumber2 = smspec_node_get_R2(ertSumVarNode); regionNumber2 = ertSumVarNode.get_R2();
} }
break; break;
case ECL_SMSPEC_SEGMENT_VAR: { case ECL_SMSPEC_SEGMENT_VAR: {
sumCategory = RifEclipseSummaryAddress::SUMMARY_WELL_SEGMENT; sumCategory = RifEclipseSummaryAddress::SUMMARY_WELL_SEGMENT;
wellName = wellNameFromNode(ertSumVarNode); wellName = stringFromPointer(ertSumVarNode.get_wgname());
wellSegmentNumber = smspec_node_get_num(ertSumVarNode); wellSegmentNumber = ertSumVarNode.get_num();
} }
break; break;
case ECL_SMSPEC_MISC_VAR: { case ECL_SMSPEC_MISC_VAR: {
@ -415,8 +413,8 @@ bool RifReaderEclipseSummary::values(const RifEclipseSummaryAddress& resultAddre
} }
else if (m_ecl_SmSpec) else if (m_ecl_SmSpec)
{ {
const smspec_node_type* ertSumVarNode = ecl_smspec_iget_node(m_ecl_SmSpec, variableIndex); const ecl::smspec_node& ertSumVarNode = ecl_smspec_iget_node_w_node_index(m_ecl_SmSpec, variableIndex);
int paramsIndex = smspec_node_get_params_index(ertSumVarNode); int paramsIndex = ertSumVarNode.get_params_index();
double_vector_type* dataValues = ecl_sum_alloc_data_vector(m_ecl_sum, paramsIndex, false); double_vector_type* dataValues = ecl_sum_alloc_data_vector(m_ecl_sum, paramsIndex, false);
@ -483,7 +481,7 @@ void RifReaderEclipseSummary::buildMetaData()
int varCount = ecl_smspec_num_nodes(m_ecl_SmSpec); int varCount = ecl_smspec_num_nodes(m_ecl_SmSpec);
for (int i = 0; i < varCount; i++) for (int i = 0; i < varCount; i++)
{ {
const smspec_node_type* ertSumVarNode = ecl_smspec_iget_node(m_ecl_SmSpec, i); const ecl::smspec_node& ertSumVarNode = ecl_smspec_iget_node_w_node_index(m_ecl_SmSpec, i);
RifEclipseSummaryAddress addr = addressFromErtSmSpecNode(ertSumVarNode); RifEclipseSummaryAddress addr = addressFromErtSmSpecNode(ertSumVarNode);
m_allResultAddresses.insert(addr); m_allResultAddresses.insert(addr);
m_resultAddressToErtNodeIdx[addr] = i; m_resultAddressToErtNodeIdx[addr] = i;
@ -529,8 +527,8 @@ std::string RifReaderEclipseSummary::unitName(const RifEclipseSummaryAddress& re
if (variableIndex < 0) return ""; if (variableIndex < 0) return "";
const smspec_node_type* ertSumVarNode = ecl_smspec_iget_node(m_ecl_SmSpec, variableIndex); const ecl::smspec_node& ertSumVarNode = ecl_smspec_iget_node_w_node_index(m_ecl_SmSpec, variableIndex);
return smspec_node_get_unit(ertSumVarNode); return ertSumVarNode.get_unit();
} }
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
@ -576,6 +574,7 @@ std::set<RifReaderEclipseSummary::ValuesCache*> RifReaderEclipseSummary::ValuesC
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
RifReaderEclipseSummary::ValuesCache::ValuesCache() RifReaderEclipseSummary::ValuesCache::ValuesCache()
{ {
// Register instance
m_instances.insert(this); m_instances.insert(this);
} }
@ -584,6 +583,7 @@ RifReaderEclipseSummary::ValuesCache::ValuesCache()
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
RifReaderEclipseSummary::ValuesCache::~ValuesCache() RifReaderEclipseSummary::ValuesCache::~ValuesCache()
{ {
// Deregister instance
m_instances.erase(this); m_instances.erase(this);
} }
@ -631,7 +631,7 @@ void RifReaderEclipseSummary::ValuesCache::purge()
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
void RifReaderEclipseSummary::ValuesCache::purgeData() void RifReaderEclipseSummary::ValuesCache::purgeData()
{ {
for (const auto& purgeAddr : m_purgeList) for (const auto purgeAddr : m_purgeList)
{ {
m_cachedValues.erase(purgeAddr); m_cachedValues.erase(purgeAddr);
} }