OilfieldToolsNet/opm-common
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
8,523 Commits 18 Branches 75 Tags 73 MiB
88f8313568
Commit Graph

8523 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Bård Skaflestad
88f8313568
Merge pull request #1793 from OPM/fix/add-missing-includes 
add some missing includes
 2020-05-19 21:35:57 +02:00
Bård Skaflestad
7194463033
Merge pull request #1794 from OPM/fix/designated-initializer 
avoid designated initializer error
 2020-05-19 21:34:44 +02:00
Bernd Flemisch
283da4d2b6 [test] avoid designated initializer error 2020-05-19 13:03:45 +02:00
Bernd Flemisch
54f08156ad add some missing includes 2020-05-19 12:59:22 +02:00
Bård Skaflestad
0d9eda9b76
Merge pull request #1792 from bska/restart-guiderate-locations 
Restart: Prepare to Output Well/Group Guide Rates
 2020-05-18 23:43:11 +02:00
Bård Skaflestad
317d1ba14e Restart: Prepare to Output Well/Group Guide Rates 
This commit identifies vector items in XWEL and XGRP that hold guide
rate values at the well and group levels, and adds functionality to
output those values to the restart file.  We do not identify such
value at the FIELD level.  As with other summary-like quantities, we
expect to pick up the fully converted values from a SummaryState
object.

Calculating and storing the guide rate quantities in SummaryState is
the subject of future work.
 2020-05-18 21:56:57 +02:00
Joakim Hove
598f0e9056
Merge pull request #1791 from joakim-hove/group-index-offset 
Fix group number used in IUAP restart array
 2020-05-18 17:37:52 +02:00
Bård Skaflestad
6f45df5e93
Merge pull request #1790 from joakim-hove/network-vfp0 
When defining branch properties: vfp == 0 should delete branch
 2020-05-16 00:46:58 +02:00
Joakim Hove
0aa5fd9f09 Fix group number used in IUAP restart array 2020-05-15 16:26:57 +02:00
Bård Skaflestad
5560f43a8c
Merge pull request #1782 from hnil/abs_convergence 
changed rootfinders to return also when absolute tolerance is less th…
 2020-05-15 15:19:33 +02:00
Joakim Hove
66acfb5249 When defining branch properties: vfp == 0 should delete branch 2020-05-15 14:21:44 +02:00
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
hnil
47df32ef1a fixed the tolerance also in RegulaFalsiBisection 2020-05-15 08:55:38 +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
hnil
ded8ef1a66 changed rootfinders to return also when absolute tolerance is less than prescribed, not only when function value is less than tolerance. 2020-05-10 22:32:01 +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