Commit Graph

6944 Commits

Author SHA1 Message Date
Arne Morten Kvarving
ef9bc3cf3f
Merge pull request #1265 from akva2/comparison_operators_output_structures
added: comparison operators for various output structures
2019-11-28 15:19:23 +01:00
Bård Skaflestad
8cd7481d14
Merge pull request #1255 from jalvestad/iseg_0_fix
correction to ISEG[0] in AggregateMSWData.cpp
2019-11-28 14:44:37 +01:00
Joakim Hove
13bdd5e5a0
Merge pull request #1273 from joakim-hove/DEST_PREFIX
Use DEST_PREFIX when installing python code
2019-11-28 13:41:49 +01:00
Arne Morten Kvarving
6600994104 added: comparison operators for various output structures 2019-11-28 13:30:48 +01:00
Joakim Hove
221d6e21f6
Merge pull request #1274 from joakim-hove/disable-rocknum
Disable 3D property testing of ROCKNUM
2019-11-28 11:32:44 +01:00
Joakim Hove
25631acbc9 Disable 3D property testing of ROCKNUM 2019-11-28 11:18:38 +01:00
Jostein Alvestad
4743584d37 removed unused vector tempOrdVect 2019-11-28 09:41:02 +01:00
Jostein Alvestad
1a4bef80b3 correction to ISEG[0] in AggregateMSWData.cpp 2019-11-28 09:41:00 +01:00
Tor Harald Sandve
d4c680ba68
Merge pull request #1258 from totto82/add_sales_PR
Convert UDA in GCONSALE and GCONSUMP
2019-11-28 09:04:28 +01:00
Tor Harald Sandve
7b41397f6f
Merge pull request #1252 from totto82/gprodEvent
add group events
2019-11-28 08:23:18 +01:00
Joakim Hove
885093d472 Use DEST_PREFIX when installing python code 2019-11-27 23:46:32 +01:00
Bård Skaflestad
78e8acf21f
Merge pull request #1269 from bska/prepare-valve_icd-restart
Prepare Restart File Support for Valves and ICDs
2019-11-27 23:37:31 +01:00
Bård Skaflestad
c333b21c90 Prepare Restart File Support for Valves and ICDs
This commit identifies certain items in restart vectors ISEG and
RSEG that pertain to valves (keyword WSEGVALV) and spiral ICDs
(keyword WSEGSICD).  In particular, we identify segment type flag
and a couple of relevant values for this flag.  Also, relevant
parameters that describe the geometry and pressure drops of these
devices.
2019-11-27 22:12:43 +01:00
Joakim Hove
ba65222caf
Merge pull request #1268 from joakim-hove/plyrock-fixup
Fix internal name in PLYROCKM json file
2019-11-27 18:38:12 +01:00
Joakim Hove
11c6d43e22
Merge pull request #1267 from joakim-hove/region-cache-fixup
Bugfix: use correct 3D property container
2019-11-27 17:14:04 +01:00
Joakim Hove
70066df8ee
Merge pull request #1266 from akva2/serialize_whole_connection
added: serialize the whole connection struct to OPM_XWEL
2019-11-27 17:13:19 +01:00
Joakim Hove
6019ad9d42 Fix internal name in PLYROCKM json file 2019-11-27 16:51:29 +01:00
Joakim Hove
ce3b1554db Temporarily added plain FIPNUM as region keyword 2019-11-27 16:31:10 +01:00
Joakim Hove
8fdbde5a48 Bugfix: use correct 3D property container 2019-11-27 16:19:16 +01:00
Joakim Hove
a9ebca90fd
Merge pull request #1264 from atgeirr/speedup-eclfile-construction
Use seekg() rather than ignore() to skip ahead.
2019-11-27 15:00:40 +01:00
Arne Morten Kvarving
a34bc76b46 added: serialize the whole connection struct to OPM_XWEL 2019-11-27 14:13:31 +01:00
Joakim Hove
854b79c280
Merge pull request #1233 from joakim-hove/thpres-refactor
Thpres refactor
2019-11-27 10:46:18 +01:00
Atgeirr Flø Rasmussen
e4e3b3bde8 Use seekg() rather than ignore() to skip ahead. 2019-11-27 10:17:30 +01:00
Joakim Hove
ca95ff1b86
Merge pull request #1235 from joakim-hove/fp-keys
Add FieldPropsManager::keys<T>() method for iteration
2019-11-27 10:06:23 +01:00
Joakim Hove
0380b9911e
Merge pull request #1261 from joakim-hove/udqtest-data-fixup
Update test fixture to use correct grid
2019-11-27 10:02:58 +01:00
Joakim Hove
94a58e87bf
Merge pull request #1234 from joakim-hove/region-cache-fp
Region cache fp
2019-11-27 09:50:29 +01:00
Joakim Hove
29b5f1e8b6 Use FieldPropsManager for THPRES initialization 2019-11-27 09:48:13 +01:00
Tor Harald Sandve
5d28ff7d24 store well and group event in same map 2019-11-27 08:58:57 +01:00
Joakim Hove
b2d9e92e25 Update test fixture to use correct grid 2019-11-26 21:34:04 +01:00
Joakim Hove
866aa5c5ca Add alternative FieldPropsManager argument to THPRES constructor 2019-11-26 20:49:15 +01:00
Joakim Hove
8e76b1346a Moved some variables closer to use-site 2019-11-26 20:49:15 +01:00
Arne Morten Kvarving
c2de0e09a3
Merge pull request #1259 from akva2/rename_accessor
changed: rename accessor to data()
2019-11-26 14:28:33 +01:00
Arne Morten Kvarving
0d6ed7cfb6 changed: rename accessor to data()
the two classes EDITNNC and NNC are very similar, which makes templating
useful. this small difference makes it hard to do. unify them.
2019-11-26 13:20:17 +01:00
Joakim Hove
d3cc7303b4
Merge pull request #1256 from akva2/fix_forwards
fixed: forward declared the intended classes
2019-11-26 13:03:37 +01:00
Tor Harald Sandve
e1029e956b convert from UDA to double for GCONSALE and GCONSUMP 2019-11-26 11:14:12 +01:00
Tor Harald Sandve
225d6ea26d Make GCONSALE an injector 2019-11-26 11:14:12 +01:00
Arne Morten Kvarving
e1e9fb7110 fixed: forward declared the intended classes 2019-11-26 10:40:03 +01:00
Tor Harald Sandve
b109331163 add group events 2019-11-25 09:55:32 +01:00
Bård Skaflestad
be27bb6154
Merge pull request #1248 from berland/wpotcalc
Change section for WPOTCALC keyword to RUNSPEC
2019-11-21 16:03:33 +01:00
Joakim Hove
91c40e60c6 Add FieldPropsManager::keys<T>() method for iteration 2019-11-21 10:21:01 +01:00
Joakim Hove
b3d28e10cc
Merge pull request #1246 from joakim-hove/fp-default-region
FieldProps::default_region() - public property
2019-11-21 10:19:16 +01:00
Håvard Berland
9cefcaf49b Change section for WPOTCALC keyword to RUNSPEC 2019-11-21 09:59:50 +01:00
Arne Morten Kvarving
049ddf74f4
Merge pull request #1247 from akva2/fix_rh_regression
fixed: a regression snuck in while enabling redhat 8
2019-11-21 09:55:19 +01:00
Arne Morten Kvarving
9bb8a35f8f fixed: a regression snuck in while enabling redhat 8
for some reason, rh7 does not link cmake3 to cmake,
while rh6 and rh8 does. cmake3 works everywhere
2019-11-21 09:01:39 +01:00
Joakim Hove
be895ce0b1 FieldProps::default_region() - public property 2019-11-21 08:43:48 +01:00
Joakim Hove
3672a29b0a
Merge pull request #1237 from joakim-hove/fp-defaulted
Fp defaulted
2019-11-21 08:39:04 +01:00
Joakim Hove
5d588fd56e
Merge pull request #1242 from akva2/add_rh8_packaging
added: support rhel8
2019-11-20 19:33:19 +01:00
Joakim Hove
eb1c9a71c7
Merge pull request #1241 from stefoss23/reorganize_krangle
added some 'special' keywords. Reorganized list of 'special' keywords.
2019-11-20 19:12:29 +01:00
Arne Morten Kvarving
3f6097bf16 added: support rhel8 2019-11-20 15:50:01 +01:00
Steinar Foss
bebcdbc43c added some 'special' keywords. Reorganized list of 'special' keywords.
added kw GCONPRI.

added kw GIALL.

added kw MASSFLOW.

added keywords MESSAGE.

RPTRST: deckname OUTSOL.

added keyword PARAOPTS.

FOAMDCN: changed structure ofg keyword.

added keywords PVG32D, PCW32D.

keyword_list.cmake: reaorginzed list of 'special' keywords.
2019-11-20 15:19:22 +01:00