Joakim Hove
|
8be1f0e8d3
|
Changed open / close behaviour of well_controls: 1) well_controls has an explicit open_close flag. 2) Will NOT flip current value to change open|close status
|
2014-03-04 20:23:19 +01:00 |
|
Kristian Flikka
|
a055b529ec
|
Add handling of WGRUPCON to new-parser friendly WellsManager constructor
|
2014-02-24 15:24:33 +01:00 |
|
Kristian Flikka
|
ab42682399
|
Removed old EclipseGridParser from WellsManager constructor, WGROUPCON still missing
|
2014-02-14 15:36:32 +01:00 |
|
Kristian Flikka
|
d1494e7daa
|
Removed the previously introduced getAndUnRootChild method
|
2014-02-14 13:46:54 +01:00 |
|
Kristian Flikka
|
3c93c7a781
|
Added building of WellsCollection group structure from new opm-parser objects
|
2014-02-14 13:43:25 +01:00 |
|
Kristian Flikka
|
ae8944f6ea
|
Added an else to avoid unnecessary checking.
|
2014-02-14 09:01:21 +01:00 |
|
Kristian Flikka
|
d7568b4adf
|
Changed the WellCollection addChild functions to be more specific, and strict
|
2014-02-13 16:00:39 +01:00 |
|
Kristian Flikka
|
f94f63ff56
|
Extracted common functionality from the three create functions
|
2014-02-12 15:45:06 +01:00 |
|
Kristian Flikka
|
1181d1c1bc
|
Create WellsGroupInterface from opm-parser Well/Group objects
|
2014-02-12 15:39:57 +01:00 |
|
Kristian Flikka
|
b6072e5112
|
Added support for creation of WellsGroup objects from new parser Well and Group objects
|
2014-02-11 14:12:36 +01:00 |
|
Kristian Flikka
|
aa329b8b3e
|
Removed WELOPEN from constructor, added throwing on non OPEN/SHUT statuses
|
2014-02-06 16:31:35 +01:00 |
|
Kristian Flikka
|
3d215691da
|
Removed WELTARG commented code, moved wellperf_data into createWellsFromSpecs function
|
2014-02-03 09:22:28 +01:00 |
|
Kristian Flikka
|
76dff2e326
|
Extracted well controls setup to separate function
|
2014-02-03 09:07:58 +01:00 |
|
Kristian Flikka
|
e12ec1b25d
|
Extracted well specification and completion data setup to a function
|
2014-02-03 08:58:54 +01:00 |
|
Joakim Hove
|
30df3cab37
|
Using well->hasInjectionControl() to check whether a particular control is available.
|
2014-01-30 16:37:20 +01:00 |
|
Joakim Hove
|
35d0808fbe
|
Implemented WCONPROD support from Parser::Schedule object.
|
2014-01-30 15:55:17 +01:00 |
|
Joakim Hove
|
3e2df33a65
|
Merge remote-tracking branch 'upstream/opm-parser-integrate' into wellsmanager-rates
Conflicts:
opm/core/wells/WellsManager.cpp
|
2014-01-30 09:50:09 +01:00 |
|
Joakim Hove
|
70e2dd9f12
|
Implemented well injector properties from opm-parser::Well.
|
2014-01-30 08:02:13 +01:00 |
|
Kristian Flikka
|
d621fdfe79
|
Removed print statement
|
2014-01-29 12:30:03 +01:00 |
|
Kristian Flikka
|
fbe2f31653
|
Updated COMPDAT i,j,k indices, and removed the old commented part
|
2014-01-29 11:58:14 +01:00 |
|
Kristian Flikka
|
7ce9cb9055
|
Compdat extraction from new CompletionXXX classes
|
2014-01-29 11:58:13 +01:00 |
|
Joakim Hove
|
7774a11eee
|
WellType is determined from well->isProducer() instead of looking for WCONINJE / WCONPROD keywords.
|
2014-01-24 12:00:58 +01:00 |
|
Kristian Flikka
|
3b0a9067b4
|
Removes the WELSPECS usage in WellsManager constructor. Step 1 in rewrite of constructor
|
2014-01-22 15:22:32 +01:00 |
|
Kristian Flikka
|
691148122c
|
Merged from upstream/opm-parser-integrate
|
2014-01-21 13:05:59 +01:00 |
|
Kristian Flikka
|
2ffcb219bb
|
Changed phaseUsageFromDeck to use eclipseState
|
2014-01-10 13:43:02 +01:00 |
|
Kristian Flikka
|
731fe7d3f4
|
Changed new WellsManager constructor to take in EclipseStateConstPtr instead of SchedulePtr
|
2014-01-08 16:10:55 +01:00 |
|
Joakim Hove
|
f00e3d5763
|
Comparing well names protects againts NULL.
|
2014-01-08 16:10:43 +01:00 |
|
Joakim Hove
|
ddf6a3c084
|
Removed access to internal variabel cpty.
|
2014-01-08 11:32:00 +01:00 |
|
Kristian Flikka
|
1f1c0ebcf3
|
New constructor for WellsManager that also takes the new parser as argument. New test comparing old and new
|
2014-01-07 16:10:45 +01:00 |
|
Joakim Hove
|
370f9f0458
|
Using && instead of &= in the functions comparing wells and well_controls.
|
2014-01-06 19:22:39 +01:00 |
|
Joakim Hove
|
9fa7362992
|
Removed explicit (struct WellControls *) cast to align with the rest of the code.
|
2014-01-06 19:09:36 +01:00 |
|
Joakim Hove
|
b22b3f9fe2
|
Moved struct WellControls to the implementation file well_controls.c.
|
2014-01-06 15:13:32 +01:00 |
|
Joakim Hove
|
8132954b85
|
Added functions to get type, target and distr of *current* control.
|
2014-01-06 14:40:03 +01:00 |
|
Joakim Hove
|
965c12a689
|
Implemented well_control based on well_controls_iset_xxx() functions.
|
2014-01-06 12:40:03 +01:00 |
|
Joakim Hove
|
2ee6331ac1
|
Implemented well_controls_add_new() with well_controls_iset_xxx() functions.
|
2014-01-06 12:24:32 +01:00 |
|
Joakim Hove
|
6098368d08
|
Added new function well_controls_iset_distr().
|
2014-01-06 12:22:15 +01:00 |
|
Joakim Hove
|
3d171bd961
|
Using new function well_controls_invert_current().
|
2014-01-06 12:08:29 +01:00 |
|
Joakim Hove
|
bf95c9f768
|
Added new functions to set target and type and invert value of current control.
|
2014-01-06 12:06:36 +01:00 |
|
Joakim Hove
|
d783028bcb
|
Using well_controls_get_num() and well_controls_get|set_current() in WellsManager
|
2014-01-06 10:12:11 +01:00 |
|
Joakim Hove
|
17b800796f
|
Temporarily added symbol HAVE_WELLCONTROLS before including well_controls.h - to get acces to the internal elements in struct WellControls.
|
2014-01-05 16:25:31 +01:00 |
|
Joakim Hove
|
3653404c41
|
Reimplemnted struct WellControls access to use the set/get functions in well_controls.c
|
2014-01-05 16:23:22 +01:00 |
|
Joakim Hove
|
aea54d073a
|
Added well_controls_get_xxx() and well_controls_set_xxx() functions. The well_controls_reserved() function is called from well_controls_add() and not explicitly.
|
2014-01-05 16:22:30 +01:00 |
|
Joakim Hove
|
fb8413960c
|
Removed #include <opm/core/well_controls.h> from wells.h and inserted explicit #include <opm/core/well_controls.h> where needed.
|
2014-01-05 15:03:30 +01:00 |
|
Joakim Hove
|
157d0870f2
|
Removed struct WellControlManagement and replaced with simple integer field cpty in the WellControls structure.
|
2014-01-05 14:54:56 +01:00 |
|
Joakim Hove
|
8acdf34653
|
Moved well_controls implementation to separate file well_controls.c.
|
2014-01-05 14:47:15 +01:00 |
|
Joakim Hove
|
0450e1bb77
|
Extracted everything related to well controls to separate header well_controls.h - to simplify introducing new parser.
|
2014-01-03 16:04:12 +01:00 |
|
Kristian Flikka
|
e4a7a33598
|
Implementation (not finished) of wells_equal, well_controls_equal, and tests. To build a WellsManager test for old and new parser
Conflicts:
CMakeLists_files.cmake
|
2014-01-03 16:00:10 +01:00 |
|
Andreas Lauser
|
fde3fe3332
|
convert users of MESSAGE to OPM_MESSAGE
|
2013-09-05 13:04:38 +02:00 |
|
Andreas Lauser
|
d6fa31b452
|
convert users of the ASSERT and the ASSERT2 macros to standard assert()
|
2013-09-05 13:04:37 +02:00 |
|
Andreas Lauser
|
cb76a0fd7f
|
convert THROW to OPM_THROW
|
2013-09-05 13:04:37 +02:00 |
|