Andreas Lauser
d5bedde8a7
add a utility class to handle ROCK tables
...
So far, this only considers Eclipse R100...
2014-02-05 15:20:56 +01:00
Andreas Lauser
6eab8d62b1
add a utility class for the ROCKTAB keyword
...
this one is a bit more complicated than a plain SimpleTable as the
number of columns depends on the deck. (to be precise, it depends on
the presence of the RKTRMDIR keyword which is also added in this
patch.)
2014-02-05 15:04:04 +01:00
Joakim Hove
0d35b7d3f6
Merge pull request #101 from AtleH/specialkeywords
...
Specialkeywords
2014-01-31 05:33:25 -08:00
Joakim Hove
bb444b5139
Added flag injectionControls to keep track of available injection controls.
2014-01-30 16:44:21 +01:00
Joakim Hove
49ee4ed1ed
Added addProductionControl() and dropproductioncontrol() to Schedule.
2014-01-30 16:44:21 +01:00
Joakim Hove
137eb5b6e1
Added bitmask status flag to keep track of which controls have been set.
2014-01-30 16:44:21 +01:00
Joakim Hove
dbb0272d12
Changed ControlEnums to become 2^n
2014-01-30 16:44:21 +01:00
Joakim Hove
e42234b17a
Added Well::Producercontrolmode
2014-01-30 16:44:21 +01:00
Joakim Hove
d0da1275c4
Changed name of item: ControlMode -> CMODE
2014-01-30 16:44:20 +01:00
Joakim Hove
5dd6865838
Added RESV target to Well.
2014-01-30 16:44:20 +01:00
Joakim Hove
7f58de5b3e
Have added liquidRate setting from Schedule.cpp
2014-01-30 16:44:20 +01:00
Joakim Hove
a83d994494
Added well->liquidRate() from WCONPROD.
2014-01-30 16:44:20 +01:00
Atle Haugan
c20c3baf6f
Fixed algorithm for concatenating strings
2014-01-30 15:18:34 +01:00
Atle Haugan
1dd448b178
Merge branch 'master' into specialkeywords
...
Conflicts:
opm/parser/eclipse/EclipseState/EclipseState.hpp
2014-01-30 15:05:01 +01:00
Atle Haugan
825e976566
New version based on feedback from code review
2014-01-29 19:39:33 +01:00
Joakim Hove
46bd341808
Setting injectorType from Schedule class.
2014-01-29 16:42:55 +01:00
Joakim Hove
0f707b7498
Keeping track of well OPEN|SHUT|STOP status from WCONxxxx keywords.
2014-01-29 15:55:02 +01:00
Joakim Hove
0457525b10
Changed name of item to STATUS.
2014-01-29 15:54:15 +01:00
Joakim Hove
db26d6cf93
Added status flag as well property.
2014-01-29 15:34:33 +01:00
Joakim Hove
86e8cc3585
Added WellCommon namespace with StatusEnum.
2014-01-29 15:10:52 +01:00
Joakim Hove
49604cf631
Added injectorControlMode to Well class.
2014-01-29 13:33:28 +01:00
Joakim Hove
c60ce712ea
Added ControlMode enum to the WellInjector namespace.
2014-01-29 13:21:04 +01:00
Joakim Hove
65e87189e4
Changed namespace InjectorType -> WellInjector.
2014-01-29 13:11:35 +01:00
Kristian Flikka
37084e991d
Shifting WELSPECS and COMPDAT i,j,k indices down one, to go from 0
2014-01-29 11:48:02 +01:00
Joakim Hove
3f62b3c777
Updated numerical test values for connection factor; due to SI dimension.
2014-01-29 10:39:55 +01:00
Kristian Flikka
3c4f12f3c7
Added dimension to connection factor / well index in json config. Updated fetching to use SI value
2014-01-28 21:29:35 +01:00
Kristian Flikka
efcfad657e
Merge pull request #102 from joakim-hove/well-injection-phase
...
Well injection phase
2014-01-28 11:37:49 -08:00
Joakim Hove
b0545fab0a
Merge pull request #100 from flikka/add-to-completion
...
Added skinFactor and diameter to Completion
2014-01-28 07:04:40 -08:00
Kristian Flikka
e669e4110d
Added CF, diameter and skinFactor check in integration test
2014-01-28 15:30:25 +01:00
Joakim Hove
7ce91cf504
Added well->Injectortype
2014-01-28 14:31:51 +01:00
Atle Haugan
5dcc90cfa6
Cosmetic fix - adjusted spacing in header file
2014-01-28 10:11:35 +01:00
Atle Haugan
1530425598
Fixed bug in ParseTITLE.cpp
2014-01-28 10:06:58 +01:00
Atle Haugan
cd3d4f9337
First cut: TITLE keyword now being parsed correctly.
2014-01-28 10:01:11 +01:00
Joakim Hove
eae4cbb889
Added InjectorType enum.
2014-01-28 08:35:12 +01:00
Joakim Hove
a464429388
Added namespace Phase around the PhaseEnum enum.
2014-01-28 08:18:03 +01:00
Kristian Flikka
fdee1d8b67
Added skinFactor and diameter to Completion
2014-01-27 19:32:00 +01:00
Joakim Hove
af00558ec7
Added THPLimit as well property.
2014-01-27 18:38:41 +01:00
Joakim Hove
3d2ddd70fc
Setting Well->BHP limit from Schedule.
2014-01-27 18:31:22 +01:00
Joakim Hove
99ef84b438
Added BHPLimit as well property.
2014-01-27 18:30:05 +01:00
Joakim Hove
a145a329f3
ADded one more DATES keyword with WCONINJE to check loading of BHP limit.
2014-01-27 18:23:29 +01:00
Joakim Hove
dee5509108
Added default value for BHPLimit/target.
2014-01-27 18:22:57 +01:00
Kristian Flikka
3cbc7ea1a0
Made getCompletions const
2014-01-27 14:40:59 +01:00
Kristian Flikka
ca0956ec02
Merge pull request #96 from joakim-hove/well-reservoir-rate
...
Well injection: differentiate between surface rate and reservoir rate
2014-01-27 03:09:09 -08:00
Joakim Hove
1ba278022a
Have added ReservoirRates to well injector.
2014-01-24 13:24:22 +01:00
Atle Haugan
51ac683ef2
OPM-17: Fixed bug in END[INC] logic.
2014-01-24 13:16:37 +01:00
Joakim Hove
1cc38786dc
Renamed well->InjectionRate to SurfaceInjectionRate.
2014-01-24 12:36:45 +01:00
Atle Haugan
620774c3a4
Added missing files
2014-01-24 12:05:03 +01:00
Atle Haugan
f2c451e07a
OPM-17: Minor change to END[INC] parsing + started to parse TITLE keyword
2014-01-24 11:18:07 +01:00
Atle Haugan
ef11a2331f
OPM-17: First attempt to handle END and ENDINC keywords
2014-01-24 10:01:17 +01:00
Joakim Hove
581bf74e9a
Changed int -> size_t many places.
2014-01-24 09:41:32 +01:00
