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

4839 Commits

Author SHA1 Message Date
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
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
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