Merge remote-tracking branch 'upstream/opm-parser-integrate' into wellsmanager-rates

Conflicts:
	opm/core/wells/WellsManager.cpp
This commit is contained in:
Joakim Hove
2014-01-30 09:50:09 +01:00
9 changed files with 265 additions and 163 deletions

View File

@@ -34,10 +34,10 @@ enum WellControlType {
SURFACE_RATE /**< Well constrained by surface volume flow rate */
};
struct WellControls;
struct WellControls;
bool
well_controls_equal(const struct WellControls *ctrls1, const struct WellControls *ctrls2);
well_controls_equal(const struct WellControls *ctrls1, const struct WellControls *ctrls2 , bool verbose);
struct WellControls *
well_controls_create(void);