From 6a6d0c9b283dda5cf6f583871385cbef41478213 Mon Sep 17 00:00:00 2001 From: Andreas Lauser Date: Tue, 3 Sep 2013 13:55:36 +0200 Subject: [PATCH] Replace the ASSERT and ASSERT2 macros by assert --- opm/polymer/GravityColumnSolverPolymer_impl.hpp | 2 +- opm/polymer/IncompPropertiesDefaultPolymer.hpp | 4 ++-- opm/polymer/PolymerProperties.hpp | 2 +- opm/polymer/TransportSolverTwophaseCompressiblePolymer.cpp | 2 +- opm/polymer/polymerUtilities.cpp | 6 +++--- 5 files changed, 8 insertions(+), 8 deletions(-) diff --git a/opm/polymer/GravityColumnSolverPolymer_impl.hpp b/opm/polymer/GravityColumnSolverPolymer_impl.hpp index 7197aea0a..ae6a021b5 100644 --- a/opm/polymer/GravityColumnSolverPolymer_impl.hpp +++ b/opm/polymer/GravityColumnSolverPolymer_impl.hpp @@ -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]; diff --git a/opm/polymer/IncompPropertiesDefaultPolymer.hpp b/opm/polymer/IncompPropertiesDefaultPolymer.hpp index b58d8bb0d..ca3faccf2 100644 --- a/opm/polymer/IncompPropertiesDefaultPolymer.hpp +++ b/opm/polymer/IncompPropertiesDefaultPolymer.hpp @@ -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]); diff --git a/opm/polymer/PolymerProperties.hpp b/opm/polymer/PolymerProperties.hpp index a447d08c5..197fd9489 100644 --- a/opm/polymer/PolymerProperties.hpp +++ b/opm/polymer/PolymerProperties.hpp @@ -117,7 +117,7 @@ namespace Opm // We assume NTSFUN=1 const std::vector& 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]; diff --git a/opm/polymer/TransportSolverTwophaseCompressiblePolymer.cpp b/opm/polymer/TransportSolverTwophaseCompressiblePolymer.cpp index f963f799d..42bc2ddea 100644 --- a/opm/polymer/TransportSolverTwophaseCompressiblePolymer.cpp +++ b/opm/polymer/TransportSolverTwophaseCompressiblePolymer.cpp @@ -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]); diff --git a/opm/polymer/polymerUtilities.cpp b/opm/polymer/polymerUtilities.cpp index 33e0ebf02..072a9b7c1 100644 --- a/opm/polymer/polymerUtilities.cpp +++ b/opm/polymer/polymerUtilities.cpp @@ -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 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 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 kr(num_cells*num_phases); props.relperm(num_cells, &s[0], &cells[0], &kr[0], 0); std::vector mu(num_cells*num_phases);