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

Replace the ASSERT and ASSERT2 macros by assert

Browse Source
This commit is contained in:
Andreas Lauser
2013-09-03 13:55:36 +02:00
parent 8ce809c400
commit 6a6d0c9b28
5 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
opm/polymer/GravityColumnSolverPolymer_impl.hpp
View File

@@ -286,7 +286,7 @@ namespace Opm
hm[bmc(2*ci + 1, 2*(ci - 1) + 0)] += dFd2[2];
hm[bmc(2*ci + 1, 2*(ci - 1) + 1)] += dFd2[3];
} else {
ASSERT(c1 == next_cell || c2 == next_cell);
assert(c1 == next_cell || c2 == next_cell);
hm[bmc(2*ci + 0, 2*(ci + 1) + 0)] += dFd2[0];
hm[bmc(2*ci + 0, 2*(ci + 1) + 1)] += dFd2[1];
hm[bmc(2*ci + 1, 2*(ci + 1) + 0)] += dFd2[2];

4
opm/polymer/IncompPropertiesDefaultPolymer.hpp
View File

@@ -43,7 +43,7 @@ namespace Opm
IncompPropertiesDefaultPolymer(const Opm::parameter::ParameterGroup& param, int dim, int num_cells)
: Opm::IncompPropertiesBasic(param, dim, num_cells)
{
ASSERT(numPhases() == 2);
assert(numPhases() == 2);
sw_.resize(3);
sw_[0] = 0.2;
sw_[1] = 0.7;
@@ -76,7 +76,7 @@ namespace Opm
double* kr,
double* dkrds) const
{
// ASSERT(dkrds == 0);
// assert(dkrds == 0);
// We assume two phases flow
for (int i = 0; i < n; ++i) {
kr[2*i] = krw(s[2*i]);

2
opm/polymer/PolymerProperties.hpp
View File

@@ -117,7 +117,7 @@ namespace Opm
// We assume NTSFUN=1
const std::vector<double>& plyrock = gridparser.getPLYROCK().plyrock_;
ASSERT(plyrock.size() == 5);
assert(plyrock.size() == 5);
dead_pore_vol_ = plyrock[0];
res_factor_ = plyrock[1];
rock_density_ = plyrock[2];

2
opm/polymer/TransportSolverTwophaseCompressiblePolymer.cpp
View File

@@ -1255,7 +1255,7 @@ namespace Opm
const int nc = grid_.number_of_cells;
const int nf = grid_.number_of_faces;
const int np = props_.numPhases();
ASSERT(np == 2);
assert(np == 2);
const int dim = grid_.dimensions;
density_.resize(nc*np);
props_.density(grid_.number_of_cells, &A_[0], &density_[0]);

6
opm/polymer/polymerUtilities.cpp
View File

@@ -75,7 +75,7 @@ namespace Opm
int num_phases = props.numPhases();
totmob.resize(num_cells);
omega.resize(num_cells);
ASSERT(int(s.size()) == num_cells*num_phases);
assert(int(s.size()) == num_cells*num_phases);
std::vector<double> kr(num_cells*num_phases);
props.relperm(num_cells, &s[0], &cells[0], &kr[0], 0);
const double* visc = props.viscosity();
@@ -113,7 +113,7 @@ namespace Opm
THROW("computeFractionalFlow() assumes 2 phases.");
}
fractional_flows.resize(num_cells*num_phases);
ASSERT(int(s.size()) == num_cells*num_phases);
assert(int(s.size()) == num_cells*num_phases);
std::vector<double> kr(num_cells*num_phases);
props.relperm(num_cells, &s[0], &cells[0], &kr[0], 0);
const double* visc = props.viscosity();
@@ -153,7 +153,7 @@ namespace Opm
THROW("computeFractionalFlow() assumes 2 phases.");
}
fractional_flows.resize(num_cells*num_phases);
ASSERT(int(s.size()) == num_cells*num_phases);
assert(int(s.size()) == num_cells*num_phases);
std::vector<double> kr(num_cells*num_phases);
props.relperm(num_cells, &s[0], &cells[0], &kr[0], 0);
std::vector<double> mu(num_cells*num_phases);