Extracted everything related to well controls to separate header well_controls.h - to simplify introducing new parser.

opm/core/pressure/tpfa/cfs_tpfa_residual.c

@@ -6,6 +6,7 @@
 #include <string.h>
 
 #include <opm/core/wells.h>
+#include <opm/core/well_controls.h>
 #include <opm/core/linalg/blas_lapack.h>
 #include <opm/core/linalg/sparse_sys.h>
 

opm/core/simulator/WellState.hpp

@@ -21,6 +21,7 @@
 #define OPM_WELLSTATE_HEADER_INCLUDED
 
 #include <opm/core/wells.h>
+#include <opm/core/well_controls.h>
 #include <vector>
 
 namespace Opm

opm/core/utility/miscUtilities.cpp

@@ -22,6 +22,7 @@
 #include <opm/core/utility/Units.hpp>
 #include <opm/core/grid.h>
 #include <opm/core/wells.h>
+#include <opm/core/well_controls.h>
 #include <opm/core/props/IncompPropertiesInterface.hpp>
 #include <opm/core/props/BlackoilPropertiesInterface.hpp>
 #include <opm/core/props/rock/RockCompressibility.hpp>

opm/core/well_controls.h

@@ -0,0 +1,103 @@
+/*
+  Copyright 2012 SINTEF ICT, Applied Mathematics.
+
+  This file is part of the Open Porous Media project (OPM).
+
+  OPM is free software: you can redistribute it and/or modify
+  it under the terms of the GNU General Public License as published by
+  the Free Software Foundation, either version 3 of the License, or
+  (at your option) any later version.
+
+  OPM is distributed in the hope that it will be useful,
+  but WITHOUT ANY WARRANTY; without even the implied warranty of
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  GNU General Public License for more details.
+
+  You should have received a copy of the GNU General Public License
+  along with OPM.  If not, see <http://www.gnu.org/licenses/>.
+*/
+
+#ifndef OPM_WELL_CONTROLS_H_INCLUDED
+#define OPM_WELL_CONTROLS_H_INCLUDED
+
+#include <stdbool.h>
+#include <opm/core/well_control_type.h>
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+
+
+
+/**
+ * Controls for a single well.
+ * Each control specifies a well rate or bottom-hole pressure. Only
+ * one control can be active at a time, indicated by current. The
+ * meaning of each control's target value depends on the control type:
+ *
+ *  - BHP            -> target pressure in Pascal.
+ *  - RESERVOIR_RATE -> target reservoir volume rate in cubic(meter)/second
+ *  - SURFACE_RATE   -> target surface volume rate in cubic(meter)/second
+ *
+ * The sign convention for RATE targets is as follows:
+ *
+ *  - (+) Fluid flowing into reservoir, i.e. injecting.
+ *  - (-) Fluid flowing out of reservoir, i.e. producing.
+ *
+ * For *_RATE controls, the distribution of phases used for the control
+ * is also needed. For example, a total rate control should have 1.0
+ * for each phase, whereas a control on oil rate should have 1.0 for
+ * the oil phase and 0.0 for the rest. For BHP controls, this is unused.
+ * The active control acts as an equality constraint, whereas the
+ * non-active controls should be interpreted as inequality
+ * constraints (upper or lower bounds).  For instance, a PRODUCER's
+ * BHP constraint defines a minimum acceptable bottom-hole pressure
+ * value for the well.
+ */
+struct WellControls
+{
+    /**
+     * Number of controls.
+     */
+    int num;
+
+    int number_of_phases;
+
+    /**
+     * Array of control types.
+     */
+    enum WellControlType *type;
+
+    /**
+     * Array of control targets.
+     */
+    double *target;
+
+    /**
+     * Array of rate control distributions,
+     * <CODE>number_of_phases</CODE> numbers for each control
+     */
+    double *distr;
+
+    /**
+     * Index of current active control.
+     */
+    int current;
+
+    /**
+     * Internal management structure.
+     */
+    void *data;
+};
+
+
+bool
+well_controls_equal(const struct WellControls *ctrls1, const struct WellControls *ctrls2);
+
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* OPM_WELL_CONTROLS_H_INCLUDED */

