Merge pull request #6426 from akva2/janitoring_sca

Janitoring: quell some SCA warnings

Author: bska

examples/art2dgf.cpp

@@ -27,8 +27,6 @@
 
 #include <algorithm>
 #include <fstream>
-#include <iomanip>
-#include <memory>
 #include <stdexcept>
 #include <sstream>
 #include <string>
@@ -70,7 +68,7 @@ namespace Ewoms {
             // remove comments
             auto commentPos = curLine.find("%");
             if (commentPos != curLine.npos) {
-                curLine = curLine.substr(0, commentPos);
+                curLine.erase(commentPos);
             }
 
             // remove leading whitespace
@@ -86,7 +84,7 @@ namespace Ewoms {
             while (curLine.size() > numTrailingSpaces
                    && std::isspace(curLine[curLine.size() - numTrailingSpaces]))
                 ++numTrailingSpaces;
-            curLine = curLine.substr(0, curLine.size() - numTrailingSpaces);
+            curLine.erase(numTrailingSpaces);
 
             // a section of the file is finished, go to the next one
             if (curLine == "$") {

opm/models/blackoil/blackoilpolymerparams.cpp

@@ -231,7 +231,6 @@ initFromState(const EclipseState& eclState)
                 shearMultiplier[i] *= refViscMult;
                 shearMultiplier[i] -= 1;
                 shearMultiplier[i] /= (refViscMult - 1);
-                shearMultiplier[i] = shearMultiplier[i];
             }
             plyshlogShearEffectRefMultiplier_[pvtRegionIdx].resize(waterVelocity.size());
             plyshlogShearEffectRefLogVelocity_[pvtRegionIdx].resize(waterVelocity.size());

opm/simulators/flow/SimulatorSerializer.cpp

@@ -223,8 +223,8 @@ void SimulatorSerializer::checkSerializedCmdLine(const std::string& current,
                                   curr_strings.begin(), curr_strings.end(),
                                   std::back_inserter(difference));
 
-    std::vector<std::string> only_stored, only_curr;
     if (!difference.empty()) {
+        std::vector<std::string> only_stored, only_curr;
         for (std::size_t i = 0; i < difference.size(); ) {
             auto stored_it = std::find(stored_strings.begin(),
                                        stored_strings.end(), difference[i]);

opm/simulators/wells/BlackoilWellModelGasLift_impl.hpp

@@ -331,10 +331,10 @@ updateWellPotentials(const Simulator& simulator,
 
         const auto it = node_pressures.find(well->wellEcl().groupName());
         if (it != node_pressures.end()) {
-            std::vector<Scalar> potentials;
             std::string cur_exc_msg;
             auto cur_exc_type = ExceptionType::NONE;
             try {
+                std::vector<Scalar> potentials;
                 well->computeWellPotentials(simulator, well_state_copy, potentials, deferred_logger);
                 auto& ws = wellState.well(well->indexOfWell());
                 for (int p = 0; p < np; ++p) {

opm/simulators/wells/GasLiftCommon.cpp

@@ -52,8 +52,7 @@ displayDebugMessageOnRank0_(const std::string& msg) const
 {
     // This output should be identical for all ranks.
 
-    if (   (!this->debug_output_only_on_rank0)
-        || (this->debug_output_only_on_rank0 && this->comm_.rank() == 0) ) {
+    if (!this->debug_output_only_on_rank0 || this->comm_.rank() == 0)  {
         displayDebugMessage_(msg);
     }
 }

opm/simulators/wells/GasLiftStage2.cpp

@@ -111,10 +111,10 @@ addOrRemoveALQincrement_(GradMap &grad_map,
     if (it == this->well_state_map_.end())
         return;
 
-    GasLiftWellState<Scalar>& state = *(it->second.get());
     const GradInfo& gi = grad_map.at(well_name);
     if (this->debug) {
         auto new_alq = gi.alq;
+        const GasLiftWellState<Scalar>& state = *(it->second.get());
         auto old_alq = state.alq();
         const std::string msg = fmt::format("well {} : {} ALQ increment, "
             "old alq: {}, new alq: {}",
@@ -1182,14 +1182,14 @@ computeDelta(const std::string& well_name)
     // compute the delta on wells on own rank
     if (this->parent.well_state_map_.count(well_name) > 0) {
         const GradInfo& gi = this->parent.dec_grads_.at(well_name);
-        GasLiftWellState<Scalar>& state = *(this->parent.well_state_map_.at(well_name).get());
         GasLiftSingleWell& gs_well = *(this->parent.stage1_wells_.at(well_name).get());
         const WellInterfaceGeneric<Scalar>& well = gs_well.getWell();
         // only get deltas for wells owned by this rank
         if (this->parent.well_state_.wellIsOwned(well.indexOfWell(), well_name)) {
             const auto& well_ecl = well.wellEcl();
             Scalar factor = well_ecl.getEfficiencyFactor() *
                             this->well_state[well_name].efficiency_scaling_factor;
+            const GasLiftWellState<Scalar>& state = *(this->parent.well_state_map_.at(well_name).get());
             auto& [delta_oil, delta_gas, delta_water, delta_alq] = delta;
             delta_oil = factor * (gi.new_oil_rate - state.oilRate());
             delta_gas = factor * (gi.new_gas_rate - state.gasRate());

opm/simulators/wells/MultisegmentWellEval.cpp

@@ -264,9 +264,6 @@ assembleDefaultPressureEq(const int seg,
     // TODO: we might be able to add member variables to store these values, then we update well state
     // after converged
 
-    auto& ws = well_state.well(baseif_.indexOfWell());
-    auto& segments = ws.segments;
-
     if (this->frictionalPressureLossConsidered()) {
         const auto friction_pressure_drop = segments_.getFrictionPressureLoss(seg);
         if (reverseFlow){
@@ -276,7 +273,8 @@ assembleDefaultPressureEq(const int seg,
                 assemblePressureEqExtraDerivatives(seg, seg_upwind, extra_derivatives, linSys_);
         }
         pressure_equation -= friction_pressure_drop;
-        segments.pressure_drop_friction[seg] = friction_pressure_drop.value();
+        auto& ws = well_state.well(baseif_.indexOfWell());
+        ws.segments.pressure_drop_friction[seg] = friction_pressure_drop.value();
     }
 
     // contribution from the outlet segment

opm/simulators/wells/VFPHelpers.cpp

@@ -578,7 +578,7 @@ intersectWithIPR(const VFPProdTable& table,
     }
     // find largest flo (flo_x) for which y = bhp(flo) + (flo-a)/b = 0 and dy/dflo > 0
     Scalar flo_x = -1.0;
-    Scalar flo0, flo1;
+    Scalar flo0;
     Scalar y0, y1;
     flo0 = 0.0; // start by checking flo=0
     auto flo_i = findInterpData(flo0, table.getFloAxis());
@@ -587,7 +587,7 @@ intersectWithIPR(const VFPProdTable& table,
 
     const std::vector<double>& flos = table.getFloAxis();
     for (size_t i = 0; i < flos.size(); ++i) {
-        flo1 = flos[i];
+        const auto flo1 = flos[i];
         flo_i = findInterpData(flo1, flos);
         bhp_i = interpolate(table, flo_i, thp_i, wfr_i, gfr_i, alq_i);
         y1 = adjust_bhp(bhp_i.value) + (flo1 - ipr_a)/ipr_b;

opm/simulators/wells/WellBhpThpCalculator.cpp

@@ -548,8 +548,8 @@ computeBhpAtThpLimitInjImpl(const std::function<std::vector<Scalar>(const Scalar
         const Scalar low = 10.0 * unit::barsa;
         const Scalar high = 800.0 * unit::barsa;
         const Scalar flo_tolerance = flo_rel_tol * std::fabs(flo_samples.back());
-        int iteration = 0;
         try {
+            int iteration = 0;
             const Scalar solved_bhp = RegulaFalsiBisection<ErrorPolicy>::
                     solve(eq, low, high, max_iteration, flo_tolerance, iteration);
             bhp_samples.push_back(solved_bhp);
@@ -610,7 +610,6 @@ computeBhpAtThpLimitInjImpl(const std::function<std::vector<Scalar>(const Scalar
     const Scalar low = bhp_samples[sign_change_index + 1];
     const Scalar high = bhp_samples[sign_change_index];
     const Scalar bhp_tolerance = 0.01 * unit::barsa;
-    int iteration = 0;
     if (low == high) {
         // We are in the high flow regime where the bhp_samples
         // are all equal to the bhp_limit.
@@ -620,6 +619,7 @@ computeBhpAtThpLimitInjImpl(const std::function<std::vector<Scalar>(const Scalar
         return std::nullopt;
     }
     try {
+        int iteration = 0;
         const Scalar solved_bhp = RegulaFalsiBisection<ErrorPolicy>::
                 solve(eq, low, high, max_iteration, bhp_tolerance, iteration);
         if constexpr (extraBhpAtThpLimitOutput) {
@@ -773,8 +773,8 @@ computeBhpAtThpLimit(const std::function<std::vector<Scalar>(const Scalar)>& fra
     // Solve for the proper solution in the given interval.
     const int max_iteration = 100;
     const Scalar bhp_tolerance = 0.01 * unit::barsa;
-    int iteration = 0;
     try {
+        int iteration = 0;
         const Scalar solved_bhp = RegulaFalsiBisection<ThrowOnError>::
             solve(eq, low, high, max_iteration, bhp_tolerance, iteration);
         return solved_bhp;
@@ -1053,10 +1053,9 @@ bruteForceBracketCommonTHP(const std::function<Scalar(const Scalar)>& eq,
     constexpr int sample_number = 1000;
     constexpr Scalar interval = 1E5; 
     Scalar eq_low = eq(min_thp);
-    Scalar eq_high = 0.0;
     for (int i = 0; i < sample_number + 1; ++i) {
         max_thp = min_thp + interval * i;
-        eq_high = eq(max_thp);
+        const Scalar eq_high = eq(max_thp);
         if (eq_high * eq_low <= 0.) {
             bracket_found = true;
             min_thp = max_thp - interval;