Commit Graph

1371 Commits

Author SHA1 Message Date
Fredrik Gundersen
94b33eaf6e Rename method 2015-01-14 11:41:32 +01:00
Fredrik Gundersen
7ed82d6458 Code refactoring, logic update 2015-01-14 11:41:13 +01:00
Fredrik Gundersen
4af77efe75 Added new constructor to completion 2015-01-14 11:40:28 +01:00
Fredrik Gundersen
65cc82f6d7 Remove default values 2015-01-13 15:06:49 +01:00
Fredrik Gundersen
a05cf32c42 Extended test to include more cases 2015-01-13 15:06:28 +01:00
Fredrik Gundersen
60d0f66587 Cleanup of logic
Added method to create value item from deckitem
2015-01-13 15:06:06 +01:00
Fredrik Gundersen
1a669d1c87 Merge remote-tracking branch 'upstream/master' into closed_completions 2015-01-13 12:57:46 +01:00
Fredrik Gundersen
e8aac2120c Update gitignore 2015-01-13 12:57:16 +01:00
Fredrik Gundersen
503a592b89 Update logic 2015-01-13 12:57:00 +01:00
Fredrik Gundersen
9a154d417c Update logic 2015-01-13 12:56:49 +01:00
Fredrik Gundersen
5f14914257 Added more tests 2015-01-13 12:56:17 +01:00
Fredrik Gundersen
5a9620d8b2 Added test for WELOPEN keyword 2015-01-13 11:25:46 +01:00
Fredrik Gundersen
b0d0c92b5d update handleWELOPEN
Enable update of completion status using the WELOPEN keyword
2015-01-13 11:25:28 +01:00
Fredrik Gundersen
2f9d5f9e65 added method to enable add of completionset 2015-01-13 11:24:31 +01:00
Joakim Hove
cdf576d5f1 Will translate STOP -> SHUT for completions. 2015-01-12 12:33:49 +01:00
Joakim Hove
b12bcdb47b Added WellCompletion namespace for completion enums 2015-01-12 10:58:30 +01:00
Joakim Hove
87cfbb4f75 Let the opm-eclkwtest also create EclipseState 2015-01-02 16:53:26 +01:00
Joakim Hove
b1a30272a2 Added hasValue() protection 2015-01-02 16:53:26 +01:00
Joakim Hove
ecac5fc691 Added DeckItem::hasValue() method 2015-01-02 16:53:25 +01:00
Joakim Hove
c3ae6164fa Added comment about default 2015-01-02 16:53:25 +01:00
Joakim Hove
6e8230db2f Set default phase to OIL in EHYSTR keyword 2015-01-02 16:53:25 +01:00
Joakim Hove
2ba6d909b5 Revert "Revert "Revert "add default values required to make it possible to terminate keywords early"""
This reverts commit a42aece4319c0e5346fc375ff0613b02a68901d4.
2015-01-02 16:51:30 +01:00
Joakim Hove
cf97b3bbe6 Revert "Revert "make the parsing stage pass even if non-defaultable items have been defaulted""
This reverts commit 13d31809e8ca7b9f283bf29a0871110071263449.
2015-01-02 16:51:15 +01:00
Joakim Hove
6d140840ee Revert "add pseudo default values for more items"
This reverts commit 317bbdb2fdded13719d9a91e493757e8c1a94a4c.
2015-01-02 16:51:02 +01:00
Andreas Lauser
17fdbfb9a8 add pseudo default values for more items
this is required by the Norne deck. the EQLOPTS keyword seems weird,
though, because its records seem to have a variable number of items...

