OilfieldToolsNet/opm-simulators
4
0
Fork 0
mirror of https://github.com/OPM/opm-simulators.git synced 2024-12-01 21:39:09 -06:00
Code Issues Packages Projects Releases Wiki Activity

remove unused functions and comments, add documentations to diagnosis().

Browse Source
This commit is contained in:
Liu Ming 2015-11-30 10:52:34 +08:00
parent a96f9b0d3b
commit 96b012d9b1
2 changed files with 6 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -526,14 +526,12 @@ namespace Opm{
// SGU <= 1.0 - SWL
if (scaledEpsInfo_[c].Sgu > (1.0 - scaledEpsInfo_[c].Swl)) {
//std::string msg = "In cell:" + std::to_string(c) + " SGU exceed 1.0 - SWL";
std::string msg = "WARNING: For scaled endpoints input, SGU exceed 1.0 - SWL";
messages_.push_back(msg);
}
// SGL <= 1.0 - SWU
if (scaledEpsInfo_[c].Sgl > (1.0 - scaledEpsInfo_[c].Swu)) {
//std::string msg = "In cell: " + std::to_string(c) + " SGL exceed 1.0 - SWU";
std::string msg = "WARNING: For scaled endpoints input, SGL exceed 1.0 - SWU";
messages_.push_back(msg);
}
@ -541,14 +539,11 @@ namespace Opm{
if (deck->hasKeyword("SCALECRS") && fluidSystem_ == FluidSystem::BlackOil) {
// Mobilility check.
if ((scaledEpsInfo_[c].Sowcr + scaledEpsInfo_[c].Swcr) >= 1.0) {
std::cout << scaledEpsInfo_[c].Sowcr << " " << scaledEpsInfo_[c].Swcr << std::endl;
//std::string msg = "In cell: " + std::to_string(c) + " SOWCR + SWCR exceed 1.0";
std::string msg = "WARNING: For scaled endpoints input, SOWCR + SWCR exceed 1.0";
messages_.push_back(msg);
}
if ((scaledEpsInfo_[c].Sogcr + scaledEpsInfo_[c].Sgcr + scaledEpsInfo_[c].Swl) >= 1.0) {
//std::string msg = "In cell: " + std::to_string(c) + " SOGCR + SGCR + SWL exceed 1.0";
std::string msg = "WARNING: For scaled endpoints input, SOGCR + SGCR + SWL exceed 1.0";
messages_.push_back(msg);
}
@ -556,19 +551,16 @@ namespace Opm{
///Following rules come from NEXUS.
if (fluidSystem_ != FluidSystem::WaterGas) {
if (scaledEpsInfo_[c].Swl > scaledEpsInfo_[c].Swcr) {
//std::string msg = "In cell: " + std::to_string(c) + " SWL > SWCR";
std::string msg = "WARNING: For scaled endpoints input, SWL > SWCR";
messages_.push_back(msg);
}
if (scaledEpsInfo_[c].Swcr > scaledEpsInfo_[c].Sowcr) {
//std::string msg = "In cell: " + std::to_string(c) + " SWCR > SOWCR";
std::string msg = "WARNING: For scaled endpoints input, SWCR > SOWCR";
messages_.push_back(msg);
}
if (scaledEpsInfo_[c].Sowcr > scaledEpsInfo_[c].Swu) {
//std::string msg = "In cell: " + std::to_string(c) + " SOWCR > SWU";
std::string msg = "WARNING: For scaled endpoints input, SOWCR > SWU";
messages_.push_back(msg);
}
@ -576,7 +568,6 @@ namespace Opm{
if (fluidSystem_ != FluidSystem::OilWater) {
if (scaledEpsInfo_[c].Sgl > scaledEpsInfo_[c].Sgcr) {
//std::string msg = "In cell: " + std::to_string(c) + " SGL > SGCR";
std::string msg = "WARNING: For scaled endpoints input, SGL > SGCR";
messages_.push_back(msg);
}
@ -584,13 +575,11 @@ namespace Opm{
if (fluidSystem_ != FluidSystem::BlackOil) {
if (scaledEpsInfo_[c].Sgcr > scaledEpsInfo_[c].Sogcr) {
//std::string msg = "In cell: " + std::to_string(c) + " SGCR > SOGCR";
std::string msg = "WARNING: For scaled endpoints input, SGCR > SOGCR";
messages_.push_back(msg);
}
if (scaledEpsInfo_[c].Sogcr > scaledEpsInfo_[c].Sgu) {
//std::string msg = "In cell: " + std::to_string(c) + " SOGCR > SGU";
std::string msg = "WARNIMG: For scaled endpoints input, SOGCR > SGU";
messages_.push_back(msg);
}

9
opm/core/props/satfunc/RelpermDiagnostics.hpp
View File

@ -42,6 +42,12 @@ namespace Opm {
class RelpermDiagnostics
{
public:
///This function is used to diagnosis relperm in
///eclipse data file. Errors and warings will be
///output if they're found.
///\param[in] eclState eclipse state.
///\param[in] deck ecliplise data file.
///\param[in] grid unstructured grid.
void diagnosis(EclipseStateConstPtr eclState,
DeckConstPtr deck,
const UnstructuredGrid& grid);
@ -69,9 +75,6 @@ namespace Opm {
std::vector<std::string> messages_;
///Display all the tables.
void keywordsDisplay_(EclipseStateConstPtr eclState);
///Check the phase that used.
void phaseCheck_(DeckConstPtr deck);