Joakim Hove
fa8afbcc6d
Merge pull request #1655 from akva2/janitoring
...
Quell warnings
2020-03-30 13:52:38 +02:00
Arne Morten Kvarving
ebc92fb92e
fixed: proper initializer list order
2020-03-30 12:38:47 +02:00
Arne Morten Kvarving
811d2e2a64
quell unused parameter warning when built without python support
2020-03-30 12:33:34 +02:00
Arne Morten Kvarving
83d1627dbb
quell signed/unsigned comparison warning
2020-03-30 12:33:20 +02:00
Joakim Hove
0025144079
Merge pull request #1559 from joakim-hove/rst-msw
...
Initialize MSW wells from restart file
2020-03-28 09:47:46 +01:00
Joakim Hove
f320fe3d57
Only compare historical modes in history mode
2020-03-28 08:58:14 +01:00
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
Joakim Hove
eb8f162663
Enable rst testing with MSW data
2020-03-28 08:58:14 +01:00
Joakim Hove
97173e51a3
Update binary testdata
2020-03-28 08:58:14 +01:00
Joakim Hove
fba1858925
Merge pull request #1652 from bska/resv-totinj
...
Restart: Save/Restore Cumulative Injected Reservoir Volume
2020-03-28 08:57:37 +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
467f7879a6
Merge pull request #1636 from joakim-hove/add-python-arg
...
Add python arg
2020-03-27 13:43:44 +01:00
Joakim Hove
50fb51d56e
Add Python arg to Schedule constructor
2020-03-27 12:43:18 +01:00
Joakim Hove
9d3ec9be61
Merge pull request #1646 from joakim-hove/python-fixup2
...
Make sure PythonInterpreter can be safely disabled
2020-03-27 12:42:18 +01:00
Joakim Hove
687887939d
Make sure PythonInterpreter can be safely disabled
2020-03-27 12:11:40 +01:00
Joakim Hove
562136772a
Merge pull request #1638 from joakim-hove/remove-stale-boost-include
...
Remove stale boost includes
2020-03-27 10:49:52 +01:00
Joakim Hove
7fc75ce61c
Merge pull request #1650 from atgeirr/fix-embedded-python-test
...
Use braces to force correct parsing.
2020-03-27 10:49:34 +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
Atgeirr Flø Rasmussen
4c5b03b83e
Use braces to force correct parsing.
...
Without this, clang thinks it is a declaration, not a function call.
2020-03-27 10:11:12 +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
Joakim Hove
c41f375e00
Merge pull request #1645 from akva2/janitoring
...
quell compiler warnings
2020-03-26 17:33:25 +01:00
Joakim Hove
6d8154823a
Merge pull request #1643 from joakim-hove/python-fixup
...
Temporarily protect against deref when python is disabled
2020-03-26 16:20:04 +01:00
Arne Morten Kvarving
c07a839f15
quell compiler warnings
2020-03-26 16:07:49 +01:00
Joakim Hove
cce2bc0686
Temporarily protect against deref when python is disabled
2020-03-26 15:38:18 +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
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
39eb327551
Remove stale boost includes
2020-03-25 18:18:25 +01:00
Joakim Hove
9ad8465609
Replace connection segIndex and compSeqIndex with sort_value member
2020-03-25 18:02:40 +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