Commit Graph

932 Commits

Author SHA1 Message Date
Kai Bao
a8eb2b2970 revising function addSegmentSetABS 2015-11-09 12:14:09 +01:00
Kai Bao
4c617e76ac revising segmentsFromWELSEGSKeyword for better readability. 2015-11-09 12:14:09 +01:00
Kai Bao
2d0b5d8237 changing getRawDouble to getSIDouble in SegmentSet. 2015-11-09 12:12:39 +01:00
Kai Bao
2ed7e5985d adding addSegmentSet() to Well 2015-11-09 12:12:39 +01:00
Kai Bao
3e9320fc31 adding function handleWELSEGS to Schedule. 2015-11-09 12:12:39 +01:00
Kai Bao
157c86ea39 adding the multi-segment related member to Well. 2015-11-09 12:12:39 +01:00
Kai Bao
3e896fbeda removing the dependence on NLBRMX and NSEGMX
which is for Fortran style memory management. Although it can also be
good for preventing people from giving too random branch numbers and
segment numbers.
2015-11-09 12:12:39 +01:00
Kai Bao
4111146685 adding class SegmentSet 2015-11-09 12:12:39 +01:00
Kai Bao
edfefc7dd1 adding enumeration types in ScheduleEnums for the segment support. 2015-11-09 12:12:39 +01:00
Kai Bao
66e9e5bee5 adding Segment class. 2015-11-09 12:12:39 +01:00
Joakim Hove
9ee519ccc0 Changed signature in hasEvent() to allow multiple. 2015-11-09 12:05:28 +01:00
Joakim Hove
debcf2ed80 New method EclipseState::applyModifierDeck() 2015-11-09 12:05:27 +01:00
Joakim Hove
508e282d2f Added TransMult::applytMULTFLT( Fault ) overload. 2015-11-09 12:05:11 +01:00
Joakim Hove
e6f9843882 Updated error message. 2015-11-09 12:05:10 +01:00
Joakim Hove
2b3e1c381a Added 'minideck' to Schedule object. 2015-11-09 12:05:10 +01:00
Joakim Hove
2ef418bf86 Added: DynamicVector::assertSize() 2015-11-09 12:05:09 +01:00
Joakim Hove
2cd69fcbda Added iget() and iset() methods to DynamicVector. 2015-11-09 12:05:09 +01:00
Joakim Hove
b20f46649d Track Schedule event GEO_MODIFIERS. 2015-11-09 12:05:08 +01:00
Tor Harald Sandve
d3a38b5039 Add test
Wells where crossflow is banned and the total rate is zero is not allow
to open. A test is added to check this behaviour.
2015-11-09 09:54:10 +01:00
Tor Harald Sandve
abe925ff2f Add method Well::canOpen(currentStep) and use it in Schedule 2015-11-09 09:52:23 +01:00
Tor Harald Sandve
a66c820f0a Prevent wells with zero rate and crossflow disabled to open 2015-11-05 14:37:47 +01:00
Joakim Hove
4178257b17 Merge pull request #622 from joakim-hove/dynamic-vector
Dynamic vector
2015-10-30 10:33:45 +01:00
Joakim Hove
a5b97fc2b8 Implemented Events with DynamicVector.
As a side side effect the m_events member in the Schedule class has
become a shared pointer.
2015-10-29 14:28:24 +01:00
Joakim Hove
931f430028 Added simple DynamicVector bound to TimeMap. 2015-10-29 14:28:22 +01:00
Joakim Hove
90c55b0257 Drop BHP control when producer <-> injector. 2015-10-29 12:49:30 +01:00
Joakim Hove
ce9727b337 Added method for change injector <-> producer.
Will reset producer BHP limit to zero when changing to an injector, and
visa versa.
2015-10-28 17:13:34 +01:00
Joakim Hove
da7871feaf Enable BHP control for history and WELTARG. 2015-10-28 17:13:33 +01:00
Joakim Hove
6027711bad Minor prettyfying of test. 2015-10-28 17:13:31 +01:00
Joakim Hove
461c74cc57 Do not update well BHP limit from WCONHIST. 2015-10-28 17:13:29 +01:00
Tor Harald Sandve
863e96c673 Test for changing BhpLimit in history mode using weltarg 2015-10-28 17:13:28 +01:00
Markus Blatt
d0b54e9f25 Fixes warning about ignored qualifiers on function return types.
In particular this warning is removed:
"In file included from /home/mblatt/src/dune/opm/opm-parser/opm/parser/eclipse/EclipseState/EclipseState.cpp:34:0:
/home/mblatt/src/dune/opm/opm-parser/opm/parser/eclipse/EclipseState/Grid/SatfuncPropertyInitializers.hpp:438:66: warning: type qualifiers ignored on function return type [-Wignored-qualifiers]
     const SaturationFunctionFamily getSaturationFunctionFamily() const{"
                                                                  ^
2015-10-22 16:09:41 +02:00
Atgeirr Flø Rasmussen
7b0a6d2556 Make dist() call well-defined. 2015-10-19 11:00:42 +02:00
Joakim Hove
88fbe579ed Merge pull request #603 from totto82/shut_crossflow
Shut wells with zero rates and crossflow not allowed
2015-10-12 16:12:18 +02:00
Tor Harald Sandve
539e75081f Add paranthesis 2015-10-12 12:28:12 +02:00
Atgeirr Flø Rasmussen
c937867286 Do not use const for value return. 2015-10-12 10:04:35 +02:00
Joakim Hove
fa4ebe7931 Merge pull request #606 from qilicun/sgwfn
Add keyword SGWFN.
2015-10-12 08:47:20 +02:00
Liu Ming
664b6a80e5 SGWFN table. 2015-10-12 14:26:51 +08:00
Joakim Hove
3dfbc75bc4 Merge pull request #594 from iLoop2/AddDRSDT_DRVDT_VAPPOR
Add keywords DRSDT DRVDT VAPPARS
2015-10-12 08:18:54 +02:00
Liu Ming
68a9366d8d Add keyword SGWFN. 2015-10-12 10:56:21 +08:00
Liu Ming
eca2105f82 make the parameter as const. 2015-10-09 17:28:20 +08:00
Liu Ming
b0995cfc0b add PinchMode from string function. 2015-10-09 17:23:37 +08:00
Liu Ming
98f2659c84 add PinchMode to instead of string. 2015-10-09 16:28:53 +08:00
Fredrik Gundersen
ec74096dcb Changed return value for option to bool 2015-10-09 09:50:09 +02:00
Liu Ming
7181255d6d Add support for PINCH item 4 and 5. 2015-10-09 10:29:33 +08:00
Tor Harald Sandve
99c03c3914 Shut wells with zero rates and crossflow not allowed
Note: Producing wells in prediction mode is kept open even if the
control rate is set to zero.
2015-10-08 12:17:29 +02:00
Fredrik Gundersen
80a77136cf Fix OilVaporizationProperties to have only one constructor 2015-10-08 11:17:24 +02:00
Joakim Hove
b67c183544 Merge pull request #600 from totto82/crossflow
Add flag allowCrossFlow()
2015-10-07 23:23:13 +02:00
Tor Harald Samdve
0d4d71dcef Use the autogenerated build constants 2015-10-07 12:23:04 +02:00
Atgeirr Flø Rasmussen
6cf9d01cc3 Avoid shadowing the 'record' variable. 2015-10-07 09:43:51 +02:00
Fredrik Gundersen
32914e2ed4 Merge remote-tracking branch 'upstream/master' 2015-10-07 07:59:02 +02:00