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

Change order of steps in algorithm to avoid rework.

Browse Source
This commit is contained in:
Atgeirr Flø Rasmussen 2014-12-01 14:18:25 +01:00
parent 5233d37e63
commit cb7be97ee5
1 changed files with 13 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
opm/core/tof/AnisotropicEikonal.cpp
View File

@ -58,9 +58,9 @@ namespace Opm
// U_i = min_{(x_j,x_k) \in NF(x_i)} G_{j,k} // U_i = min_{(x_j,x_k) \in NF(x_i)} G_{j,k}
// 4. Find the Considered cell with the smallest value: r. // 4. Find the Considered cell with the smallest value: r.
// 5. Move cell r to Accepted. Update AcceptedFront. // 5. Move cell r to Accepted. Update AcceptedFront.
// 6. Move cells adjacent to r from Far to Considered. // 6. Recompute the value for all Considered cells within
// 7. Recompute the value for all Considered cells within
// distance h * F_2/F1 from x_r. Use min of previous and new. // distance h * F_2/F1 from x_r. Use min of previous and new.
// 7. Move cells adjacent to r from Far to Considered.
// 8. If Considered is not empty, go to step 4. // 8. If Considered is not empty, go to step 4.
// 1. Put all cells in Far. U_i = \inf. // 1. Put all cells in Far. U_i = \inf.
@ -126,17 +126,7 @@ namespace Opm
} }
} }
// 6. Move cells adjacent to r from Far to Considered. // 6. Recompute the value for all Considered cells within
for (auto it = cell_neighbours_[rcell].begin(); it != cell_neighbours_[rcell].end(); ++it) {
const int nb_cell = *it;
if (!is_accepted_[nb_cell] && !is_considered_[nb_cell]) {
assert(solution[nb_cell] == inf);
const double value = computeValue(nb_cell, metric, solution.data());
pushConsidered(std::make_pair(value, nb_cell));
}
}
// 7. Recompute the value for all Considered cells within
// distance h * F_2/F1 from x_r. Use min of previous and new. // distance h * F_2/F1 from x_r. Use min of previous and new.
for (auto it = considered_.begin(); it != considered_.end(); ++it) { for (auto it = considered_.begin(); it != considered_.end(); ++it) {
const int ccell = it->second; const int ccell = it->second;
@ -153,6 +143,16 @@ namespace Opm
} }
} }
// 7. Move cells adjacent to r from Far to Considered.
for (auto it = cell_neighbours_[rcell].begin(); it != cell_neighbours_[rcell].end(); ++it) {
const int nb_cell = *it;
if (!is_accepted_[nb_cell] && !is_considered_[nb_cell]) {
assert(solution[nb_cell] == inf);
const double value = computeValue(nb_cell, metric, solution.data());
pushConsidered(std::make_pair(value, nb_cell));
}
}
// 8. If Considered is not empty, go to step 4. // 8. If Considered is not empty, go to step 4.
} }