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

Merge pull request #2607 from akva2/janitoring

Browse Source 
Some more SCA warning cleanup
This commit is contained in:
Bård Skaflestad 2021-08-16 12:24:56 +02:00 committed by GitHub
commit 612cbf749c
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
12 changed files with 30 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
opm/parser/eclipse/EclipseState/Aquifer/Aquancon.hpp
View File

@ -85,7 +85,7 @@ namespace Opm {
Aquancon() = default; Aquancon() = default;
Aquancon(const EclipseGrid& grid, const Deck& deck); Aquancon(const EclipseGrid& grid, const Deck& deck);
Aquancon(const std::unordered_map<int, std::vector<Aquancon::AquancCell>>& data); explicit Aquancon(const std::unordered_map<int, std::vector<Aquancon::AquancCell>>& data);
static Aquancon serializeObject(); static Aquancon serializeObject();

2
opm/parser/eclipse/EclipseState/Aquifer/Aquifetp.hpp
View File

@ -96,7 +96,7 @@ class Aquifetp {
Aquifetp() = default; Aquifetp() = default;
Aquifetp(const TableManager& tables, const Deck& deck); Aquifetp(const TableManager& tables, const Deck& deck);
Aquifetp(const std::vector<Aquifetp::AQUFETP_data>& data); explicit Aquifetp(const std::vector<Aquifetp::AQUFETP_data>& data);
static Aquifetp serializeObject(); static Aquifetp serializeObject();

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

@ -55,7 +55,7 @@ namespace Opm {
}; };
EclipseState() = default; EclipseState() = default;
EclipseState(const Deck& deck); explicit EclipseState(const Deck& deck);
virtual ~EclipseState() = default; virtual ~EclipseState() = default;
const IOConfig& getIOConfig() const; const IOConfig& getIOConfig() const;

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&);

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

@ -61,7 +61,7 @@ private:
std::array<double, 2> unit_x; std::array<double, 2> unit_x;
std::array<double, 2> unit_y; std::array<double, 2> unit_y;
std::vector<float> m_input; std::vector<float> m_input;
double inv_norm; double inv_norm = 1.0;
std::optional<std::string> map_units; std::optional<std::string> map_units;
}; };

2
opm/parser/eclipse/EclipseState/Tables/TLMixpar.hpp
View File

@ -56,7 +56,7 @@ class TLMixpar {
public: public:
TLMixpar() = default; TLMixpar() = default;
TLMixpar(const Deck& deck); explicit TLMixpar(const Deck& deck);
static TLMixpar serializeObject(); static TLMixpar serializeObject();
std::size_t size() const; std::size_t size() const;
bool empty() const; bool empty() const;

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());

2
src/opm/parser/eclipse/EclipseState/Schedule/Action/ActionValue.cpp
View File

@ -81,7 +81,7 @@ Value::Value(double value) :
is_scalar(true) is_scalar(true)
{ } { }
Value::Value(const std::string& wname, double value) { Value::Value(const std::string& wname, double value) : scalar_value(0.0) {
this->add_well(wname, value); this->add_well(wname, value);
} }

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);

6
tests/test_AggregateAquiferData.cpp
View File

@ -269,7 +269,7 @@ AQUTAB
ct.finishInitialisation(waterProperties()); ct.finishInitialisation(waterProperties());
} }
return { properties }; return Opm::AquiferCT(properties);
} }
void connectFetkovic(AquiferConnections& aquancon) void connectFetkovic(AquiferConnections& aquancon)
@ -329,7 +329,7 @@ AQUTAB
fetp.finishInitialisation(waterProperties()); fetp.finishInitialisation(waterProperties());
} }
return { properties }; return Opm::Aquifetp(properties);
} }
Opm::AquiferConfig createAquiferConfig() Opm::AquiferConfig createAquiferConfig()
@ -339,7 +339,7 @@ AQUTAB
connectFetkovic(aquancon); connectFetkovic(aquancon);
return { return {
createFetkovich(), createCarterTracy(), aquancon.getAllConnections() createFetkovich(), createCarterTracy(), Opm::Aquancon(aquancon.getAllConnections())
}; };
} }

14
tests/test_Tables.cpp
View File

@ -172,7 +172,7 @@ END
Opm::Parser{}.parseString(input) Opm::Parser{}.parseString(input)
}; };
return {deck}; return Opm::EclipseState{deck};
} }
std::vector<double> expect_SGFN() std::vector<double> expect_SGFN()
@ -324,7 +324,7 @@ END
Opm::Parser{}.parseString(input) Opm::Parser{}.parseString(input)
}; };
return {deck}; return Opm::EclipseState{deck};
} }
std::vector<double> expect_SOFN() std::vector<double> expect_SOFN()
@ -495,7 +495,7 @@ END
Opm::Parser{}.parseString(input) Opm::Parser{}.parseString(input)
}; };
return {deck}; return Opm::EclipseState{deck};
} }
std::vector<double> expect_SGFN() std::vector<double> expect_SGFN()
@ -652,7 +652,7 @@ END
Opm::Parser{}.parseString(input) Opm::Parser{}.parseString(input)
}; };
return {deck}; return Opm::EclipseState{deck};
} }
std::vector<double> expect_SGFN() std::vector<double> expect_SGFN()
@ -823,7 +823,7 @@ END
Opm::Parser{}.parseString(input) Opm::Parser{}.parseString(input)
}; };
return {deck}; return Opm::EclipseState{deck};
} }
std::vector<double> expect_SOFN() std::vector<double> expect_SOFN()
@ -1007,7 +1007,7 @@ END
Opm::Parser{}.parseString(input) Opm::Parser{}.parseString(input)
}; };
return {deck}; return Opm::EclipseState{deck};
} }
std::vector<double> expect_SGFN() std::vector<double> expect_SGFN()
@ -1494,7 +1494,7 @@ namespace {
Opm::EclipseState parse(const std::string& rspec, Opm::EclipseState parse(const std::string& rspec,
const std::string& props) const std::string& props)
{ {
return { return Opm::EclipseState{
Opm::Parser{}.parseString(rspec + R"(GRID Opm::Parser{}.parseString(rspec + R"(GRID
INIT INIT