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

fix indentation and fluid system issues.

Browse Source
This commit is contained in:
Liu Ming
2016-03-11 17:03:31 +08:00
parent 8cea813d57
commit 7cecb10edf
1 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -66,27 +66,27 @@ namespace Opm{
bool hasWater = deck->hasKeyword("WATER");
bool hasGas = deck->hasKeyword("GAS");
bool hasOil = deck->hasKeyword("OIL");
bool Solvent = deck->hasKeyword("SOLVENT");
bool hasSolvent = deck->hasKeyword("SOLVENT");
if (hasWater && hasGas && !hasOil) {
if (hasWater && hasGas && !hasOil && !hasSolvent) {
const std::string msg = "System: Water-Gas system.";
std::cout << msg << std::endl;
streamLog_->addMessage(Log::MessageType::Info, msg);
fluidSystem_ = FluidSystem::WaterGas;
}
if (hasWater && hasOil && !hasGas) {
if (hasWater && hasOil && !hasGas && !hasSolvent) {
const std::string msg = "System: Oil-Water system.";
std::cout << msg << std::endl;
streamLog_->addMessage(Log::MessageType::Info, msg);
fluidSystem_ = FluidSystem::OilWater;
}
if (hasOil && hasGas && !hasWater) {
if (hasOil && hasGas && !hasWater && !hasSolvent) {
const std::string msg = "System: Oil-Gas system.";
std::cout << msg << std::endl;
streamLog_->addMessage(Log::MessageType::Info, msg);
fluidSystem_ = FluidSystem::OilGas;
}
if (hasOil && hasWater && hasGas) {
if (hasOil && hasWater && hasGas && !hasSolvent) {
const std::string msg = "System: Black-oil system.";
std::cout << msg << std::endl;
streamLog_->addMessage(Log::MessageType::Info, msg);
@@ -563,7 +563,7 @@ namespace Opm{
void RelpermDiagnostics::sgcwmisTableCheck_(const Opm::SgcwmisTable& sgcwmisTables,
const int satnumIdx)
const int satnumIdx)
{
const auto& sw = sgcwmisTables.getWaterSaturationColumn();
const auto& sgc = sgcwmisTables.getMiscibleResidualGasColumn();
@@ -590,7 +590,7 @@ namespace Opm{
void RelpermDiagnostics::sorwmisTableCheck_(const Opm::SorwmisTable& sorwmisTables,
const int satnumIdx)
const int satnumIdx)
{
const auto& sw = sorwmisTables.getWaterSaturationColumn();
const auto& sor = sorwmisTables.getMiscibleResidualOilColumn();