#4495 Active Cells : Add const to methods

This commit is contained in:
Magne Sjaastad
2019-06-19 13:10:51 +02:00
parent cf00cb4809
commit 3b8348ddba
2 changed files with 14 additions and 14 deletions

View File

@@ -123,7 +123,7 @@ void getDayMonthYear(const ecl_kw_type* intehead_kw, int* day, int* month, int*
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
/// Get list of time step texts (dates) /// Get list of time step texts (dates)
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
void RifEclipseOutputFileTools::timeSteps(ecl_file_type* ecl_file, std::vector<QDateTime>* timeSteps, std::vector<double>* daysSinceSimulationStart) void RifEclipseOutputFileTools::timeSteps(const ecl_file_type* ecl_file, std::vector<QDateTime>* timeSteps, std::vector<double>* daysSinceSimulationStart)
{ {
if (!ecl_file) return; if (!ecl_file) return;
@@ -183,7 +183,7 @@ void RifEclipseOutputFileTools::timeSteps(ecl_file_type* ecl_file, std::vector<Q
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
/// ///
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
bool RifEclipseOutputFileTools::keywordData(ecl_file_type* ecl_file, const QString& keyword, size_t fileKeywordOccurrence, std::vector<double>* values) bool RifEclipseOutputFileTools::keywordData(const ecl_file_type* ecl_file, const QString& keyword, size_t fileKeywordOccurrence, std::vector<double>* values)
{ {
bool result = false; bool result = false;
@@ -210,7 +210,7 @@ bool RifEclipseOutputFileTools::keywordData(ecl_file_type* ecl_file, const QStri
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
/// ///
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
bool RifEclipseOutputFileTools::keywordData(ecl_file_type* ecl_file, const QString& keyword, size_t fileKeywordOccurrence, std::vector<int>* values) bool RifEclipseOutputFileTools::keywordData(const ecl_file_type* ecl_file, const QString& keyword, size_t fileKeywordOccurrence, std::vector<int>* values)
{ {
bool result = false; bool result = false;
@@ -365,7 +365,7 @@ void RifEclipseOutputFileTools::readGridDimensions(const QString& gridFileName,
/// 3 : LAB /// 3 : LAB
/// -1 : No INTEHEAD keyword found /// -1 : No INTEHEAD keyword found
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
int RifEclipseOutputFileTools::readUnitsType(ecl_file_type* ecl_file) int RifEclipseOutputFileTools::readUnitsType(const ecl_file_type* ecl_file)
{ {
int unitsType = -1; int unitsType = -1;
@@ -427,7 +427,7 @@ QString RifEclipseOutputFileTools::createIndexFileName(const QString& resultFile
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
/// ///
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
std::set<RiaDefines::PhaseType> RifEclipseOutputFileTools::findAvailablePhases(ecl_file_type* ecl_file) std::set<RiaDefines::PhaseType> RifEclipseOutputFileTools::findAvailablePhases(const ecl_file_type* ecl_file)
{ {
std::set<RiaDefines::PhaseType> phaseTypes; std::set<RiaDefines::PhaseType> phaseTypes;
@@ -462,7 +462,7 @@ std::set<RiaDefines::PhaseType> RifEclipseOutputFileTools::findAvailablePhases(e
/// ///
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
void RifEclipseOutputFileTools::transferNncFluxData(const ecl_grid_type* grid, void RifEclipseOutputFileTools::transferNncFluxData(const ecl_grid_type* grid,
ecl_file_view_type* summaryView, const ecl_file_view_type* summaryView,
std::vector<double>* waterFlux, std::vector<double>* waterFlux,
std::vector<double>* oilFlux, std::vector<double>* oilFlux,
std::vector<double>* gasFlux) std::vector<double>* gasFlux)
@@ -501,7 +501,7 @@ void RifEclipseOutputFileTools::transferNncFluxData(const ecl_grid_type* grid,
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
/// ///
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
bool RifEclipseOutputFileTools::isExportedFromIntersect(ecl_file_type* ecl_file) bool RifEclipseOutputFileTools::isExportedFromIntersect(const ecl_file_type* ecl_file)
{ {
// This code is taken from ecl_file_get_ecl_version() in ecl_file.cpp // This code is taken from ecl_file_get_ecl_version() in ecl_file.cpp

View File

@@ -51,10 +51,10 @@ public:
static void findKeywordsAndItemCount(std::vector<ecl_file_type*> ecl_files, QStringList* resultNames, std::vector<size_t>* resultDataItemCounts); static void findKeywordsAndItemCount(std::vector<ecl_file_type*> ecl_files, QStringList* resultNames, std::vector<size_t>* resultDataItemCounts);
static bool keywordData(ecl_file_type* ecl_file, const QString& keyword, size_t fileKeywordOccurrence, std::vector<double>* values); static bool keywordData(const ecl_file_type* ecl_file, const QString& keyword, size_t fileKeywordOccurrence, std::vector<double>* values);
static bool keywordData(ecl_file_type* ecl_file, const QString& keyword, size_t fileKeywordOccurrence, std::vector<int>* values); static bool keywordData(const ecl_file_type* ecl_file, const QString& keyword, size_t fileKeywordOccurrence, std::vector<int>* values);
static void timeSteps(ecl_file_type* ecl_file, std::vector<QDateTime>* timeSteps, std::vector<double>* daysSinceSimulationStart); static void timeSteps(const ecl_file_type* ecl_file, std::vector<QDateTime>* timeSteps, std::vector<double>* daysSinceSimulationStart);
static bool isValidEclipseFileName(const QString& fileName); static bool isValidEclipseFileName(const QString& fileName);
static QByteArray md5sum(const QString& fileName); static QByteArray md5sum(const QString& fileName);
@@ -65,18 +65,18 @@ public:
static void readGridDimensions(const QString& gridFileName, std::vector< std::vector<int> >& gridDimensions); static void readGridDimensions(const QString& gridFileName, std::vector< std::vector<int> >& gridDimensions);
static int readUnitsType(ecl_file_type* ecl_file); static int readUnitsType(const ecl_file_type* ecl_file);
static cvf::ref<RifEclipseRestartDataAccess> createDynamicResultAccess(const QString& fileName); static cvf::ref<RifEclipseRestartDataAccess> createDynamicResultAccess(const QString& fileName);
static QString createIndexFileName(const QString& resultFileName); static QString createIndexFileName(const QString& resultFileName);
static std::set<RiaDefines::PhaseType> findAvailablePhases(ecl_file_type* ecl_file); static std::set<RiaDefines::PhaseType> findAvailablePhases(const ecl_file_type* ecl_file);
static void transferNncFluxData(const ecl_grid_type* grid, ecl_file_view_type* summaryView, static void transferNncFluxData(const ecl_grid_type* grid, const ecl_file_view_type* summaryView,
std::vector<double>* waterFlux, std::vector<double>* oilFlux, std::vector<double>* gasFlux); std::vector<double>* waterFlux, std::vector<double>* oilFlux, std::vector<double>* gasFlux);
static bool isExportedFromIntersect(ecl_file_type* ecl_file); static bool isExportedFromIntersect(const ecl_file_type* ecl_file);
static ecl_kw_type* createActnumFromPorv(ecl_file_type* ecl_file); static ecl_kw_type* createActnumFromPorv(ecl_file_type* ecl_file);