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

Changed enums, variable names and defaults.

Browse Source
This commit is contained in:
Atgeirr Flø Rasmussen 2012-05-02 09:26:36 +02:00
parent c234c0b42a
commit 3a31bbee30
2 changed files with 13 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
opm/core/ProductionSpecification.cpp
View File

@ -5,13 +5,15 @@ namespace Opm
ProductionSpecification::ProductionSpecification() ProductionSpecification::ProductionSpecification()
: :
control_mode_(NONE_CM), control_mode_(NONE),
procedure_(NONE_P), procedure_(NONE_P),
oil_max_rate_(1e100), oil_max_rate_(-1e100),
water_production_target_(1e100), water_max_rate_(-1e100),
fluid_volume_max_rate_(1e100), gas_max_rate_(-1e100),
BHP_limit_(1e100), liquid_max_rate_(-1e100),
guide_rate_(1), reservoir_flow_max_rate_(-1e100),
BHP_limit_(-1e100),
guide_rate_(1.0),
guide_rate_type_(NONE_GRT) guide_rate_type_(NONE_GRT)
{ {
} }

10
opm/core/ProductionSpecification.hpp
View File

@ -11,7 +11,7 @@ namespace Opm
enum ControlMode enum ControlMode
{ {
NONE_CM, ORAT, WRAT, LRAT, REIN, RESV, VREP, WGRA, FLD, GRUP, BHP NONE, ORAT, WRAT, GRAT, LRAT, CRAT, RESV, PRBL, BHP, THP, GRUP, FLD
}; };
enum Procedure enum Procedure
@ -21,7 +21,7 @@ namespace Opm
enum GuideRateType enum GuideRateType
{ {
OIL, RAT, NONE_GRT OIL, NONE_GRT
}; };
ProductionSpecification(); ProductionSpecification();
@ -30,11 +30,11 @@ namespace Opm
Procedure procedure_; Procedure procedure_;
double oil_max_rate_; double oil_max_rate_;
double water_production_target_; double water_max_rate_;
double fluid_volume_max_rate_;
double BHP_limit_;
double gas_max_rate_; double gas_max_rate_;
double liquid_max_rate_; double liquid_max_rate_;
double reservoir_flow_max_rate_;
double BHP_limit_;
double guide_rate_; double guide_rate_;
GuideRateType guide_rate_type_; GuideRateType guide_rate_type_;