OilfieldToolsNet/opm-common
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
773 Commits 18 Branches 75 Tags
674d38000659da4813f072d12dbcd406e19bb580
Commit Graph

140 Commits

Author SHA1 Message Date
Andreas Lauser
674d380006 fix a few pedantic GCC warnings due to superfluous semicolons 
these warnings are only only produced by GCC in its pedantic mode (and
possibly with -O3 in addition, but I haven't checked this...)
 2014-03-19 16:24:28 +01:00
Andreas Lauser
189b671930 ScheduleEnums: strip whitespace around the control mode strings 
for some reason, the Norne deck included whitespace for some control
modes of some wells which lead to an exception. Since Eclipse seems to
eat this, and Eclipse is correct by defintion, let's adapt our
digestion system a bit...
 2014-03-17 18:13:49 +01:00
Joakim Hove
b4bbbb7c8e Merge pull request #137 from joakim-hove/Norne-Schedule 
Small changes to support loading of Norne Schedule file
 2014-03-11 20:08:15 +01:00
Andreas Lauser
08331914bd TimeMap: extend unit tests for the time levels 
I forgot, sorry...
 2014-03-11 19:01:23 +01:00
Andreas Lauser
30a16410aa TimeMap: fix the timePassedUntil() method 
whoever wrote the original code must have his brain left in the bed
that day ;)...
 2014-03-11 15:01:14 +01:00
Joakim Hove
8598fa279e Added throw() in Schedule if trying to control well on an item which has been defaulted. 2014-03-03 15:06:26 +01:00
Joakim Hove
7dc8767c80 Made sure that groups were added when reading the GRUPTREE keyword. 2014-03-03 15:06:26 +01:00
Joakim Hove
ceb4a8df8d Added check on Well->status before reading controlmode. 2014-03-03 15:06:25 +01:00
Joakim Hove
f91229218e Moved the implementation of two micro functions from .hpp to .cpp file + changed one int -> size_t. 2014-02-26 23:24:31 +01:00
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
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
Kristian Flikka
e4eb60be4b Added guide rate phase enum 2014-02-20 09:30:33 +01:00
Kristian Flikka
b69f41f32d Added support for guide rate 2014-02-19 15:43:42 +01:00
Kristian Flikka
bd564ad944 Added WGRUPCON, and simple YES/NO handling in Schedule 2014-02-17 16:10:31 +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
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
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