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

make enum as private members.

Browse Source
This commit is contained in:
Liu Ming 2015-11-30 10:20:43 +08:00
parent 6d06c36f64
commit 5cfc3961db
1 changed files with 17 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -23,7 +23,10 @@
#include <vector> #include <vector>
#include <utility> #include <utility>
#if HAVE_CONFIG_H
#include "config.h" #include "config.h"
#endif // HAVE_CONFIG_H
#include <opm/core/grid.h> #include <opm/core/grid.h>
#include <opm/core/grid/GridManager.hpp> #include <opm/core/grid/GridManager.hpp>
#include <opm/core/grid/GridHelpers.hpp> #include <opm/core/grid/GridHelpers.hpp>
@ -33,19 +36,6 @@
#include <opm/material/fluidmatrixinteractions/EclEpsScalingPoints.hpp> #include <opm/material/fluidmatrixinteractions/EclEpsScalingPoints.hpp>
namespace Opm { namespace Opm {
enum FluidSystem {
OilWater,
OilGas,
WaterGas,
BlackOil
};
enum SaturationFunctionFamily {
FamilyI,
FamilyII,
NoFamily
};
///This class is intend to be a relpmer diganostics, to detect ///This class is intend to be a relpmer diganostics, to detect
///wrong input of relperm table and endpoints. ///wrong input of relperm table and endpoints.
@ -57,8 +47,21 @@ namespace Opm {
const UnstructuredGrid& grid); const UnstructuredGrid& grid);
private: private:
FluidSystem fluidSystem_; enum FluidSystem {
OilWater,
OilGas,
WaterGas,
BlackOil
};
FluidSystem fluidSystem_;
enum SaturationFunctionFamily {
FamilyI,
FamilyII,
NoFamily
};
SaturationFunctionFamily satFamily_; SaturationFunctionFamily satFamily_;
std::vector<Opm::EclEpsScalingPointsInfo<double> > unscaledEpsInfo_; std::vector<Opm::EclEpsScalingPointsInfo<double> > unscaledEpsInfo_;