diff --git a/Applications/FileIO/Legacy/OGSIOVer4.cpp b/Applications/FileIO/Legacy/OGSIOVer4.cpp index cfd58b39a8d83816a0c7f20185095b66f35441ef..763cebfd9f454b60cf42955b6b8c0b53171cded6 100644 --- a/Applications/FileIO/Legacy/OGSIOVer4.cpp +++ b/Applications/FileIO/Legacy/OGSIOVer4.cpp @@ -735,7 +735,7 @@ void writeAllDataToGLIFileV4(const std::string& fname, // writing all points os << "#POINTS" << "\n"; - for (auto& geo_name : geo_names) + for (auto const& geo_name : geo_names) { os.precision(std::numeric_limits<double>::digits10); GeoLib::PointVec const* const pnt_vec(geo.getPointVecObj(geo_name)); diff --git a/ChemistryLib/PhreeqcKernelData/CreateKineticReactant.cpp b/ChemistryLib/PhreeqcKernelData/CreateKineticReactant.cpp index d3589afa5654dc0fbe96c692da7505d9eca33fc6..43fb4710358a1d7da818118a85723b713142ec1a 100644 --- a/ChemistryLib/PhreeqcKernelData/CreateKineticReactant.cpp +++ b/ChemistryLib/PhreeqcKernelData/CreateKineticReactant.cpp @@ -49,7 +49,7 @@ std::unique_ptr<Kinetics> createKineticReactants( 1); std::fill(std::begin(*amount), std::end(*amount), initial_amount); - kinetic_reactants.emplace_back(name, initial_amount); + kinetic_reactants.emplace_back(std::move(name), initial_amount); } return std::make_unique<Kinetics>(kinetic_reactants); diff --git a/ChemistryLib/PhreeqcKernelData/KineticReactant.cpp b/ChemistryLib/PhreeqcKernelData/KineticReactant.cpp index 04c801cd38f1e2ff35dfebd7d94ada77035649e0..688bd343e68f0270e12563c6f9f1d4f226b55f12 100644 --- a/ChemistryLib/PhreeqcKernelData/KineticReactant.cpp +++ b/ChemistryLib/PhreeqcKernelData/KineticReactant.cpp @@ -16,11 +16,10 @@ namespace ChemistryLib { namespace PhreeqcKernelData { -KineticReactant::KineticReactant(std::string const& name, - double const initial_amount) +KineticReactant::KineticReactant(std::string name, double const initial_amount) { - rate_name = name.c_str(); - namecoef.add(name.c_str(), 1.0); + rate_name = std::move(name); + namecoef.add(rate_name.c_str(), 1.0); m = initial_amount; m0 = initial_amount; } diff --git a/ChemistryLib/PhreeqcKernelData/KineticReactant.h b/ChemistryLib/PhreeqcKernelData/KineticReactant.h index b6a5d0f3192a5d705f7baa54fb671d222dd2b428..c27275300afbb31615dc616e0d3b4cc0b6989848 100644 --- a/ChemistryLib/PhreeqcKernelData/KineticReactant.h +++ b/ChemistryLib/PhreeqcKernelData/KineticReactant.h @@ -22,7 +22,7 @@ namespace PhreeqcKernelData class KineticReactant final : private cxxKineticsComp { public: - KineticReactant(std::string const& name, double const initial_amount); + KineticReactant(std::string name, double const initial_amount); cxxKineticsComp const* castToBaseClass() const { diff --git a/GeoLib/AnalyticalGeometry-impl.h b/GeoLib/AnalyticalGeometry-impl.h index 6838ed5a81f31c35ca7440ce0b50ac23e414fb77..c908962516e029116b538ce9d8a637a42ed6f07d 100644 --- a/GeoLib/AnalyticalGeometry-impl.h +++ b/GeoLib/AnalyticalGeometry-impl.h @@ -17,8 +17,8 @@ std::pair<Eigen::Vector3d, double> getNewellPlane(InputIterator pnts_begin, Eigen::Vector3d plane_normal({0, 0, 0}); Eigen::Vector3d centroid({0, 0, 0}); for (auto i=std::prev(pnts_end), j=pnts_begin; j!=pnts_end; i = j, ++j) { - auto &pt_i = *(*i); - auto &pt_j = *(*j); + auto const& pt_i = *(*i); + auto const& pt_j = *(*j); plane_normal[0] += (pt_i[1] - pt_j[1]) * (pt_i[2] + pt_j[2]); // projection on yz plane_normal[1] += (pt_i[2] - pt_j[2]) diff --git a/MathLib/LinAlg/UnifiedMatrixSetters.cpp b/MathLib/LinAlg/UnifiedMatrixSetters.cpp index 9b3a7df21f6bf85528afe65f7e1b458092aca408..72acd7306e5338bc26dc7d861dc04d19463a2477 100644 --- a/MathLib/LinAlg/UnifiedMatrixSetters.cpp +++ b/MathLib/LinAlg/UnifiedMatrixSetters.cpp @@ -110,14 +110,14 @@ void addToMatrix(PETScMatrix& m, std::initializer_list<double> values) namespace MathLib { -void setVector(EigenVector& v_, std::initializer_list<double> values) +void setVector(EigenVector& v, std::initializer_list<double> values) { - auto& v(v_.getRawVector()); + auto& w = v.getRawVector(); assert((std::size_t)v.size() == values.size()); auto it = values.begin(); for (std::size_t i = 0; i < values.size(); ++i) { - v[i] = *(it++); + w[i] = *(it++); } } diff --git a/MathLib/Nonlinear/Root1D.h b/MathLib/Nonlinear/Root1D.h index 259dc2e2f49785b08b32bf9fd1fb5d8f1e29a48d..62bf1693bb2fed90e1866db0bf6541c768393240 100644 --- a/MathLib/Nonlinear/Root1D.h +++ b/MathLib/Nonlinear/Root1D.h @@ -168,8 +168,8 @@ struct AndersonBjorck { static double get_m(const double /*fa*/, const double fb, const double fc) { - const double f = 1.0 - fc / fb; - return (f >= 0.0) ? f : 0.5; + const double v = 1.0 - fc / fb; + return (v >= 0.0) ? v : 0.5; } }; diff --git a/NumLib/DOF/SimpleMatrixVectorProvider.cpp b/NumLib/DOF/SimpleMatrixVectorProvider.cpp index 012ff6589f75b38d352a12c98b11b0f276d5d195..c777b3b186aa28bb0397a7c92b90bb98770f2685 100644 --- a/NumLib/DOF/SimpleMatrixVectorProvider.cpp +++ b/NumLib/DOF/SimpleMatrixVectorProvider.cpp @@ -151,12 +151,12 @@ SimpleMatrixVectorProvider::~SimpleMatrixVectorProvider() _used_vectors.size()); } - for (auto& ptr_id : _used_matrices) + for (auto const& ptr_id : _used_matrices) { delete ptr_id.first; } - for (auto& ptr_id : _used_vectors) + for (auto const& ptr_id : _used_vectors) { delete ptr_id.first; }