Commit Graph

8510 Commits

Author SHA1 Message Date
Joakim Hove
d1babffa8b
Merge pull request #1789 from joakim-hove/udqactive-gconprod
Make sure the UDQ usage in GCONPROD is recorded
2020-05-15 13:17:02 +02:00
Joakim Hove
fd5a42801f Make sure the UDQ usage in GCONPROD is recorded 2020-05-15 08:27:52 +02:00
Atgeirr Flø Rasmussen
7cff27c801
Merge pull request #1788 from atgeirr/fix-missing-openmp
Let make_lodsmry also work without OpenMP.
2020-05-14 19:11:51 +02:00
Atgeirr Flø Rasmussen
28f3df5259 Let make_lodsmry also work without OpenMP. 2020-05-14 16:58:51 +02:00
Bård Skaflestad
162e0b53cd
Merge pull request #1787 from atgeirr/add-missing-include
Add missing <array> include.
2020-05-14 15:43:45 +02:00
Atgeirr Flø Rasmussen
1593df2a32 Add missing <array> include. 2020-05-14 13:45:46 +02:00
Bård Skaflestad
3a8ea856bc
Merge pull request #1785 from tskille/lod_esmry
Lod esmry
2020-05-14 10:55:19 +02:00
Torbjørn Skille
c430eeb374 Adding support for LODSMRY file
> implemented for unified and multiple, and for formatted and binary summary files
 > avaliable/used only when loadBaserun is false (default)
2020-05-14 07:39:23 +02:00
Torbjørn Skille
9766e0ebb3 using file handling functions from stdio.h for lod in ESmry
> improved read efficiency compared with fstream routines

