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

#1934 Observed Data : Support for vector based files

Browse Source
This commit is contained in:
Magne Sjaastad 2017-09-27 15:12:55 +02:00
parent 53ec396449
commit cdd1a96f44
8 changed files with 422 additions and 44 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
ApplicationCode/FileInterface/CMakeLists_files.cmake
View File

@ -31,6 +31,7 @@ ${CEE_CURRENT_LIST_DIR}RifEclipseSummaryAddressQMetaType.h
${CEE_CURRENT_LIST_DIR}RifWellPathImporter.h
${CEE_CURRENT_LIST_DIR}RifHdf5ReaderInterface.h
${CEE_CURRENT_LIST_DIR}RifColumnBasedUserData.h
${CEE_CURRENT_LIST_DIR}RifKeywordVectorUserData.h
# HDF5 file reader is directly included in ResInsight main CmakeList.txt
#${CEE_CURRENT_LIST_DIR}RifHdf5Reader.h
@ -68,6 +69,8 @@ ${CEE_CURRENT_LIST_DIR}RifEclipseSummaryAddress.cpp
${CEE_CURRENT_LIST_DIR}RifWellPathImporter.cpp
${CEE_CURRENT_LIST_DIR}RifHdf5ReaderInterface.cpp
${CEE_CURRENT_LIST_DIR}RifColumnBasedUserData.cpp
${CEE_CURRENT_LIST_DIR}RifKeywordVectorUserData.cpp
# HDF5 file reader is directly included in ResInsight main CmakeList.txt
#${CEE_CURRENT_LIST_DIR}RifHdf5Reader.cpp

29
ApplicationCode/FileInterface/RifColumnBasedUserData.cpp
View File

@ -48,31 +48,21 @@ RifColumnBasedUserData::~RifColumnBasedUserData()
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
bool RifColumnBasedUserData::open(const QString& headerFileName)
bool RifColumnBasedUserData::parse(const QString& data)
{
if (!caf::Utils::fileExists(headerFileName)) return false;
m_allResultAddresses.clear();
m_timeSteps.clear();
m_mapFromAddressToTimeStepIndex.clear();
m_mapFromAddressToResultIndex.clear();
QFile file(headerFileName);
if (!file.open(QIODevice::ReadOnly | QIODevice::Text))
{
RiaLogging::error(QString("Failed to open %1").arg(headerFileName));
return false;
}
QTextStream in(&file);
QString fileContents = in.readAll();
m_parser = std::unique_ptr<RifColumnBasedUserDataParser>(new RifColumnBasedUserDataParser(fileContents));
m_parser = std::unique_ptr<RifColumnBasedUserDataParser>(new RifColumnBasedUserDataParser(data));
if (!m_parser)
{
RiaLogging::error(QString("Failed to parse file %1").arg(headerFileName));
RiaLogging::error(QString("Failed to parse file"));
return false;
}
m_allResultAddresses.clear();
for (size_t tableIndex = 0; tableIndex < m_parser->tables().size(); tableIndex++)
{
size_t timeColumnIndex = m_parser->tables()[tableIndex].size();
@ -90,7 +80,7 @@ bool RifColumnBasedUserData::open(const QString& headerFileName)
if (timeColumnIndex == m_parser->tables()[tableIndex].size())
{
RiaLogging::warning(QString("Failed to find time data for table %1 in file %2").arg(tableIndex).arg(headerFileName));
RiaLogging::warning(QString("Failed to find time data for table %1 in file %2").arg(tableIndex));
RiaLogging::warning(QString("No data for this table is imported"));
}
else
@ -106,7 +96,7 @@ bool RifColumnBasedUserData::open(const QString& headerFileName)
timeSteps.push_back(v);
}
}
for (size_t columIndex = 0; columIndex < m_parser->tables()[tableIndex].size(); columIndex++)
{
const ColumnInfo& ci = m_parser->tables()[tableIndex][columIndex];
@ -123,6 +113,7 @@ bool RifColumnBasedUserData::open(const QString& headerFileName)
}
return true;
}
//--------------------------------------------------------------------------------------------------

2
ApplicationCode/FileInterface/RifColumnBasedUserData.h
View File

@ -42,7 +42,7 @@ public:
RifColumnBasedUserData();
~RifColumnBasedUserData();
bool open(const QString& headerFileName);
bool parse(const QString& data);
virtual const std::vector<time_t>& timeSteps(const RifEclipseSummaryAddress& resultAddress) const override;

