OilfieldToolsNet/opm-simulators
4
0
Fork 0
mirror of https://github.com/OPM/opm-simulators.git synced 2024-12-19 05:53:28 -06:00
Code Issues Packages Projects Releases Wiki Activity

Make multidim upwind more forgiving of bad grids.

Browse Source 
Now it will no longer trigger assertation failure when grids are not
edge-conformal (faulted cornerpoint grids processed by our code will
usually not be). Minor algorithm change to handle this.
This commit is contained in:
Atgeirr Flø Rasmussen 2013-04-22 11:07:41 +02:00
parent 52e96825a4
commit b0132b3b05
1 changed files with 10 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
opm/core/tof/TofReorder.cpp
View File

@ -387,6 +387,9 @@ namespace Opm
// This will over-weight the immediate upstream cell value in an extruded 2d grid with // This will over-weight the immediate upstream cell value in an extruded 2d grid with
// one layer (top and bottom no-flow faces will enter the computation) compared to the // one layer (top and bottom no-flow faces will enter the computation) compared to the
// original 2d case. Improvements are welcome. // original 2d case. Improvements are welcome.
// Note: Modified algorithm to consider faces that share even a single vertex with
// the input face. This reduces the problem of non-edge-conformal grids, but does not
// eliminate it entirely.
// Identify the adjacent faces of the upwind cell. // Identify the adjacent faces of the upwind cell.
const int* face_nodes_beg = grid_.face_nodes + grid_.face_nodepos[face]; const int* face_nodes_beg = grid_.face_nodes + grid_.face_nodepos[face];
@ -404,11 +407,11 @@ namespace Opm
for (const int* f_iter = f_nodes_beg; f_iter < f_nodes_end; ++f_iter) { for (const int* f_iter = f_nodes_beg; f_iter < f_nodes_end; ++f_iter) {
num_common += std::count(face_nodes_beg, face_nodes_end, *f_iter); num_common += std::count(face_nodes_beg, face_nodes_end, *f_iter);
} }
if (num_common == grid_.dimensions - 1) { // Before: neighbours over an edge (3d) or vertex (2d).
// Neighbours over an edge (3d) or vertex (2d). // Now: neighbours across a vertex.
// if (num_common == grid_.dimensions - 1) {
if (num_common > 0) {
adj_faces_.push_back(f); adj_faces_.push_back(f);
} else {
ASSERT(num_common == 0);
} }
} }
} }
@ -416,7 +419,9 @@ namespace Opm
// Indentify adjacent faces with inflows, compute omega_star, omega, // Indentify adjacent faces with inflows, compute omega_star, omega,
// add up contributions. // add up contributions.
const int num_adj = adj_faces_.size(); const int num_adj = adj_faces_.size();
ASSERT(num_adj == face_nodes_end - face_nodes_beg); // The assertion below only holds if the grid is edge-conformal.
// No longer testing, since method no longer requires it.
// ASSERT(num_adj == face_nodes_end - face_nodes_beg);
const double flux_face = std::fabs(darcyflux_[face]); const double flux_face = std::fabs(darcyflux_[face]);
face_term = 0.0; face_term = 0.0;
cell_term_factor = 0.0; cell_term_factor = 0.0;