Commit Graph

7393 Commits

Author SHA1 Message Date
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
Arne Morten Kvarving
9825e25740 allow constructing RestartConfig from tables
also add accessors and equality operator
2019-12-17 16:34:24 +01:00
Arne Morten Kvarving
6ee97a3f9a allow constructing DynamicState from tables
also add accessor and equality operator
2019-12-17 16:34:24 +01:00
Arne Morten Kvarving
6378d55fa9 allow constructing TimeMap from tables
also add accessors and equality operators
2019-12-17 16:33:46 +01:00
Arne Morten Kvarving
d78319222f
Merge pull request #1349 from akva2/noecl_flush
Another round of serialization preparation
2019-12-17 15:45:39 +01:00
Joakim Hove
8573c947fa Temporarily bypass the unit conversion in handleWELTARG 2019-12-17 15:28:08 +01:00
Atgeirr Flø Rasmussen
6c1c6e2c13
Merge pull request #1350 from akva2/janitoring
add a default to quell unhandled value in switch warning
2019-12-17 13:40:13 +01:00
Arne Morten Kvarving
b7be32fadc allow constructing SimulationConfig from tables
also equality operator
2019-12-17 12:46:27 +01:00
Arne Morten Kvarving
b4066d40f5 allow constructing InitConfig from tables
also add accessors and equality operator
2019-12-17 12:46:27 +01:00
Arne Morten Kvarving
d13b9a0a15 allow constructing FoamConfig from tables
also add accessors and equality operator
2019-12-17 12:46:27 +01:00
Jostein Alvestad
3fa8c25b47 remove debug print 2019-12-17 12:30:50 +01:00
Jostein Alvestad
cf82a90815 Add changes for WHISTCTL data in ECL restart 2019-12-17 12:30:48 +01:00
Jostein Alvestad
ae47d39a1a further corrections 2019-12-17 12:30:47 +01:00
Jostein Alvestad
0c9a2cbbf6 initial changes to test output of UDQ and ACTIONX data to ecl-restart
change to avoid zero-size windows in Actionx

changes to improve Restart output content

change to correct IUDQ for DEFINE

corrections to IACN and SACN

initial changes to add item to ZWEL

further changes to add Action to well

further changes to allow for action name in ZWEL

more changes

further changes to output action name to ZWEL

changes to test/debug Restart write

turn on writing of ZWEL again

First running version of udq-actionx-rst

use Action::Result direkte

first working! version

some corrections

changes to allow for output of SACN [4.6.8]

added debug print

changes to improve IACN and IACT

further corrections to Actionx IACN pluss error messages

changes to adapt to well2 converted to well class

further changes to enable restart with group control

changes to adapt to newly merged code in master

changes to include Intehead [51] - group control

test

changes to iGrp[nwgmax +7]

initial changes for GUIDERATE

changes to add guiderate parameters to the restart file

add comment

correction to guiderate - test if exist

correction to DoubHead - test if GR exist

correction to ISEG[8]

correction for eclipse version Restart-file

Cosmetic change

corrections to igrp

correction to segment type in iseg
2019-12-17 12:30:40 +01:00
Arne Morten Kvarving
a63bde6bba add a default to quell unhandled value in switch warning 2019-12-17 11:57:08 +01:00
Joakim Hove
132665e469
Merge pull request #1270 from bska/restart-wsegvalv
Add Restart File Support for WSEGVALV Devices
2019-12-17 11:29:37 +01:00
Arne Morten Kvarving
b56cef3103 allow constructing FoamData from doubles
also add accessors and equality operator
2019-12-17 11:04:12 +01:00
Arne Morten Kvarving
0741f4c099 allow constructing Equil from tables
also add accessors and equality operator
2019-12-17 10:31:23 +01:00
Arne Morten Kvarving
d532f861ac add equality operator and a default constructor to EquilRecord 2019-12-17 10:31:23 +01:00
Arne Morten Kvarving
850c91f047 add accessors to TableContainer
also add equality operator and default constructor
2019-12-17 10:26:42 +01:00
Arne Morten Kvarving
baef4f00fa allow constructing SimpleTable from tables
also add accessors and equality operator
2019-12-17 10:25:12 +01:00
Arne Morten Kvarving
3b49c8a63c allow constructing TableColumn from tables
also add accessors and equality operator
2019-12-17 10:25:12 +01:00
Bård Skaflestad
ebfa768fd2 Segment: Make Type Predicates Free Functions
That way, we won't have to pollute the Segment API when adding new
segment types.  While here, also reduce header file coupling by
forward-declaring SpiralICD and Valve in Segment.hpp.
2019-12-17 09:14:17 +01:00
Bård Skaflestad
21de27a1cb Output Valve Characteristics to Restart File
This commit identifies well segments that correspond to valves
(input keyword WSEGVALV) and captures those in the ISEG vector.
Furthermore, we output characteristic properties of such valve
segments (e.g, the valve length, the base strength, and
cross-sectional area) in the RSEG vector.
2019-12-17 09:14:17 +01:00