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

Whitespace

Browse Source
This commit is contained in:
Magne Sjaastad 2019-04-01 14:43:55 +02:00
parent 11f9b1fe21
commit 014f389fe3
2 changed files with 150 additions and 145 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

74
ApplicationCode/FileInterface/RifReaderEclipseSummary.cpp
View File

@ -17,25 +17,30 @@
/////////////////////////////////////////////////////////////////////////////////
#include "RifReaderEclipseSummary.h"
#include "RiaStringEncodingTools.h"
#include "RiaFilePathTools.h"
#include "RifReaderEclipseOutput.h"
#include "RifEclipseSummaryTools.h"
#include <string>
#include "RiaFilePathTools.h"
#include "RiaStringEncodingTools.h"
#include "RifEclipseSummaryTools.h"
#include "RifReaderEclipseOutput.h"
#include <cassert>
#include <string>
#include <QDateTime>
#include <QDir>
#include <QString>
#include <QStringList>
#include <QDir>
#include "ert/ecl/ecl_file.h"
#include "ert/ecl/ecl_kw.h"
#include "ert/ecl/ecl_kw_magic.h"
#include "ert/ecl/ecl_sum.h"
#include "ert/ecl/smspec_node.h"
#include "ert/ecl/ecl_file.h"
#include "ert/ecl/ecl_kw_magic.h"
#include "ert/ecl/ecl_kw.h"
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
std::vector<time_t> getTimeSteps(ecl_sum_type* ecl_sum)
{
std::vector<time_t> timeSteps;
@ -53,7 +58,6 @@ std::vector<time_t> getTimeSteps(ecl_sum_type* ecl_sum)
time_t_vector_free(steps);
}
}
return timeSteps;
}
@ -98,14 +102,14 @@ ecl_sum_type* openEclSum(const QString& inHeaderFileName, bool includeRestartFil
//--------------------------------------------------------------------------------------------------
void closeEclSum(ecl_sum_type* ecl_sum)
{
if(ecl_sum) ecl_sum_free(ecl_sum);
if (ecl_sum) ecl_sum_free(ecl_sum);
}
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
RifReaderEclipseSummary::RifReaderEclipseSummary()
: m_ecl_sum(nullptr),
m_ecl_SmSpec(nullptr)
: m_ecl_sum(nullptr)
, m_ecl_SmSpec(nullptr)
{
m_valuesCache.reset(new ValuesCache());
}
@ -158,7 +162,7 @@ std::vector<RifRestartFileInfo> RifReaderEclipseSummary::getRestartFiles(const Q
RifRestartFileInfo currFile;
currFile.fileName = headerFileName;
while(!currFile.fileName.isEmpty())
while (!currFile.fileName.isEmpty())
{
// Due to a weakness in libecl regarding restart summary header file selection,
// do some extra checking
@ -198,11 +202,9 @@ std::vector<RifRestartFileInfo> RifReaderEclipseSummary::getRestartFiles(const Q
*hasWarnings = true;
break;
}
}
if (!currFile.fileName.isEmpty())
restartFiles.push_back(currFile);
if (!currFile.fileName.isEmpty()) restartFiles.push_back(currFile);
}
return restartFiles;
}
@ -244,7 +246,7 @@ std::string stringFromPointer(const char* pointerToChar)
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
std::string wellNameFromNode(const smspec_node_type * ertSumVarNode)
std::string wellNameFromNode(const smspec_node_type* ertSumVarNode)
{
return stringFromPointer(smspec_node_get_wgname(ertSumVarNode));
}
@ -252,7 +254,7 @@ std::string wellNameFromNode(const smspec_node_type * ertSumVarNode)
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
std::string lgrNameFromNode(const smspec_node_type * ertSumVarNode)
std::string lgrNameFromNode(const smspec_node_type* ertSumVarNode)
{
return stringFromPointer(smspec_node_get_lgr_name(ertSumVarNode));
}
@ -260,7 +262,7 @@ std::string lgrNameFromNode(const smspec_node_type * ertSumVarNode)
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
RifEclipseSummaryAddress addressFromErtSmSpecNode(const smspec_node_type * ertSumVarNode)
RifEclipseSummaryAddress addressFromErtSmSpecNode(const smspec_node_type* ertSumVarNode)
{
if (smspec_node_get_var_type(ertSumVarNode) == ECL_SMSPEC_INVALID_VAR)
{
@ -372,7 +374,6 @@ RifEclipseSummaryAddress addressFromErtSmSpecNode(const smspec_node_type * ertSu
sumCategory = RifEclipseSummaryAddress::SUMMARY_REGION_2_REGION;
regionNumber = smspec_node_get_R1(ertSumVarNode);
regionNumber2 = smspec_node_get_R2(ertSumVarNode);
}
break;
case ECL_SMSPEC_SEGMENT_VAR:
@ -400,7 +401,9 @@ RifEclipseSummaryAddress addressFromErtSmSpecNode(const smspec_node_type * ertSu
wellName,
wellSegmentNumber,
lgrName,
cellI, cellJ, cellK,
cellI,
cellJ,
cellK,
aquiferNumber,
isErrorResult);
}
@ -414,7 +417,7 @@ bool RifReaderEclipseSummary::values(const RifEclipseSummaryAddress& resultAddre
int variableIndex = indexFromAddress(resultAddress);
if ( variableIndex < 0 ) return false;
if (variableIndex < 0) return false;
values->clear();
values->reserve(timeStepCount());
@ -489,12 +492,12 @@ void RifReaderEclipseSummary::buildMetaData()
m_allResultAddresses.clear();
m_resultAddressToErtNodeIdx.clear();
if(m_ecl_SmSpec)
if (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 smspec_node_type* ertSumVarNode = ecl_smspec_iget_node(m_ecl_SmSpec, i);
RifEclipseSummaryAddress addr = addressFromErtSmSpecNode(ertSumVarNode);
m_allResultAddresses.insert(addr);
m_resultAddressToErtNodeIdx[addr] = i;
@ -511,7 +514,7 @@ RifRestartFileInfo RifReaderEclipseSummary::getRestartFile(const QString& header
const ecl_smspec_type* smspec = ecl_sum ? ecl_sum_get_smspec(ecl_sum) : nullptr;
const char* rstCase = smspec ? ecl_smspec_get_restart_case(smspec) : nullptr;
QString restartCase = rstCase? RiaFilePathTools::canonicalPath(RiaStringEncodingTools::fromNativeEncoded(rstCase)) : "";
QString restartCase = rstCase ? RiaFilePathTools::canonicalPath(RiaStringEncodingTools::fromNativeEncoded(rstCase)) : "";
closeEclSum(ecl_sum);
if (!restartCase.isEmpty())
@ -519,7 +522,8 @@ RifRestartFileInfo RifReaderEclipseSummary::getRestartFile(const QString& header
QString path = QFileInfo(restartCase).dir().path();
QString restartBase = QDir(restartCase).dirName();
char* smspec_header = ecl_util_alloc_exfilename(path.toStdString().data(), restartBase.toStdString().data(), ECL_SUMMARY_HEADER_FILE, false /*unformatted*/, 0);
char* smspec_header = ecl_util_alloc_exfilename(
path.toStdString().data(), restartBase.toStdString().data(), ECL_SUMMARY_HEADER_FILE, false /*unformatted*/, 0);
QString restartFileName = RiaFilePathTools::toInternalSeparator(RiaStringEncodingTools::fromNativeEncoded(smspec_header));
free(smspec_header);
@ -537,9 +541,9 @@ std::string RifReaderEclipseSummary::unitName(const RifEclipseSummaryAddress& re
int variableIndex = indexFromAddress(resultAddress);
if(variableIndex < 0) return "";
if (variableIndex < 0) return "";
const smspec_node_type * ertSumVarNode = ecl_smspec_iget_node(m_ecl_SmSpec, variableIndex);
const smspec_node_type* ertSumVarNode = ecl_smspec_iget_node(m_ecl_SmSpec, variableIndex);
return smspec_node_get_unit(ertSumVarNode);
}
@ -586,7 +590,6 @@ std::set<RifReaderEclipseSummary::ValuesCache*> RifReaderEclipseSummary::ValuesC
//--------------------------------------------------------------------------------------------------
RifReaderEclipseSummary::ValuesCache::ValuesCache()
{
// Register instance
m_instances.insert(this);
}
@ -595,14 +598,14 @@ RifReaderEclipseSummary::ValuesCache::ValuesCache()
//--------------------------------------------------------------------------------------------------
RifReaderEclipseSummary::ValuesCache::~ValuesCache()
{
// Deregister instance
m_instances.erase(this);
}
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
void RifReaderEclipseSummary::ValuesCache::insertValues(const RifEclipseSummaryAddress& address, const std::vector<double>& values)
void RifReaderEclipseSummary::ValuesCache::insertValues(const RifEclipseSummaryAddress& address,
const std::vector<double>& values)
{
m_cachedValues[address] = values;
m_purgeList.erase(address);
@ -633,7 +636,8 @@ void RifReaderEclipseSummary::ValuesCache::markAddressForPurge(const RifEclipseS
//--------------------------------------------------------------------------------------------------
void RifReaderEclipseSummary::ValuesCache::purge()
{
for (auto instance : m_instances) instance->purgeData();
for (auto instance : m_instances)
instance->purgeData();
}
//--------------------------------------------------------------------------------------------------
@ -641,7 +645,7 @@ void RifReaderEclipseSummary::ValuesCache::purge()
//--------------------------------------------------------------------------------------------------
void RifReaderEclipseSummary::ValuesCache::purgeData()
{
for (const auto purgeAddr : m_purgeList)
for (const auto& purgeAddr : m_purgeList)
{
m_cachedValues.erase(purgeAddr);
}

1
ApplicationCode/UnitTests/RifReaderEclipseSummary-Test.cpp
View File

@ -41,6 +41,7 @@ TEST(RifEclipseSummaryTest, BasicTestSetCurrentFolder)
bool hasWarning = false;
std::vector<RifRestartFileInfo> originFileInfos = eclSummary.getRestartFiles(summaryFileName, &hasWarning);
EXPECT_TRUE(originFileInfos.empty());
}
/*