mirror of
https://github.com/OPM/opm-simulators.git
synced 2026-11-02 20:30:55 -06:00
Merge pull request #6863 from akva2/use_ranges_min_element
replace std::min_element with std::ranges::min_element where appropriate
This commit is contained in:
3 files changed
+6
-5
No files matched your search
@@ -477,7 +477,7 @@ solveJacobianSystem(BVector& x)
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
int fastest_solver = std::min_element(times.begin(), times.end()) - times.begin();
|
int fastest_solver = std::ranges::min_element(times) - times.begin();
|
||||||
// Use timing on rank 0 to determine fastest, must be consistent across ranks.
|
// Use timing on rank 0 to determine fastest, must be consistent across ranks.
|
||||||
grid_.comm().broadcast(&fastest_solver, 1, 0);
|
grid_.comm().broadcast(&fastest_solver, 1, 0);
|
||||||
linear_solve_setup_time_ = setupTimes[fastest_solver];
|
linear_solve_setup_time_ = setupTimes[fastest_solver];
|
||||||
|
|||||||
@@ -157,8 +157,8 @@ namespace Opm
|
|||||||
/// \brief return min step length used so far
|
/// \brief return min step length used so far
|
||||||
double AdaptiveSimulatorTimer::minStepLength () const
|
double AdaptiveSimulatorTimer::minStepLength () const
|
||||||
{
|
{
|
||||||
if( steps_.empty() ) return 0.0;
|
if (steps_.empty()) return 0.0;
|
||||||
return *(std::min_element( steps_.begin(), steps_.end() ));
|
return *std::ranges::min_element(steps_);
|
||||||
}
|
}
|
||||||
|
|
||||||
/// \brief report start and end time as well as used steps so far
|
/// \brief report start and end time as well as used steps so far
|
||||||
|
|||||||
@@ -619,8 +619,9 @@ getGroupFipnumAndPvtreg() const
|
|||||||
auto regIndexPair = std::make_pair(pvtreg, firstWellIndex);
|
auto regIndexPair = std::make_pair(pvtreg, firstWellIndex);
|
||||||
std::vector<decltype(regIndexPair)> pairs(comm_.size());
|
std::vector<decltype(regIndexPair)> pairs(comm_.size());
|
||||||
comm_.allgather(®IndexPair, 1, pairs.data());
|
comm_.allgather(®IndexPair, 1, pairs.data());
|
||||||
pvtreg = std::min_element(pairs.begin(), pairs.end(),
|
pvtreg = std::ranges::min_element(pairs,
|
||||||
[](const auto& p1, const auto& p2){ return p1.second < p2.second;})
|
[](const auto& p1, const auto& p2)
|
||||||
|
{ return p1.second < p2.second; })
|
||||||
->first;
|
->first;
|
||||||
}
|
}
|
||||||
return std::make_pair(fipnum, pvtreg);
|
return std::make_pair(fipnum, pvtreg);
|
||||||
|
|||||||
Reference in new issue
Block a user