OilfieldToolsNet/opm-core
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

use two slashes for comments inside functions.

Browse Source
This commit is contained in:
Liu Ming 2016-03-11 17:19:39 +08:00
parent 26e18bdcc4
commit 897aa67b89
1 changed files with 41 additions and 41 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

82
opm/core/props/satfunc/RelpermDiagnostics.cpp
View File

@ -229,15 +229,15 @@ namespace Opm{
const auto& krw = swofTables.getKrwColumn();
const auto& krow = swofTables.getKrowColumn();
const std::string regionIdx = std::to_string(satnumIdx);
///Check sw column.
//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);
streamLog_->addMessage(Log::MessageType::Error, msg);
counter_.error += 1;
}
///TODO check endpoint sw.back() == 1. - Sor.
///Check krw column.
//TODO check endpoint sw.back() == 1. - Sor.
//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);
@ -272,7 +272,7 @@ namespace Opm{
const auto& krg = sgofTables.getKrgColumn();
const auto& krog = sgofTables.getKrogColumn();
const std::string regionIdx = std::to_string(satnumIdx);
///Check sw column.
//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);
@ -285,8 +285,8 @@ namespace Opm{
streamLog_->addMessage(Log::MessageType::Error, msg);
counter_.error += 1;
}
///TODO check endpoint sw.back() == 1. - Sor.
///Check krw column.
//TODO check endpoint sw.back() == 1. - Sor.
//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);
@ -300,14 +300,14 @@ namespace Opm{
counter_.error += 1;
}
///Check krow column.
//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);
streamLog_->addMessage(Log::MessageType::Error, msg);
counter_.error += 1;
}
///TODO check if run with water.
//TODO check if run with water.
}
void RelpermDiagnostics::slgofTableCheck_(const Opm::SlgofTable& slgofTables,
@ -317,8 +317,8 @@ namespace Opm{
const auto& krg = slgofTables.getKrgColumn();
const auto& krog = slgofTables.getKrogColumn();
const std::string regionIdx = std::to_string(satnumIdx);
///Check sl column.
///TODO first value means sl = swco + sor
//Check sl column.
//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);
@ -363,7 +363,7 @@ namespace Opm{
const auto& sw = swfnTables.getSwColumn();
const auto& krw = swfnTables.getKrwColumn();
const std::string regionIdx = std::to_string(satnumIdx);
///Check sw column.
//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);
@ -371,7 +371,7 @@ namespace Opm{
counter_.error += 1;
}
///Check krw column.
//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);
@ -397,7 +397,7 @@ namespace Opm{
const auto& sg = sgfnTables.getSgColumn();
const auto& krg = sgfnTables.getKrgColumn();
const std::string regionIdx = std::to_string(satnumIdx);
///Check sg column.
//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);
@ -405,7 +405,7 @@ namespace Opm{
counter_.error += 1;
}
///Check krg column.
//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);
@ -431,8 +431,8 @@ namespace Opm{
const auto& krow = sof3Tables.getKrowColumn();
const auto& krog = sof3Tables.getKrogColumn();
const std::string regionIdx = std::to_string(satnumIdx);
///Check so column.
///TODO: The max so = 1 - Swco
//Check so column.
//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);
@ -440,7 +440,7 @@ namespace Opm{
counter_.error += 1;
}
///Check krow column.
//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);
@ -454,7 +454,7 @@ namespace Opm{
counter_.error += 1;
}
///Check krog column.
//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);
@ -487,8 +487,8 @@ namespace Opm{
const auto& so = sof2Tables.getSoColumn();
const auto& kro = sof2Tables.getKroColumn();
const std::string regionIdx = std::to_string(satnumIdx);
///Check so column.
///TODO: The max so = 1 - Swco
//Check so column.
//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);
@ -496,7 +496,7 @@ namespace Opm{
counter_.error += 1;
}
///Check krow column.
//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);
@ -522,7 +522,7 @@ namespace Opm{
const auto& krg = sgwfnTables.getKrgColumn();
const auto& krgw = sgwfnTables.getKrgwColumn();
const std::string regionIdx = std::to_string(satnumIdx);
///Check sg column.
//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);
@ -530,7 +530,7 @@ namespace Opm{
counter_.error += 1;
}
///Check krg column.
//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);
@ -544,8 +544,8 @@ namespace Opm{
counter_.error += 1;
}
///Check krgw column.
///TODO check saturation sw = 1. - sg
//Check krgw column.
//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);
@ -568,7 +568,7 @@ namespace Opm{
const auto& sw = sgcwmisTables.getWaterSaturationColumn();
const auto& sgc = sgcwmisTables.getMiscibleResidualGasColumn();
const std::string regionIdx = std::to_string(satnumIdx);
///Check sw column.
//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);
@ -576,7 +576,7 @@ namespace Opm{
counter_.error += 1;
}
///Check critical gas column.
//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);
@ -595,7 +595,7 @@ namespace Opm{
const auto& sw = sorwmisTables.getWaterSaturationColumn();
const auto& sor = sorwmisTables.getMiscibleResidualOilColumn();
const std::string regionIdx = std::to_string(satnumIdx);
///Check sw column.
//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);
@ -603,7 +603,7 @@ namespace Opm{
counter_.error += 1;
}
///Check critical oil column.
//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);
@ -622,7 +622,7 @@ namespace Opm{
const auto& krgm = ssfnTables.getGasRelPermMultiplierColumn();
const auto& krsm = ssfnTables.getSolventRelPermMultiplierColumn();
const std::string regionIdx = std::to_string(satnumIdx);
///Check phase fraction column.
//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);
@ -630,7 +630,7 @@ namespace Opm{
counter_.error += 1;
}
///Check gas relperm multiplier column.
//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);
@ -638,7 +638,7 @@ namespace Opm{
counter_.error += 1;
}
///Check solvent relperm multiplier column.
//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);
@ -659,7 +659,7 @@ namespace Opm{
const auto& misc = miscTables.getMiscibilityColumn();
const std::string regionIdx = std::to_string(satnumIdx);
///Check phase fraction column.
//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);
@ -667,7 +667,7 @@ namespace Opm{
counter_.error += 1;
}
///Check miscibility column.
//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);
@ -688,7 +688,7 @@ namespace Opm{
const auto& krom = msfnTables.getOilRelpermMultiplierColumn();
const std::string regionIdx = std::to_string(satnumIdx);
///Check phase fraction column.
//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);
@ -696,7 +696,7 @@ namespace Opm{
counter_.error += 1;
}
///Check gas_solvent relperm multiplier column.
//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);
@ -704,7 +704,7 @@ namespace Opm{
counter_.error += 1;
}
///Check oil relperm multiplier column.
//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);
@ -748,8 +748,8 @@ namespace Opm{
counter_.warning += 1;
}
///Krow(Sou) == Krog(Sou) for three-phase
/// means Krow(Swco) == Krog(Sgco)
//Krow(Sou) == Krog(Sou) for three-phase
// means Krow(Swco) == Krog(Sgco)
double krow_value = 1e20;
double krog_value = 1e-20;
if (fluidSystem_ == FluidSystem::BlackOil) {
@ -782,8 +782,8 @@ namespace Opm{
counter_.warning += 1;
}
}
///Krw(Sw=0)=Krg(Sg=0)=Krow(So=0)=Krog(So=0)=0.
///Mobile fluid requirements
//Krw(Sw=0)=Krg(Sg=0)=Krow(So=0)=Krog(So=0)=0.
//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);