OilfieldToolsNet/opm-common
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

pass by const ref

Browse Source
This commit is contained in:
Arne Morten Kvarving 2021-08-16 11:06:00 +02:00
parent e25667dc71
commit f7a143c604
4 changed files with 14 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
opm/parser/eclipse/EclipseState/Grid/EclipseGrid.hpp
View File

@ -232,7 +232,7 @@ namespace Opm {
const std::vector<double>& zcorn , const std::vector<double>& zcorn ,
const int * actnum); const int * actnum);
bool keywInputBeforeGdfile(const Deck& deck, const std::string keyword) const; bool keywInputBeforeGdfile(const Deck& deck, const std::string& keyword) const;
void initCylindricalGrid(const Deck&); void initCylindricalGrid(const Deck&);
void initSpiderwebGrid(const Deck&); void initSpiderwebGrid(const Deck&);

10
opm/utility/EModel.hpp
View File

@ -55,10 +55,10 @@ public:
void resetFilter(); void resetFilter();
template <typename T> template <typename T>
void addFilter(std::string param1, std::string opperator, T num); void addFilter(const std::string& param1, const std::string& opperator, T num);
template <typename T> template <typename T>
void addFilter(std::string param1, std::string opperator, T num1, T num2); void addFilter(const std::string& param1, const std::string& opperator, T num1, T num2);
void setDepthfwl(const std::vector<float>& fwl); void setDepthfwl(const std::vector<float>& fwl);
@ -116,13 +116,13 @@ private:
const std::vector<float>& getSolutionFloat(const std::string& name); const std::vector<float>& getSolutionFloat(const std::string& name);
template <typename T> template <typename T>
const std::vector<T>& get_filter_param(std::string param1); const std::vector<T>& get_filter_param(const std::string& param1);
template <typename T> template <typename T>
void updateActiveFilter(const std::vector<T>& paramVect, const std::string opperator, T value); void updateActiveFilter(const std::vector<T>& paramVect, const std::string& opperator, T value);
template <typename T> template <typename T>
void updateActiveFilter(const std::vector<T>& paramVect, const std::string opperator, T value1, T value2); void updateActiveFilter(const std::vector<T>& paramVect, const std::string& opperator, T value1, T value2);
}; };

2
src/opm/parser/eclipse/EclipseState/Grid/EclipseGrid.cpp
View File

@ -435,7 +435,7 @@ EclipseGrid::EclipseGrid(const Deck& deck, const int * actnum)
zcorn_fixed = mapper.fixupZCORN( m_zcorn ); zcorn_fixed = mapper.fixupZCORN( m_zcorn );
} }
bool EclipseGrid::keywInputBeforeGdfile(const Deck& deck, const std::string keyword) const { bool EclipseGrid::keywInputBeforeGdfile(const Deck& deck, const std::string& keyword) const {
std::vector<std::string> keywordList; std::vector<std::string> keywordList;
keywordList.reserve(deck.size()); keywordList.reserve(deck.size());

14
src/opm/utility/EModel.cpp
View File

@ -261,7 +261,7 @@ void EModel::resetFilter()
template <typename T> template <typename T>
void EModel::updateActiveFilter(const std::vector<T>& paramVect, const std::string opperator, T value) void EModel::updateActiveFilter(const std::vector<T>& paramVect, const std::string& opperator, T value)
{ {
if ((opperator == "eq") || (opperator == "==")){ if ((opperator == "eq") || (opperator == "==")){
for (size_t i = 0; i < paramVect.size(); i++) for (size_t i = 0; i < paramVect.size(); i++)
@ -287,7 +287,7 @@ void EModel::updateActiveFilter(const std::vector<T>& paramVect, const std::stri
} }
template <typename T> template <typename T>
void EModel::updateActiveFilter(const std::vector<T>& paramVect, const std::string opperator, T value1, T value2) void EModel::updateActiveFilter(const std::vector<T>& paramVect, const std::string& opperator, T value1, T value2)
{ {
if ((opperator == "in") || (opperator == "between")) { if ((opperator == "in") || (opperator == "between")) {
for (size_t i = 0; i < paramVect.size(); i++) for (size_t i = 0; i < paramVect.size(); i++)
@ -302,7 +302,7 @@ void EModel::updateActiveFilter(const std::vector<T>& paramVect, const std::stri
} }
template <typename T> template <typename T>
const std::vector<T>& EModel::get_filter_param(std::string param) const std::vector<T>& EModel::get_filter_param(const std::string& param)
{ {
if constexpr (std::is_same<T, int>::value){ if constexpr (std::is_same<T, int>::value){
if ((param == "I") || (param == "ROW")) if ((param == "I") || (param == "ROW"))
@ -335,21 +335,21 @@ const std::vector<T>& EModel::get_filter_param(std::string param)
template <> template <>
void EModel::addFilter<int>(std::string param1, std::string opperator, int num) void EModel::addFilter<int>(const std::string& param1, const std::string& opperator, int num)
{ {
std::vector<int> paramVect = get_filter_param<int>(param1); std::vector<int> paramVect = get_filter_param<int>(param1);
updateActiveFilter(paramVect, opperator, num); updateActiveFilter(paramVect, opperator, num);
} }
template <> template <>
void EModel::addFilter<int>(std::string param1, std::string opperator, int num1, int num2) void EModel::addFilter<int>(const std::string& param1, const std::string& opperator, int num1, int num2)
{ {
std::vector<int> paramVect = get_filter_param<int>(param1);; std::vector<int> paramVect = get_filter_param<int>(param1);;
updateActiveFilter(paramVect, opperator, num1, num2); updateActiveFilter(paramVect, opperator, num1, num2);
} }
template <> template <>
void EModel::addFilter<float>(std::string param1, std::string opperator, float num) void EModel::addFilter<float>(const std::string& param1, const std::string& opperator, float num)
{ {
std::vector<float> paramVect = get_filter_param<float>(param1); std::vector<float> paramVect = get_filter_param<float>(param1);
updateActiveFilter(paramVect, opperator, num); updateActiveFilter(paramVect, opperator, num);
@ -357,7 +357,7 @@ void EModel::addFilter<float>(std::string param1, std::string opperator, float n
template <> template <>
void EModel::addFilter<float>(std::string param1, std::string opperator, float num1, float num2) void EModel::addFilter<float>(const std::string& param1, const std::string& opperator, float num1, float num2)
{ {
std::vector<float> paramVect = get_filter_param<float>(param1); std::vector<float> paramVect = get_filter_param<float>(param1);
updateActiveFilter(paramVect, opperator, num1, num2); updateActiveFilter(paramVect, opperator, num1, num2);