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

#1918 : Observed Data : Rename of several files

Browse Source
This commit is contained in:
Magne Sjaastad 2017-09-27 10:19:24 +02:00
parent a24ce670cf
commit dc23c63b97
11 changed files with 63 additions and 55 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
ApplicationCode/FileInterface/CMakeLists_files.cmake
View File

@ -18,7 +18,7 @@ ${CEE_CURRENT_LIST_DIR}RifReaderEclipseOutput.h
${CEE_CURRENT_LIST_DIR}RifSummaryReaderInterface.h
${CEE_CURRENT_LIST_DIR}RifColumnBasedAsciiParser.h
${CEE_CURRENT_LIST_DIR}RifRsmspecParserTools.h
${CEE_CURRENT_LIST_DIR}RifColumnBasedRsmspecParser.h
${CEE_CURRENT_LIST_DIR}RifColumnBasedUserDataParser.h
${CEE_CURRENT_LIST_DIR}RifKeywordVectorParser.h
${CEE_CURRENT_LIST_DIR}RifReaderObservedData.h
${CEE_CURRENT_LIST_DIR}RifReaderEclipseSummary.h
@ -30,7 +30,7 @@ ${CEE_CURRENT_LIST_DIR}RifEclipseSummaryAddress.h
${CEE_CURRENT_LIST_DIR}RifEclipseSummaryAddressQMetaType.h
${CEE_CURRENT_LIST_DIR}RifWellPathImporter.h
${CEE_CURRENT_LIST_DIR}RifHdf5ReaderInterface.h
${CEE_CURRENT_LIST_DIR}RifReaderRmspecColumnBasedData.h
${CEE_CURRENT_LIST_DIR}RifColumnBasedUserData.h
# HDF5 file reader is directly included in ResInsight main CmakeList.txt
#${CEE_CURRENT_LIST_DIR}RifHdf5Reader.h
@ -56,7 +56,7 @@ ${CEE_CURRENT_LIST_DIR}RifReaderEclipseOutput.cpp
${CEE_CURRENT_LIST_DIR}RifSummaryReaderInterface.cpp
${CEE_CURRENT_LIST_DIR}RifColumnBasedAsciiParser.cpp
${CEE_CURRENT_LIST_DIR}RifRsmspecParserTools.cpp
${CEE_CURRENT_LIST_DIR}RifColumnBasedRsmspecParser.cpp
${CEE_CURRENT_LIST_DIR}RifColumnBasedUserDataParser.cpp
${CEE_CURRENT_LIST_DIR}RifKeywordVectorParser.cpp
${CEE_CURRENT_LIST_DIR}RifReaderObservedData.cpp
${CEE_CURRENT_LIST_DIR}RifReaderEclipseSummary.cpp
@ -67,7 +67,7 @@ ${CEE_CURRENT_LIST_DIR}RifReaderSettings.cpp
${CEE_CURRENT_LIST_DIR}RifEclipseSummaryAddress.cpp
${CEE_CURRENT_LIST_DIR}RifWellPathImporter.cpp
${CEE_CURRENT_LIST_DIR}RifHdf5ReaderInterface.cpp
${CEE_CURRENT_LIST_DIR}RifReaderRmspecColumnBasedData.cpp
${CEE_CURRENT_LIST_DIR}RifColumnBasedUserData.cpp
# HDF5 file reader is directly included in ResInsight main CmakeList.txt
#${CEE_CURRENT_LIST_DIR}RifHdf5Reader.cpp

18
ApplicationCode/FileInterface/RifReaderRmspecColumnBasedData.cpp → ApplicationCode/FileInterface/RifColumnBasedUserData.cpp
View File

