Commit Graph

35 Commits

Author SHA1 Message Date
Arne Morten Kvarving
e3bd1e6723 add static method to return a test object for serialization
this allows killing the constructors taking member values
2020-03-23 10:58:15 +01:00
Bård Skaflestad
4b85366d7e Merge pull request #1592 from jalvestad/opm_data_Groups
Changes in opm-common for current Production/Injection Group Control parameters
2020-03-19 16:53:07 +01:00
Arne Morten Kvarving
902fd38eb2 add serialization template to Location 2020-03-19 09:34:12 +01:00
Jostein Alvestad
e77a2c7816 Added SummaryConfig.hpp 2020-03-16 14:04:04 +01:00
Williham Williham Totland
ec2cd2f9eb Audits forward declarations. 2020-03-13 15:40:41 +01:00
Williham Williham Totland
fb7d4315c9 Renames Opm::SummaryNode to Opm::SummaryConfigNode. 2020-03-13 15:40:41 +01:00
Arne Morten Kvarving
939648e833 Merge pull request #1567 from akva2/serialize_summarynode
add serialization template to SummaryNode
2020-03-13 15:32:48 +01:00
Williham Williham Totland
d5c4487808 Implements support for RUNSUM-related keywords NARROW and SEPARATE 2020-03-13 09:15:46 +01:00
Williham Williham Totland
0910e55be7 Changes Opm::SummaryConfig::createRunSummary to be backed by a field. 2020-03-13 07:45:52 +01:00
Williham Totland
6f83c4198c Review Action: Renames SummaryConfig::doRunSummary to SummaryConfig::createRunSummary 2020-03-12 12:23:09 +01:00
Williham Totland
36e91f5cff Implements SummaryConfig::doRunSummary() 2020-03-12 12:14:00 +01:00
Arne Morten Kvarving
f25f7e77f5 add serialization template to SummaryNode 2020-03-12 12:11:01 +01:00
Williham Totland
fcc2e32d66 Renames runsum to doRunSummary, adds accessor. 2020-03-12 10:52:10 +01:00
Arne Morten Kvarving
6a2c036582 add serialization template to SummaryConfig
remove accessors that was only required for the external serialization
support
2020-03-10 13:09:08 +01:00
Arne Morten Kvarving
8fbff44d22 make SummaryConfig constructible from variables
also add accessors and equality operator
2020-01-08 09:58:20 +01:00
Arne Morten Kvarving
d9c7260784 make SummaryNode default constructible 2020-01-08 09:58:10 +01:00
Steinar Foss
4b5ef93293 added enum class FuncType for ASTNode.
ActionParserNode takes functype arg.

ActionParser getfunc.

ASTNode constr take func_type-arg.

ASTNode: throws exception if not FunctionType well.

FuncType: expanded list.

ActionParser: gettype distnguishes types.

ACTIONX.cpp: added test with group*.

parseKeywordCategory made public.

ActionParser: uses parseCategory.
2019-12-04 16:24:58 +01:00
Joakim Hove
f17eefcaf7 Add Location member to SummaryNode instances 2019-11-11 15:31:36 +01:00
Bård Skaflestad
70daf0f2c8 Decouple SummaryConfig From LibECL
This commit reimplements the SummaryNode class in order not to use
the ecl::smspec_node class from LibECL.  Consequently, we remove
class SummaryConfig's binding to LibECL.

Class SummaryNode maintains the same information as before.  We also
implement a "named constructor" strategy to assign data members that
only make sense for a subset of the node categories.  The previous
member function 'type' is renamed to 'category' to identify the
attachment category (e.g., Well, Group, Field, Block, Region).  In
turn, we introduce a new 'type' member function to identify the
parameter kind (e.g, pressure, rate, cumulative total, well count)
represented by a given node.  We furthermore capture whether or not
the node is a user defined quantity (i.e., a UDQ).

We reimplement the keyword classifier operations that are currently
needed as free functions named 'is_*()' in SummaryConfig.cpp.

Note that in addition to the renamed member functions of class
SummaryNode, this commit also switches the summary key strategy for
block parameters.  Rather than capturing the 'ijk' values
individually as "BOSAT:3,3,6", we now store the equivalent global
(Cartesian) index (i.e., as "BOSAT:523").  Code that directly
constructs block parameter keys must be updated accordingly.

Chase the API change in the 'Summary' constructor and update unit
tests as needed.
2019-09-30 13:59:34 +02:00
Joakim Hove
5734923b1e Add size() method to SummaryConfig class 2019-03-29 15:40:37 +01:00
Joakim Hove
2cd6fa2f49 Add overloads without ParseContext and ErrorGuard - update all tests 2019-01-04 13:59:28 +01:00
Joakim Hove
bf52e6d123 Added ErrorGuard& arguments to library 2019-01-03 13:14:40 +01:00
Joakim Hove
f414f5b8ad Adapt to C++ changes in libecl 2018-11-26 17:30:09 +01:00
Joakim Hove
5aa0bfadf0 Use plain C api for smspec_nodes 2018-09-07 13:56:04 +02:00
Joakim Hove
a580259d99 Changed summaryconfig constructor. 2017-09-25 10:05:09 +02:00
Joakim Hove
6b3db2f9fe Removed EclipseState::getSchedule( ) calls. 2017-09-24 01:46:05 +02:00
Joakim Hove
b9823a4c2e Changed region expansion in Rxxx SUMAMRY keywords.
If the region keywords from the SUMMARY section, like e.g. RPR, are
specified without explicit region numbers a summary key is added for all
region values from 1..NTFIP, irrespective of which region values are
actually present.
2017-05-25 23:39:45 +02:00
Joakim Hove
5ea448ac93 Check required restart fields for summary. 2017-02-07 11:16:28 +01:00
Joakim Hove
c42d2a7022 Added simple test for hasKeyword. 2016-09-19 20:18:51 +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
Kjell W. Kongsvik
7f3cbcf91a Expands ALL keyword for summary
Only support F, G, W, not A
2016-06-28 15:39:59 +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