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

8059 Commits

This Branch
This Branch
All Branches
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
3bc8f832d8 Merge pull request #1618 from bska/add-missing-header 
Parser.cpp: Include Missing Header
 2020-03-22 18:02:47 +01:00
Bård Skaflestad
e7324ccd95 Parser.cpp: Include Missing Header 
The implementation uses std::stack and therefore needs a declaration
of this type in scope.  This apparently built by accident earlier.
While here, also include a few other headers to make Parser.[hc]pp
more self-contained.
 2020-03-22 17:06:38 +01:00
Bård Skaflestad
01d6ad95e0 Merge pull request #1617 from bska/summary-wmctl 
Support Outputting Active Well Control to Summary File
 2020-03-21 14:30:25 +01:00
Bård Skaflestad
f2e848bb5d Restart File: Reimplement Active Well Control Output Code 
Switch to using the same backend that is also used for outputting
the equivalent value to the 'WMCTL' summary vector.
 2020-03-20 22:07:32 +01:00
Bård Skaflestad
2f8ad86afd Summary Output: Implement 'WMCTL' Keyword 
This outputs a numeric code, an integer value, for all configured
wells at all times and enables more visual inspection of how the
wells' active controls change over time--either in response to
explicit target modes in the input or as a result of limits becoming
active.

Note that due to the fall-back option of selecting the input value
if no dynamic value is available, we must ensure that the test code
does not specify well types (producer/injector) that conflict with
the keywords used in the backing data set.  Update the relevant
tests accordingly.
 2020-03-20 22:07:32 +01:00
Bård Skaflestad
45b501cb83 Summary Config: Recognize 'WMCTL' Keyword 
This would previously be interpreted as a completion keyword due to
matching the pattern 'W*L'.
 2020-03-20 22:07:32 +01:00
Bård Skaflestad
8d2cc14ad0 Active Well Control Output: Place Duplicate Implementation in Well 
Will become shared backend for output to restart and summary files.
Add unit tests to exercise the new functions.
 2020-03-20 22:07:04 +01:00
Joakim Hove
4e2dae298f Merge pull request #1593 from joakim-hove/internalize-pyaction 
Internalize pyaction
 2020-03-20 18:38:29 +01:00
Joakim Hove
81b70de140 Add serializer support for PyAction 2020-03-20 17:15:53 +01:00
Joakim Hove
d2af97b1b2 Internalize PYACTION keywords while parsing Schedule 2020-03-20 16:59:50 +01:00
Joakim Hove
9632eae663 Add PyAction container to Actions class 2020-03-20 16:59:50 +01:00
Joakim Hove
c7f6b22bdf Add static method bool Python::enabled() 2020-03-20 16:59:50 +01:00
Joakim Hove
d06a5a78e0 Moved PyAction class into Action:: namespace 2020-03-20 16:59:50 +01:00
Joakim Hove
7852203d39 PYACTION: The actual python code is in an external file 
With this commit the PYACTION keyword is changed, instead of embedding the
Python code directly in the .DATA file the keyword now points to an external
file which is loaded verbatim into the PyAction keyword.

In addition the PYACTION keyword has now got a name and a string indicating how
many times it should run.
 2020-03-20 16:59:50 +01:00
Joakim Hove
db72ff80ed Use template Deck::count() in opmpack IMPORT handler 2020-03-20 16:59:50 +01:00
Joakim Hove
6e5cd6c371 Add templated method Deck::count() 2020-03-20 16:59:50 +01:00
Arne Morten Kvarving
c57af82c52 Merge pull request #1616 from akva2/fix_dynmap 
fixed: make a two-param map template for splitDynMap
 2020-03-20 14:06:50 +01:00
Arne Morten Kvarving
f0a25e4cf3 fixed: make a two-param map template for splitDynMap 
gcc is more forgiving with default template parameters than clang.
 2020-03-20 12:42:30 +01:00
Joakim Hove
438e4b68bf Merge pull request #1612 from joakim-hove/connection-global-index 
Add global_index to Connections
 2020-03-20 09:08:49 +01:00
