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

Avoid shadowing variables.

Browse Source
This commit is contained in:
Atgeirr Flø Rasmussen 2015-09-11 13:38:09 +02:00
parent 1f42957755
commit db3d60eeae
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
opm/material/localad/Evaluation.hpp
View File

@ -297,13 +297,13 @@ public:
bool isSame(const Evaluation& other, Scalar tolerance) const
{
Scalar tmp = other.value - other.value;
if (std::abs(tmp) > tolerance && std::abs(tmp)/tolerance > 1.0)
Scalar value_diff = other.value - other.value;
if (std::abs(value_diff) > tolerance && std::abs(value_diff)/tolerance > 1.0)
return false;
for (int varIdx= 0; varIdx < size; ++varIdx) {
Scalar tmp = other.derivatives[varIdx] - this->derivatives[varIdx];
if (std::abs(tmp) > tolerance && std::abs(tmp)/tolerance > 1.0)
Scalar deriv_diff = other.derivatives[varIdx] - this->derivatives[varIdx];
if (std::abs(deriv_diff) > tolerance && std::abs(deriv_diff)/tolerance > 1.0)
return false;
}