opm/core/wells.h

@@ -21,6 +21,8 @@
 #define OPM_WELLS_H_INCLUDED
 
 #include <stdbool.h>
+#include <opm/core/well_control_type.h>
+#include <opm/core/well_controls.h>
 
 /**
  * \file
@@ -42,75 +44,6 @@ enum WellType {
     PRODUCER   /**< Well is a producer */
 };
 
-/**
- * Type of well control equation or inequality constraint.
- */
-enum WellControlType  {
-    BHP,              /**< Well constrained by BHP target */
-    RESERVOIR_RATE,   /**< Well constrained by reservoir volume flow rate */
-    SURFACE_RATE      /**< Well constrained by surface volume flow rate */
-};
-
-/**
- * Controls for a single well.
- * Each control specifies a well rate or bottom-hole pressure. Only
- * one control can be active at a time, indicated by current. The
- * meaning of each control's target value depends on the control type:
- *
- *  - BHP            -> target pressure in Pascal.
- *  - RESERVOIR_RATE -> target reservoir volume rate in cubic(meter)/second
- *  - SURFACE_RATE   -> target surface volume rate in cubic(meter)/second
- *
- * The sign convention for RATE targets is as follows:
- *
- *  - (+) Fluid flowing into reservoir, i.e. injecting.
- *  - (-) Fluid flowing out of reservoir, i.e. producing.
- *
- * For *_RATE controls, the distribution of phases used for the control
- * is also needed. For example, a total rate control should have 1.0
- * for each phase, whereas a control on oil rate should have 1.0 for
- * the oil phase and 0.0 for the rest. For BHP controls, this is unused.
- * The active control acts as an equality constraint, whereas the
- * non-active controls should be interpreted as inequality
- * constraints (upper or lower bounds).  For instance, a PRODUCER's
- * BHP constraint defines a minimum acceptable bottom-hole pressure
- * value for the well.
- */
-struct WellControls
-{
-    /**
-     * Number of controls.
-     */
-    int num;
-
-    int number_of_phases;
-
-    /**
-     * Array of control types.
-     */
-    enum WellControlType *type;
-
-    /**
-     * Array of control targets.
-     */
-    double *target;
-
-    /**
-     * Array of rate control distributions,
-     * <CODE>number_of_phases</CODE> numbers for each control
-     */
-    double *distr;
-
-    /**
-     * Index of current active control.
-     */
-    int current;
-
-    /**
-     * Internal management structure.
-     */
-    void *data;
-};
 
 
 
@@ -285,6 +218,8 @@ add_well(enum WellType  type     ,
  * \param[in,out] W  Existing set of well controls.
  * \return Non-zero (true) if successful and zero (false) otherwise.
  */
+
+
 int
 append_well_controls(enum WellControlType type  ,
                      double               target,
@@ -333,8 +268,6 @@ clone_wells(const struct Wells *W);
 bool
 wells_equal(const struct Wells *W1, const struct Wells *W2);
 
-bool
-well_controls_equal(const struct WellControls *ctrls1, const struct WellControls *ctrls2);
 
 
 #ifdef __cplusplus

opm/core/wells/WellsGroup.cpp

@@ -20,6 +20,7 @@
 #include "config.h"
 #include <opm/core/wells/WellsGroup.hpp>
 #include <opm/core/wells.h>
+#include <opm/core/well_controls.h>
 #include <opm/core/props/phaseUsageFromDeck.hpp>
 
 #include <cmath>

opm/core/wells/wells.c

@@ -35,6 +35,7 @@
 */
 #include "config.h"
 #include <opm/core/wells.h>
+#include <opm/core/well_controls.h>
 
 #include <assert.h>
 #include <stddef.h>