Commit Graph

4141 Commits

Author SHA1 Message Date
Williham Williham Totland
9f7664fe13 Makes the new interface compile against tests. 2020-04-01 13:02:29 +02:00
Joakim Hove
6fb2989708 WPIMULT: directly multiply the connection transmissibility factor 2020-03-31 16:53:28 +02:00
Joakim Hove
5444eade2f Use std::shared_ptr<Python> for Python argument in Schedule 2020-03-31 10:26:55 +02:00
Joakim Hove
7bc5272290 Connections / segments: retain start and end from restart 2020-03-28 08:58:14 +01:00
Joakim Hove
22396d1b21 Do not alter sort value when attaching segment from restart file 2020-03-28 08:58:14 +01:00
Joakim Hove
f613c15727 Connections: keep order from restart file 2020-03-28 08:58:14 +01:00
Joakim Hove
50fb51d56e Add Python arg to Schedule constructor 2020-03-27 12:43:18 +01:00
Joakim Hove
687887939d Make sure PythonInterpreter can be safely disabled 2020-03-27 12:11:40 +01:00
Joakim Hove
3e2160af28 Merge pull request #1608 from joakim-hove/connections-sort-item
Connections sort item
2020-03-26 17:52:54 +01:00
Joakim Hove
eca0589fe1 Merge pull request #1641 from joakim-hove/python-enable-enum
Enable fine grained control of Python ON | OFF
2020-03-26 14:21:24 +01:00
Joakim Hove
a8f0ebb183 Enable fine grained control of Python ON | OFF 2020-03-26 12:00:59 +01:00
Bård Skaflestad
5a701a2ee8 Merge pull request #1609 from wito/new-summarynode
New SummaryNode implementation
2020-03-26 11:34:21 +01:00
Joakim Hove
9ad8465609 Replace connection segIndex and compSeqIndex with sort_value member 2020-03-25 18:02:40 +01:00
Joakim Hove
c7d3603184 Changes in WellConnection ordering
1. If the well is MSW the connections in the WellConnection class is sorted in
   output order in the ::order() method, and retained that way.

2. Add method WellConnection::output() which return a vector of connection
   pointers sorted in output order.
2020-03-25 10:54:21 +01:00
Joakim Hove
9411af4dfc Implement TracerConfig in EclipseState
Co-authored-by: Arne Morten Kvarving <arne.morten.kvarving@sintef.no>
2020-03-25 07:53:08 +01:00
Joakim Hove
611b21beab Add serialization active member 2020-03-24 08:40:13 +01:00
Joakim Hove
9ce64d5aae Add copy constructor and assignment operator to PyAction 2020-03-24 08:07:21 +01:00
Joakim Hove
a0ebb2091f Add method Actions::pending_python() to get active Python functions 2020-03-24 07:23:31 +01:00
Joakim Hove
4c25ce69c1 Add mutable bool active member to PyAction 2020-03-24 07:23:31 +01:00
Atgeirr Flø Rasmussen
0b0fab781b Add missing header inclusion. 2020-03-23 17:49:43 +01:00
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
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
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
6e5cd6c371 Add templated method Deck::count() 2020-03-20 16:59:50 +01:00
Williham Williham Totland
6970158f7f Makes the return value of Opm::Group::flow_group/::control_group optional. 2020-03-20 14:08:03 +01:00
Williham Williham Totland
b940d81aed Rewrites ::need_wells() for Opm::EclIO::SummaryNode. 2020-03-20 14:08:03 +01:00
Williham Williham Totland
e5e0a49e89 Adds conversion operator SummaryConfigNode => SummaryNode. 2020-03-20 14:08:03 +01:00
Williham Williham Totland
402f28f749 Adds Opm::EclIO::SummaryNode::Type::Mode. 2020-03-20 14:08:03 +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
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
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