Commit Graph

27 Commits

Author SHA1 Message Date
Jørgen Kvalsvik
239ef7a34c Remove shared_ptr typedef in TimeMap 2016-10-19 20:38:28 +02:00
Jørgen Kvalsvik
1906bf4d16 Make EclipseGrid no longer use shared_ptr 2016-10-19 20:38:28 +02:00
Jørgen Kvalsvik
b3dbd6f930 Return const ref from getSchedule 2016-10-19 20:38:27 +02:00
Joakim Hove
c42d2a7022 Added simple test for hasKeyword. 2016-09-19 20:18:51 +02:00
Jørgen Kvalsvik
d98215ae40 [Summary] W-keywords accept patterns
The W-family of keywords accept a pattern to expand, rather than just
names or defaulted-all. This is the actual behaviour, according to the
manual.
2016-07-18 14:46:00 +02:00
Jørgen Kvalsvik
3f98a747df Connection keywords support well matching
Looking up well keywords uses the well matching algorithm. This covers
all cases supplied by the eclipse documentation, and extends it slightly
by also allowing matching.
2016-07-15 14:40:27 +02:00
Jørgen Kvalsvik
a84327ca25 Fix warnings in SummaryConfig 2016-07-13 23:40:09 +02:00
Jørgen Kvalsvik
e1befcc03f SummaryConfig: don't register duplicate entries
By using the ALL keyword or by denoting the same keyword multiple times,
there would be corresponding multiple entries in the SUMMARY file.
Address this by removing duplicate entries from the list of smspec
nodes.
2016-07-04 16:47:20 +02:00
Jørgen Kvalsvik
c998b35647 Reindentation 2016-07-04 16:47:19 +02:00
Jørgen Kvalsvik
27eeb9f85e Refactor SummaryConfig internals
The internal helper functions have been redesign. The initial ambition
was to create small, composable functions by-value functions and have
the high-level algorithm, which is essentially (concat . map handler
[kwlist]). However, MSVC breaking and therefore poor development speed
of utility libraries mandates adjusting the approach a bit.

The major change here is the "return value" of the helper functions
being passed by-reference to all helpers, which will append the elements
they generate onto the collection.
2016-07-04 16:47:04 +02:00
Jørgen Kvalsvik
daf833e3ba Minor control flow simplification 2016-07-04 13:15:25 +02:00
Jørgen Kvalsvik
3d01da1f4c ALL keyword SummaryConfig as parse-then-merge
Generalises the SummaryConfig internal representation building by no
longer special casing the ALL keyword in the loop, but rather explicitly
look it up, analyse the expanded list as a new and isolated deck, and
then merge the results.
2016-07-04 13:10:57 +02:00
Jørgen Kvalsvik
4f8ad8a533 SummaryConfig::merge
Combine two Summary configs, essentially concatenating the underlying
vectors.
2016-07-04 12:02:43 +02:00
Jørgen Kvalsvik
ffc94fc0b2 SummaryConfig: anon namespace; private ALL list
Some minor hygiene, not exposing some highly internal detail. The list
of keywords ALL expands to is duplicated rather than acessible via a
method, but:

1. this is highly likely never an interesting list of applications
2. it's really only useful for testing **AND** is unlikely to change
3. unclutters the header files slightly
2016-07-04 11:47:22 +02:00
Joakim Hove
d3f415c5aa ParseContext treatment of unknown wells/groups. 2016-07-01 17:04:58 +02:00
Joakim Hove
433b8ce73e Removed unused filter/remove functionality. 2016-07-01 17:04:58 +02:00
Kjell W. Kongsvik
31ec1dcfb2 Minor code formatting changes 2016-06-29 10:11:06 +02:00
Kjell W. Kongsvik
7f3cbcf91a Expands ALL keyword for summary
Only support F, G, W, not A
2016-06-28 15:39:59 +02:00
Joakim Hove
0ab3917233 Merge pull request #849 from jokva/remove-well-ptr
Remove shared_ptr Well alias, make Schedule interface more consistent
2016-06-20 14:57:17 +02:00
Jørgen Kvalsvik
44d7abc6fb Well shared_ptr alias removed
Deprecate the WellPtr -> shared_ptr aliases. The Schedule object is the
sole owner of these objects, and shared_ptr in the interfaces hid that.

The interfaces still relies on pointers to pass Wells around for now,
in order to (mostly) preserve source compability.
2016-06-16 13:58:12 +02:00
Joakim Hove
9b874aabfb Avoid shadowing of member variable. 2016-06-15 15:31:37 +02:00
Magne Sjaastad
f66294832c VS2015 : Workaround for VS2015 compiler bug 2016-05-25 16:23:09 +02:00
Jørgen Kvalsvik
6affc5f9c1 Split Well/Group; ignore unknown names
Occasionally the SUMMARY section requests wells or groups that aren't
defined in the Deck. Ignore these names (which would typically crash
downstream) and carry on.
2016-05-23 10:32:41 +02:00
Jørgen Kvalsvik
99829e1696 Ignore RPTONLY 2016-05-10 14:43:19 +02:00
Jørgen Kvalsvik
00066e225f Special-case handling of RUNSUM keyword
The RUNSUM keyword is identified as a Region-type keyword, but isn't
really. It's to be ignored by the SummaryConfig construction.
2016-05-09 15:09:43 +02:00
Jørgen Kvalsvik
ee8710d3cb SummaryConfig does not require EclipseState
Rewrite construction to accept EclipseState components instead of the
full state. Enables having SummaryConfig as a member in EclipseState.
2016-05-09 14:55:24 +02:00
Jørgen Kvalsvik
ee4e447e92 Rename Summary to SummaryConfig
This object turns out to be the actual configuration object, not a
mediator state to obtain a configuration. It is therefore renamed to
reflect intent and behaviour.
2016-04-25 11:45:39 +02:00