Commit Graph

10955 Commits

Author SHA1 Message Date
Joakim Hove
0f0dcea773 Fix bug with group offset in UDQACtive 2021-10-15 13:13:01 +02:00
Joakim Hove
35f35541ff Add testdata for WLIST restart testing 2021-10-14 11:41:40 +02:00
Joakim Hove
7b23110ccc
Merge pull request #2753 from joakim-hove/wconprod-question-pattern
Ensure that matched wells are passed to WCONPROD and WCONINJE
2021-10-14 07:22:07 +02:00
Joakim Hove
aaed77da09
Merge pull request #2754 from joakim-hove/rst-deck-testing
Move some code from rst_deck application to FileDeck class
2021-10-14 07:21:53 +02:00
Joakim Hove
fa77a72e61
Merge pull request #2755 from bska/use-mutable-error-guard
Confer 'trim_wgname' Errors Back to Caller
2021-10-14 07:21:04 +02:00
Bård Skaflestad
64d0db7a26 Confer 'trim_wgname' Errors Back to Caller
Mutating a copy of the ErrorGuard object means we potentially lose
error conditions.
2021-10-13 22:37:10 +02:00
Joakim Hove
82b112305e Move some code from rst_deck application to FileDeck class 2021-10-13 14:51:02 +02:00
Joakim Hove
e101020f33 Add FileDeck::Index::operator< 2021-10-13 14:37:25 +02:00
Bård Skaflestad
117c9179fa
Merge pull request #2739 from bska/restore-guiderate
Add Means of Initialising GR Values in SI Units
2021-10-13 14:01:25 +02:00
Joakim Hove
1e0c65163b Ensure that matched wells are passed to WCONPROD and WCONINJE 2021-10-13 12:33:36 +02:00
Bård Skaflestad
05e449440a Add Means of Initialising GR Values in SI Units
Intended use case is reading initial guide-rate values from the
restart file.
2021-10-13 11:41:23 +02:00
Bård Skaflestad
dcaf86e443 Hook Production Groups Into Guide Rate System at Restart
Otherwise, groups that have a non-trivial guide rate definition
won't be a part of group-level controls (GCONPROD) when continuing
the simulation run.
2021-10-13 11:41:23 +02:00
Bård Skaflestad
e451babec7 Restore Guiderate's Nominated Phase From Restart File 2021-10-13 11:41:23 +02:00
Bård Skaflestad
0c8f270723 Use min_element to Determine When GR Values Have Expired
This reduces the amount of mutable state being processed.
2021-10-13 11:41:23 +02:00
Bård Skaflestad
79a856ab20 Simplify Logic to Determine When to Reuse GR Values
Using map<>::find() means we also don't need to perform repeated
name-based lookups.
2021-10-13 11:41:23 +02:00
Bård Skaflestad
55ac8ff824 Make GuideRate Implementation Tidier
Mark parameters 'const' where possible, make value state private,
and wrap long lines.
2021-10-13 11:41:23 +02:00
Joakim Hove
0c2645154f
Merge pull request #2747 from joakim-hove/wtest-state-rst-load
Wtest state rst load
2021-10-13 11:27:50 +02:00
Bård Skaflestad
9a866a8a10
Merge pull request #2751 from bska/report-siunits-injgr-grouplevel
Add Guide Rate Value Accessor for SI Units
2021-10-13 10:56:57 +02:00
Bård Skaflestad
d3ccb820af Add Guide Rate Value Accessor for SI Units
Needed to properly report group-level injection guide rates in the
summary file.