Also fixed bug with lod for formatted unified summary when number of vectors larger than max block size
2020-05-11 21:39:57 +02:00
Bård Skaflestad
0756cd93ad
Merge pull request #1783 from joakim-hove/fp-operate-maxlim
Fp operate maxlim
2020-05-11 21:21:55 +02:00
Bård Skaflestad
355fb2aabb
Merge pull request #1784 from joakim-hove/guderate-def-init
Initialize group production guide_rate to Target::NONE
2020-05-11 19:04:40 +02:00
Joakim Hove
ebdffa2abb Ensure correct SI conversion for the scalar data in OPERATE keyword 2020-05-11 15:45:01 +02:00
Joakim Hove
ce368bb850 Initialize groups GuideRate target to NONE 2020-05-11 12:53:37 +02:00
Joakim Hove
9065bf2390 Remove dummy/unit dimension for NTG 2020-05-11 12:15:09 +02:00
Joakim Hove
55620ac254
Merge pull request #1781 from joakim-hove/gtnode-bug
Bug: pointer -> to stack variable - fix with parent *name*
2020-05-08 09:20:52 +02:00
Joakim Hove
64fb589ec6 Use string based parent *name* in GTNode instead of pointer 2020-05-07 20:08:39 +02:00
Joakim Hove
310bd82b8b
Merge pull request #1778 from joakim-hove/gas-lift-opt
Internalize keywords for Gas Lift Optimization
2020-05-07 20:07:58 +02:00
Joakim Hove
e05e6f83ea
Merge pull request #1772 from atgeirr/fix-starttime-actionx
Fix start-time of ACTIONX actions.
2020-05-07 18:38:26 +02:00
Joakim Hove
18cd60cd86
Merge pull request #1780 from berland/solvdirs-size
Add size to SOLVDIRS json
2020-05-07 16:33:23 +02:00
Joakim Hove
7fe89422e2 Internalize keywords for gas lift optimization 2020-05-07 16:29:42 +02:00
Håvard Berland
8346941b92 Add size to SOLVDIRS json 2020-05-07 15:35:49 +02:00
Joakim Hove
b311cef875
Merge pull request #1776 from joakim-hove/zwel-fix
Make sure the action name is only added to ZWEL when it is true
2020-05-07 11:04:18 +02:00
Bård Skaflestad
3065218e6d
Merge pull request #1779 from joakim-hove/fixup-network
Fix: integrate ExtNetwork instance in Schedule serialization
2020-05-07 09:56:00 +02:00
Joakim Hove
ea14bf2298 Fix: integrate ExtNetwork instance in Schedule serialization 2020-05-06 21:10:52 +02:00
Joakim Hove
3c879dd5dc ActionResult will not access wells if overall false 2020-05-06 12:48:38 +02:00
Joakim Hove
dc9ba1dc56 Minor white space cleanup 2020-05-05 19:13:32 +02:00
Joakim Hove
c073ad2d8b Make sure Action result is checked before wells are considered 2020-05-05 19:03:22 +02:00
Joakim Hove
352cc5797b Make sure the action name is only added to ZWEL when it is true 2020-05-05 18:00:29 +02:00
Bård Skaflestad
26cdff10fc
Merge pull request #1775 from totto82/fixSolvent
Allow for mixing of SOF2 from familiy 2 and family 1 for 3p + solvent
2020-05-05 15:14:44 +02:00
Tor Harald Sandve
c73c83d317 Allow for mixing of SOF2 from familiy 2 and family 1 for 3p solvent models 2020-05-05 11:52:30 +02:00
Atgeirr Flø Rasmussen
5e985cfaf3 Fix start-time of ACTIONX actions. 2020-05-05 10:09:09 +02:00
Joakim Hove
94ab966c1b
Merge pull request #1774 from atgeirr/fix-actionx-testcase
Remove group list in test file
2020-05-05 09:11:44 +02:00
Atgeirr Flø Rasmussen
3cb39f8bd4 We do not handle lists of groups.
Addressed by removing such a list (replace with the single
group matching pattern) in a test case.
2020-05-05 08:28:10 +02:00
Joakim Hove
f8e7c4eee0
Merge pull request #1773 from joakim-hove/group-level-report
Group level report
2020-05-04 21:46:53 +02:00
Williham Williham Totland
5e981cc74b Corrects all_nodes implementation. 2020-05-04 18:29:48 +02:00
Williham Williham Totland
54ced2e368 Implements Group Level report. 2020-05-04 18:29:48 +02:00
Williham Williham Totland
8af0d505cf Implements GTNode::level and GTNode::all_nodes. 2020-05-04 18:29:08 +02:00
Joakim Hove
c22a7e5b46
Merge pull request #1765 from wito/group-hierarchy-report
Implementing Group Hierarchy Report
2020-05-04 18:27:33 +02:00
Joakim Hove
44af497f8a
Merge pull request #1771 from joakim-hove/welspecs-report-refactor
Use proper Connection::perf_range() when creating WELSPECS MSW report
2020-05-04 12:19:23 +02:00
Joakim Hove
c8e81f32fb
Merge pull request #1763 from joakim-hove/weltarg-uda
Weltarg uda
2020-05-04 11:54:19 +02:00
Joakim Hove
afc7f5d2f2 Use proper Connection::perf_range() when creating WELSPECS MSW report 2020-05-04 10:46:32 +02:00
Joakim Hove
9b370dcad1
Merge pull request #1739 from wito/welspecs-report-refactor
Add Unit System awareness to WELSPECS reports
2020-05-04 10:46:20 +02:00
Joakim Hove
35dc429aa4 Sort IUAD output vectr on UDQ input index 2020-05-04 10:23:16 +02:00
Joakim Hove
5c2a8b9fc4 Update UDQActive when UDA is used in WELTARG 2020-05-04 10:23:00 +02:00
Joakim Hove
9a4c8f754e Change type of new value argument in WELTARG to UDA 2020-05-04 08:29:34 +02:00
Håvard Berland
f6318ee271 WELTARG keyword can have UDA-data in E100 2020-05-04 08:29:34 +02:00
Joakim Hove
ef77be1508 Refactor ScheduleTests to use fixture function 2020-05-04 08:29:34 +02:00
Joakim Hove
4fa0c93ff7
Merge pull request #1759 from joakim-hove/rename-segdist
Connection - Segment interaction implemented with optional pair
2020-05-01 08:52:03 +02:00
Bård Skaflestad
021d946a96
Merge pull request #1769 from joakim-hove/is-udq-regexp
Update regexp to allow for digits in UDQ name
2020-04-30 16:32:17 +02:00
Joakim Hove
8b70e42e0f Connection - Segment interaction implemented with optional pair 2020-04-30 14:54:21 +02:00