Commit Graph

11207 Commits

Author SHA1 Message Date
Joakim Hove
5a653d7464 Use handleGEOKeyword also for MULTFLT 2021-11-12 16:51:29 +01:00
Joakim Hove
cf640a62ad Fix Copyright comment 2021-11-12 16:51:29 +01:00
Joakim Hove
6056a4c7d0
Merge pull request #2828 from daniepin/activate-cells-during-actionx
Activate cells during ACTIONX sequence if specific keywords are encountered
2021-11-12 16:50:30 +01:00
Daniel
e4026b84e9 Made corrections to inspect_actionx_keyword() method 2021-11-12 15:59:44 +01:00
Daniel
ff638862d9 Inspect keywords during ACTIONX sequence and activate Cells. 2021-11-12 15:08:16 +01:00
Joakim Hove
1d6a930784 Add test for COMPDAT as ACTIONX keyword 2021-11-12 15:08:16 +01:00
Joakim Hove
10314ce169
Merge pull request #2826 from daniepin/applyAction-refactor
Combine ScheduleGrid and FieldPropsManager
2021-11-12 15:04:37 +01:00
Joakim Hove
e65639a2e6
Merge pull request #2836 from akva2/update_data_base
added: tell update_data where to start branch from
2021-11-12 14:10:44 +01:00
Joakim Hove
3a1679319f
Merge pull request #2809 from bska/ext-network-restart
Support Loading Extended Network Model From Restart
2021-11-12 14:04:46 +01:00
Daniel
6c1f2e4ded Add serializeOp() and serializeObject() methods to Prop struct 2021-11-12 13:56:33 +01:00
Arne Morten Kvarving
f7375c2638 added: tell update_data where to start branch from
this to allow for update_data from opm-tests
2021-11-12 13:30:44 +01:00
Bård Skaflestad
459fd67203 Incorporate Extended Network Objects From Restart into Schedule
This commit hooks the new RstNetwork object into the restart feature
of the main Schedule object.  We form ExtNetwork Schedule subobjects
if there are active branches and nodes in the restart file.
2021-11-12 13:06:31 +01:00
Bård Skaflestad
19ec3b34f9 Support Loading Extended Network Model From Restart
This commit adds a new helper class, RstNetwork, that loads the raw
data representing the extended network model from restart vectors
IBRAN, INODE, RNODE, and ZNODE.  We support loading the information
that is currently output to those restart vectors, but those do not
include every option supported by the input keywords BRANPROP and
NODEPROP.

