Commit Graph

11106 Commits

Author SHA1 Message Date
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
Daniel
d8a2061a14 Modify loadCOMPDAT() to not take a FieldPropsManager* as an argument 2021-11-09 12:16:40 +01:00
Daniel
11ddf673f0 Add keyword NTG to Cell props struct 2021-11-09 10:16:09 +01:00
Daniel
c3a55cb03b Add keywords SATNUM and PVTNUM to Cell props struct 2021-11-09 10:07:00 +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
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
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
Bård Skaflestad
ab5cb1118d Identify Extended Network Model Node Name Item in ZNODE
In preparation of adding initial support for restarting simulations
featuring the extended network model.
2021-11-03 13:17:49 +01:00
Joakim Hove
6e56d80529 Change sign of gas lift rate calculated from IGLR and ALQ value 2021-11-03 11:54:26 +01:00
Joakim Hove
dd54d2aad1
Merge pull request #2805 from bska/restart-continuous-xlpt
Ensure Continuous Cumulative Liquid Production On Restart
2021-11-03 08:40:50 +01:00
Bård Skaflestad
9ce58ec2ad Ensure Continuous Cumulative Liquid Production On Restart
The xLPT curves should not start at zero in a restarted simulation
run.  This commit initialises the cumulative liquid production
volume using the value

    xOPT + xWPT

with the individual terms taken from XWEL or XGRP as appropriate.
2021-11-02 16:16:45 +01:00
Joakim Hove
cbfc727cd2
Merge pull request #2773 from bska/restart-gefac
Add Restart Support for Item 2 of GEFAC
2021-11-02 15:32:52 +01:00
Bård Skaflestad
c51724942b Add Restart Support for Item 2 of GEFAC
That is, save and restore the group efficiency factor value to/from
the SGRP array in the restart file.
2021-11-02 12:41:19 +01:00
Bård Skaflestad
7aae45a67f Adjust Whitespace
In preparation of adding restart support for Item 2 of GEFAC.
2021-11-02 12:41:19 +01:00
Joakim Hove
612706e02f
Merge pull request #2804 from jalvestad/rst_improv
Add item IGRP[NWGMAX + 39] to the Eclipse-compatible restart file
2021-11-02 11:57:32 +01:00
Joakim Hove
ea856e1484
Merge pull request #2791 from joakim-hove/alq-output
Use gas lift rate value for WALQ output when gas lift rate optimization is in action
2021-11-01 19:37:52 +01:00
Joakim Hove
1342b47f63 Calculate GLIR from liquid rates and fraction Gas / Liquid 2021-11-01 17:48:47 +01:00
Joakim Hove
5b2712490e Change argument type in utility functions 2021-11-01 17:48:47 +01:00
Joakim Hove
8fb66ef908 Fetch ALQ value from simulator if WLIFTOPT is enabled for well 2021-11-01 17:48:47 +01:00
Joakim Hove
03f440d064 Use named symbol zero for increased readability 2021-11-01 17:48:47 +01:00
Joakim Hove
5e84c8d935 Add function GLiftOpt::num_wells() 2021-11-01 17:48:47 +01:00
Joakim Hove
4eddb181c6
Merge pull request #2803 from akva2/remove_ebos_flags
changed: remove extra flags for ebos
2021-11-01 17:39:24 +01:00
Atgeirr Flø Rasmussen
af8fc94188
Merge pull request #2802 from akva2/remove_gcc7_compat
changed: drop gcc7 compatibility
2021-11-01 15:29:52 +01:00
Jostein Alvestad
ffad873b0f Added output of IGRP[NWGMAX + 39] - node sequence number for groups in external network 2021-11-01 15:04:02 +01:00
Arne Morten Kvarving
becfb799a5 changed: remove extra flags for ebos
ebos is no more
2021-11-01 13:52:05 +01:00
Arne Morten Kvarving
6465cfe1ea changed: drop gcc7 compatibility
this means getting rid of the Opm::filesystem namespace
and directly using std::filesystem, as well as dropping
some of the compat code for the tr filesystem.

we still need the FileSystem.hpp/cpp files though as unique_path
is not part of std::filesystem.
2021-11-01 12:36:42 +01:00
Joakim Hove
f8d33def59
Merge pull request #2786 from daniepin/completed_cells-refactor
Refactored ScheduleGrid to use public struct cell
2021-10-30 17:10:32 +02:00
Joakim Hove
30f44eff1d
Merge pull request #2789 from joakim-hove/deck-view-rename
Rename DeckView -> DeckViewInternal
2021-10-30 15:56:30 +02:00
Joakim Hove
0d6acd82e0
Merge pull request #2790 from joakim-hove/gaslift-rst-fixup
Gaslift rst fixup
2021-10-30 15:55:37 +02:00
Joakim Hove
f60b5d1c8c
Merge pull request #2794 from joakim-hove/gliftopt
Gliftopt
2021-10-30 15:55:16 +02:00