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 MESSAGE to OPM_MESSAGE

Browse Source
This commit is contained in:
Andreas Lauser 2013-08-28 14:09:28 +02:00
parent d6fa31b452
commit fde3fe3332
4 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
opm/core/props/pvt/PvtPropertiesIncompFromDeck.cpp
View File

@ -66,7 +66,7 @@ namespace Opm
if (deck.hasField("PVTW")) { if (deck.hasField("PVTW")) {
const std::vector<double>& pvtw = deck.getPVTW().pvtw_[region_number]; const std::vector<double>& pvtw = deck.getPVTW().pvtw_[region_number];
if (pvtw[2] != 0.0 || pvtw[4] != 0.0) { if (pvtw[2] != 0.0 || pvtw[4] != 0.0) {
MESSAGE("Compressibility effects in PVTW are ignored."); OPM_MESSAGE("Compressibility effects in PVTW are ignored.");
} }
reservoir_density_[phase_usage.phase_pos[PhaseUsage::Aqua]] /= pvtw[1]; reservoir_density_[phase_usage.phase_pos[PhaseUsage::Aqua]] /= pvtw[1];
viscosity_[phase_usage.phase_pos[PhaseUsage::Aqua]] = pvtw[3]; viscosity_[phase_usage.phase_pos[PhaseUsage::Aqua]] = pvtw[3];
@ -80,7 +80,7 @@ namespace Opm
if (deck.hasField("PVCDO")) { if (deck.hasField("PVCDO")) {
const std::vector<double>& pvcdo = deck.getPVCDO().pvcdo_[region_number]; const std::vector<double>& pvcdo = deck.getPVCDO().pvcdo_[region_number];
if (pvcdo[2] != 0.0 || pvcdo[4] != 0.0) { if (pvcdo[2] != 0.0 || pvcdo[4] != 0.0) {
MESSAGE("Compressibility effects in PVCDO are ignored."); OPM_MESSAGE("Compressibility effects in PVCDO are ignored.");
} }
reservoir_density_[phase_usage.phase_pos[PhaseUsage::Liquid]] /= pvcdo[1]; reservoir_density_[phase_usage.phase_pos[PhaseUsage::Liquid]] /= pvcdo[1];
viscosity_[phase_usage.phase_pos[PhaseUsage::Liquid]] = pvcdo[3]; viscosity_[phase_usage.phase_pos[PhaseUsage::Liquid]] = pvcdo[3];

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

@ -113,7 +113,7 @@ namespace Opm
const double cum_src = std::accumulate(source, source + grid_.number_of_cells, 0.0); const double cum_src = std::accumulate(source, source + grid_.number_of_cells, 0.0);
if (std::fabs(cum_src) > *std::max_element(source, source + grid_.number_of_cells)*1e-2) { if (std::fabs(cum_src) > *std::max_element(source, source + grid_.number_of_cells)*1e-2) {
// OPM_THROW(std::runtime_error, "Sources do not sum to zero: " << cum_src); // OPM_THROW(std::runtime_error, "Sources do not sum to zero: " << cum_src);
MESSAGE("Warning: sources do not sum to zero: " << cum_src); OPM_MESSAGE("Warning: sources do not sum to zero: " << cum_src);
} }
#endif #endif
const int num_basis = basis_func_->numBasisFunc(); const int num_basis = basis_func_->numBasisFunc();
@ -191,7 +191,7 @@ namespace Opm
const double cum_src = std::accumulate(source, source + grid_.number_of_cells, 0.0); const double cum_src = std::accumulate(source, source + grid_.number_of_cells, 0.0);
if (std::fabs(cum_src) > *std::max_element(source, source + grid_.number_of_cells)*1e-2) { if (std::fabs(cum_src) > *std::max_element(source, source + grid_.number_of_cells)*1e-2) {
// OPM_THROW(std::runtime_error, "Sources do not sum to zero: " << cum_src); // OPM_THROW(std::runtime_error, "Sources do not sum to zero: " << cum_src);
MESSAGE("Warning: sources do not sum to zero: " << cum_src); OPM_MESSAGE("Warning: sources do not sum to zero: " << cum_src);
} }
#endif #endif
const int num_basis = basis_func_->numBasisFunc(); const int num_basis = basis_func_->numBasisFunc();

2
opm/core/utility/miscUtilities.cpp
View File

@ -459,7 +459,7 @@ namespace Opm
for (int w = 0; w < wells.number_of_wells; ++w) { for (int w = 0; w < wells.number_of_wells; ++w) {
const int cur = wells.ctrls[w]->current; const int cur = wells.ctrls[w]->current;
if (wells.ctrls[w]->num != 1) { if (wells.ctrls[w]->num != 1) {
MESSAGE("In wellsToSrc(): well has more than one control, all but current control will be ignored."); OPM_MESSAGE("In wellsToSrc(): well has more than one control, all but current control will be ignored.");
} }
if (wells.ctrls[w]->type[cur] != RESERVOIR_RATE) { if (wells.ctrls[w]->type[cur] != RESERVOIR_RATE) {
OPM_THROW(std::runtime_error, "In wellsToSrc(): well is something other than RESERVOIR_RATE."); OPM_THROW(std::runtime_error, "In wellsToSrc(): well is something other than RESERVOIR_RATE.");

4
opm/core/wells/WellsManager.cpp
View File

@ -249,7 +249,7 @@ namespace Opm
keywords.push_back("COMPDAT"); keywords.push_back("COMPDAT");
// keywords.push_back("WELTARG"); // keywords.push_back("WELTARG");
if (!deck.hasFields(keywords)) { if (!deck.hasFields(keywords)) {
MESSAGE("Missing well keywords in deck, initializing no wells."); OPM_MESSAGE("Missing well keywords in deck, initializing no wells.");
return; return;
} }
if (!(deck.hasField("WCONINJE") || deck.hasField("WCONPROD")) ) { if (!(deck.hasField("WCONINJE") || deck.hasField("WCONPROD")) ) {
@ -385,7 +385,7 @@ namespace Opm
double radius = 0.5*compdat.compdat[kw].diameter_; double radius = 0.5*compdat.compdat[kw].diameter_;
if (radius <= 0.0) { if (radius <= 0.0) {
radius = 0.5*unit::feet; radius = 0.5*unit::feet;
MESSAGE("**** Warning: Well bore internal radius set to " << radius); OPM_MESSAGE("**** Warning: Well bore internal radius set to " << radius);
} }
std::array<double, 3> cubical = getCubeDim(grid, cell); std::array<double, 3> cubical = getCubeDim(grid, cell);
const double* cell_perm = &permeability[grid.dimensions*grid.dimensions*cell]; const double* cell_perm = &permeability[grid.dimensions*grid.dimensions*cell];