Joakim Hove
f59fec133d
Check NSCONZ before reading CFKind value from SCON
2020-03-28 08:58:14 +01:00
Joakim Hove
bbc87beed5
Improve error message for connection comparison
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
d827fd6da5
Update debug message
2020-03-28 08:58:14 +01:00
Joakim Hove
ad5b410940
Sort segments
2020-03-28 08:58:14 +01:00
Joakim Hove
aa6128c4be
Check for invalid value when loading segment information
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
Joakim Hove
413a45ec21
Merge pull request #1648 from berland/jq
...
Reformat all json keyword files through jq
2020-03-27 10:48:59 +01:00
Williham Williham Totland
3e29350e94
Integrate SummaryNode in ESmry ( #1642 )
2020-03-27 08:07:52 +01:00
Håvard Berland
54b714f361
Reformat all json keyword files through jq
...
Ensures similar pretty-printing everywhere.
Includes a bugfix for 000_Eclipse100/O/OVERBURD which had
a } too much
2020-03-26 23:16:17 +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
Arne Morten Kvarving
c07a839f15
quell compiler warnings
2020-03-26 16:07:49 +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
6ffb5883d4
Merge pull request #1639 from wito/add-aquifer-category
...
Add Aquifer Category
2020-03-26 12:39:11 +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
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
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
03efd5e589
Merge pull request #1635 from joakim-hove/internalize_tracers
...
Internalize tracers
2020-03-25 10:17:29 +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
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
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
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
4a88b87958
Merge pull request #1626 from totto82/fixGuideRat
...
fix bug in guiderate model
2020-03-23 17:51:10 +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
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
Atgeirr Flø Rasmussen
2805f862db
Compile-error fix: do not narrow double->bool in init list.
2020-03-23 14:34:27 +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
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
Joakim Hove
d1527da245
Use reference when accessing Schedule actions
2020-03-23 08:52:02 +01:00