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

8976 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Atgeirr Flø Rasmussen
873ad61e23 Add missing <string> include. 2020-09-03 10:41:20 +02:00
Bård Skaflestad
f8f5987aff
Merge pull request #1901 from akva2/missing_boost_include 
fixed: add missing include for boost version
 2020-09-03 10:02:07 +02:00
Arne Morten Kvarving
40c2c00d58 fixed: add missing include for boost version 2020-09-03 09:20:49 +02:00
Bård Skaflestad
ae91ede665
Merge pull request #1871 from bska/add-guiderate-summary 
Add Guiderate Summary Output
 2020-09-03 09:20:36 +02:00
Bård Skaflestad
084aa69641 Add Guiderate Summary Output 
This commit adds support for outputting the guiderate summary
vectors

    [GW][OGWV]PGR, [GW][GW]IGR

under the assumption that the values are fully calculated at another
level and that we therefore only need to extract the numerical
values and convert the rate units to output conventions.  We assume
that such values are communicated to the summary output layer by
means of a 'GuideRateValue' object.

The assumption of values already being calculated leads to a small
change in the 'need_wells()' function.  We're now able to exclude
guiderate values at the group level from those vectors that require
setting up a well vector.  This is a (tiny) performance improvement.
 2020-09-03 01:04:15 +02:00
Bård Skaflestad
746bb15681
Merge pull request #1887 from joakim-hove/udq-undefined 
Udq undefined
 2020-09-03 00:50:26 +02:00
Joakim Hove
11e70ca779 Handle undefined UDQ expressions 2020-09-02 23:03:03 +02:00
Bård Skaflestad
a74855f74b
Merge pull request #1899 from joakim-hove/serialize-empty-string 
Handle empty strings in serializer
 2020-09-02 09:37:53 +02:00
Joakim Hove
e99e2c5e82 Handle empty strings in serializer 2020-09-02 07:49:04 +02:00
Bård Skaflestad
015d8ff923
Merge pull request #1898 from akva2/janitoring 
Some janitoring
 2020-09-01 18:02:01 +02:00
Arne Morten Kvarving
efedbffe63 let compiler deal with copy-ellusion 2020-09-01 15:28:12 +02:00
Arne Morten Kvarving
39db643dd3 quell warning with boost >= 1.71 
header was relocated
 2020-09-01 15:25:44 +02:00
Arne Morten Kvarving
44f29eb4f7 add explicit copy-constructors 
implicitly generated copy constructors are deprecated in C++11,
if the class already has an assignment operator.

quells warnings with modern gcc/clang.
 2020-09-01 15:25:44 +02:00
Arne Morten Kvarving
acad356e2d remove unused variable 2020-09-01 15:25:44 +02:00
Joakim Hove
076bc3107b
Merge pull request #1896 from joakim-hove/add-udq-state 
Add UDQState argument to output writer
 2020-09-01 15:07:14 +02:00
Joakim Hove
8b23b572cd
Merge pull request #1895 from joakim-hove/serializer 
Serializer class
 2020-09-01 14:15:52 +02:00
Joakim Hove
3b0e795e0b Add UDQState argument to output writer 2020-09-01 13:18:59 +02:00
Joakim Hove
4b3304730c Serializer class: SummaryState & UDQState 2020-09-01 13:15:42 +02:00
Joakim Hove
432f666768
Merge pull request #1897 from joakim-hove/add-wsegiter 
Add wsegiter
 2020-09-01 13:11:20 +02:00
Joakim Hove
53f78a02fe Internalize WSEGITER settings in Tuning implementation 2020-08-31 18:24:09 +02:00
Joakim Hove
71ba9ae6fd Remove DynamicState<..> access to Tuning class 2020-08-31 17:25:40 +02:00
Joakim Hove
24b66d8bb4
Merge pull request #1889 from joakim-hove/udq-state 
Udq state
 2020-08-31 07:35:14 +02:00
Bård Skaflestad
bb8c1f192f
Merge pull request #1894 from GitPaean/code_compatibility 
rewriting a for loop for intel compilers
 2020-08-28 12:29:48 +02:00
Kai Bao
1927e305ed rewriting a for loop for intel compilers 2020-08-28 11:37:04 +02:00
Joakim Hove
0161f50255 Add UDQState 2020-08-27 17:25:51 +02:00
Joakim Hove
8b2363b940
Merge pull request #1885 from joakim-hove/udq-uadd 
Correctly parse and handle UADD / UMUL / UMIN / UMAX set operations
 2020-08-27 17:11:25 +02:00
