remove internal messages container.
This commit is contained in:
Liu Ming
parent
98a413bf5c
commit
b25a964597
@ -37,16 +37,6 @@ namespace Opm{
|
||||
|
||||
|
||||
|
||||
|
||||
std::vector<std::string>
|
||||
RelpermDiagnostics::getMessages() const
|
||||
{
|
||||
return messages_;
|
||||
}
|
||||
|
||||
|
||||
|
||||
|
||||
void RelpermDiagnostics::phaseCheck_(DeckConstPtr deck)
|
||||
{
|
||||
bool hasWater = deck->hasKeyword("WATER");
|
||||
@ -108,7 +98,6 @@ namespace Opm{
|
||||
|
||||
if (family1 && family2) {
|
||||
const std::string msg = "Error: Saturation families should not be mixed.\n Use either SGOF and SWOF or SGFN, SWFN and SOF3.";
|
||||
messages_.push_back(msg);
|
||||
OpmLog::error(msg);
|
||||
counter_.error += 1;
|
||||
}
|
||||
@ -117,7 +106,6 @@ namespace Opm{
|
||||
const std::string msg = "Error, Saturations function must be specified using either \n \
|
||||
family 1 or family 2 keywords \n \
|
||||
Use either SGOF and SWOF or SGFN, SWFN and SOF3.";
|
||||
messages_.push_back(msg);
|
||||
OpmLog::error(msg);
|
||||
counter_.error += 1;
|
||||
}
|
||||
@ -218,7 +206,6 @@ namespace Opm{
|
||||
//Check sw column.
|
||||
if (sw.front() < 0.0 || sw.back() > 1.0) {
|
||||
const std::string msg = "Error: In SWOF table SATNUM = "+ regionIdx + ", saturation should be in range [0,1].";
|
||||
messages_.push_back(msg);
|
||||
OpmLog::error(msg);
|
||||
counter_.error += 1;
|
||||
}
|
||||
@ -226,13 +213,11 @@ namespace Opm{
|
||||
//Check krw column.
|
||||
if (krw.front() != 0.0) {
|
||||
const std::string msg = "Error: In SWOF table SATNUM = " + regionIdx + ", first value of krw should be 0.";
|
||||
messages_.push_back(msg);
|
||||
OpmLog::error(msg);
|
||||
counter_.error += 1;
|
||||
}
|
||||
if (krw.front() < 0.0 || krw.back() > 1.0) {
|
||||
const std::string msg = "Error: In SWOF table SATNUM = " + regionIdx + ", krw should be in range [0,1].";
|
||||
messages_.push_back(msg);
|
||||
OpmLog::error(msg);
|
||||
counter_.error += 1;
|
||||
}
|
||||
@ -240,7 +225,6 @@ namespace Opm{
|
||||
///Check krow column.
|
||||
if (krow.front() > 1.0 || krow.back() < 0.0) {
|
||||
const std::string msg = "Error: In SWOF table SATNUM = "+ regionIdx + ", krow should be in range [0, 1].";
|
||||
messages_.push_back(msg);
|
||||
OpmLog::error(msg);
|
||||
counter_.error += 1;
|
||||
}
|
||||
@ -261,13 +245,11 @@ namespace Opm{
|
||||
//Check sw column.
|
||||
if (sg.front() < 0.0 || sg.back() > 1.0) {
|
||||
const std::string msg = "Error: In SGOF table SATNUM = " + regionIdx + ", saturation should be in range [0,1].";
|
||||
messages_.push_back(msg);
|
||||
OpmLog::error(msg);
|
||||
counter_.error += 1;
|
||||
}
|
||||
if (sg.front() != 0.0) {
|
||||
const std::string msg = "Error: In SGOF table SATNUM = " + regionIdx + ", first value of sg should be 0.";
|
||||
messages_.push_back(msg);
|
||||
OpmLog::error(msg);
|
||||
counter_.error += 1;
|
||||
}
|
||||
@ -275,13 +257,11 @@ namespace Opm{
|
||||
//Check krw column.
|
||||
if (krg.front() != 0.0) {
|
||||
const std::string msg = "Error: In SGOF table SATNUM = " + regionIdx + ", first value of krg should be 0.";
|
||||
messages_.push_back(msg);
|
||||
OpmLog::error(msg);
|
||||
counter_.error += 1;
|
||||
}
|
||||
if (krg.front() < 0.0 || krg.back() > 1.0) {
|
||||
const std::string msg = "Error: In SGOF table SATNUM = " + regionIdx + ", krg should be in range [0,1].";
|
||||
messages_.push_back(msg);
|
||||
OpmLog::error(msg);
|
||||
counter_.error += 1;
|
||||
}
|
||||
@ -289,7 +269,6 @@ namespace Opm{
|
||||
//Check krow column.
|
||||
if (krog.front() > 1.0 || krog.back() < 0.0) {
|
||||
const std::string msg = "Error: In SGOF table SATNUM = " + regionIdx + ", krog should be in range [0, 1].";
|
||||
messages_.push_back(msg);
|
||||
OpmLog::error(msg);
|
||||
counter_.error += 1;
|
||||
}
|
||||
@ -307,33 +286,28 @@ namespace Opm{
|
||||
//TODO first value means sl = swco + sor
|
||||
if (sl.front() < 0.0 || sl.back() > 1.0) {
|
||||
const std::string msg = "Error: In SLGOF table SATNUM = " + regionIdx + ", saturation should be in range [0,1].";
|
||||
messages_.push_back(msg);
|
||||
OpmLog::error(msg);
|
||||
counter_.error += 1;
|
||||
}
|
||||
if (sl.back() != 1.0) {
|
||||
const std::string msg = "Error: In SLGOF table SATNUM = " + regionIdx + ", last value of sl should be 1.";
|
||||
messages_.push_back(msg);
|
||||
OpmLog::error(msg);
|
||||
counter_.error += 1;
|
||||
}
|
||||
|
||||
if (krg.front() > 1.0 || krg.back() < 0) {
|
||||
const std::string msg = "Error: In SLGOF table SATNUM = " + regionIdx + ", krg shoule be in range [0, 1].";
|
||||
messages_.push_back(msg);
|
||||
OpmLog::error(msg);
|
||||
counter_.error += 1;
|
||||
}
|
||||
if (krg.back() != 0.0) {
|
||||
const std::string msg = "Error: In SLGOF table SATNUM = " + regionIdx + ", last value of krg hould be 0.";
|
||||
messages_.push_back(msg);
|
||||
OpmLog::error(msg);
|
||||
counter_.error += 1;
|
||||
}
|
||||
|
||||
if (krog.front() < 0.0 || krog.back() > 1.0) {
|
||||
const std::string msg = "Error: In SLGOF table SATNUM = " + regionIdx + ", krog shoule be in range [0, 1].";
|
||||
messages_.push_back(msg);
|
||||
OpmLog::error(msg);
|
||||
counter_.error += 1;
|
||||
}
|
||||
@ -352,7 +326,6 @@ namespace Opm{
|
||||
//Check sw column.
|
||||
if (sw.front() < 0.0 || sw.back() > 1.0) {
|
||||
const std::string msg = "Error: In SWFN table SATNUM = " + regionIdx + ", saturation should be in range [0,1].";
|
||||
messages_.push_back(msg);
|
||||
OpmLog::error(msg);
|
||||
counter_.error += 1;
|
||||
}
|
||||
@ -360,14 +333,12 @@ namespace Opm{
|
||||
//Check krw column.
|
||||
if (krw.front() < 0.0 || krw.back() > 1.0) {
|
||||
const std::string msg = "Error: In SWFN table SATNUM = " + regionIdx + ", krw should be in range [0,1].";
|
||||
messages_.push_back(msg);
|
||||
OpmLog::error(msg);
|
||||
counter_.error += 1;
|
||||
}
|
||||
|
||||
if (krw.front() != 0.0) {
|
||||
const std::string msg = "Error: In SWFN table SATNUM = " + regionIdx + ", first value of krw should be 0.";
|
||||
messages_.push_back(msg);
|
||||
OpmLog::error(msg);
|
||||
counter_.error += 1;
|
||||
}
|
||||
@ -386,7 +357,6 @@ namespace Opm{
|
||||
//Check sg column.
|
||||
if (sg.front() < 0.0 || sg.back() > 1.0) {
|
||||
const std::string msg = "Error: In SGFN table SATNUM = " + regionIdx + ", saturation should be in range [0,1].";
|
||||
messages_.push_back(msg);
|
||||
OpmLog::error(msg);
|
||||
counter_.error += 1;
|
||||
}
|
||||
@ -394,13 +364,11 @@ namespace Opm{
|
||||
//Check krg column.
|
||||
if (krg.front() < 0.0 || krg.back() > 1.0) {
|
||||
const std::string msg = "Error: In SGFN table SATNUM = " + regionIdx + ", krg should be in range [0,1].";
|
||||
messages_.push_back(msg);
|
||||
OpmLog::error(msg);
|
||||
counter_.error += 1;
|
||||
}
|
||||
if (krg.front() != 0.0) {
|
||||
const std::string msg = "Error: In SGFN table SATNUM = " + regionIdx + ", first value of krg should be 0.";
|
||||
messages_.push_back(msg);
|
||||
OpmLog::error(msg);
|
||||
counter_.error += 1;
|
||||
}
|
||||
@ -421,7 +389,6 @@ namespace Opm{
|
||||
//TODO: The max so = 1 - Swco
|
||||
if (so.front() < 0.0 || so.back() > 1.0) {
|
||||
const std::string msg = "Error: In SOF3 table SATNUM = " + regionIdx + ", saturation should be in range [0,1].";
|
||||
messages_.push_back(msg);
|
||||
OpmLog::error(msg);
|
||||
counter_.error += 1;
|
||||
}
|
||||
@ -429,13 +396,11 @@ namespace Opm{
|
||||
//Check krow column.
|
||||
if (krow.front() < 0.0 || krow.back() > 1.0) {
|
||||
const std::string msg = "Error: In SOF3 table SATNUM = " + regionIdx + ", krow should be in range [0,1].";
|
||||
messages_.push_back(msg);
|
||||
OpmLog::error(msg);
|
||||
counter_.error += 1;
|
||||
}
|
||||
if (krow.front() != 0.0) {
|
||||
const std::string msg = "Error: In SOF3 table SATNUM = " + regionIdx + ", first value of krow should be 0.";
|
||||
messages_.push_back(msg);
|
||||
OpmLog::error(msg);
|
||||
counter_.error += 1;
|
||||
}
|
||||
@ -443,21 +408,18 @@ namespace Opm{
|
||||
//Check krog column.
|
||||
if (krog.front() < 0.0 || krog.back() > 1.0) {
|
||||
const std::string msg = "Error: In SOF3 table SATNUM = " + regionIdx + ", krog should be in range [0,1].";
|
||||
messages_.push_back(msg);
|
||||
OpmLog::error(msg);
|
||||
counter_.error += 1;
|
||||
}
|
||||
|
||||
if (krog.front() != 0.0) {
|
||||
const std::string msg = "Error: In SOF3 table SATNUM = " + regionIdx + ", first value of krog should be 0.";
|
||||
messages_.push_back(msg);
|
||||
OpmLog::error(msg);
|
||||
counter_.error += 1;
|
||||
}
|
||||
|
||||
if (krog.back() != krow.back()) {
|
||||
const std::string msg = "Error: In SOF3 table SATNUM = " + regionIdx + ", max value of krog and krow should be the same.";
|
||||
messages_.push_back(msg);
|
||||
OpmLog::error(msg);
|
||||
counter_.error += 1;
|
||||
}
|
||||
@ -477,7 +439,6 @@ namespace Opm{
|
||||
//TODO: The max so = 1 - Swco
|
||||
if (so.front() < 0.0 || so.back() > 1.0) {
|
||||
const std::string msg = "Error: In SOF2 table SATNUM = " + regionIdx + ", saturation should be in range [0,1].";
|
||||
messages_.push_back(msg);
|
||||
OpmLog::error(msg);
|
||||
counter_.error += 1;
|
||||
}
|
||||
@ -485,13 +446,11 @@ namespace Opm{
|
||||
//Check krow column.
|
||||
if (kro.front() < 0.0 || kro.back() > 1.0) {
|
||||
const std::string msg = "Error: In SOF2 table SATNUM = " + regionIdx + ", krow should be in range [0,1].";
|
||||
messages_.push_back(msg);
|
||||
OpmLog::error(msg);
|
||||
counter_.error += 1;
|
||||
}
|
||||
if (kro.front() != 0.0) {
|
||||
const std::string msg = "Error: In SOF2 table SATNUM = " + regionIdx + ", first value of krow should be 0.";
|
||||
messages_.push_back(msg);
|
||||
OpmLog::error(msg);
|
||||
counter_.error += 1;
|
||||
}
|
||||
@ -511,7 +470,6 @@ namespace Opm{
|
||||
//Check sg column.
|
||||
if (sg.front() < 0.0 || sg.back() > 1.0) {
|
||||
const std::string msg = "Error: In SGWFN table SATNUM = " + regionIdx + ", saturation should be in range [0,1].";
|
||||
messages_.push_back(msg);
|
||||
OpmLog::error(msg);
|
||||
counter_.error += 1;
|
||||
}
|
||||
@ -519,13 +477,11 @@ namespace Opm{
|
||||
//Check krg column.
|
||||
if (krg.front() < 0.0 || krg.back() > 1.0) {
|
||||
const std::string msg = "Error: In SGWFN table SATNUM = " + regionIdx + ", krg should be in range [0,1].";
|
||||
messages_.push_back(msg);
|
||||
OpmLog::error(msg);
|
||||
counter_.error += 1;
|
||||
}
|
||||
if (krg.front() != 0.0) {
|
||||
const std::string msg = "Error: In SGWFN table SATNUM = " + regionIdx + ", first value of krg should be 0.";
|
||||
messages_.push_back(msg);
|
||||
OpmLog::error(msg);
|
||||
counter_.error += 1;
|
||||
}
|
||||
@ -534,13 +490,11 @@ namespace Opm{
|
||||
//TODO check saturation sw = 1. - sg
|
||||
if (krgw.front() > 1.0 || krgw.back() < 0.0) {
|
||||
const std::string msg = "Error: In SGWFN table SATNUM = " + regionIdx + ", krgw should be in range [0,1].";
|
||||
messages_.push_back(msg);
|
||||
OpmLog::error(msg);
|
||||
counter_.error += 1;
|
||||
}
|
||||
if (krgw.back() != 0.0) {
|
||||
const std::string msg = "Error: In SGWFN table SATNUM = " + regionIdx + ", last value of krgw should be 0.";
|
||||
messages_.push_back(msg);
|
||||
OpmLog::error(msg);
|
||||
counter_.error += 1;
|
||||
}
|
||||
@ -557,7 +511,6 @@ namespace Opm{
|
||||
//Check sw column.
|
||||
if (sw.front() < 0.0 || sw.back() > 1.0) {
|
||||
const std::string msg = "Error: In SGCWMIS table SATNUM = " + regionIdx + ", saturation should be in range [0,1].";
|
||||
messages_.push_back(msg);
|
||||
OpmLog::error(msg);
|
||||
counter_.error += 1;
|
||||
}
|
||||
@ -565,7 +518,6 @@ namespace Opm{
|
||||
//Check critical gas column.
|
||||
if (sgc.front() < 0.0 || sgc.back() > 1.0) {
|
||||
const std::string msg = "Error: In SGCWMIS table SATNUM = " + regionIdx + ", critical gas saturation should be in range [0,1].";
|
||||
messages_.push_back(msg);
|
||||
OpmLog::error(msg);
|
||||
counter_.error += 1;
|
||||
}
|
||||
@ -584,7 +536,6 @@ namespace Opm{
|
||||
//Check sw column.
|
||||
if (sw.front() < 0.0 || sw.back() > 1.0) {
|
||||
const std::string msg = "Error: In SORWMIS table SATNUM = " + regionIdx + ", saturation should be in range [0,1].";
|
||||
messages_.push_back(msg);
|
||||
OpmLog::error(msg);
|
||||
counter_.error += 1;
|
||||
}
|
||||
@ -592,7 +543,6 @@ namespace Opm{
|
||||
//Check critical oil column.
|
||||
if (sor.front() < 0.0 || sor.back() > 1.0) {
|
||||
const std::string msg = "Error: In SORWMIS table SATNUM = " + regionIdx + ", critical oil saturation should be in range [0,1].";
|
||||
messages_.push_back(msg);
|
||||
OpmLog::error(msg);
|
||||
counter_.error += 1;
|
||||
}
|
||||
@ -611,7 +561,6 @@ namespace Opm{
|
||||
//Check phase fraction column.
|
||||
if (frac.front() < 0.0 || frac.back() > 1.0) {
|
||||
const std::string msg = "Error: In SSFN table SATNUM = " + regionIdx + ", phase fraction should be in range [0,1].";
|
||||
messages_.push_back(msg);
|
||||
OpmLog::error(msg);
|
||||
counter_.error += 1;
|
||||
}
|
||||
@ -619,7 +568,6 @@ namespace Opm{
|
||||
//Check gas relperm multiplier column.
|
||||
if (krgm.front() < 0.0 || krgm.back() > 1.0) {
|
||||
const std::string msg = "Error: In SSFN table SATNUM = " + regionIdx + ", gas relative permeability multiplier should be in range [0,1].";
|
||||
messages_.push_back(msg);
|
||||
OpmLog::error(msg);
|
||||
counter_.error += 1;
|
||||
}
|
||||
@ -627,7 +575,6 @@ namespace Opm{
|
||||
//Check solvent relperm multiplier column.
|
||||
if (krsm.front() < 0.0 || krsm.back() > 1.0) {
|
||||
const std::string msg = "Error: In SSFN table SATNUM = " + regionIdx + ", solvent relative permeability multiplier should be in range [0,1].";
|
||||
messages_.push_back(msg);
|
||||
OpmLog::error(msg);
|
||||
counter_.error += 1;
|
||||
}
|
||||
@ -648,7 +595,6 @@ namespace Opm{
|
||||
//Check phase fraction column.
|
||||
if (frac.front() < 0.0 || frac.back() > 1.0) {
|
||||
const std::string msg = "Error: In MISC table SATNUM = " + regionIdx + ", phase fraction should be in range [0,1].";
|
||||
messages_.push_back(msg);
|
||||
OpmLog::error(msg);
|
||||
counter_.error += 1;
|
||||
}
|
||||
@ -656,7 +602,6 @@ namespace Opm{
|
||||
//Check miscibility column.
|
||||
if (misc.front() < 0.0 || misc.back() > 1.0) {
|
||||
const std::string msg = "Error: In MISC table SATNUM = " + regionIdx + ", miscibility should be in range [0,1].";
|
||||
messages_.push_back(msg);
|
||||
OpmLog::error(msg);
|
||||
counter_.error += 1;
|
||||
}
|
||||
@ -677,7 +622,6 @@ namespace Opm{
|
||||
//Check phase fraction column.
|
||||
if (frac.front() < 0.0 || frac.back() > 1.0) {
|
||||
const std::string msg = "Error: In MSFN table SATNUM = " + regionIdx + ", total gas fraction should be in range [0,1].";
|
||||
messages_.push_back(msg);
|
||||
OpmLog::error(msg);
|
||||
counter_.error += 1;
|
||||
}
|
||||
@ -685,7 +629,6 @@ namespace Opm{
|
||||
//Check gas_solvent relperm multiplier column.
|
||||
if (krgsm.front() < 0.0 || krgsm.back() > 1.0) {
|
||||
const std::string msg = "Error: In MSFN table SATNUM = " + regionIdx + ", gas+solvent relative permeability multiplier should be in range [0,1].";
|
||||
messages_.push_back(msg);
|
||||
OpmLog::error(msg);
|
||||
counter_.error += 1;
|
||||
}
|
||||
@ -693,7 +636,6 @@ namespace Opm{
|
||||
//Check oil relperm multiplier column.
|
||||
if (krom.front() > 1.0 || krom.back() < 0.0) {
|
||||
const std::string msg = "Error: In MSFN table SATNUM = " + regionIdx + ", oil relative permeability multiplier should be in range [0,1].";
|
||||
messages_.push_back(msg);
|
||||
OpmLog::error(msg);
|
||||
counter_.error += 1;
|
||||
}
|
||||
@ -723,13 +665,11 @@ namespace Opm{
|
||||
///Consistency check.
|
||||
if (unscaledEpsInfo_[satnumIdx].Sgu > (1. - unscaledEpsInfo_[satnumIdx].Swl)) {
|
||||
const std::string msg = "Warning: In saturation table SATNUM = " + regionIdx + ", Sgmax should not exceed 1-Swco.";
|
||||
messages_.push_back(msg);
|
||||
OpmLog::warning(msg);
|
||||
counter_.warning += 1;
|
||||
}
|
||||
if (unscaledEpsInfo_[satnumIdx].Sgl > (1. - unscaledEpsInfo_[satnumIdx].Swu)) {
|
||||
const std::string msg = "Warning: In saturation table SATNUM = " + regionIdx + ", Sgco should not exceed 1-Swmax.";
|
||||
messages_.push_back(msg);
|
||||
OpmLog::warning(msg);
|
||||
counter_.warning += 1;
|
||||
}
|
||||
@ -763,7 +703,6 @@ namespace Opm{
|
||||
}
|
||||
if (krow_value != krog_value) {
|
||||
const std::string msg = "Warning: In saturation table SATNUM = " + regionIdx + ", Krow(Somax) should be equal to Krog(Somax).";
|
||||
messages_.push_back(msg);
|
||||
OpmLog::warning(msg);
|
||||
counter_.warning += 1;
|
||||
}
|
||||
@ -772,13 +711,11 @@ namespace Opm{
|
||||
//Mobile fluid requirements
|
||||
if (((unscaledEpsInfo_[satnumIdx].Sowcr + unscaledEpsInfo_[satnumIdx].Swcr)-1) >= 0) {
|
||||
const std::string msg = "Warning: In saturation table SATNUM = " + regionIdx + ", Sowcr + Swcr should be less than 1.";
|
||||
messages_.push_back(msg);
|
||||
OpmLog::warning(msg);
|
||||
counter_.warning += 1;
|
||||
}
|
||||
if (((unscaledEpsInfo_[satnumIdx].Sogcr + unscaledEpsInfo_[satnumIdx].Sgcr + unscaledEpsInfo_[satnumIdx].Swl) - 1 ) > 0) {
|
||||
const std::string msg = "Warning: In saturation table SATNUM = " + regionIdx + ", Sogcr + Sgcr + Swco should be less than 1.";
|
||||
messages_.push_back(msg);
|
||||
OpmLog::warning(msg);
|
||||
counter_.warning += 1;
|
||||
}
|
||||
|
||||
@ -62,8 +62,6 @@ namespace Opm {
|
||||
DeckConstPtr deck,
|
||||
const GridT& grid);
|
||||
|
||||
std::vector<std::string> getMessages() const;
|
||||
|
||||
private:
|
||||
enum FluidSystem {
|
||||
OilWater,
|
||||
@ -96,9 +94,6 @@ namespace Opm {
|
||||
std::vector<Opm::EclEpsScalingPointsInfo<double> > unscaledEpsInfo_;
|
||||
std::vector<Opm::EclEpsScalingPointsInfo<double> > scaledEpsInfo_;
|
||||
|
||||
std::vector<std::string> messages_;
|
||||
///Store scaled information.
|
||||
std::vector<std::string> scaled_messages_;
|
||||
|
||||
///Check the phase that used.
|
||||
void phaseCheck_(DeckConstPtr deck);
|
||||
|
||||
@ -39,35 +39,6 @@ namespace Opm {
|
||||
tableCheck_(eclState, deck);
|
||||
unscaledEndPointsCheck_(deck, eclState);
|
||||
scaledEndPointsCheck_(deck, eclState, grid);
|
||||
if (!messages_.empty()) {
|
||||
std::sort(messages_.begin(), messages_.end());
|
||||
auto it = std::unique(messages_.begin(), messages_.end());
|
||||
messages_.erase(it, messages_.end());
|
||||
std::cout << std::endl;
|
||||
for (const auto& x : messages_) {
|
||||
std::cout << x << std::endl;
|
||||
}
|
||||
}
|
||||
int limits = 0;
|
||||
if (!scaled_messages_.empty()) {
|
||||
std::cout << std::endl;
|
||||
for (const auto& x : scaled_messages_) {
|
||||
if (limits < 10) {
|
||||
std::cout << x << std::endl;
|
||||
limits++;
|
||||
} else {
|
||||
std::cout << "\nMore inconsistencies exist. Check saturation function input and .SATFUNCLOG file!" << std::endl;
|
||||
break;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
const std::string summary_msg = "\n\nError summary:" +
|
||||
std::string("\nWarnings " + std::to_string(counter_.warning)) +
|
||||
std::string("\nProblems " + std::to_string(counter_.problem)) +
|
||||
std::string("\nErrors " + std::to_string(counter_.error)) +
|
||||
std::string("\nBugs " + std::to_string(counter_.bug))+ "\n";
|
||||
std::cout << summary_msg << std::endl;
|
||||
}
|
||||
|
||||
template <class GridT>
|
||||
@ -100,7 +71,6 @@ namespace Opm {
|
||||
// SGU <= 1.0 - SWL
|
||||
if (scaledEpsInfo_[c].Sgu > (1.0 - scaledEpsInfo_[c].Swl)) {
|
||||
const std::string msg = "Warning: For scaled endpoints input, cell" + cellIdx + " SATNUM = " + satnumIdx + ", SGU exceed 1.0 - SWL";
|
||||
scaled_messages_.push_back(msg);
|
||||
OpmLog::warning(tag, msg);
|
||||
counter_.warning += 1;
|
||||
}
|
||||
@ -108,7 +78,6 @@ namespace Opm {
|
||||
// SGL <= 1.0 - SWU
|
||||
if (scaledEpsInfo_[c].Sgl > (1.0 - scaledEpsInfo_[c].Swu)) {
|
||||
const std::string msg = "Warning: For scaled endpoints input, cell" + cellIdx + " SATNUM = " + satnumIdx + ", SGL exceed 1.0 - SWU";
|
||||
scaled_messages_.push_back(msg);
|
||||
OpmLog::warning(tag, msg);
|
||||
counter_.warning += 1;
|
||||
}
|
||||
@ -117,14 +86,12 @@ namespace Opm {
|
||||
// Mobilility check.
|
||||
if ((scaledEpsInfo_[c].Sowcr + scaledEpsInfo_[c].Swcr) >= 1.0) {
|
||||
const std::string msg = "Warning: For scaled endpoints input, cell" + cellIdx + " SATNUM = " + satnumIdx + ", SOWCR + SWCR exceed 1.0";
|
||||
scaled_messages_.push_back(msg);
|
||||
OpmLog::warning(tag, msg);
|
||||
counter_.warning += 1;
|
||||
}
|
||||
|
||||
if ((scaledEpsInfo_[c].Sogcr + scaledEpsInfo_[c].Sgcr + scaledEpsInfo_[c].Swl) >= 1.0) {
|
||||
const std::string msg = "Warning: For scaled endpoints input, cell" + cellIdx + " SATNUM = " + satnumIdx + ", SOGCR + SGCR + SWL exceed 1.0";
|
||||
scaled_messages_.push_back(msg);
|
||||
OpmLog::warning(tag, msg);
|
||||
counter_.warning += 1;
|
||||
}
|
||||
@ -133,21 +100,18 @@ namespace Opm {
|
||||
if (fluidSystem_ != FluidSystem::WaterGas) {
|
||||
if (scaledEpsInfo_[c].Swl > scaledEpsInfo_[c].Swcr) {
|
||||
const std::string msg = "Warning: For scaled endpoints input, cell" + cellIdx + " SATNUM = " + satnumIdx + ", SWL > SWCR";
|
||||
scaled_messages_.push_back(msg);
|
||||
OpmLog::warning(tag, msg);
|
||||
counter_.warning += 1;
|
||||
}
|
||||
|
||||
if (scaledEpsInfo_[c].Swcr > scaledEpsInfo_[c].Sowcr) {
|
||||
const std::string msg = "Warning: For scaled endpoints input, cell" + cellIdx + " SATNUM = " + satnumIdx + ", SWCR > SOWCR";
|
||||
scaled_messages_.push_back(msg);
|
||||
OpmLog::warning(tag, msg);
|
||||
counter_.warning += 1;
|
||||
}
|
||||
|
||||
if (scaledEpsInfo_[c].Sowcr > scaledEpsInfo_[c].Swu) {
|
||||
const std::string msg = "Warning: For scaled endpoints input, cell" + cellIdx + " SATNUM = " + satnumIdx + ", SOWCR > SWU";
|
||||
scaled_messages_.push_back(msg);
|
||||
OpmLog::warning(tag, msg);
|
||||
counter_.warning += 1;
|
||||
}
|
||||
@ -156,7 +120,6 @@ namespace Opm {
|
||||
if (fluidSystem_ != FluidSystem::OilWater) {
|
||||
if (scaledEpsInfo_[c].Sgl > scaledEpsInfo_[c].Sgcr) {
|
||||
const std::string msg = "Warning: For scaled endpoints input, cell" + cellIdx + " SATNUM = " + satnumIdx + ", SGL > SGCR";
|
||||
scaled_messages_.push_back(msg);
|
||||
OpmLog::warning(tag, msg);
|
||||
counter_.warning += 1;
|
||||
}
|
||||
@ -165,14 +128,12 @@ namespace Opm {
|
||||
if (fluidSystem_ != FluidSystem::BlackOil) {
|
||||
if (scaledEpsInfo_[c].Sgcr > scaledEpsInfo_[c].Sogcr) {
|
||||
const std::string msg = "-- Warning: For scaled endpoints input, cell" + cellIdx + " SATNUM = " + satnumIdx + ", SGCR > SOGCR";
|
||||
scaled_messages_.push_back(msg);
|
||||
OpmLog::warning(tag, msg);
|
||||
counter_.warning += 1;
|
||||
}
|
||||
|
||||
if (scaledEpsInfo_[c].Sogcr > scaledEpsInfo_[c].Sgu) {
|
||||
const std::string msg = "Warning: For scaled endpoints input, cell" + cellIdx + " SATNUM = " + satnumIdx + ", SOGCR > SGU";
|
||||
scaled_messages_.push_back(msg);
|
||||
OpmLog::warning(tag, msg);
|
||||
counter_.warning += 1;
|
||||
}
|
||||
|
||||
Loading…
Reference in New Issue
Block a user