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

169 Commits

Author SHA1 Message Date
Andreas Lauser
d71cb1aa51 parser integration test: use std::istream as a template argument for std::shared_ptr 
gcc 4.4 has problems with such implicit conversions...
 2014-05-20 13:27:37 +02:00
Andreas Lauser
0d92cd43b0 export possibility to parse an arbitrary std::istream 
this has the potential to reduce the memory requirements of the parser
for opm-benchmarks considerably and is quite easy to add since
internally all parsing happend on istreams anyway...

The parser integration test has been extended to test the new method
as well as `parseString()` which was omitted previously. (I wonder who
introduced this without changing the test. ;)
 2014-05-20 12:12:12 +02:00
Kristian Flikka
82a38c1cc8 Merge pull request #208 from AtleH/wellnamewithwildcard 
Added wildcard support in WCONINJE and WCONPROD
 2014-05-16 12:28:39 +02:00
Atle Haugan
77ed32662c Enabled integration tests in ParseWellWithWildcards 2014-05-16 11:07:01 +02:00
Arne Morten Kvarving
a8f216175a fixed: remove misplaced semi-colons 2014-05-15 14:46:16 +02:00
Arne Morten Kvarving
3827ddca64 fixed: mark static symbols as such to quell warnings 2014-05-15 14:46:16 +02:00
Atle Haugan
344d02ad1c Add support for wildcard in WCONPROD and WCONINJE keywords. 2014-05-06 09:54:37 +02:00
Joakim Hove
af6f18b5aa Added methods to export the ZCORN, COORD and ACTNUM keywords from the EclipseGrid. 2014-04-22 00:20:03 +02:00
Joakim Hove
d5bf1726f2 Verified behaviour of defaults (i.e. *) for multivalued items. 2014-04-11 13:42:22 +02:00
Joakim Hove
f59fd25668 Added boolan flag scalar = true to DeckItem. 
The purpose of this flag is to keep track of whether a keyword is
supposed to have only one element, i.e. scalar, or several. The
defaultApplied method only makes sense in the case of scalar items, this
method will now throw if it is called on a non-scalar item.
 2014-04-11 13:42:22 +02:00
Joakim Hove
5becf79dd1 The ParserKeyword->parse() method will throw if the raw input argument is not finished. 
Requires several changes to assure that the rawkeyword instances are
marked as finished before reacing the ParserKeyword->parse method.
 2014-04-11 13:42:22 +02:00
Joakim Hove
a14dc265b5 Will temporarily convert double -> float before instantiating an ERT eclipsegrid. 2014-04-07 12:28:07 +02:00
Kristian Flikka
666ba3e607 Temporary revert and test removal - pending float/double cleanups 2014-04-04 15:39:29 +02:00
Joakim Hove
9c29c00c2b Added ability to create EclipseGrid from cornerpoint keywords. 2014-04-01 09:06:43 +02:00
Joakim Hove
5785d088ea Added functionality in Completion class to adjust I and J to wellHead value if they have been defaulted (i.e. have value -1). This is unfortunate because we loose quite a lot of const correctness. 2014-03-28 18:56:21 +01:00
Joakim Hove
f84ec0bb3f Made injection and production control variables into property variables. 2014-03-21 00:07:23 +01:00
Joakim Hove
011eb8a2c6 camelCased property attributes in the production and injection properties structures. 2014-03-20 23:27:18 +01:00
Atle Haugan
3daaf827c9 Renamed getXyzProperties to getXyzPropertiesCopy. Added new getXyzProperties which currently does not work... 2014-03-20 10:36:57 +01:00
Atle Haugan
af784c6734 Enabled the remaining tests. 2014-03-20 10:31:21 +01:00
Atle Haugan
87599c9841 Moved has/drop/addProductionControl to WellProductionProperties. The same for WellInjectionProperties. 2014-03-20 10:11:56 +01:00
Atle Haugan
fb5c83086a Moved (duplicated) m_isInPredictionMode to WellProductionProperties and WellInjectionProperties. 2014-03-19 10:51:13 +01:00
Atle Haugan
9c64af0b6b Moved BHPLimits and THPLimits to WellProductionProperties and WellInjectionProperties (duplicated). Several unit tests are still commented out - will fix. 2014-03-19 10:42:21 +01:00
Atle Haugan
3040697ccc Added WellInjectionProperties.InjectionControls. Adjusted som unit tests. Removed some dead code. 2014-03-19 10:40:48 +01:00
Atle Haugan
8aee879dc5 Added WellInjectionProperties, modified Well class to use it 2014-03-19 10:40:07 +01:00
Atle Haugan
df40a0aa21 Replaced single-item calls with call to get/setProductionProperties() 2014-03-19 10:13:58 +01:00
Atle Haugan
9650fce19a Using pointers for WellProductionProperties 2014-03-19 10:13:58 +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
b0ee11ebb3 Merge pull request #130 from AtleH/pathskeyword 
PATHS keyword
 2014-02-26 23:10:45 +01:00
Joakim Hove
1907a8e467 Merge pull request #129 from andlaus/refactor_timemap 
Refactor timemap
 2014-02-26 23:09:50 +01:00
Atle Haugan
c81fe99fec Fixed definition for PATHS keyword + improved unit test for same 2014-02-26 15:03:04 +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
Atle Haugan
9ac0401af5 Support for PATHS keyword - first take 2014-02-21 12:56:20 +01:00
Kristian Flikka
b3dc1ea5ca Added rest of WGRUPCON handlingin Well and Schedule 2014-02-21 12:48:36 +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
46b3a364d8 Added test to run through the iter functionality in GroupTreeNode 2014-02-14 11:38:49 +01:00
Kristian Flikka
720cd21b0e Merged from upstream/master 2014-02-12 10:13:49 +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
08ec94e15c Added setting of the injection/production status of group 2014-02-10 15:43:37 +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
e42234b17a Added Well::Producercontrolmode 2014-01-30 16:44:21 +01:00