Commit Graph

7122 Commits

Author SHA1 Message Date
Joakim Hove
434f671391 Cache the region vectors in the MULTREGT scanner 2019-12-02 06:30:58 +01:00
Joakim Hove
9b9ba2c88c Merge pull request #1286 from joakim-hove/fp-default
Fp default
2019-12-02 06:30:42 +01:00
Joakim Hove
b8d3b8a16e Remove FieldPropsManager default constructor 2019-12-01 21:19:02 +01:00
Joakim Hove
296288bce4 Remove FieldProps->tables member 2019-12-01 18:01:01 +01:00
Joakim Hove
c9ac9eaec1 Merge pull request #1284 from joakim-hove/disable-fp
Disable use of FieldPropsManager in MULTREGTScanner
2019-12-01 11:34:40 +01:00
Joakim Hove
7a9409fc08 Disable use of FieldPropsManager in MULTREGTScanner 2019-12-01 09:43:07 +01:00
Joakim Hove
4893f534f7 Merge pull request #1282 from joakim-hove/add-PORO
Add poro
2019-11-30 09:43:10 +01:00
Joakim Hove
c403db8379 Merge pull request #1240 from joakim-hove/transmult-fp
Add FieldPropsManager argument to TransMult constructors
2019-11-30 08:46:43 +01:00
Joakim Hove
bb032c6182 Add PORO to testdata 2019-11-30 08:35:39 +01:00
Joakim Hove
9e3b8a94e8 Add missing "GRID" section in testdata 2019-11-30 08:35:34 +01:00
Joakim Hove
b04cd0b207 Merge pull request #1281 from joakim-hove/report-wellopen-status
Log message when a well status changes from WELOPEN
2019-11-29 19:17:12 +01:00
Joakim Hove
d53d8b4947 Enable testing of FieldPropsManager in transmult classes 2019-11-29 19:12:46 +01:00
Joakim Hove
0514b6bb52 Add FieldPropsManager argument to TransMult constructors 2019-11-29 18:16:20 +01:00
Joakim Hove
cb8cc2c5b2 Remove unused argument 2019-11-29 18:15:35 +01:00
Joakim Hove
61fd4e0c88 FieldProps::default_region() - public property 2019-11-29 18:15:35 +01:00
Joakim Hove
b5f3a94842 Merge pull request #1249 from joakim-hove/wellconnection-fp
Use FieldPropsManager in WellConnection
2019-11-29 18:14:18 +01:00
Joakim Hove
bdea9b4da7 Log message when a well status changes from WELOPEN 2019-11-29 18:11:45 +01:00
Joakim Hove
198b208258 Test use of FieldPropsManager in WellConnections 2019-11-29 16:42:29 +01:00
Joakim Hove
8211007714 Merge pull request #1278 from joakim-hove/add-PORO
Add poro
2019-11-29 12:46:34 +01:00
Joakim Hove
74704f4cc6 Merge pull request #1280 from joakim-hove/lwsltnum
add lwsltnum
2019-11-29 09:32:03 +01:00
Tor Harald Sandve
fddaa46e98 add lwsltnum 2019-11-29 08:42:08 +01:00
Joakim Hove
c3ab4829e0 Merge pull request #1275 from joakim-hove/enable-ROCKNUM
Enable ROCKNUM in FieldProps
2019-11-29 08:38:17 +01:00
Bård Skaflestad
27f1c5b998 Merge pull request #1279 from akva2/fix_xwel
fixed: serialize thp to OPM_XWEL
2019-11-28 23:39:19 +01:00
Arne Morten Kvarving
529a181617 fixed: serialize thp to OPM_XWEL 2019-11-28 23:22:14 +01:00
Joakim Hove
e9b6ac54d9 Add PORO keyword to testdata 2019-11-28 20:06:39 +01:00
Joakim Hove
e5b40870b6 Remove unused testdata 2019-11-28 20:06:39 +01:00
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
Joakim Hove
5cd4814de1 Enable ROCKNUM in FieldProps 2019-11-28 15:14:31 +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