Joakim Hove
1907a8e467
Merge pull request #129 from andlaus/refactor_timemap
...
Refactor timemap
2014-02-26 23:09:50 +01:00
Andreas Lauser
af13b5ed31
TimeMap: always assume the presence of the TIME item
...
i.e., the number of items in a date record must now always be 4. to
make this happen, some tests had to be fixed, too...
2014-02-26 22:15:53 +01:00
Andreas Lauser
b9956385ef
fixup! TimeMap: Expose more data
2014-02-26 15:46:18 +01:00
Andreas Lauser
57f199a6e8
fixup! TimeMap: add constructor which takes a deck
2014-02-26 15:33:08 +01:00
Joakim Hove
47fee36223
Merge pull request #128 from flikka/add-WGRUPCON
...
Add WGRUPCON support to parser
2014-02-25 20:06:45 +01:00
Andreas Lauser
bffa709dd3
TimeMap: extend test to check "from deck construction" and the new accessor methods
2014-02-21 17:06:22 +01:00
Andreas Lauser
9b8c5d317e
TimeMap: add constructor which takes a deck
...
this simplifies things considerably and hopefully avoids code
excessive code duplication..
2014-02-21 17:06:22 +01:00
Andreas Lauser
e6c0ff4546
TimeMap: Expose more data
...
basically, we now can access the beginning of a timestep its length
and the total time passed since the beginning of life, the universe
and all the rest.
2014-02-21 17:06:21 +01:00
Andreas Lauser
be137414c8
TimeMap: simplify the initialization of the eclipse month name map slightly
2014-02-21 17:06:21 +01:00
Andreas Lauser
18eb2fd8f4
TimeMap: replace boost::gregorian::date by boost::posix_time::ptime
...
this is necessary because boost::gregorian::date does not have a
notion of "time during a day" which is required to specify time step
lengths less than a day...
2014-02-21 17:06:21 +01:00
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
b3dc1ea5ca
Added rest of WGRUPCON handlingin Well and Schedule
2014-02-21 12:48:36 +01:00
Joakim Hove
d49ff37891
Merge pull request #126 from AtleH/floatitem
...
Added DeckFloatItem, ParserFloatItem
2014-02-20 12:56:43 +01:00
Kristian Flikka
e4eb60be4b
Added guide rate phase enum
2014-02-20 09:30:33 +01:00
Atle Haugan
0d134e8dcd
Removed special float/double handling in ParserFloatItem
2014-02-20 07:23:56 +01:00
Kristian Flikka
b69f41f32d
Added support for guide rate
2014-02-19 15:43:42 +01:00
Atle Haugan
442d0fb7bf
Added ParserFloatItem + some tests. More tests may be needed.
2014-02-18 11:02:38 +01:00
Kristian Flikka
bd564ad944
Added WGRUPCON, and simple YES/NO handling in Schedule
2014-02-17 16:10:31 +01:00
Atle Haugan
ed17058ad3
Renamed FLOAT to DOUBLE in JSON files, tests and some code using the enum
2014-02-17 15:02:40 +01:00
Atle Haugan
d672f4f5eb
Added DOUBLE enum to ParserValueTypeEnum
2014-02-17 14:32:32 +01:00
Atle Haugan
6a907bc7b2
Added new DeckFloatItem with tests
2014-02-14 13:41:10 +01:00
Joakim Hove
3a3e40efb1
Merge pull request #125 from flikka/fix-treefromschedule-bug
...
Fix treefromschedule bug
2014-02-14 13:35:45 +01:00
Joakim Hove
c61f71f552
Merge pull request #124 from flikka/add-grouptree-child-iter-test
...
Add grouptree child iter test
2014-02-14 13:35:30 +01:00
Joakim Hove
99cbff8f3c
Merge pull request #123 from flikka/constify-group-iterator
...
Changed the begin and end iterator functions of GroupTreeNode into const...
2014-02-14 13:35: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
46b3a364d8
Added test to run through the iter functionality in GroupTreeNode
2014-02-14 11:38:49 +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
Andreas Lauser
c972e6c0c1
GconinjeWrapper: return raw instead of SI rates
...
the wrapper could be a bit more sophisticated and do the conversion
internally, but the new wells management code seems to ignore the
wrapper anyway, so there is no real point in investing time into that
(yet).
2014-02-13 14:23:56 +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
Kristian Flikka
e105b0b3c5
Added missing files from the Utility folder to the CMakeLists file.
2014-02-12 08:53:53 +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
Andreas Lauser
50f2288148
units: rename "m" to "Mass"
2014-02-11 12:45:44 +01:00
Andreas Lauser
690f26c223
units: rename "Rho" to "Density"
2014-02-11 12:45:43 +01:00
Andreas Lauser
ae73345763
units: rename "K" to "Permeability"
2014-02-11 12:45:43 +01:00
Andreas Lauser
ac60eed7d6
units: rename "1/Rs to "OilDissolutionFactor" and "Rs to "GasDissolutionFactor"
2014-02-11 12:45:43 +01:00
Andreas Lauser
bc4d467322
units replace: "mu" by "Viscosity"
2014-02-11 12:45:43 +01:00
Andreas Lauser
19d89d44cd
units: Replace "P" by "Pressure"
2014-02-11 12:45:43 +01:00
Andreas Lauser
0129a382a8
units: Replace "L" by "Length"
2014-02-11 12:45:43 +01:00
Andreas Lauser
6a97d78cc6
units: replace "t" with "Time"
...
this makes things more explicit and more readable
2014-02-11 12:45:41 +01:00
Andreas Lauser
44f310bfbf
units: substitute "FlowVolume" by "LiquidVolume" and "GasVolume"
...
because the units for them are different in the "Field" unit system.
2014-02-11 12:45:05 +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
Joakim Hove
e4c60e6aa1
Merge pull request #112 from andlaus/another_typo
...
fix another missibility typo
2014-02-06 22:25:51 +01:00
