OilfieldToolsNet/opm-common
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
1,077 Commits 18 Branches 75 Tags
4253fb151b10d9aaffe23d6e27bf9cf5a2222f6c
Commit Graph

87 Commits

Author SHA1 Message Date
Joakim Hove
29df8e9f89 Added count() method to Section class 2014-07-08 17:16:02 +02:00
Joakim Hove
7269924543 Added name() property to section objects. 2014-06-03 22:42:23 +02:00
Joakim Hove
22ed38b319 Added iterators begin() and end() to DeckKeyword class. 2014-06-03 22:42:23 +02:00
Arne Morten Kvarving
463eae9b07 fixed: don't mix member names and function parameters 2014-05-19 13:15:09 +02:00
Joakim Hove
2786b5e87b Added isDataKeyword() property to deckKeyword. 2014-05-16 15:29:54 +02:00
Joakim Hove
30fe203932 Utility functions to check if deck has sections. 2014-05-16 13:10:20 +02:00
Arne Morten Kvarving
670e8b692b changed: don't use parameter names that conflicts with member function names 
quells warnings (with gcc 4.8)
 2014-05-15 14:46:16 +02:00
Joakim Hove
4672e386f0 Added getDataSize() method to DeckKeyword. 2014-04-27 23:51:43 +02:00
Atgeirr Flø Rasmussen
b0d93977b9 Comment out unused function argument. 2014-04-15 09:26:04 +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
3087f33fd8 Merge pull request #155 from andlaus/schedule_trim_names 
schedule: do not let us be disturbed by leading or trailing white space in names
 2014-04-03 20:22:10 +02:00
Andreas Lauser
debe11a8f3 DeckItem: introduce getTrimmedString() 
which is like getString() but with the leading and trailing white
space removed. It is intended for names which seem to not care about
such white space in Eclipse.
 2014-04-03 14:32:25 +02:00
Joakim Hove
edde68fa6a Added float data accessors. 2014-04-01 09:05:33 +02:00
Joakim Hove
6c9d03258e Added getKeyword() method to Section class. 2014-03-28 19:09:56 +01:00
Joakim Hove
a141d7722b Added missing #include <iostream> in two tests. 2014-03-25 12:34:48 +01:00
atleh
ec22c39f5c Minor adjustments in Section[Tests], Schedule and KeywordContainerTests 2014-03-25 09:26:43 +01:00
atleh
d761081d96 Commented out failing assert in KeywordContainerTests 2014-03-25 07:29:51 +01:00
atleh
73df57b920 Added some iterator support in KeywordContainer and Section. Not finished. 2014-03-24 18:55:35 +01:00
atleh
a4b8c08c0e Some code cleanup in XyzSection classes 2014-03-24 14:56:20 +01:00
atleh
7225ee8f90 First version of XyzSection classes implemented - based on Section class 2014-03-24 14:48:23 +01:00
atleh
0e9cd5ff33 Some more logic added to the Section class 2014-03-24 10:05:22 +01:00
atleh
0d3f74986a Added a few tests 2014-03-21 15:40:44 +01:00
atleh
14507208d5 Added first version of Section class 2014-03-21 14:39:24 +01:00
Atgeirr Flø Rasmussen
3ab6a5388c Suppress unused argument warnings. 2014-03-03 11:06:44 +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
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
0129a382a8 units: Replace "L" by "Length" 2014-02-11 12:45:43 +01:00
Arne Morten Kvarving
4a9c18ac9f run tests through valgrind 2014-01-27 15:16:34 +01:00
Andreas Lauser
ab65990653 avoid coverting the data of a deck item to SI multiple times 
This resulted in _quadratic_ complexity if data points where retrieved
one-by-one. For the Norne case, this had the consequence that
retrieving the data for ZCORN (-> about 1M data points) took hours...
 2014-01-18 13:34:12 +01:00
Andreas Lauser
d261fcfe98 also constify the getSIDoubleData() method in DeckKeyword 
in the item and in the record it already was marked as const, the
DeckKeyword class was forgotten during that excercise.
 2014-01-15 12:52:12 +01:00
Andreas Lauser
e5066ae495 make the getSIDouble*() methods const 
the fact that data is lazily converted to SI units should not be
relevant for the caller. This requires to decorate the array for SI
units in the DoubleItem as mutable, though...
 2013-12-19 15:39:28 +01:00
Joakim Hove
65c9882b53 Added dimensions to WCONHIST & WCONPROD. 2013-12-16 00:02:47 +01:00
Joakim Hove
9de20014fc Correctly parses EQUIL with units. 2013-12-15 09:41:25 +01:00
Joakim Hove
04ae0a1798 Final applyUnits commit ... 2013-12-14 10:31:07 +01:00
Joakim Hove
5d7adb027d KeywordContainer is accessed in non-const fashion. 2013-12-14 10:30:37 +01:00
Joakim Hove
d0bfaaece1 Added unitSystems to Deck. 2013-12-14 10:23:56 +01:00
Joakim Hove
55a77c2224 Deck->getKeyword() return modifiable DekcKeyword instance. Required to apply dimensions. 2013-12-14 10:22:55 +01:00
Joakim Hove
084fc24174 Changed parserItem::scan to return modifyable DeckItem - this is required to push dimension later. 2013-12-14 10:11:59 +01:00
Joakim Hove
3f536cda67 Added virtual method pushBack_dimensions() to deckitem. 2013-12-14 10:07:47 +01:00
Joakim Hove
7ea0bb8e53 Changed getDouble() -> getRawDouble throughout. 2013-12-10 14:16:54 +01:00
Joakim Hove
4fce7703db Added dimension to DeckDoubleItem and method get SIData(). 2013-12-10 13:49:15 +01:00
Joakim Hove
24e233a53c Support for parsing keywords with unknown size. 2013-12-05 08:26:29 +01:00
Kristian Flikka
1d0135da5e Removed use of boost::shared_ptr, replaced with std::shared_ptr 2013-12-02 13:07:01 +01:00
Joakim Hove
803304d5f8 Deck->keywordContainer will set deckIndex of DeckKeyword when inserting: Have relaxed const properties of DeckKeyword 2013-10-22 11:42:15 +02:00
Joakim Hove
0598e9122a Added deckIndex property to deckKeyword 2013-10-22 11:40:45 +02:00
Kristian Flikka
13f30cb3ef Removed template for ParserItem for decoding default/repetetive tokens for String and Double 2013-10-16 14:57:01 +02:00
Joakim Hove
2d68ebe94c Merge remote-tracking branch 'upstream/master' into track-default 2013-10-15 14:24:42 +02:00
Joakim Hove
2ac8bc55a5 Merge pull request #30 from joakim-hove/data-with-space 
Data with space
 2013-10-15 05:23:11 -07:00
Joakim Hove
801e6b9fd1 Added DeckIntItem->push_backMultiple() 2013-10-14 21:12:22 +02:00