Commit Graph

11129 Commits

Author SHA1 Message Date
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
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
Håkon Hægland
25ccb17917 Test UDA value DeckKeyword
Test that the DeckKeyword() Python constructor can handle UDA value
keywords.
2021-11-09 11:47:58 +01:00
Joakim Hove
381e54f4a9
Merge pull request #2822 from joakim-hove/mutable-transmult
Add mutable EclipseState::getTransMult()
2021-11-09 11:25:40 +01:00
Joakim Hove
acbcccda22
Merge pull request #2819 from joakim-hove/refactor-micpara-contructions
Refactor construction of Microbial growth constructor
2021-11-09 11:25:09 +01:00
Joakim Hove
2c1c298003 Add mutable EclipseState::getTransMult() 2021-11-08 11:59:32 +01:00
Joakim Hove
b1b7ed5ecb
Merge pull request #2818 from joakim-hove/rename-geo-modifiers
Rename EclipseState::apply_geo_keywords -> apply_schedule_keywords
2021-11-08 11:46:25 +01:00
Håkon Hægland
702c4d46af Add support for UDA values in DeckKeyword constructor.
Add support for UDA values items when constructing DeckKeywords from
DeckValues. This is needed when constructing DeckKeywords
from Python. For example WCONPROD has UDA value argument for the oil
rate.
2021-11-08 09:58:22 +01:00
Joakim Hove
3a291283eb
Merge pull request #2820 from bska/support-fluid-api-gravity
Support GRAVITY As Fallback for DENSITY
2021-11-08 07:50:15 +01:00
Joakim Hove
1c8c2cb11f Refactor construction of Microbial growth constructor 2021-11-07 20:24:17 +01:00
Bård Skaflestad
da9d550f05 Support GRAVITY As Fallback for DENSITY
This commit activates support for the 'GRAVITY' keyword.  We treat
this as a fallback alternative to the 'DENSITY' keyword.
2021-11-07 20:20:56 +01:00
Joakim Hove
3d17cee393 Rename EclipseState::apply_geo_keywords -> apply_schedule_keywords 2021-11-07 19:55:09 +01:00
Joakim Hove
0595aa8fea
Merge pull request #2801 from joakim-hove/affected-wells
Register well as "touched" by WCONHIST and WCONINJE in ACTIONX block
2021-11-05 12:02:01 +01:00
Joakim Hove
70261592b3
Merge pull request #2814 from bska/restart-load-field-wide-constraints
Load Field-Wide Constraints From Restart File
2021-11-05 11:06:29 +01:00
Joakim Hove
bbfd433b8e
Merge pull request #2807 from joakim-hove/alq-sign
Change sign of gas lift rate calculated from IGLR and ALQ value
2021-11-05 11:05:52 +01:00
Bård Skaflestad
67df58e10d Load Field-Wide Constraints From Restart File
If constraints are applied at the field level, e.g., through the
GCONINJE keyword, then we must incorporate those constraints into
FIELD when restarting a simulation run.  This commit takes a step in
this direction by explicitly loading the *GRP array entries
pertaining to FIELD and special casing

    Schedule::addGroup(RstGroup, time)

to look for "rst_group.name == FIELD".  In that case, we update the
injection and production properties of the existing FIELD group as
needed.
2021-11-05 10:02:07 +01:00
Joakim Hove
f78a6a858a
Merge pull request #2806 from daniepin/completed-cells-fp
Add permability property to CompletedCells
2021-11-05 09:34:04 +01:00
Joakim Hove
6dca968e66
Merge pull request #2811 from joakim-hove/remove-unused-deck-function
Remove unused Deck::hasKeyword( const DeckKeyword& )
2021-11-04 17:11:51 +01:00
Joakim Hove
822df970dc
Merge pull request #2813 from joakim-hove/avoid-use-of-generated-header
Avoid use of generated header S.hpp in header file
2021-11-04 17:11:32 +01:00
Joakim Hove
3fcbac1e95 Move implementation to cpp file 2021-11-04 13:33:43 +01:00
Joakim Hove
f13cf8db11 Remove unused Deck::hasKeyword( const DeckKeyword& ) 2021-11-04 12:41:12 +01:00
Daniel
0d8edeccfa Remove active_index from serializer 2021-11-04 11:29:12 +01:00
Daniel
45dd77938b Removed constructor from ScheduleGrid, added perm prop to tests
Changed (BASE_SIM.DATA, BASE_SIM_THPRES.DATA, RESTART_SIM.DATA),  testblackoilstate3.DATA and testrft.DATA since they affect the tests in test_Restart.cpp, test_restartwellinfo.cpp and test_RFT.cpp respectively.
2021-11-04 11:29:12 +01:00
Daniel
931cebb12f Add Props struct to CompletedCells::Cell 2021-11-04 11:29:12 +01:00
Daniel
39723102a9 Add permability property to CompletedCells 2021-11-04 11:29:12 +01:00
Joakim Hove
f2db4651d0 Register well as "touched" by WCONHIST and WCONINJE in ACTIONX block 2021-11-04 09:37:36 +01:00
Joakim Hove
5e2dc1e30c
Merge pull request #2808 from bska/identify-nodename-restart-item
Identify Extended Network Model Node Name Item in ZNODE
2021-11-03 16:44:47 +01:00