254
ApplicationCode/FileInterface/RifKeywordVectorUserData.cpp Normal file
View File

@ -0,0 +1,254 @@
/////////////////////////////////////////////////////////////////////////////////
//
// Copyright (C) 2017- Statoil ASA
//
// ResInsight is free software: you can redistribute it and/or modify
// it under the terms of the GNU General Public License as published by
// the Free Software Foundation, either version 3 of the License, or
// (at your option) any later version.
//
// ResInsight is distributed in the hope that it will be useful, but WITHOUT ANY
// WARRANTY; without even the implied warranty of MERCHANTABILITY or
// FITNESS FOR A PARTICULAR PURPOSE.
//
// See the GNU General Public License at <http://www.gnu.org/licenses/gpl.html>
// for more details.
//
/////////////////////////////////////////////////////////////////////////////////
#include "RifKeywordVectorUserData.h"
#include "RiaLogging.h"
#include "RifEclipseSummaryAddress.h"
#include "RifKeywordVectorParser.h"
#include "RifRsmspecParserTools.h"
#include "cafUtils.h"
#include <QDateTime>
#include <QFile>
#include <QStringList>
#include <QTextStream>
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
RifKeywordVectorUserData::RifKeywordVectorUserData()
{
}
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
RifKeywordVectorUserData::~RifKeywordVectorUserData()
{
}
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
bool RifKeywordVectorUserData::parse(const QString& data)
{
m_allResultAddresses.clear();
m_timeSteps.clear();
m_parser = std::unique_ptr<RifKeywordVectorParser>(new RifKeywordVectorParser(data));
if (!m_parser)
{
RiaLogging::error(QString("Failed to parse file"));
return false;
}
std::vector<std::map<QString, QString>> keyValuePairVector;
for (const KeywordBasedVector& keywordVector : m_parser->keywordBasedVectors())
{
std::map<QString, QString> keyValuePairs;
for (auto s : keywordVector.header)
{
QString ss = QString::fromStdString(s);
QStringList entries = ss.split(" ");
if (entries.size() == 2)
{
keyValuePairs[entries[0]] = entries[1];
}
}
keyValuePairVector.push_back(keyValuePairs);
}
// Find all time vectors
for (size_t i = 0; i < keyValuePairVector.size(); i++)
{
const std::map<QString, QString>& keyValuePairs = keyValuePairVector[i];
if (isTimeHeader(keyValuePairs))
{
QString unitText = valueForKey(keyValuePairs, "UNITS");
if (unitText.compare("YEAR", Qt::CaseInsensitive) == 0)
{
std::vector<time_t> ts;
for (const auto& year : m_parser->keywordBasedVectors()[i].values)
{
ts.push_back(secondsSinceEpochForYear(year));
}
m_timeSteps.push_back(ts);
QString originText = valueForKey(keyValuePairs, "ORIGIN");
m_mapFromOriginToTimeStepIndex[originText] = m_timeSteps.size() - 1;
}
}
}
// Find all data vectors having a reference to a time step vector
for (size_t i = 0; i < keyValuePairVector.size(); i++)
{
const std::map<QString, QString>& keyValuePairs = keyValuePairVector[i];
if (!isTimeHeader(keyValuePairs))
{
if (isVectorHeader(keyValuePairs))
{
QString originText = valueForKey(keyValuePairs, "ORIGIN");
auto timeStepIndexIterator = m_mapFromOriginToTimeStepIndex.find(originText);
if (timeStepIndexIterator != m_mapFromOriginToTimeStepIndex.end())
{
QString vectorText = valueForKey(keyValuePairs, "VECTOR");
RifEclipseSummaryAddress addr(RifEclipseSummaryAddress::SUMMARY_WELL,
vectorText.toStdString(),
-1,
-1,
"",
originText.toStdString(),
-1,
"",
-1,
-1,
-1
);
m_allResultAddresses.push_back(addr);
m_mapFromAddressToTimeIndex[addr] = timeStepIndexIterator->second;
m_mapFromAddressToVectorIndex[addr] = i;
}
}
}
}
return true;
}
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
bool RifKeywordVectorUserData::values(const RifEclipseSummaryAddress& resultAddress, std::vector<double>* values) const
{
auto search = m_mapFromAddressToVectorIndex.find(resultAddress);
if (search == m_mapFromAddressToVectorIndex.end()) return false;
for (const auto& v : m_parser->keywordBasedVectors()[search->second].values)
{
values->push_back(v);
}
return true;
}
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
const std::vector<time_t>& RifKeywordVectorUserData::timeSteps(const RifEclipseSummaryAddress& resultAddress) const
{
auto timeIndexIterator = m_mapFromAddressToTimeIndex.find(resultAddress);
if (timeIndexIterator != m_mapFromAddressToTimeIndex.end())
{
return m_timeSteps[timeIndexIterator->second];
}
static std::vector<time_t> emptyVector;
return emptyVector;
}
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
std::string RifKeywordVectorUserData::unitName(const RifEclipseSummaryAddress& resultAddress) const
{
return "";
}
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
bool RifKeywordVectorUserData::isTimeHeader(const std::map<QString, QString>& header)
{
for (const auto& keyValue : header)
{
if (keyValue.first == "VECTOR" && keyValue.second == "YEARX")
{
return true;
}
}
return false;
}
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
bool RifKeywordVectorUserData::isVectorHeader(const std::map<QString, QString>& header)
{
for (const auto& keyValue : header)
{
if (keyValue.first == "VECTOR")
{
return true;
}
}
return false;
}
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
QString RifKeywordVectorUserData::valueForKey(const std::map<QString, QString>& header, const QString& key)
{
auto it = header.find(key);
if (it != header.end())
{
return it->second;
}
return "";
}
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
double RifKeywordVectorUserData::secondsSinceEpochForYear(double year)
{
static double secondsPerDay = 60.0 * 60.0* 24.0;
static double secondsPerYear = secondsPerDay * 365.0;
double yearsSinceEphoch = year - 1970.0;
double secondsSinceEpoch = yearsSinceEphoch * secondsPerYear;
return secondsSinceEpoch;
}

