OilfieldToolsNet/opm-simulators
4
0
Fork 0
mirror of https://github.com/OPM/opm-simulators.git synced 2024-11-29 12:33:49 -06:00
Code Issues Packages Projects Releases Wiki Activity

Replace MESSAGE by OPM_MESSAGE

Browse Source
This commit is contained in:
Andreas Lauser 2013-09-03 15:00:30 +02:00
parent 7e8d941a6f
commit 05af2ab6ff
5 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
examples/sim_poly2p_comp_reorder.cpp
View File

@ -274,7 +274,7 @@ try
const bool use_wpolymer = deck->hasField("WPOLYMER");
if (use_wpolymer) {
if (param.has("poly_start_days")) {
MESSAGE("Warning: Using WPOLYMER to control injection since it was found in deck. "
OPM_MESSAGE("Warning: Using WPOLYMER to control injection since it was found in deck. "
"You seem to be trying to control it via parameter poly_start_days (etc.) as well.");
}
}

2
examples/sim_poly2p_incomp_reorder.cpp
View File

@ -278,7 +278,7 @@ try
const bool use_wpolymer = deck->hasField("WPOLYMER");
if (use_wpolymer) {
if (param.has("poly_start_days")) {
MESSAGE("Warning: Using WPOLYMER to control injection since it was found in deck. "
OPM_MESSAGE("Warning: Using WPOLYMER to control injection since it was found in deck. "
"You seem to be trying to control it via parameter poly_start_days (etc.) as well.");
}
}

4
opm/polymer/PolymerInflow.cpp
View File

@ -46,7 +46,7 @@ namespace Opm
if (step_start + eps >= stime_ && step_end - eps <= etime_) {
std::fill(poly_inflow_c.begin(), poly_inflow_c.end(), amount_);
} else if (step_start + eps <= etime_ && step_end - eps >= stime_) {
MESSAGE("Warning: polymer injection set to change inside timestep. Using value at start of step.");
OPM_MESSAGE("Warning: polymer injection set to change inside timestep. Using value at start of step.");
std::fill(poly_inflow_c.begin(), poly_inflow_c.end(), amount_);
} else {
std::fill(poly_inflow_c.begin(), poly_inflow_c.end(), 0.0);
@ -66,7 +66,7 @@ namespace Opm
: sparse_inflow_(num_cells)
{
if (!deck.hasField("WPOLYMER")) {
MESSAGE("PolymerInflowFromDeck initialized without WPOLYMER in current epoch.");
OPM_MESSAGE("PolymerInflowFromDeck initialized without WPOLYMER in current epoch.");
return;
}

4
opm/polymer/TransportSolverTwophaseCompressiblePolymer.cpp
View File

@ -817,7 +817,7 @@ namespace Opm
if ((iters_used_split >= max_iters_split) && (norm(res) > tol_)) {
MESSAGE("Newton for single cell did not work in cell number " << cell);
OPM_MESSAGE("Newton for single cell did not work in cell number " << cell);
solveSingleCellBracketing(cell);
} else {
scToc(x, x_c);
@ -963,7 +963,7 @@ namespace Opm
}
if ((iters_used_split >= max_iters_split) && (norm(res) > tol_)) {
MESSAGE("Newton for single cell did not work in cell number " << cell);
OPM_MESSAGE("Newton for single cell did not work in cell number " << cell);
solveSingleCellBracketing(cell);
} else {
concentration_[cell] = x[1];

6
opm/polymer/TransportSolverTwophasePolymer.cpp
View File

@ -751,7 +751,7 @@ namespace Opm
if ((iters_used_split >= max_iters_split) && (norm(res) > tol_)) {
MESSAGE("Newton for single cell did not work in cell number " << cell);
OPM_MESSAGE("Newton for single cell did not work in cell number " << cell);
solveSingleCellBracketing(cell);
} else {
scToc(x, x_c);
@ -850,7 +850,7 @@ namespace Opm
}
if ((iters_used_split >= max_iters_split) && (norm(res) > tol_)) {
MESSAGE("Newton for single cell did not work in cell number " << cell);
OPM_MESSAGE("Newton for single cell did not work in cell number " << cell);
solveSingleCellBracketing(cell);
} else {
concentration_[cell] = x[1];
@ -997,7 +997,7 @@ namespace Opm
}
if ((iters_used_split >= max_iters_split) || (norm(res) > tol_)) {
MESSAGE("NewtonSimple for single cell did not work in cell number " << cell);
OPM_MESSAGE("NewtonSimple for single cell did not work in cell number " << cell);
solveSingleCellBracketing(cell);
} else {
concentration_[cell] = x[1];