From c0869c2e2c3440784a297e8e67eb000ee8502552 Mon Sep 17 00:00:00 2001 From: Arne Morten Kvarving Date: Tue, 24 Jun 2025 09:05:11 +0200 Subject: [PATCH] quell shadowing warnings --- opm/simulators/flow/Transmissibility_impl.hpp | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/opm/simulators/flow/Transmissibility_impl.hpp b/opm/simulators/flow/Transmissibility_impl.hpp index 76d6c9f5a7..24b675a57d 100644 --- a/opm/simulators/flow/Transmissibility_impl.hpp +++ b/opm/simulators/flow/Transmissibility_impl.hpp @@ -262,11 +262,11 @@ update(bool global, const TransUpdateQuantities update_quantities, centroids_cache_[elemIdx] = centroids_(elemIdx); } - auto harmonicMean = [](const Scalar half1, const Scalar half2) + auto harmonicMean = [](const Scalar x1, const Scalar x2) { - return (std::abs(half1) < 1e-30 || std::abs(half2) < 1e-30) + return (std::abs(x1) < 1e-30 || std::abs(x2) < 1e-30) ? 0.0 - : 1.0 / (1.0 / half1 + 1.0 / half2); + : 1.0 / (1.0 / x1 + 1.0 / x2); }; auto faceIdToDir = [](int insideFaceIdx) @@ -344,12 +344,12 @@ update(bool global, const TransUpdateQuantities update_quantities, auto computeHalfMean = [&inside, &outside, &computeHalf, &ntg, &harmonicMean] (const auto& halfComputer, const auto& prop) { - auto half = computeHalf(halfComputer, prop[inside.elemIdx], prop[outside.elemIdx]); - applyNtg_(half[0], inside, ntg); - applyNtg_(half[1], outside, ntg); + auto onesided = computeHalf(halfComputer, prop[inside.elemIdx], prop[outside.elemIdx]); + applyNtg_(onesided[0], inside, ntg); + applyNtg_(onesided[1], outside, ntg); //TODO Add support for multipliers - return harmonicMean(half[0], half[1]); + return harmonicMean(onesided[0], onesided[1]); }; unsigned boundaryIsIdx = 0;