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

#2097 Reservoir Phase Detection : Find available phases from result files

Browse Source
This commit is contained in:
Magne Sjaastad
2017-11-10 09:43:51 +01:00
parent f8a2250f3c
commit 5db08c7b76
13 changed files with 160 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

34
ApplicationCode/FileInterface/RifEclipseOutputFileTools.cpp
View File

@@ -383,6 +383,40 @@ QString RifEclipseOutputFileTools::createIndexFileName(const QString& resultFile
return indexFileName;
}
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
std::set<RiaDefines::PhaseType> RifEclipseOutputFileTools::findAvailablePhases(ecl_file_type* ecl_file)
{
std::set<RiaDefines::PhaseType> phaseTypes;
if (ecl_file)
{
const ecl_kw_type* intehead = ecl_file_iget_named_kw(ecl_file, INTEHEAD_KW, 0);
if (intehead)
{
int phases = ecl_kw_iget_int(intehead, INTEHEAD_PHASE_INDEX);
if (phases & ECL_OIL_PHASE)
{
phaseTypes.insert(RiaDefines::OIL_PHASE);
}
if (phases & ECL_GAS_PHASE)
{
phaseTypes.insert(RiaDefines::GAS_PHASE);
}
if (phases & ECL_WATER_PHASE)
{
phaseTypes.insert(RiaDefines::WATER_PHASE);
}
}
}
return phaseTypes;
}
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------

2
ApplicationCode/FileInterface/RifEclipseOutputFileTools.h
View File

@@ -69,6 +69,8 @@ public:
static QString createIndexFileName(const QString& resultFileName);
static std::set<RiaDefines::PhaseType> findAvailablePhases(ecl_file_type* ecl_file);
private:
static void createReportStepsMetaData(std::vector<ecl_file_type*> ecl_files, std::vector<RifRestartReportStep>* reportSteps);
};

2
ApplicationCode/FileInterface/RifEclipseRestartDataAccess.h
View File

@@ -108,4 +108,6 @@ public:
virtual void readWellData(well_info_type * well_info, bool importCompleteMswData) = 0;
virtual int readUnitsType() = 0;
virtual std::set<RiaDefines::PhaseType> availablePhases() const = 0;
};

15
ApplicationCode/FileInterface/RifEclipseRestartFilesetAccess.cpp
View File

@@ -294,6 +294,13 @@ void RifEclipseRestartFilesetAccess::openTimeStep(size_t timeStep)
ecl_file_type* ecl_file = ecl_file_open(m_fileNames[index].toAscii().data(), ECL_FILE_CLOSE_STREAM);
m_ecl_files[timeStep] = ecl_file;
if (ecl_file)
{
auto phases = RifEclipseOutputFileTools::findAvailablePhases(ecl_file);
m_availablePhases.insert(phases.begin(), phases.end());
}
}
}
@@ -313,6 +320,14 @@ int RifEclipseRestartFilesetAccess::readUnitsType()
return RifEclipseOutputFileTools::readUnitsType(ecl_file);
}
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
std::set<RiaDefines::PhaseType> RifEclipseRestartFilesetAccess::availablePhases() const
{
return m_availablePhases;
}
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------

3
ApplicationCode/FileInterface/RifEclipseRestartFilesetAccess.h
View File

@@ -54,6 +54,8 @@ public:
virtual void readWellData(well_info_type* well_info, bool importCompleteMswData);
virtual int readUnitsType();
virtual std::set<RiaDefines::PhaseType> availablePhases() const override;
private:
void openTimeStep(size_t timeStep);
@@ -63,4 +65,5 @@ private:
std::vector<double> m_daysSinceSimulationStart;
std::vector< ecl_file_type* > m_ecl_files;
std::set<RiaDefines::PhaseType> m_availablePhases;
};

11
ApplicationCode/FileInterface/RifEclipseUnifiedRestartFileAccess.cpp
View File

@@ -128,8 +128,11 @@ bool RifEclipseUnifiedRestartFileAccess::openFile()
}
}
if (!m_ecl_file) return false;
m_availablePhases = RifEclipseOutputFileTools::findAvailablePhases(m_ecl_file);
return true;
}
@@ -346,6 +349,14 @@ int RifEclipseUnifiedRestartFileAccess::readUnitsType()
return RifEclipseOutputFileTools::readUnitsType(m_ecl_file);
}
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
std::set<RiaDefines::PhaseType> RifEclipseUnifiedRestartFileAccess::availablePhases() const
{
return m_availablePhases;
}
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------

4
ApplicationCode/FileInterface/RifEclipseUnifiedRestartFileAccess.h
View File

@@ -57,6 +57,8 @@ public:
virtual void readWellData(well_info_type * well_info, bool importCompleteMswData);
virtual int readUnitsType();
virtual std::set<RiaDefines::PhaseType> availablePhases() const override;
private:
bool openFile();
bool useResultIndexFile() const;
@@ -69,4 +71,6 @@ private:
std::vector<QDateTime> m_timeSteps;
std::vector<double> m_daysSinceSimulationStart;
std::vector<int> m_reportNr;
std::set<RiaDefines::PhaseType> m_availablePhases;
};

13
ApplicationCode/FileInterface/RifReaderEclipseOutput.cpp
View File

@@ -2076,6 +2076,19 @@ void RifReaderEclipseOutput::transferCoarseningInfo(const ecl_grid_type* eclGrid
}
}
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
std::set<RiaDefines::PhaseType> RifReaderEclipseOutput::availablePhases() const
{
if (m_dynamicResultsAccess.notNull())
{
return m_dynamicResultsAccess->availablePhases();
}
return std::set<RiaDefines::PhaseType>();
}
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------

2
ApplicationCode/FileInterface/RifReaderEclipseOutput.h
View File

@@ -68,6 +68,8 @@ public:
static bool transferGeometry(const ecl_grid_type* mainEclGrid, RigEclipseCaseData* eclipseCase);
static void transferCoarseningInfo(const ecl_grid_type* eclGrid, RigGridBase* grid);
virtual std::set<RiaDefines::PhaseType> availablePhases() const override;
private:
bool readActiveCellInfo();
void buildMetaData();

8
ApplicationCode/FileInterface/RifReaderInterface.cpp
View File

@@ -64,6 +64,14 @@ void RifReaderInterface::setTimeStepFilter(const std::vector<size_t>& fileTimeSt
m_fileTimeStepIndices = fileTimeStepIndices;
}
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
std::set<RiaDefines::PhaseType> RifReaderInterface::availablePhases() const
{
return std::set<RiaDefines::PhaseType>();
}
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------

4
ApplicationCode/FileInterface/RifReaderInterface.h
View File

@@ -20,6 +20,7 @@
#pragma once
#include "RiaDefines.h"
#include "RiaPorosityModel.h"
#include "cvfBase.h"
@@ -31,6 +32,7 @@
#include <QStringList>
#include <vector>
#include <set>
class RigEclipseCaseData;
@@ -63,6 +65,8 @@ public:
void setTimeStepFilter(const std::vector<size_t>& fileTimeStepIndices);
virtual std::set<RiaDefines::PhaseType> availablePhases() const;
protected:
bool isTimeStepIncludedByFilter(size_t timeStepIndex) const;
size_t timeStepIndexOnFile(size_t timeStepIndex) const;