OilfieldToolsNet/opm-simulators
4
0
Fork 0
mirror of https://github.com/OPM/opm-simulators.git synced 2024-11-25 10:40:21 -06:00
Code Issues Packages Projects Releases Wiki Activity

Remove trailing whitespace

Browse Source
This commit is contained in:
Joakim Hove 2019-10-04 13:22:20 +02:00
parent 0961cf6e22
commit 2d544b87f3
3 changed files with 24 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -32,21 +32,21 @@ namespace Opm{
bool hasGas = phases.active( Phase::GAS );
bool hasOil = phases.active( Phase::OIL );
bool hasSolvent = phases.active( Phase::SOLVENT );
if (hasWater && hasGas && !hasOil && !hasSolvent) {
const std::string msg = "System: Water-Gas system.";
OpmLog::info(msg);
fluidSystem_ = FluidSystem::WaterGas;
}
if (hasWater && hasOil && !hasGas && !hasSolvent) {
if (hasWater && hasOil && !hasGas && !hasSolvent) {
const std::string msg = "System: Oil-Water system.";
OpmLog::info(msg);
fluidSystem_ = FluidSystem::OilWater;
fluidSystem_ = FluidSystem::OilWater;
}
if (hasOil && hasGas && !hasWater && !hasSolvent) {
if (hasOil && hasGas && !hasWater && !hasSolvent) {
const std::string msg = "System: Oil-Gas system.";
OpmLog::info(msg);
fluidSystem_ = FluidSystem::OilGas;
fluidSystem_ = FluidSystem::OilGas;
}
if (hasOil && hasWater && hasGas && !hasSolvent) {
const std::string msg = "System: Black-oil system.";
@ -115,7 +115,7 @@ namespace Opm{
satFamily_ = SaturationFunctionFamily::FamilyI;
const std::string msg = "Relative permeability input format: Saturation Family I.";
OpmLog::info(msg);
}
}
if (!family1 && family2) {
satFamily_ = SaturationFunctionFamily::FamilyII;
const std::string msg = "Relative permeability input format: Saturation Family II.";
@ -124,7 +124,7 @@ namespace Opm{
}
void RelpermDiagnostics::tableCheck_(const EclipseState& eclState)
{
@ -147,7 +147,7 @@ namespace Opm{
const TableContainer& ssfnTables = tableManager.getSsfnTables();
const TableContainer& miscTables = tableManager.getMiscTables();
const TableContainer& msfnTables = tableManager.getMsfnTables();
for (int satnumIdx = 0; satnumIdx < numSatRegions; ++satnumIdx) {
if (tableManager.hasTables("SWOF")) {
swofTableCheck_(swofTables.getTable<SwofTable>(satnumIdx), satnumIdx+1);
@ -203,7 +203,7 @@ namespace Opm{
void RelpermDiagnostics::swofTableCheck_(const Opm::SwofTable& swofTables,
void RelpermDiagnostics::swofTableCheck_(const Opm::SwofTable& swofTables,
const int satnumIdx)
{
const auto& sw = swofTables.getSwColumn();
@ -274,7 +274,7 @@ namespace Opm{
}
void RelpermDiagnostics::slgofTableCheck_(const Opm::SlgofTable& slgofTables,
const int satnumIdx)
const int satnumIdx)
{
const auto& sl = slgofTables.getSlColumn();
const auto& krg = slgofTables.getKrgColumn();
@ -321,7 +321,7 @@ namespace Opm{
const std::string msg = "In SWFN table SATNUM = " + regionIdx + ", saturation should be in range [0,1].";
OpmLog::error(msg);
}
//Check krw column.
if (krw.front() < 0.0 || krw.back() > 1.0) {
const std::string msg = "In SWFN table SATNUM = " + regionIdx + ", krw should be in range [0,1].";
@ -334,7 +334,7 @@ namespace Opm{
}
}
@ -349,7 +349,7 @@ namespace Opm{
const std::string msg = "In SGFN table SATNUM = " + regionIdx + ", saturation should be in range [0,1].";
OpmLog::error(msg);
}
//Check krg column.
if (krg.front() < 0.0 || krg.back() > 1.0) {
const std::string msg = "In SGFN table SATNUM = " + regionIdx + ", krg should be in range [0,1].";
@ -399,7 +399,7 @@ namespace Opm{
const std::string msg = "In SOF3 table SATNUM = " + regionIdx + ", first value of krog should be 0.";
OpmLog::error(msg);
}
if (krog.back() != krow.back()) {
const std::string msg = "In SOF3 table SATNUM = " + regionIdx + ", max value of krog and krow should be the same.";
OpmLog::error(msg);

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

@ -45,11 +45,11 @@ namespace Opm {
///This class is intend to be a relpmer diganostics, to detect
///wrong input of relperm table and endpoints.
class RelpermDiagnostics
class RelpermDiagnostics
{
public:
///This function is used to diagnosis relperm in
///eclipse data file. Errors and warings will be
///eclipse data file. Errors and warings will be
///output if they're found.
///\param[in] eclState eclipse state.
///\param[in] deck ecliplise data file.
@ -67,7 +67,7 @@ namespace Opm {
BlackOil,
Solvent
};
FluidSystem fluidSystem_;
enum SaturationFunctionFamily {
@ -75,7 +75,7 @@ namespace Opm {
FamilyII,
NoFamily
};
SaturationFunctionFamily satFamily_;
std::vector<Opm::EclEpsScalingPointsInfo<double> > unscaledEpsInfo_;
@ -87,7 +87,7 @@ namespace Opm {
///Check saturation family I and II.
void satFamilyCheck_(const EclipseState& eclState);
///Check saturation tables.
void tableCheck_(const EclipseState& eclState);

10
opm/core/props/satfunc/RelpermDiagnostics_impl.hpp
View File

@ -55,9 +55,9 @@ namespace Opm {
const auto& compressedToCartesianIdx = Opm::compressedToCartesian(nc, global_cell);
scaledEpsInfo_.resize(nc);
EclEpsGridProperties epsGridProperties;
epsGridProperties.initFromDeck(deck, eclState, /*imbibition=*/false);
epsGridProperties.initFromDeck(deck, eclState, /*imbibition=*/false);
const auto& satnum = eclState.get3DProperties().getIntGridProperty("SATNUM");
const std::string tag = "Scaled endpoints";
for (int c = 0; c < nc; ++c) {
const int cartIdx = compressedToCartesianIdx[c];
@ -66,7 +66,7 @@ namespace Opm {
ijk[0] = cartIdx % dims[0];
ijk[1] = (cartIdx / dims[0]) % dims[1];
ijk[2] = cartIdx / dims[0] / dims[1];
const std::string cellIdx = "(" + std::to_string(ijk[0]) + ", " +
const std::string cellIdx = "(" + std::to_string(ijk[0]) + ", " +
std::to_string(ijk[1]) + ", " +
std::to_string(ijk[2]) + ")";
scaledEpsInfo_[c].extractScaled(eclState, epsGridProperties, cartIdx);
@ -76,7 +76,7 @@ namespace Opm {
const std::string msg = "For scaled endpoints input, cell" + cellIdx + " SATNUM = " + satnumIdx + ", SGU exceed 1.0 - SWL";
OpmLog::warning(tag, msg);
}
// SGL <= 1.0 - SWU
if (scaledEpsInfo_[c].Sgl > (1.0 - scaledEpsInfo_[c].Swu + tolerance)) {
const std::string msg = "For scaled endpoints input, cell" + cellIdx + " SATNUM = " + satnumIdx + ", SGL exceed 1.0 - SWU";
@ -95,7 +95,7 @@ namespace Opm {
OpmLog::warning(tag, msg);
}
}
}
}
}
} //namespace Opm