mirror of
https://github.com/OPM/opm-simulators.git
synced 2025-02-25 18:55:30 -06:00
Silence shadowing warning.
This commit is contained in:
parent
6d762f7533
commit
d46d23befd
@ -1980,11 +1980,11 @@ namespace Opm
|
|||||||
getPrimaryVars() const
|
getPrimaryVars() const
|
||||||
{
|
{
|
||||||
const int num_seg = this->numberOfSegments();
|
const int num_seg = this->numberOfSegments();
|
||||||
constexpr int numWellEq = MSWEval::numWellEq;
|
constexpr int num_eq = MSWEval::numWellEq;
|
||||||
std::vector<double> retval(num_seg * numWellEq);
|
std::vector<double> retval(num_seg * num_eq);
|
||||||
for (int ii = 0; ii < num_seg; ++ii) {
|
for (int ii = 0; ii < num_seg; ++ii) {
|
||||||
const auto& pv = this->primary_variables_.value(ii);
|
const auto& pv = this->primary_variables_.value(ii);
|
||||||
std::copy(pv.begin(), pv.end(), retval.begin() + ii * numWellEq);
|
std::copy(pv.begin(), pv.end(), retval.begin() + ii * num_eq);
|
||||||
}
|
}
|
||||||
return retval;
|
return retval;
|
||||||
}
|
}
|
||||||
@ -1998,14 +1998,14 @@ namespace Opm
|
|||||||
setPrimaryVars(std::vector<double>::const_iterator it)
|
setPrimaryVars(std::vector<double>::const_iterator it)
|
||||||
{
|
{
|
||||||
const int num_seg = this->numberOfSegments();
|
const int num_seg = this->numberOfSegments();
|
||||||
constexpr int numWellEq = MSWEval::numWellEq;
|
constexpr int num_eq = MSWEval::numWellEq;
|
||||||
std::array<double, numWellEq> tmp;
|
std::array<double, num_eq> tmp;
|
||||||
for (int ii = 0; ii < num_seg; ++ii) {
|
for (int ii = 0; ii < num_seg; ++ii) {
|
||||||
const auto start = it + num_seg * numWellEq;
|
const auto start = it + num_seg * num_eq;
|
||||||
std::copy(start, start + numWellEq, tmp.begin());
|
std::copy(start, start + num_eq, tmp.begin());
|
||||||
this->primary_variables_.setValue(ii, tmp);
|
this->primary_variables_.setValue(ii, tmp);
|
||||||
}
|
}
|
||||||
return num_seg * numWellEq;
|
return num_seg * num_eq;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user