Joakim Hove
f87369713b Add global_index to Connections 2020-03-19 22:14:06 +01:00
Joakim Hove
25e31a95ca Merge pull request #1611 from joakim-hove/aggregate-connections-rename 
Minor refactoring for improved readability
 2020-03-19 22:05:07 +01:00
Joakim Hove
7a6208a66a Minor refactoring for improved readability 2020-03-19 16:53:57 +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
ae858182eb Merge pull request #1605 from akva2/serialize_internal_schedule 
Internal serialization in Schedule
 2020-03-19 12:53:00 +01:00
Arne Morten Kvarving
524b180102 update UDQConfig serialization 
to avoid the need for OPM defined types in underlying
serializer
 2020-03-19 09:34:12 +01:00
Arne Morten Kvarving
63cbf052d6 update TransMult serialization 
to avoid the need for OPM defined types in underlying
serializer
 2020-03-19 09:34:12 +01:00
Arne Morten Kvarving
66a4d1119d add serialization template to VFPProdTable 2020-03-19 09:34:12 +01:00
Arne Morten Kvarving
4d7d3b0e7c add serialization template to VFPInjTable 2020-03-19 09:34:12 +01:00
Arne Morten Kvarving
e4e853065c remove accessors in Group added for external serialization 2020-03-19 09:34:12 +01:00
Arne Morten Kvarving
5304b0ce2b add serialization template to Group 2020-03-19 09:34:12 +01:00
Arne Morten Kvarving
21e5d975e8 add serialization template to GroupProductionProperties 2020-03-19 09:34:12 +01:00
Arne Morten Kvarving
a87ec3ad46 add serialization template to GroupInjectionProperties 2020-03-19 09:34:12 +01:00
Arne Morten Kvarving
12889a675d remove accessors in IOrderSet added for external serialization 2020-03-19 09:34:12 +01:00
Arne Morten Kvarving
d25220ba4e add serialization template to IOrderSet 2020-03-19 09:34:12 +01:00
Arne Morten Kvarving
6100e1f572 remove accessors in Well added for external serialization 2020-03-19 09:34:12 +01:00
Arne Morten Kvarving
91bd6edd87 add serialization template to Well 2020-03-19 09:34:12 +01:00
Arne Morten Kvarving
0a4bb79b4a changed: use shared_ptr to mutable references 
const refs are incompatible with serialization
 2020-03-19 09:34:12 +01:00
Arne Morten Kvarving
0a45fd4da6 add serialization template to WellType 2020-03-19 09:34:12 +01:00
Arne Morten Kvarving
2a3b3e3e73 remove accessors in WellSegments added for external serialization 2020-03-19 09:34:12 +01:00
Arne Morten Kvarving
815526a4a8 add serialization template to WellSegments 2020-03-19 09:34:12 +01:00
Arne Morten Kvarving
7c298d0891 remove accessors in Segment added for external serialization 2020-03-19 09:34:12 +01:00
Arne Morten Kvarving
117682d211 add serialization template to Segment 2020-03-19 09:34:12 +01:00
Arne Morten Kvarving
a6f546a87a add serialization template to Valve 2020-03-19 09:34:12 +01:00
Arne Morten Kvarving
335eb8c5e1 add serialization template to SpiralICD 2020-03-19 09:34:12 +01:00
Arne Morten Kvarving
dcbde5ea53 add serialization template to WellInjectionProperties 2020-03-19 09:34:12 +01:00
Arne Morten Kvarving
b045048e73 remove accessors in WellProductionProperties added for external serialization 2020-03-19 09:34:12 +01:00
Arne Morten Kvarving
9fb608fd0d add serialization template to WellProductionProperties 2020-03-19 09:34:12 +01:00
Arne Morten Kvarving
6079e1d261 remove accessors in WellConnections added for external serialization 2020-03-19 09:34:12 +01:00
Arne Morten Kvarving
39034dabe4 add serialization template to WellConnections 2020-03-19 09:34:12 +01:00