The RstNetwork type supports querying whether or not the extended
network model is active and, if so, to get iterable collections of
branches and nodes that are geared towards constructing ExtNetwork
objects.
2021-11-12 13:06:31 +01:00
Bård Skaflestad
c3b3ce4832 Sort Headers in Restart State Object Implementation
In preparation of adding restart support for the extended network
model.
2021-11-12 13:06:31 +01:00
Bård Skaflestad
def4dd2c68 Return Restart State Object by Move()
Useful since we don't get in-place construction when returning a
composite object.  Also useful if we decide to make RstState a
move-only type.
2021-11-12 13:06:31 +01:00
Joakim Hove
d7c495e229
Merge pull request #2824 from joakim-hove/rst-deck-file-arg
rst_deck: interpret restart argument as proper filename
2021-11-12 13:03:08 +01:00
Joakim Hove
c6209872f6 Rename struct options -> struct Options in rst_deck 2021-11-12 12:22:15 +01:00
Joakim Hove
d950e3ceb1 rst_deck: optionally interpret restart argument as proper filename 2021-11-12 12:22:15 +01:00
Joakim Hove
01a7149b36
Merge pull request #2788 from joakim-hove/deck-view
Refactor Deck and DeckView class hierarchy
2021-11-12 10:14:09 +01:00
Joakim Hove
fe38dbb663
Merge pull request #2834 from joakim-hove/restart-throw-input-error
Use OpmInputError for restart input problems
2021-11-12 09:59:01 +01:00
Joakim Hove
c73e77b3de Use OpmInputError for restart input problems 2021-11-12 09:19:08 +01:00
Joakim Hove
ee105b7bbf Remove base class DeckViewInternal and create new class DeckView 2021-11-12 08:09:29 +01:00
Joakim Hove
fb1dcd0203
Merge pull request #2817 from joakim-hove/schedule-fp
Schedule fp
2021-11-12 07:52:58 +01:00
Joakim Hove
12dd45ca66
Merge pull request #2835 from joakim-hove/add-dimension-to-uda
Add dimension to uda in Python
2021-11-12 07:51:55 +01:00
Joakim Hove
08e29defd2 Remove python2 adaption 2021-11-11 15:53:21 +01:00
Joakim Hove
e017195478 Whitespace fixup 2021-11-11 15:53:21 +01:00
Joakim Hove
b77ed8cc7c Add dimension to UDAValue when creating 2021-11-11 15:53:21 +01:00
Joakim Hove
0fc2448369 Expose UDAValue to Python 2021-11-11 15:53:21 +01:00
Joakim Hove
e9ec23b385 Spelling fix 2021-11-11 15:53:21 +01:00
Joakim Hove
77985eaa08 Export UnitSystem and Dimension from opm.io 2021-11-11 15:53:21 +01:00
Joakim Hove
64e10a9c77 Export UnitSystem to opm._common 2021-11-11 15:53:21 +01:00
Joakim Hove
55eeabba42 Use only python3 syntax for import from test directory 2021-11-11 15:53:21 +01:00
Joakim Hove
90e55025d6
Merge pull request #2831 from joakim-hove/action-sim-update
Add struct SimulatorUpdate to transport results back to simulator
2021-11-11 14:59:07 +01:00
Joakim Hove
2320c16508
Merge pull request #2829 from joakim-hove/use-optional-for-active-units
Use std::optional< > for Deck unitsystem
2021-11-11 14:58:09 +01:00
Joakim Hove
40df72bc95
Merge pull request #2821 from hakonhagland/py11_uda
Add support for UDA values in DeckKeyword constructor.
2021-11-10 16:58:26 +01:00
Joakim Hove
d61f2356db Remove unused variables 2021-11-10 16:21:28 +01:00
Joakim Hove
f1e768e184 Add struct SimulatorUpdate to transport results back to simulator 2021-11-10 15:57:56 +01:00
Håkon Hægland
4e5f7ef48e Add some more UDA value tests.
Adds some more tests for UDA value items when constructing DeckKeyword
from Python.
2021-11-10 15:56:36 +01:00
Joakim Hove
ba3bcdb21b Refactor / simplify function 2021-11-10 15:05:36 +01:00
Joakim Hove
2921838895 Apply MULTXYZ multipliers from Schedule section 2021-11-10 15:05:36 +01:00
Joakim Hove
243beeb96a Add functionality to update FieldProps with schedule multipliers 2021-11-10 15:05:36 +01:00
Joakim Hove
948504444d Remove ParseContext::UNSUPPORTED_SCHEDULE_GEO_MODIFIERS 2021-11-10 15:05:36 +01:00
Joakim Hove
37fa5f034c Rename EclipseState::initTransMult -> applyMULTXYZ 2021-11-10 14:52:12 +01:00
Joakim Hove
304f4179c5 Mark MULTXYZ as allowed in SCHEDULE section 2021-11-10 14:52:12 +01:00
Joakim Hove
4b89399640 Use std::optional< > for Deck unitsystem 2021-11-10 14:51:15 +01:00
Daniel
faefde1a4f Modify ACTIONX tests 2021-11-09 13:01:36 +01:00
Joakim Hove
edf4a9bcf4 Add ACTIONX + COMPDAT integration test with msim 2021-11-09 12:33:34 +01:00
Joakim Hove
a51a220a24 Add test for ACTIONX with trailing COMPDAT 2021-11-09 12:33:22 +01:00
Daniel
c80bcfd0bb Removed unused variable active_index 2021-11-09 12:26:52 +01:00
Daniel
243c46a9a6 Removed FieldPropsManager* parameter from applyAction() 2021-11-09 12:20:27 +01:00