OilfieldToolsNet/opm-common
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
7,215 Commits 18 Branches 75 Tags
4f11b7846c841be6891a039ba89106ed1c2b34ad
Commit Graph

7215 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Joakim Hove
4f11b7846c Add support for MULTREGP in FieldProps::porv implementation 2019-12-20 07:28:48 +01:00
Joakim Hove
fde5c0b096 Merge pull request #1359 from joakim-hove/fp-comments 
Fp comments
 2019-12-20 07:27:17 +01:00
Joakim Hove
5cf0d0393b Merge pull request #1363 from stefoss23/add_some_uknown_size_keywords 
keyword ROCK: size->UNKNOWN. Added keyword ADSORP.
 2019-12-19 20:14:36 +01:00
Steinar Foss
a5c245bc6c keyword ROCK: size->UNKNOWN. Added keyword ADSORP. 
added keyword ADSOPR w/ test.

keyword ADSORP: size set to NTSFUN, TABDIMS.

keyword ADSORP size shift:1.

ParserTests: added test for kw ROCK.
 2019-12-19 15:27:55 +01:00
Joakim Hove
46999f418f Refactored FieldProps 
- The lowest level get method is called init_get() - this will unconditionally
  create new keyword. The init_get() method is private.

- Introduced FieldDataManager which keeps track of data pointer and status.

- Refactored get( ) implementation
 2019-12-19 15:06:20 +01:00
Joakim Hove
ce5b9b1e1d Add documentation to the FieldPropsManager 2019-12-19 10:55:57 +01:00
Joakim Hove
7cfb51dfe6 Merge pull request #1195 from jalvestad/actionx-udq-rst 
Code to write UDQ and ACTIONX data to the Eclipse compatible restart file
 2019-12-19 10:27:51 +01:00
Arne Morten Kvarving
306af1b445 Merge pull request #1360 from akva2/noecl_flush 
Yet another round of serialization preparation
 2019-12-19 10:25:25 +01:00
Arne Morten Kvarving
0841a28776 allow constructing TableManager from variables 
also add accessor, assignment operator and equality operator
 2019-12-19 09:29:26 +01:00
Arne Morten Kvarving
8e1a332920 add equality operator to ROCKRecord 2019-12-19 09:29:26 +01:00
Arne Morten Kvarving
7b36d325b5 allow constructing Aqudims from variables 
also add equality operator
 2019-12-19 09:28:23 +01:00
Arne Morten Kvarving
8c61d6fff5 add equality operator to Eqldims 2019-12-19 09:28:23 +01:00
Arne Morten Kvarving
90bb9abf31 add equality operator to Regdims 2019-12-19 09:28:23 +01:00
Arne Morten Kvarving
415fda815f allow constructing SkprwatTable from variables 
also add equality operator
 2019-12-19 09:26:57 +01:00
Arne Morten Kvarving
1ecbc75bfb allow constructing SkprpolyTable from variables 
also add equality operator
 2019-12-19 09:26:57 +01:00
Arne Morten Kvarving
d7acc1ee0f allow constructing PlymwinjTables from variables 
also add equality operator
 2019-12-19 09:26:57 +01:00
Arne Morten Kvarving
6ccdaaa635 allow constructing PolyInjTables from variables 
also add equality operator
 2019-12-19 09:24:34 +01:00
Bård Skaflestad
ceb4b1e287 Merge pull request #1354 from stefoss23/add_some_keywords 
Adding some keywords
 2019-12-18 22:19:14 +01:00
Bård Skaflestad
0b4b3cf22b Merge pull request #1355 from joakim-hove/switch-warning 
Add default: clause in switch
 2019-12-18 20:37:34 +01:00
Arne Morten Kvarving
87ca5e6f58 Merge pull request #1356 from akva2/noecl_flush 
Another round of serialization preparation
 2019-12-18 16:56:09 +01:00
Arne Morten Kvarving
2ae7921fcb add equality operator to WATDENTRecord 2019-12-18 14:27:02 +01:00
Arne Morten Kvarving
49b8bff030 add equality operator to VISCREFRecord 2019-12-18 14:27:02 +01:00
Arne Morten Kvarving
b0ab7fdf8d add equality operator to DENSITYRecord 2019-12-18 14:27:02 +01:00
Arne Morten Kvarving
d992bfc1e0 add equality operator to PVCDORecord 2019-12-18 14:25:51 +01:00
Arne Morten Kvarving
98a332fc5f allow constructing FlatTable from vector 2019-12-18 14:25:08 +01:00
Joakim Hove
6a03d72a4e Add default: clause in switch 2019-12-18 14:24:21 +01:00
Arne Morten Kvarving
59235b5a11 add equality operator to PVTWRecord 2019-12-18 14:24:17 +01:00
Arne Morten Kvarving
39ab36819e allow constructing JFunc from variables 
also add equality operator
 2019-12-18 14:23:11 +01:00