69
ApplicationCode/FileInterface/RifKeywordVectorUserData.h Normal file
View File

@ -0,0 +1,69 @@
/////////////////////////////////////////////////////////////////////////////////
//
// Copyright (C) 2017- Statoil ASA
//
// ResInsight is free software: you can redistribute it and/or modify
// it under the terms of the GNU General Public License as published by
// the Free Software Foundation, either version 3 of the License, or
// (at your option) any later version.
//
// ResInsight is distributed in the hope that it will be useful, but WITHOUT ANY
// WARRANTY; without even the implied warranty of MERCHANTABILITY or
// FITNESS FOR A PARTICULAR PURPOSE.
//
// See the GNU General Public License at <http://www.gnu.org/licenses/gpl.html>
// for more details.
//
/////////////////////////////////////////////////////////////////////////////////
#pragma once
#include "RifSummaryReaderInterface.h"
#include <map>
#include <memory>
#include <string>
#include <vector>
class QDateTime;
class QString;
class RifKeywordVectorParser;
class RifEclipseSummaryAddress;
//==================================================================================================
//
//
//==================================================================================================
class RifKeywordVectorUserData : public RifSummaryReaderInterface
{
public:
RifKeywordVectorUserData();
~RifKeywordVectorUserData();
bool parse(const QString& data);
virtual const std::vector<time_t>& timeSteps(const RifEclipseSummaryAddress& resultAddress) const override;
virtual bool values(const RifEclipseSummaryAddress& resultAddress,
std::vector<double>* values) const override;
std::string unitName(const RifEclipseSummaryAddress& resultAddress) const override;
private:
static bool isTimeHeader(const std::map<QString, QString>& header);
static bool isVectorHeader(const std::map<QString, QString>& header);
static QString valueForKey(const std::map<QString, QString>& header, const QString& key);
static double secondsSinceEpochForYear(double year);
private:
std::unique_ptr<RifKeywordVectorParser> m_parser;
std::vector< std::vector<time_t> > m_timeSteps;
std::map<QString, size_t> m_mapFromOriginToTimeStepIndex;
std::map<RifEclipseSummaryAddress, size_t> m_mapFromAddressToVectorIndex;
std::map<RifEclipseSummaryAddress, size_t> m_mapFromAddressToTimeIndex;
};

42
ApplicationCode/ProjectDataModel/Summary/RimColumnBasedUserData.cpp
View File