Forgotten in PR #2605 (commit 2a374fc53).
2021-10-13 09:53:39 +02:00
Joakim Hove
06fd01c6ba Create WellTestState object from restart file 2021-10-13 08:46:11 +02:00
Joakim Hove
ee92f53b72
Merge pull request #2746 from joakim-hove/wtest-load-rst
Wtest load rst
2021-10-13 08:43:06 +02:00
Joakim Hove
7a1869fa60 Load WTEST configuration from restart file 2021-10-12 17:04:18 +02:00
Joakim Hove
af253dde47
Merge pull request #2748 from joakim-hove/wtest-serialize
Enable serialize support for WellTestState
2021-10-12 17:03:23 +02:00
Joakim Hove
4d72677b57
Merge pull request #2750 from joakim-hove/rst_deck_bugfix
Fix bug in SOLUTION section iteration in rst_deck
2021-10-12 13:05:47 +02:00
Joakim Hove
b440860478 Fix bug in SOLUTION section iteration in rst_deck 2021-10-12 12:06:46 +02:00
Joakim Hove
c5267ad7e6
Merge pull request #2745 from joakim-hove/wtest-state-is-open
Remove WellTestState::xxx_is_open() predicates
2021-10-12 09:17:35 +02:00
Joakim Hove
c56165b2d0 Enable serialize support for WellTestState 2021-10-12 07:57:41 +02:00
Joakim Hove
178fd6462c Remove WellTestState::xxx_is_open() predicates 2021-10-11 17:26:51 +02:00
Joakim Hove
f1c51b549a
Merge pull request #2718 from joakim-hove/wtest-restart
Wtest restart
2021-10-11 17:25:56 +02:00
Joakim Hove
7f24433337 Write WTEST configuration and state to restart file 2021-10-10 13:06:28 +02:00
Joakim Hove
f7b09380d4 Add WellTestState argument to AggregateWellData functions 2021-10-10 12:11:29 +02:00
Joakim Hove
bc6e2b268a
Merge pull request #2737 from joakim-hove/wtest-state-refactor2
Wtest state refactor2
2021-10-10 09:54:08 +02:00
Joakim Hove
139e988598 Refactor WellStateTest to use map storage internally 2021-10-08 18:34:47 +02:00
Joakim Hove
5bd7b61075 Rename updateWells -> test_wells 2021-10-08 14:15:16 +02:00
Joakim Hove
e41a8dfbf1 Remove ecl wells from WellTestState::update call 2021-10-08 14:15:14 +02:00
Joakim Hove
69e0a49e55
Merge pull request #2742 from joakim-hove/welltest-state-rename
Welltest state rename
2021-10-08 14:06:52 +02:00
Joakim Hove
b317e1e8d8 WellTestState::dropCompletion -> WellTestState::open_completion 2021-10-08 12:56:48 +02:00
Joakim Hove
ac6a8f91d6 WellTestState::openWell -> WellTestState::open_well 2021-10-08 12:56:48 +02:00
Joakim Hove
a5ee46c195 WellTestState::hasWellClosed -> WellTestState::well_is_closed 2021-10-08 12:56:48 +02:00
Joakim Hove
60f0c3f260 WellTestState::closeWell -> WellTestState::close_well 2021-10-08 12:56:47 +02:00
Joakim Hove
c202ccfb46 WellTestState::hasCompletion -> WellTestState::completion_is_closed 2021-10-08 12:56:47 +02:00
Joakim Hove
d840b72ed5 WellTestState::addClosedCompletion - WellTestState::close_completion 2021-10-08 12:56:47 +02:00
Joakim Hove
52dde24faf WellTestState::openAllCompletions -> WellTestState::open_completions 2021-10-08 12:56:47 +02:00
Joakim Hove
b39cf81142 Renome unused function WellTestState::updateCompletion() 2021-10-08 12:56:47 +02:00
Joakim Hove
04bbb164d9
Merge pull request #2741 from dafeda/find_boost
Use built in FindBoost
2021-10-08 10:46:58 +02:00
Bård Skaflestad
72e4f5f774
Merge pull request #2738 from bska/restore-group-control
Restore Group Level Controls if Limits Exist
2021-10-08 10:13:21 +02:00
Bård Skaflestad
3ac75ed2fc Restore Group Level Controls if Limits Exist
A group may have limits but no active control at the time of restart.
2021-10-07 21:59:27 +02:00
Bård Skaflestad
687d98aeea Restore Limited Version of Exceed Action From Restart File
Applies to group-level production controls.
2021-10-07 21:59:27 +02:00
Bård Skaflestad
de0d603215
Merge pull request #2735 from bska/restore-history-cmode
Restore Well Level History Control Mode From Restart File
2021-10-07 21:01:38 +02:00
Bård Skaflestad
f1cdcdb0e9 Restore History Control Mode From Restart File
In this case, we must also discard all other limits to ensure we
don't accidentally change control modes until explicitly reset with
a new WCONHIST or WCONINJH keyword.
2021-10-07 15:49:13 +02:00