From 2d7d52bec1b2ae7dfef3f2ff5fdb1ee3ce224911 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Atgeirr=20Fl=C3=B8=20Rasmussen?= <atgeirr@sintef.no>
Date: Wed, 2 May 2012 09:25:19 +0200
Subject: [PATCH] Refined and reordered control enum, added guide rates.

---
 opm/core/InjectionSpecification.hpp | 13 ++++++++++---
 1 file changed, 10 insertions(+), 3 deletions(-)

diff --git a/opm/core/InjectionSpecification.hpp b/opm/core/InjectionSpecification.hpp
index d2886239f..62c9e6678 100644
--- a/opm/core/InjectionSpecification.hpp
+++ b/opm/core/InjectionSpecification.hpp
@@ -11,7 +11,7 @@ namespace Opm
 
         enum ControlMode
         {
-            NONE, ORAT, REIN, RESV, VREP, WGRA, FLD, GRUP
+            NONE, RATE, RESV, BHP, THP, REIN, VREP, GRUP, FLD
         };
 
         enum InjectorType
@@ -19,14 +19,21 @@ namespace Opm
             WATER, OIL, GAS
         };
 
+        enum GuideRateType
+        {
+            RAT, NONE_GRT
+        };
+
         InjectionSpecification();
 
         InjectorType injector_type_;
         ControlMode control_mode_;
         double surface_flow_max_rate_;
-        double reinjection_fraction_target_;
-        double fluid_volume_max_rate_;
+        double reservoir_flow_max_rate_;
         double BHP_limit_;
+        double reinjection_fraction_target_;
+        double guide_rate_;
+        GuideRateType guide_rate_type_;
     };
 
 }