OilfieldToolsNet/opm-simulators
4
0
Fork 0
mirror of https://github.com/OPM/opm-simulators.git synced 2025-02-25 18:55:30 -06:00
Code Issues Packages Projects Releases Wiki Activity

drop the for loop over fip regions.

Browse Source
This commit is contained in:
Liu Ming 2016-08-17 14:22:17 +08:00 committed by Atgeirr Flø Rasmussen
parent a492a60a64
commit 2ac3306c18
2 changed files with 5 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
opm/autodiff/BlackoilModelBase_impl.hpp
View File

@ -2349,12 +2349,10 @@ namespace detail {
const int dims = *std::max_element(fipnum.begin(), fipnum.end());
std::vector<V> values(dims, V::Zero(5));
for (int d = 0; d < dims; ++d) {
for (int i = 0; i < 5; ++i) {
for (int c = 0; c < nc; ++c) {
if (fipnum[c] == (d + 1)) {
values[d][i] += fip[i][c];
}
if (fipnum[c] != 0) {
values[fipnum[c]-1][i] += fip[i][c];
}
}
}

2
opm/autodiff/SimulatorBase_impl.hpp
View File

@ -664,7 +664,7 @@ namespace Opm
std::vector<V>& fip)
{
if (units.getType() == UnitSystem::UnitType::UNIT_TYPE_FIELD) {
for (int i = 0; i < fip.size(); ++i) {
for (size_t i = 0; i < fip.size(); ++i) {
fip[i][0] = unit::convert::to(fip[i][0], unit::stb);
fip[i][1] = unit::convert::to(fip[i][1], unit::stb);
fip[i][2] = unit::convert::to(fip[i][2], 1000*unit::cubic(unit::feet));