Commit Graph

4865 Commits

Author SHA1 Message Date
Joakim Hove
f59fec133d Check NSCONZ before reading CFKind value from SCON 2020-03-28 08:58:14 +01:00
Joakim Hove
7bc5272290 Connections / segments: retain start and end from restart 2020-03-28 08:58:14 +01:00
Joakim Hove
ad5b410940 Sort segments 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
Bård Skaflestad
1113c25eb1 Restart: Save/Restore Cumulative Injected Reservoir Volume
This commit adds support for persisting the *VIT cumulative summary
vector at the well, group, and field levels in the simulation
restart files.  Connection level currently not supported.
2020-03-27 14:59:29 +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
Williham Williham Totland
3e29350e94 Integrate SummaryNode in ESmry (#1642) 2020-03-27 08:07:52 +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
Williham Williham Totland
4e08ff7f6d Adds ::Aquifer to Opm::EclIO::SummaryNode::Category. 2020-03-26 11:36:13 +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
Williham Williham Totland
06d317d119 Review Actions: Un-consts SummaryNode members and un-statics some data vectors. 2020-03-26 08:20:50 +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
d40ebe647a Merge pull request #1634 from joakim-hove/pyaction-fixup
Pyaction fixup
2020-03-24 10:58:05 +01:00
Joakim Hove
9498217e0a Merge pull request #1623 from joakim-hove/find-connection
Find connection
2020-03-24 10:06:34 +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
Joakim Hove
1ac240a425 Merge pull request #1625 from tskille/replace_long_int_eclio
replacing long int and unsigned long int
2020-03-23 19:57:10 +01:00
Atgeirr Flø Rasmussen
0b0fab781b Add missing header inclusion. 2020-03-23 17:49:43 +01:00
Torbjørn Skille
9d24f0dc34 replacing long int and unsigned long int
- long int -> int64_t
  - unsigned long int -> uint64_t

All EclIO classes and associated tests has been updated.
2020-03-23 17:12:56 +01:00
Joakim Hove
02a5501c0b Add method out::Well::find_connection(std::size_t global_index) 2020-03-23 13:43:50 +01:00
Arne Morten Kvarving
0a9a0285dc Merge pull request #1621 from akva2/move_ser_object
move data serialization objects close to the class code
2020-03-23 12:40:30 +01:00
Arne Morten Kvarving
e9e69ca44f Merge pull request #1607 from tskille/latest_pybind_eclio
Python bindings for EclIO classes
2020-03-23 12:05:55 +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
Torbjørn Skille
1a39c07981 Adding python bindings for C++ class ERft 2020-03-23 10:57:49 +01:00
Torbjørn Skille
d258ce5a57 Updates of C++ class ERft to be used with python bindings
-> Support for extracting data based on report index
  -> adding extra float (time) to RftReportList
2020-03-23 10:57:49 +01:00
Torbjørn Skille
f97dfda92e Adding python bindings for C++ class ESmry 2020-03-23 10:57:49 +01:00
Torbjørn Skille
931fa96a59 Updates of C++ class ESmry to be used with python bindings
-> adding member function ESmry::get_startdat(), start of simulation from keyword STARTDAT in SMSPEC file
  -> adding member function ESmry::numberOfTimeSteps(), number of timesteps in run
2020-03-23 10:57:49 +01:00
Torbjørn Skille
c1caf4738e Adding python bindings for C++ class ERst
-> one additional C++ member function ERst::numberOfReportSteps()
2020-03-23 10:57:44 +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
ab71b43f10 Fixes minor formatting glitch in the SummaryNode copyright statement. 2020-03-20 14:48:32 +01:00
Williham Williham Totland
327fe79c90 Adds Opm::EclIO::SummaryNode::is_user_defined(). 2020-03-20 14:08:03 +01:00
Williham Williham Totland
99375eb5be Reworks requiredRestartVectors for Opm::EclIO::SummaryNode. 2020-03-20 14:08:03 +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