Arne Morten Kvarving
73be14b7b8 Merge pull request #1353 from akva2/noecl_flush 
Next round of serialization preparation
 2019-12-18 14:16:44 +01:00
Atgeirr Flø Rasmussen
7c77d9e2a7 Merge pull request #1351 from joakim-hove/weltarg-unit-conversio 
Temporarily bypass the unit conversion in handleWELTARG
 2019-12-18 13:56:02 +01:00
Joakim Hove
a89063e6a4 Merge pull request #1346 from stefoss23/dynamicr 
DYNAMICR
 2019-12-18 13:50:21 +01:00
Jostein Alvestad
b519d825f2 corrections to test_msim_ACTIONX and SCON[40] 2019-12-18 13:27:34 +01:00
Steinar Foss
429a5be890 added keywords ACTIONS, AMALGAM, APILIM, APIVD, AQUALIST, AQUCHGAS, AQUCHWAT, BDENSITY, BGGI, BOGI. 
added keywords AMALGAM, APILIM, APIVD.

added keyword AQUALIST.

added keywords AQUCHGAS, AQUCHWAT, BDENSITY.

added keywords BGGI, BOGI.

altered list of 'special' keywords.
 2019-12-18 12:46:09 +01:00
Steinar Foss
01b62e4617 added keyword DYNAMICR. 
added keyword DYNAMICR.
 2019-12-18 09:34:40 +01:00
Arne Morten Kvarving
07a782d9c0 allow constructing Pvt(g|o|x)Tables from variables 
also add equality operator
 2019-12-18 09:18:29 +01:00
Arne Morten Kvarving
9ff8cb9f15 allow constructing Runspec from variables 
also add equality operator
 2019-12-18 09:18:29 +01:00
Arne Morten Kvarving
33e14dd3cf allow constructing Actdims from variables 
also add equality operator
 2019-12-18 09:17:12 +01:00
Arne Morten Kvarving
dc1168edb4 allow constructing EclHysterConfig from variables 
also add equality operator
 2019-12-18 09:17:12 +01:00
Arne Morten Kvarving
d5384aa659 allow constructing UDQParams from variables 
also add equality operator
 2019-12-18 09:17:12 +01:00
Arne Morten Kvarving
14c67975cb allow constructing WellSegmentDims from variables 
also add equality operator
 2019-12-18 09:14:45 +01:00
Arne Morten Kvarving
7c4b63c4bd allow constructing Welldims from variables 
also add equality operator
 2019-12-18 09:14:45 +01:00
Arne Morten Kvarving
3f1aa7f4df allow constructing EndpointScaling from variables 
also add accessors and equality operator
 2019-12-18 09:14:45 +01:00
Markus Blatt
43116d3c45 Merge pull request #1352 from akva2/noecl_flush 
Next round of serialization preparation
 2019-12-18 08:11:23 +01:00
Joakim Hove
3a87395419 Merge pull request #1348 from joakim-hove/udq-parse-diff 
UDQ parse A - B - C
 2019-12-17 18:55:06 +01:00
Joakim Hove
46f6aaec02 Merge pull request #1338 from stefoss23/double_records 
Can parse keywords of type double-record.
 2019-12-17 17:09:11 +01:00
Joakim Hove
89ab99e6b9 UDQ: fix bug with parsing of expressions like A - B - C - D 
- In the case of several tokens separated with +/- the final tree is assembled
   from left, was previously from the right. This fixes evaluation bug with
   expressions like A - B - C which were eventually evaluated as A - (B - C).

 - Improved handling of different types; both transiton from scalar to sets of
   wells and groups, and also groups in general. In particular you can now
   assign to a group variable:

        DEFINE GUXXX  WOPR * 0.25

 - Actually hook up the evaluation of group variables from the Summary code.
 2019-12-17 16:59:06 +01:00
Arne Morten Kvarving
582e08692b allow constructing Tabdims from variables 
also add equality operator
 2019-12-17 16:36:42 +01:00
Arne Morten Kvarving
6069867b32 allow constructing Phases from variables 
also add accessors and equality operator
 2019-12-17 16:36:42 +01:00
Arne Morten Kvarving
95680c70c3 allow constructing IOConfig from variables 
also add accessors and equality operator
 2019-12-17 16:36:06 +01:00
Jostein Alvestad
1e0a43c4f8 corrections to unit tests 2019-12-17 16:34:45 +01:00