for most of these the RM says that if nothing is specified, a value of
another item should be used. some items even have legitimate
defaults, but they are only mentioned in the prose of the RM's item
description. (e.g.the wetting_phase_flag item of the EHYSTR keyword...)
2014-12-19 23:02:21 +01:00
Andreas Lauser
e0706524e0 Revert "make the parsing stage pass even if non-defaultable items have been defaulted"
This reverts commit 5ce5a3539641ac6eac9362d9c2b8a09084f9c35b.
2014-12-19 19:02:53 +01:00
Andreas Lauser
86b617794b Revert "Revert "add default values required to make it possible to terminate keywords early""
This reverts commit 41dbe397db56e547f254f3b0302440b8f7a00db5.
2014-12-19 19:02:44 +01:00
Andreas Lauser
e12a0aab1b parser main loop: handle unknown sized keywords in a better way 2014-12-19 10:59:12 +01:00
Joakim Hove
85f247fd2a Minor rebase fixup 2014-12-18 18:02:15 +01:00
Joakim Hove
e56a136565 Added support for COPYREG keyword 2014-12-18 18:02:15 +01:00
Joakim Hove
a92ff43237 Added COPYREG keyword 2014-12-18 18:02:14 +01:00
Joakim Hove
a4620f5ed0 Added support for ADDREG keyword 2014-12-18 18:02:14 +01:00
Joakim Hove
275d69255f Added ADDREG keyword 2014-12-18 18:02:13 +01:00
Joakim Hove
9ddd8e83c0 Added GridProperty::maskedAdd() and maskedCopy() 2014-12-18 18:02:13 +01:00
Joakim Hove
233b9b9e32 Added support for MULTIREG keyword in EclipseState 2014-12-18 18:02:12 +01:00
Joakim Hove
22bba69159 Added MULTIREG keyword. 2014-12-18 18:02:12 +01:00
Joakim Hove
d75c830388 Added GridProperty::maskedMultiply() method 2014-12-18 18:02:11 +01:00
Joakim Hove
ed89b8ee9d Added test for EQUAL. 2014-12-18 18:02:11 +01:00
Joakim Hove
be08d6df2a Added support for EQUALREG in EclipseState 2014-12-18 18:02:10 +01:00
Joakim Hove
06f2715d10 Added method GridProperties::getInitializedKeyword()
The getKeyword() method will autocreate and initialize a keyword if you
ask for one which is supported, but has not yet been accessed. The new
getInitializedkeyword() method will raise an exception if the keyword
has not already been initialized.
2014-12-18 18:02:10 +01:00
Joakim Hove
7588096c08 Added GridProperty::getDimensionString() 2014-12-18 18:02:09 +01:00
Joakim Hove
a100d94608 Added const to GridProperty::containsNan() 2014-12-18 18:02:09 +01:00
Joakim Hove
867fdb2de5 Added maskedSet() and initMask() GridProperties<T> 2014-12-18 18:02:08 +01:00
Joakim Hove
60ad53c7d1 Added EQUALREG json configuration 2014-12-18 18:02:08 +01:00
Andreas Lauser
de3b3e2772 Revert "add default values required to make it possible to terminate keywords early"
This is not necessary anymore with approach of the previous commit...
2014-12-18 11:43:52 +01:00
Andreas Lauser
231cf39d47 make the parsing stage pass even if non-defaultable items have been defaulted
... but throw later when trying to access the data of the item in
question.

Note that this was demanded by [at] joakim-hove and that I do not want
to be held responsible for any issues which are caused by this
approach. (read: please direct your barks to Joakim if you fell on
your nose because of this...)
2014-12-18 11:43:52 +01:00
Andreas Lauser
0262b333fd make items which do not have a default un-defaultable
this was a much more common problem than it seemed initially...
2014-12-18 11:43:52 +01:00
Andreas Lauser
74d2cca3a4 add default values required to make it possible to terminate keywords early
for many of them the RM says "default is undefined" but that I've come
to the conclusion that this doesn't mean that no default could be
applied, but that the simulator is allowed to screw up if the values
of them are accessed. (Note that in this sense this change is no
change from the current situation, but makes the screw-up more
explicit.)

In particular, note the GRIDUNIT keyword which had some serious JSON
syntax errors in it but so far the unit tests worked anyway for some
reason...
2014-12-17 16:37:17 +01:00
Joakim Hove
1f111668ac Removed stale comments - problem has been fixed. 2014-12-15 17:36:11 +01:00
Joakim Hove
19c29ff6df Added BUILD_TESTING() guard 2014-12-15 17:36:10 +01:00