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

convert users of the ASSERT and the ASSERT2 macros to standard assert()

Browse Source
This commit is contained in:
Andreas Lauser
2013-08-28 14:00:35 +02:00
parent cb76a0fd7f
commit d6fa31b452
17 changed files with 48 additions and 48 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
opm/core/tof/TofDiscGalReorder.cpp
View File

@@ -651,7 +651,7 @@ namespace Opm
limiter = 0.0;
basis_func_->addConstant(min_upstream_tof - tof_c, tof + num_basis*cell);
}
ASSERT(limiter >= 0.0);
assert(limiter >= 0.0);
// Actually do the limiting (if applicable).
if (limiter < 1.0) {
@@ -674,7 +674,7 @@ namespace Opm
// any limiting applied to its upstream cells.
const std::vector<int>& seq = ReorderSolverInterface::sequence();
const int nc = seq.size();
ASSERT(nc == grid_.number_of_cells);
assert(nc == grid_.number_of_cells);
for (int i = 0; i < nc; ++i) {
const int cell = seq[i];
applyLimiter(cell, tof_coeff_);

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

@@ -331,7 +331,7 @@ namespace Opm
// Identify the adjacent faces of the upwind cell.
const int* face_nodes_beg = grid_.face_nodes + grid_.face_nodepos[face];
const int* face_nodes_end = grid_.face_nodes + grid_.face_nodepos[face + 1];
ASSERT(face_nodes_end - face_nodes_beg == 2 || grid_.dimensions != 2);
assert(face_nodes_end - face_nodes_beg == 2 || grid_.dimensions != 2);
adj_faces_.clear();
for (int hf = grid_.cell_facepos[upwind_cell]; hf < grid_.cell_facepos[upwind_cell + 1]; ++hf) {
const int f = grid_.cell_faces[hf];
@@ -358,7 +358,7 @@ namespace Opm
const int num_adj = adj_faces_.size();
// 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);
// assert(num_adj == face_nodes_end - face_nodes_beg);
const double flux_face = std::fabs(darcyflux_[face]);
face_term = 0.0;
cell_term_factor = 0.0;