@ -18,12 +18,18 @@
#include "RimColumnBasedUserData.h"
#include "RifColumnBasedUserDataParser.h"
#include "RiaLogging.h"
#include "RifColumnBasedUserData.h"
#include "RifColumnBasedUserDataParser.h"
#include "RifKeywordVectorParser.h"
#include "RifKeywordVectorUserData.h"
#include "RifSummaryReaderInterface.h"
#include "cafUtils.h"
#include <QFile>
CAF_PDM_SOURCE_INIT(RimColumnBasedUserData, "RimColumnBasedUserData");
@ -50,12 +56,40 @@ RimColumnBasedUserData::~RimColumnBasedUserData()
//--------------------------------------------------------------------------------------------------
void RimColumnBasedUserData::createSummaryReaderInterface()
{
m_summeryReader = nullptr;
if (caf::Utils::fileExists(this->summaryHeaderFilename()))
{
m_summeryReader = new RifColumnBasedUserData();
if (!m_summeryReader->open(this->summaryHeaderFilename()))
QFile file(this->summaryHeaderFilename());
if (!file.open(QIODevice::ReadOnly | QIODevice::Text))
{
m_summeryReader = nullptr;
RiaLogging::error(QString("Failed to open %1").arg(this->summaryHeaderFilename()));
return;
}
QTextStream in(&file);
QString fileContents = in.readAll();
if (RifKeywordVectorParser::canBeParsed(fileContents))
{
RifKeywordVectorUserData* keywordVectorUserData = new RifKeywordVectorUserData();
if (keywordVectorUserData->parse(fileContents))
{
m_summeryReader = keywordVectorUserData;
}
}
else
{
RifColumnBasedUserData* columnBaseUserData = new RifColumnBasedUserData();
if (!columnBaseUserData->parse(fileContents))
{
columnBaseUserData = nullptr;
}
else
{
m_summeryReader = columnBaseUserData;
}
}
}
else

4
ApplicationCode/ProjectDataModel/Summary/RimColumnBasedUserData.h
View File

@ -24,7 +24,7 @@
#include "cafPdmField.h"
#include "cvfObject.h"
class RifColumnBasedUserData;
class RifSummaryReaderInterface;
//==================================================================================================
//
@ -41,5 +41,5 @@ public:
virtual RifSummaryReaderInterface* summaryReader() override;
private:
cvf::ref<RifColumnBasedUserData> m_summeryReader;
cvf::ref<RifSummaryReaderInterface> m_summeryReader;
};

63
ApplicationCode/ProjectDataModel/Summary/RimObservedDataCollection.cpp
View File

@ -19,10 +19,18 @@
#include "RimObservedDataCollection.h"
#include "RimObservedData.h"
#include "RiaLogging.h"
#include "RifKeywordVectorParser.h"
#include "RimColumnBasedUserData.h"
#include "RimObservedData.h"
#include "RimSummaryObservedDataFile.h"
#include "cafUtils.h"
#include <QFile>
CAF_PDM_SOURCE_INIT(RimObservedDataCollection, "ObservedDataCollection");
//--------------------------------------------------------------------------------------------------
@ -68,27 +76,46 @@ RimObservedData* RimObservedDataCollection::createAndAddObservedDataFromFileName
{
RimObservedData* observedData = nullptr;
if (fileName.endsWith(".rsm", Qt::CaseInsensitive))
if (caf::Utils::fileExists(fileName))
{
RimColumnBasedUserData* columnBasedUserData = new RimColumnBasedUserData();
QFile file(fileName);
if (!file.open(QIODevice::ReadOnly | QIODevice::Text))
{
RiaLogging::error(QString("Failed to open %1").arg(fileName));
observedData = columnBasedUserData;
}
// else
// {
// RimSummaryObservedDataFile* newObservedData = new RimSummaryObservedDataFile();
//
// observedData = newObservedData;
// }
return nullptr;
}
if (observedData)
{
this->m_observedDataArray.push_back(observedData);
observedData->setSummaryHeaderFileName(fileName);
observedData->createSummaryReaderInterface();
observedData->updateOptionSensitivity();
QTextStream in(&file);
QString fileContents = in.readAll();
this->updateConnectedEditors();
bool eclipseUserData = false;
if (fileName.endsWith(".rsm", Qt::CaseInsensitive))
{
eclipseUserData = true;
}
if (RifKeywordVectorParser::canBeParsed(fileContents))
{
eclipseUserData = true;
}
if (eclipseUserData)
{
RimColumnBasedUserData* columnBasedUserData = new RimColumnBasedUserData();
observedData = columnBasedUserData;
}
if (observedData)
{
this->m_observedDataArray.push_back(observedData);
observedData->setSummaryHeaderFileName(fileName);
observedData->createSummaryReaderInterface();
observedData->updateOptionSensitivity();
this->updateConnectedEditors();
}
}
return observedData;