Andreas Lauser
f1f801aca5
add back blank line as requested by @bska
2014-02-07 19:35:28 +01:00
Andreas Lauser
a91a6c9484
git add variant of phaseUsageFromDeck() which takes a deck of the new parser
2014-02-07 19:35:28 +01:00
Kristian Flikka
aa329b8b3e
Removed WELOPEN from constructor, added throwing on non OPEN/SHUT statuses
2014-02-06 16:31:35 +01:00
Joakim Hove
2c05b6a1b4
Merge remote-tracking branch 'upstream/master' into opm-parser-integrate
2014-02-05 23:06:54 +01:00
Atgeirr Flø Rasmussen
cb99938c62
Fix initialisation warning.
2014-02-05 13:05:33 +01:00
Joakim Hove
ca2def2a02
Merged upstream/master
2014-02-04 21:42:07 +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
Joakim Hove
0d8b883b8e
Added namespace prefix to enum.
2014-01-30 08:00:45 +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
9f948329c4
Merge remote-tracking branch 'upstream/master' into opm-parser-integrate
2014-01-29 11:02:21 +01:00
Joakim Hove
1548984acd
Merge remote-tracking branch 'upstream/master' into wellsmanager-rates
2014-01-29 11:01:14 +01:00
Kristian Flikka
4049426ec9
Updated Namespace of PhaseEnum from opm-parser
2014-01-28 21:11:51 +01:00
osae
64b9726692
Saturation table scaling and hysteresis.
...
This commit implements some additional scaling keywords. This includes
the ISWL-family that provide hysteresis behaviour via alternative
scaling of the tables. The old parser has been somewhat extended for
testing purposes. The commit also includes a slight refactoring of the
SatFunc-family where a new base class has been introduced.
2014-01-28 16:36:55 +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
Tor Harald Sandve
0c6bf64a33
Phase pressure is used for surface volumes calculations
2014-01-10 16:07:02 +01:00
Tor Harald Sandve
9e2ec6e558
Initialization using the RV keyword
...
The initial Rv value is specified using the RV keyword in the Parser.
The Rv values are used in the computation of the initial surface
volumes.
2014-01-10 16:07:02 +01:00
Tor Harald Sandve
d5b47295e3
Added pvt functionality for wetgas
...
The pvt interface is extended to handle wet-gas systems:
1. rvSat is added as a function in the PVT interface
2. SinglePvtLiveGas computes the pvt values and its derivatives
3. The old rbub variable is changed to rsSat for clearity
4. The new interface is tested in test_blackoilfluid with data from
liveoil.DATA and wetgas.DATA
2014-01-10 16:07:02 +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
d96b88742e
Removed commented out code.
2014-01-08 15:58:11 +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
c970363f5e
Implemented well_controls based on well_controls_get_xxx() functions.
2014-01-06 14:59:11 +01:00
Joakim Hove
8ef5b2b695
Implemented well_controls based on well_controls_get_xxx() functions.
2014-01-06 14:51:11 +01:00
Joakim Hove
027ffb3c5a
Implemented well_controls based on well_controls_get_xxx() functions.
2014-01-06 14:40:55 +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
4db3a70e05
Implemented well_controls based on well_controls_iset_xxx() functions.
2014-01-06 14:19:09 +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
