When NONE is specified, no group control enforcement.

NONE is specified in GCONPROD or GCONINJE.
This commit is contained in:
Kai Bao 2016-10-13 10:46:54 +02:00
parent 65d61d1c4f
commit b8ac674f9b

View File

@ -293,8 +293,11 @@ namespace Opm
const double target, const double target,
const bool only_group) const bool only_group)
{ {
if (!only_group || injSpec().control_mode_ == InjectionSpecification::FLD if (injSpec().control_mode_ == InjectionSpecification::NONE) {
|| injSpec().control_mode_ == InjectionSpecification::NONE) { return;
}
if (!only_group || injSpec().control_mode_ == InjectionSpecification::FLD) {
const double my_guide_rate = injectionGuideRate(only_group); const double my_guide_rate = injectionGuideRate(only_group);
if (my_guide_rate == 0.0) { if (my_guide_rate == 0.0) {
// Nothing to do here // Nothing to do here
@ -320,8 +323,7 @@ namespace Opm
if (prodSpec().control_mode_ == ProductionSpecification::NONE) { if (prodSpec().control_mode_ == ProductionSpecification::NONE) {
return; return;
} }
if (!only_group || (prodSpec().control_mode_ == ProductionSpecification::FLD if (!only_group || prodSpec().control_mode_ == ProductionSpecification::FLD) {
|| prodSpec().control_mode_ == ProductionSpecification::NONE)) {
const double my_guide_rate = productionGuideRate(false); const double my_guide_rate = productionGuideRate(false);
if (my_guide_rate == 0.0) { if (my_guide_rate == 0.0) {
// Nothing to do here // Nothing to do here