Joakim Hove
7894a21749
Merge pull request #1892 from joakim-hove/fp-fipxxx 
Allow FIPxxx keywords in FieldProps manager
 2020-08-27 17:11:05 +02:00
Joakim Hove
8b718ef0e1
Merge pull request #1890 from joakim-hove/extract-udq-eval 
Remove call to udq::eval() from Summary::eval()
 2020-08-27 17:09:28 +02:00
Joakim Hove
168aa5602d Make sure DEFINE statements are evaluated in input order 2020-08-27 15:24:32 +02:00
Joakim Hove
718e00ca1f Correctly parse and handle UADD / UMUL / UMIN / UMAX set operations 2020-08-27 15:24:32 +02:00
Joakim Hove
1cf069c837
Merge pull request #1886 from joakim-hove/udq-tokens 
Fix UDQ parsing for mix of '*' and *
 2020-08-27 15:22:25 +02:00
Joakim Hove
76e8805d92
Merge pull request #1893 from joakim-hove/remove-require-fipnum 
Remove function SummaryConfig::requireFIPNUM
 2020-08-27 13:56:36 +02:00
Joakim Hove
dee69e78c3 Remove function SummaryConfig::requireFIPNUM 2020-08-27 11:55:17 +02:00
Joakim Hove
e00516842c Allow FIPxxx keywords in FieldProps manager 2020-08-26 08:52:12 +02:00
Joakim Hove
b9ca9c3d47 Remove call to udq::eval() from Summary::eval() 2020-08-25 16:27:46 +02:00
Bård Skaflestad
98c9ce7abd
Merge pull request #1888 from joakim-hove/udq-scalar-optional 
Use std::optional<double> in UDQScalar
 2020-08-24 09:35:13 +02:00
Joakim Hove
9ccc9a72e4 Use std::optional<double> in UDQScalar 2020-08-24 06:59:11 +02:00
Joakim Hove
6c2563c5a5 Fix tokenizer bug with mix of '*' and * 
The token '*' should be interpreted as all wells/groups for a variable like WOPR
or GGPR, whereas the naked * is a multiplication sign. This commit fixes a bug
where the all wells/groups token '*' would be incorrectly interpreted as a
multiplication sign.
 2020-08-23 08:31:15 +02:00
Joakim Hove
f608487772
Merge pull request #1883 from bska/use-wmctl-rstval 
Restart Wells: Use IWEL WMCTL Values as Switch Cases
 2020-08-20 15:30:57 +02:00
Bård Skaflestad
af362fa4cf Restart Wells: Use IWEL WMCTL Values as Switch Cases 
These are (marginally) easier to understand than their raw integer
values.  While here, also insert the missing 'GRUP' case for
producers.
 2020-08-20 13:43:12 +02:00
Bård Skaflestad
a92c8ca6e0
Merge pull request #1870 from jalvestad/group-udq-actx_ph2 
Corrections and improvements to Eclipse compatible restart file output
 2020-08-19 12:30:01 +02:00
Bård Skaflestad
501db1003d
Merge pull request #1876 from joakim-hove/rptrst-solution 
Correctly handle RPTRST in SOLUTION section
 2020-08-18 11:08:31 +02:00
Jostein Alvestad
b624facaf2 minor corrections of comments 2020-08-18 11:07:57 +02:00
Jostein Alvestad
156c934993 minor comment corrections 2020-08-18 11:07:54 +02:00
Jostein Alvestad
c525546489 correct some logical tests determining IGRP 2020-08-18 11:07:52 +02:00
Joakim Hove
106c0881ee Correctly handle RPTRST in SOLUTION section 2020-08-18 10:48:50 +02:00
Joakim Hove
effe70876f
Merge pull request #1879 from berland/weconcmf 
Add support for parsing E300 kw WECONCMF
 2020-08-18 00:10:34 +02:00
Bård Skaflestad
8e1f8099b2
Merge pull request #1878 from berland/wcutback-fix 
Add GLR_LIMIT to WCUTBACK

Fixes #1878
 2020-08-17 12:56:45 +02:00
Håvard Berland
b1b04d3dec Add GLR_LIMIT to WCUTBACK, solving bug #1877 
Also add dimensions to all relevant fields.
 2020-08-17 11:41:19 +02:00
Håvard Berland
ab047eca6a Add support for parsing E300 kw WECONCMF 2020-08-17 11:05:09 +02:00