Andreas Lauser
1f9c5d2583
trivial: fix end-of-file comment in Completion.hpp
...
that clearly was a copy-and-pasteo...
2014-02-21 17:06:21 +01:00
Andreas Lauser
6b70634f94
fix the "DATES" keyword
...
The time of the day field was missing. The defaults for it are those
of E100.
2014-02-21 17:06:21 +01:00
Kristian Flikka
56c3dd2085
Make sure that the tree is updated correctly after reading WELSPECS
2014-02-14 12:36:26 +01:00
Kristian Flikka
dea586829c
Changed the begin and end iterator functions of GroupTreeNode into const_iterators
2014-02-14 09:58:06 +01:00
Joakim Hove
b386b0b944
Merge pull request #119 from flikka/add-producergroup-status
...
Add producergroup status to Group object
2014-02-12 14:35:36 +01:00
Joakim Hove
452da21fc4
Merge pull request #118 from flikka/getnodes-grouptree
...
Added getNodes to get a vector of the group nodes in the tree
2014-02-12 14:34:57 +01:00
Kristian Flikka
720cd21b0e
Merged from upstream/master
2014-02-12 10:13:49 +01:00
Joakim Hove
e31873f560
Merge pull request #117 from andlaus/unit_system_cleanups
...
Unit system cleanups
2014-02-11 13:13:39 +01:00
Andreas Lauser
03d6e9a20b
correct the context dependent rates in the schedule code
2014-02-11 12:45:44 +01:00
Andreas Lauser
849bc7df93
units: introduce a "ContextDependent" dimension
...
this is meant for those nasty keywords where the dimension of an entry
depends on a user-defined value of some field of a (potentially
different) keyword. One example for this are the surface rates of the
produced fluids for the .CON(INJ|PROD).* keywords which exhibit
different units depending on whether the user choses to control for
the surface gas or the liquid rate.
the approach taken in this patch is to convert all numbers to NaN if
the unit is queried in SI (via item->getSIDouble()). It might be more
desireable to throw an exception in this case, but this approach would
be more elaborate and NaNs should be quickly noticeable by the users
of this code.
I tried to adapt all implemented keywords, but it's quite likely that
I missed some...
2014-02-11 12:45:44 +01:00
Kristian Flikka
1988221d41
Added const to a couple of get-type methods
2014-02-11 09:32:34 +01:00
Kristian Flikka
08ec94e15c
Added setting of the injection/production status of group
2014-02-10 15:43:37 +01:00
Kristian Flikka
41a1e889b8
Added isProducerGroup to Group class, need this in opm-core
2014-02-10 15:43:37 +01:00
Kristian Flikka
9363f39cb9
Added getNodes to get a vector of the group nodes in the tree
2014-02-10 12:18:42 +01:00
Kristian Flikka
15682a71df
Merge pull request #114 from joakim-hove/valgrind
...
Valgrind
2014-02-06 16:39:30 +01:00
Joakim Hove
e17f03b8a0
Merge remote-tracking branch 'akva2/run_tests_through_valgrind' into valgrind
2014-02-06 14:30:01 +01:00
Kristian Flikka
9db42f6eb3
Added support for WELOPEN in the Schedule class, NOT support specific completions, only the well
2014-02-04 16:12:49 +01: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
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
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
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
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
Joakim Hove
7ce91cf504
Added well->Injectortype
2014-01-28 14:31:51 +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
Arne Morten Kvarving
4a9c18ac9f
run tests through valgrind
2014-01-27 15:16:34 +01:00
Kristian Flikka
3cbc7ea1a0
Made getCompletions const
2014-01-27 14:40:59 +01:00
Joakim Hove
1ba278022a
Have added ReservoirRates to well injector.
2014-01-24 13:24:22 +01:00
Joakim Hove
1cc38786dc
Renamed well->InjectionRate to SurfaceInjectionRate.
2014-01-24 12:36:45 +01:00
Kristian Flikka
6229fd1250
Added functionality to get vector containing active / all wells
2014-01-22 14:40:10 +01:00
Kristian Flikka
bd74a32c89
Added dimension to WELSPECS REF_DEPT, updated usage to query for SI
2014-01-21 10:10:05 +01:00
Kristian Flikka
3537de2209
Removed unused includes
2014-01-20 15:02:21 +01:00
