Commit Graph

8154 Commits

Author SHA1 Message Date
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
6ffb5883d4
Merge pull request #1639 from wito/add-aquifer-category
Add Aquifer Category
2020-03-26 12:39:11 +01:00
Joakim Hove
cda315ce41
Merge pull request #1640 from atgeirr/fix-field-unavailable
Make the FIELD group unavailable for higher level control.
2020-03-26 12:37:44 +01:00
Atgeirr Flø Rasmussen
fce6eeca1b Make the FIELD group unavailable for higher level control. 2020-03-26 12:07:06 +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
Joakim Hove
52855cce1e
Merge pull request #1637 from bska/restore-all-injlimits
Simulation Restart: Restore All Available Injection Control Modes
2020-03-26 09:14: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
Bård Skaflestad
c2bd04edcb Simulation Restart: Restore All Possible Injection Control Modes
In particular, declare that the well supports RATE, RESV, and THP
limits/targets if such values are available in the SWEL array.
2020-03-25 18:54:28 +01:00
Joakim Hove
91841a99e1
Merge pull request #1606 from joakim-hove/wellconnections-output
Changes in WellConnection ordering
2020-03-25 18:01:51 +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
03efd5e589
Merge pull request #1635 from joakim-hove/internalize_tracers
Internalize tracers
2020-03-25 10:17:29 +01:00
Bård Skaflestad
9f0985850c
Merge pull request #1614 from joakim-hove/wellrates-get-connection-rates
Get connection rates from well rates object
2020-03-25 08:09:10 +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
5c2a5898c0 Fetch connection rates using global_index 2020-03-25 07:43:10 +01:00
Joakim Hove
8b2e503602 Update incorrect test 2020-03-25 07:43:10 +01:00
Bård Skaflestad
c68be43301
Merge pull request #1629 from joakim-hove/load-restart
Load restart XCON data
2020-03-24 12:21:59 +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
179b6ba9ff Use global index when assembling connection rates from XCON keyword 2020-03-24 10:55:49 +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
00faf6099a
Merge pull request #1628 from joakim-hove/init-global-index
Initialize global index when creating connections from rst file
2020-03-24 10:05:10 +01:00
Joakim Hove
fad5346ec1
Merge pull request #1633 from atgeirr/fix-type-mismatch
Fix type mismatch error for EclEntry.
2020-03-24 09:27:52 +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
Atgeirr Flø Rasmussen
2d52268bf8 Fix type mismatch error for EclEntry. 2020-03-24 08:05:34 +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
4b687e3368 Fix bug in CMakeLists.txt - mock simulator tests were not built 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
Bård Skaflestad
d52180389b
Merge pull request #1631 from atgeirr/add-missing-include
Add missing header inclusion.
2020-03-23 19:04:36 +01:00
Atgeirr Flø Rasmussen
4a88b87958
Merge pull request #1626 from totto82/fixGuideRat
fix bug in guiderate model
2020-03-23 17:51: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
Bård Skaflestad
6cf4b7efc7
Merge pull request #1624 from atgeirr/fix-narrowing
Compile-error fix: do not narrow double->bool in init list.
2020-03-23 16:30:17 +01:00
Joakim Hove
1192830c60 Initialize global index when creating connections from rst file 2020-03-23 16:08:49 +01:00
Tor Harald Sandve
41ae6b0bc4 fix bug in guideratemodel 2020-03-23 15:30:51 +01:00
Arne Morten Kvarving
0a8a25d5df
Merge pull request #1622 from joakim-hove/include-hpp
Include hpp files and not cpp files
2020-03-23 14:50:33 +01:00
Atgeirr Flø Rasmussen
2805f862db Compile-error fix: do not narrow double->bool in init list. 2020-03-23 14:34:27 +01:00
Joakim Hove
02a5501c0b Add method out::Well::find_connection(std::size_t global_index) 2020-03-23 13:43:50 +01:00
Joakim Hove
a61c48521a Include hpp files and not cpp files 2020-03-23 13:28:47 +01:00
Joakim Hove
f88d382172
Merge pull request #1615 from joakim-hove/connection-testing
Connection testing
2020-03-23 13:00:06 +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
c33372b8b4 Adding python bindings for C++ class EclOutput 2020-03-23 10:57:49 +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
b992ff0e1c Adding python bindings for C++ class EGrid 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