@ -16,11 +16,11 @@
//
/////////////////////////////////////////////////////////////////////////////////
#include "RifReaderRmspecColumnBasedData.h"
#include "RifColumnBasedUserData.h"
#include "RiaLogging.h"
#include "RifColumnBasedRsmspecParser.h"
#include "RifColumnBasedUserDataParser.h"
#include "RifRsmspecParserTools.h"
#include "cafUtils.h"
@ -32,7 +32,7 @@
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
RifReaderRmspecColumnBasedData::RifReaderRmspecColumnBasedData()
RifColumnBasedUserData::RifColumnBasedUserData()
{
}
@ -40,7 +40,7 @@ RifReaderRmspecColumnBasedData::RifReaderRmspecColumnBasedData()
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
RifReaderRmspecColumnBasedData::~RifReaderRmspecColumnBasedData()
RifColumnBasedUserData::~RifColumnBasedUserData()
{
}
@ -48,7 +48,7 @@ RifReaderRmspecColumnBasedData::~RifReaderRmspecColumnBasedData()
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
bool RifReaderRmspecColumnBasedData::open(const QString& headerFileName)
bool RifColumnBasedUserData::open(const QString& headerFileName)
{
if (!caf::Utils::fileExists(headerFileName)) return false;
@ -63,7 +63,7 @@ bool RifReaderRmspecColumnBasedData::open(const QString& headerFileName)
QTextStream in(&file);
QString fileContents = in.readAll();
m_parser = std::unique_ptr<RifColumnBasedRsmspecParser>(new RifColumnBasedRsmspecParser(fileContents));
m_parser = std::unique_ptr<RifColumnBasedUserDataParser>(new RifColumnBasedUserDataParser(fileContents));
if (!m_parser)
{
RiaLogging::error(QString("Failed to parse file %1").arg(headerFileName));
@ -128,7 +128,7 @@ bool RifReaderRmspecColumnBasedData::open(const QString& headerFileName)
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
bool RifReaderRmspecColumnBasedData::values(const RifEclipseSummaryAddress& resultAddress, std::vector<double>* values) const
bool RifColumnBasedUserData::values(const RifEclipseSummaryAddress& resultAddress, std::vector<double>* values) const
{
auto search = m_mapFromAddressToResultIndex.find(resultAddress);
if (search != m_mapFromAddressToResultIndex.end())
@ -148,7 +148,7 @@ bool RifReaderRmspecColumnBasedData::values(const RifEclipseSummaryAddress& resu
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
const std::vector<time_t>& RifReaderRmspecColumnBasedData::timeSteps(const RifEclipseSummaryAddress& resultAddress) const
const std::vector<time_t>& RifColumnBasedUserData::timeSteps(const RifEclipseSummaryAddress& resultAddress) const
{
auto search = m_mapFromAddressToTimeStepIndex.find(resultAddress);
if (search != m_mapFromAddressToTimeStepIndex.end())
@ -164,7 +164,7 @@ const std::vector<time_t>& RifReaderRmspecColumnBasedData::timeSteps(const RifEc
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
std::string RifReaderRmspecColumnBasedData::unitName(const RifEclipseSummaryAddress& resultAddress) const
std::string RifColumnBasedUserData::unitName(const RifEclipseSummaryAddress& resultAddress) const
{
auto search = m_mapFromAddressToResultIndex.find(resultAddress);
if (search != m_mapFromAddressToResultIndex.end())

10
ApplicationCode/FileInterface/RifReaderRmspecColumnBasedData.h → ApplicationCode/FileInterface/RifColumnBasedUserData.h
View File

@ -29,18 +29,18 @@
class QDateTime;
class QString;
class RifColumnBasedRsmspecParser;
class RifColumnBasedUserDataParser;
class RifEclipseSummaryAddress;
//==================================================================================================
//
//
//==================================================================================================
class RifReaderRmspecColumnBasedData : public RifSummaryReaderInterface
class RifColumnBasedUserData : public RifSummaryReaderInterface
{
public:
RifReaderRmspecColumnBasedData();
~RifReaderRmspecColumnBasedData();
RifColumnBasedUserData();
~RifColumnBasedUserData();
bool open(const QString& headerFileName);
@ -52,7 +52,7 @@ public:
std::string unitName(const RifEclipseSummaryAddress& resultAddress) const override;
private:
std::unique_ptr<RifColumnBasedRsmspecParser> m_parser;
std::unique_ptr<RifColumnBasedUserDataParser> m_parser;
std::vector< std::vector<time_t> > m_timeSteps;
std::map<RifEclipseSummaryAddress, size_t > m_mapFromAddressToTimeStepIndex;

8
ApplicationCode/FileInterface/RifColumnBasedRsmspecParser.cpp → ApplicationCode/FileInterface/RifColumnBasedUserDataParser.cpp
View File

@ -16,7 +16,7 @@
//
/////////////////////////////////////////////////////////////////////////////////
#include "RifColumnBasedRsmspecParser.h"
#include "RifColumnBasedUserDataParser.h"
#include "RifRsmspecParserTools.h"
@ -32,7 +32,7 @@
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
RifColumnBasedRsmspecParser::RifColumnBasedRsmspecParser(const QString& data)
RifColumnBasedUserDataParser::RifColumnBasedUserDataParser(const QString& data)
{
parseData(data);
}
@ -40,7 +40,7 @@ RifColumnBasedRsmspecParser::RifColumnBasedRsmspecParser(const QString& data)
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
const std::vector< std::vector<ColumnInfo> >& RifColumnBasedRsmspecParser::tables() const
const std::vector< std::vector<ColumnInfo> >& RifColumnBasedUserDataParser::tables() const
{
return m_tables;
}
@ -48,7 +48,7 @@ const std::vector< std::vector<ColumnInfo> >& RifColumnBasedRsmspecParser::table
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
void RifColumnBasedRsmspecParser::parseData(const QString& data)
void RifColumnBasedUserDataParser::parseData(const QString& data)
{
std::stringstream streamData;
streamData.str(data.toStdString());

4
ApplicationCode/FileInterface/RifColumnBasedRsmspecParser.h → ApplicationCode/FileInterface/RifColumnBasedUserDataParser.h
View File

@ -33,10 +33,10 @@ struct ColumnInfo;
//==================================================================================================
///
//==================================================================================================
class RifColumnBasedRsmspecParser
class RifColumnBasedUserDataParser
{
public:
RifColumnBasedRsmspecParser(const QString& data);
RifColumnBasedUserDataParser(const QString& data);
const std::vector< std::vector<ColumnInfo> >& tables() const;
private:

4
ApplicationCode/ProjectDataModel/Summary/CMakeLists_files.cmake
View File

@ -25,7 +25,7 @@ ${CEE_CURRENT_LIST_DIR}RimSummaryYAxisProperties.h
${CEE_CURRENT_LIST_DIR}RimObservedData.h
${CEE_CURRENT_LIST_DIR}RimObservedDataCollection.h
${CEE_CURRENT_LIST_DIR}RimSummaryObservedDataFile.h
${CEE_CURRENT_LIST_DIR}RimObservedRsmspecColumnBasedData.h
${CEE_CURRENT_LIST_DIR}RimColumnBasedUserData.h
)
set (SOURCE_GROUP_SOURCE_FILES
@ -49,7 +49,7 @@ ${CEE_CURRENT_LIST_DIR}RimSummaryYAxisProperties.cpp
${CEE_CURRENT_LIST_DIR}RimObservedData.cpp
${CEE_CURRENT_LIST_DIR}RimObservedDataCollection.cpp
${CEE_CURRENT_LIST_DIR}RimSummaryObservedDataFile.cpp
${CEE_CURRENT_LIST_DIR}RimObservedRsmspecColumnBasedData.cpp
${CEE_CURRENT_LIST_DIR}RimColumnBasedUserData.cpp
)
list(APPEND CODE_HEADER_FILES

18
ApplicationCode/ProjectDataModel/Summary/RimObservedRsmspecColumnBasedData.cpp → ApplicationCode/ProjectDataModel/Summary/RimColumnBasedUserData.cpp
View File

@ -16,22 +16,22 @@
//
/////////////////////////////////////////////////////////////////////////////////
#include "RimObservedRsmspecColumnBasedData.h"
#include "RimColumnBasedUserData.h"
#include "RifColumnBasedRsmspecParser.h"
#include "RifReaderRmspecColumnBasedData.h"
#include "RifColumnBasedUserDataParser.h"
#include "RifColumnBasedUserData.h"
#include "RifSummaryReaderInterface.h"
#include "cafUtils.h"
CAF_PDM_SOURCE_INIT(RimObservedRsmspecColumnBasedData, "RimObservedRsmspecColumnBasedData");
CAF_PDM_SOURCE_INIT(RimColumnBasedUserData, "RimColumnBasedUserData");
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
RimObservedRsmspecColumnBasedData::RimObservedRsmspecColumnBasedData()
RimColumnBasedUserData::RimColumnBasedUserData()
{
CAF_PDM_InitObject("Observed RSMSPEC Column Based Data File", ":/Default.png", "", "");
m_summaryHeaderFilename.uiCapability()->setUiName("File");
@ -40,7 +40,7 @@ RimObservedRsmspecColumnBasedData::RimObservedRsmspecColumnBasedData()
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
RimObservedRsmspecColumnBasedData::~RimObservedRsmspecColumnBasedData()
RimColumnBasedUserData::~RimColumnBasedUserData()
{
}
@ -48,11 +48,11 @@ RimObservedRsmspecColumnBasedData::~RimObservedRsmspecColumnBasedData()
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
void RimObservedRsmspecColumnBasedData::createSummaryReaderInterface()
void RimColumnBasedUserData::createSummaryReaderInterface()
{
if (caf::Utils::fileExists(this->summaryHeaderFilename()))
{
m_summeryReader = new RifReaderRmspecColumnBasedData();
m_summeryReader = new RifColumnBasedUserData();
if (!m_summeryReader->open(this->summaryHeaderFilename()))
{
m_summeryReader = nullptr;
@ -67,7 +67,7 @@ void RimObservedRsmspecColumnBasedData::createSummaryReaderInterface()
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
RifSummaryReaderInterface* RimObservedRsmspecColumnBasedData::summaryReader()
RifSummaryReaderInterface* RimColumnBasedUserData::summaryReader()
{
return m_summeryReader.p();
}

10
ApplicationCode/ProjectDataModel/Summary/RimObservedRsmspecColumnBasedData.h → ApplicationCode/ProjectDataModel/Summary/RimColumnBasedUserData.h
View File

@ -24,22 +24,22 @@
#include "cafPdmField.h"
#include "cvfObject.h"
class RifReaderRmspecColumnBasedData;
class RifColumnBasedUserData;
//==================================================================================================
//
//==================================================================================================
class RimObservedRsmspecColumnBasedData : public RimObservedData
class RimColumnBasedUserData : public RimObservedData
{
CAF_PDM_HEADER_INIT;
public:
RimObservedRsmspecColumnBasedData();
virtual ~RimObservedRsmspecColumnBasedData();
RimColumnBasedUserData();
virtual ~RimColumnBasedUserData();
virtual void createSummaryReaderInterface() override;
virtual RifSummaryReaderInterface* summaryReader() override;
private:
cvf::ref<RifReaderRmspecColumnBasedData> m_summeryReader;
cvf::ref<RifColumnBasedUserData> m_summeryReader;
};

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

@ -20,7 +20,7 @@
#include "RimObservedDataCollection.h"
#include "RimObservedData.h"
#include "RimObservedRsmspecColumnBasedData.h"
#include "RimColumnBasedUserData.h"
#include "RimSummaryObservedDataFile.h"
CAF_PDM_SOURCE_INIT(RimObservedDataCollection, "ObservedDataCollection");
@ -70,9 +70,9 @@ RimObservedData* RimObservedDataCollection::createAndAddObservedDataFromFileName
if (fileName.endsWith(".rsm", Qt::CaseInsensitive))
{
RimObservedRsmspecColumnBasedData* rsmspecColumnBasedData = new RimObservedRsmspecColumnBasedData();
RimColumnBasedUserData* columnBasedUserData = new RimColumnBasedUserData();
observedData = rsmspecColumnBasedData;
observedData = columnBasedUserData;
}
else
{

8
ApplicationCode/UnitTests/ObservedDataParser-Test.cpp
View File

@ -1,7 +1,7 @@
#include "gtest/gtest.h"
#include "RifColumnBasedAsciiParser.h"
#include "RifColumnBasedRsmspecParser.h"
#include "RifColumnBasedUserDataParser.h"
#include "RifKeywordVectorParser.h"
#include "RifRsmspecParserTools.h"
@ -286,7 +286,7 @@ TEST(RifColumnBasedRsmspecParserTest, TestKeywordsAndMissingUnitName)
out << "1709 2004.055 1.0E-12 1.0E-12 1.0E-12 1.0E-12 1.0E-12 1.0E-12 1.0E-12\n";
out << "\n";
RifColumnBasedRsmspecParser parser = RifColumnBasedRsmspecParser(data);
RifColumnBasedUserDataParser parser = RifColumnBasedUserDataParser(data);
std::vector< std::vector<ColumnInfo> > tables = parser.tables();
ASSERT_EQ(2, tables.size());
@ -354,7 +354,7 @@ TEST(RifColumnBasedRsmspecParserTest, TestTableValues)
out << " 4 0.0 0.0 370 0.0 0.0\n";
out << "\n";
RifColumnBasedRsmspecParser parser = RifColumnBasedRsmspecParser(data);
RifColumnBasedUserDataParser parser = RifColumnBasedUserDataParser(data);
std::vector< std::vector<ColumnInfo> > tables = parser.tables();
ASSERT_EQ(tables.size(), 2);
@ -526,7 +526,7 @@ TEST(RifKeywordBasedRsmspecParserTest, TestShutins)
RifColumnBasedRsmspecParser parser = RifColumnBasedRsmspecParser(data);
RifColumnBasedUserDataParser parser = RifColumnBasedUserDataParser(data);
std::vector< std::vector<ColumnInfo> > tables = parser.tables();
ASSERT_EQ(1, tables.size());

24
doc/observed_data.plantuml
View File

@ -1,21 +1,29 @@
@startuml
left to right direction
RigSummaryCaseData *-- "1" RifSummaryReaderInterface
RimSummaryCase *-- "1" RigSummaryCaseData
RifSummaryReaderInterface <|-- RifReaderEclipseSummary
RifSummaryReaderInterface <|-- RifReaderObservedData
RifSummaryReaderInterface <|- RifReaderEclipseSummary
RifSummaryReaderInterface <|- RifColumnBasedAsciiData
RifSummaryReaderInterface <|- RifColumnBasedUserData
RifSummaryReaderInterface <|- RifKeywordVectorUserData
RifReaderObservedData *-- "N" RifColumnBasedAsciiParser
RifColumnBasedAsciiData *-- "N" RifColumnBasedAsciiDataParser
RifColumnBasedUserData *-- "1" RifColumnBasedUserDataParser
RifKeywordVectorUserData *-- "1" RifKeywordVectorUserDataParser
RimSummaryCase <|-- RimFileSummaryCase
RimSummaryCase <|-- RimGridSummaryCase
RimSummaryCase <|-- RimObservedData
RimObservedData <|-- RimObservedAsciiColumnBasedData
RimObservedData <|-- RimAsciiColumnBasedData
RimObservedData <|-- RimColumnBasedUserData
RimObservedData <|-- RimKeywordVectorBasedUserData
RimObservedData <|-- RimObservedRsmspecColumnBasedData
RimObservedData <|-- RimObservedRsmspecKeywordBasedData
RimColumnBasedUserData *--> RifColumnBasedUserData
RimKeywordVectorBasedUserData *--> RifKeywordVectorUserData
RimAsciiColumnBasedData *--> RifColumnBasedAsciiData
RimFileSummaryCase *--> RifReaderEclipseSummary
RimGridSummaryCase *--> RifReaderEclipseSummary
@enduml