Rebase (#4)

* update reference data for faults_model_1 msw_2d_h msw_3d_hfa msw_model_1

Reason: OPM/opm-simulators#2138

opm-common     = d6cd0ff8716edfc6d0765c7342687373efd69088
opm-grid       = 4c7c2963762e407e978382a86d06dd67bd5320dc
opm-material   = c44caf6a5a9e4e918368f7c693d3f91dfa48af90
opm-models     = 3afc70c335c367c533b01b20f1245dc71599a7e5
opm-simulators = a0d502bec7fcf4c9146121585b5ad403eb8cf4de

* update reference data for fetkovich_2d ctaquifer_2d_oilwater polymer2d faults_model_1 base_model_1 wecon_wtest polymer_injectivity spe1_metric_vfp1 msw_2d_h msw_3d_hfa polymer_oilwater msw_model_1

Reason: OPM/opm-common#1200

opm-common     = 875c2bd61cbd74e4f10cccdd8778d2bb2334a410
opm-grid       = 3d95bd59092506e77b0440e3586be248117485ad
opm-material   = 705f7fa9710714ccb046086d2cf5c07db6bf6bd8
opm-models     = dc0d5b51263a0704c9af6b7134e9f0f9b57a7ee1
opm-simulators = 875c2bd61cbd74e4f10cccdd8778d2bb2334a410

* update reference data for spe9group wecon_wtest udq

Reason: OPM/opm-common#1205
        OPM/opm-simulators#2144

opm-common     = e2dcff81a5b3ac6ccf4035972d0398e0533907f4
opm-grid       = 3d95bd59092506e77b0440e3586be248117485ad
opm-material   = 705f7fa9710714ccb046086d2cf5c07db6bf6bd8
opm-models     = dc0d5b51263a0704c9af6b7134e9f0f9b57a7ee1
opm-simulators = 10d816b000f0e323de2f2eb98f6da7b771acd9c6

* plot wells now using new program summary based on opm i/o classes

* update reference data for fetkovich_2d

Reason: OPM/opm-simulators#2152

opm-common     = da625838b698a443f3b0faea789b669579b2b94e
opm-grid       = aa0266ba15a7b0a6457e8d18780346cba6996d58
opm-material   = 705f7fa9710714ccb046086d2cf5c07db6bf6bd8
opm-models     = dc0d5b51263a0704c9af6b7134e9f0f9b57a7ee1
opm-simulators = 4239dc8ec060e42d3b1c2ffb79159672559b9b4c

* adding more features to 2D_FETKOVICHAQUIFER.DATA

to incoporate the recent development in Fetkovich aquifer modeling

* update reference data for fetkovich_2d

Reason: OPM/opm-common#1239

opm-common     = 297514bcb8a7fbcbcf3837b1111931c84d8ef267
opm-grid       = c83ba3e7718486ba4b06c67432b240397b20311d
opm-material   = 902580243cf81999e59b004375439255ba766481
opm-models     = b2019c96b2d71a272a312d5a3162f0f403fe542a
opm-simulators = 297514bcb8a7fbcbcf3837b1111931c84d8ef267

* Add test case with ROCKCOMP

* new test case for WSEGSICD

* added: add well curves for parallel simulation

* update reference data for multpvv_model2 fetkovich_2d base_model2 editnnc_model2 ctaquifer_2d_oilwater polymer2d multflt_model2 polymer_injectivity multiply_tranxyz_model2 spe1_metric_vfp1 msw_2d_h hysteresis_model2 msw_3d_hfa multregt_model2 polymer_oilwater swatinit_model2 nnc endscale_model2 multxyz_model2

Reason: OPM/opm-common#1255

opm-common     = 7f1e6fad6a2087367f88e1ac6114d4591a6de16f
opm-grid       = 748cb70684001e7c8f2f9d38bcd70ce3fd59ef7c
opm-material   = 96693823e9130cb456cb9fe152d8c487c7569ae8
opm-models     = 52201845a4212b454add01f42476b60e5f478830
opm-simulators = 7f1e6fad6a2087367f88e1ac6114d4591a6de16f

* update reference data for spe1rockcomp

Reason: OPM/opm-simulators#2194

opm-common     = 221d6e21f65cd161e5fe67c5570931053510b7b6
opm-grid       = 748cb70684001e7c8f2f9d38bcd70ce3fd59ef7c
opm-material   = 96693823e9130cb456cb9fe152d8c487c7569ae8
opm-models     = 52201845a4212b454add01f42476b60e5f478830
opm-simulators = 6decbd666222ffeac04d03bbe8d16e983c7a0391

* update reference data for spe12p spe1nowells spe1rockcomp spe12 spe1oilgas spe1thermal spe1 spe1_metric_vfp1 ctaquifer_2d_oilwater fetkovich_2d spe3 spe9 spe9group msw_2d_h msw_3d_hfa polymer_oilwater polymer_injectivity polymer2d spe5 wecon_wtest msw_model_1 base_model_1 faults_model_1 base_model2 multregt_model2 udq multxyz_model2 multflt_model2 multpvv_model2 swatinit_model2 endscale_model2 hysteresis_model2 multiply_tranxyz_model2 editnnc_model2 nnc spe1_foam norne_init

Reason: OPM/opm-common#1297

opm-common     = 27d3cba4915304b0efd04888ab8743e307d3cfeb
opm-grid       = 99e1e6fc3558b8fd32a3e3a436986e7dd8eb05fd
opm-material   = e158bc8cb8d228cb85c8ab56427a189e82c75193
opm-models     = 52201845a4212b454add01f42476b60e5f478830
opm-simulators = 27d3cba4915304b0efd04888ab8743e307d3cfeb

* update reference data for wecon_wtest

Reason: OPM/opm-simulators#2207

opm-common     = 206e0b3b25a1e06ba3520a40d46fdde262c361f9
opm-grid       = 99e1e6fc3558b8fd32a3e3a436986e7dd8eb05fd
opm-material   = e158bc8cb8d228cb85c8ab56427a189e82c75193
opm-models     = 52201845a4212b454add01f42476b60e5f478830
opm-simulators = da6799db1acaa75042caa647109f197b5393b0e0

* update reference data for ctaquifer_2d_oilwater fetkovich_2d spe3 msw_2d_h msw_3d_hfa polymer_oilwater polymer_injectivity polymer2d spe5 base_model2 multregt_model2 udq multxyz_model2 multflt_model2 multpvv_model2 swatinit_model2 endscale_model2 hysteresis_model2 multiply_tranxyz_model2 editnnc_model2 nnc

Reason: OPM/opm-common#1288

opm-common     = 89c896210c9b5434c54c7f9b65d9c64a9a7f7532
opm-grid       = 99e1e6fc3558b8fd32a3e3a436986e7dd8eb05fd
opm-material   = e158bc8cb8d228cb85c8ab56427a189e82c75193
opm-models     = 52201845a4212b454add01f42476b60e5f478830
opm-simulators = 89c896210c9b5434c54c7f9b65d9c64a9a7f7532

* update reference data for msw_model_1 faults_model_1

Reason: OPM/opm-simulators#2170

opm-common     = 1534570b3d509087071f9b7e9676108188906c05
opm-grid       = 99e1e6fc3558b8fd32a3e3a436986e7dd8eb05fd
opm-material   = e158bc8cb8d228cb85c8ab56427a189e82c75193
opm-models     = 52201845a4212b454add01f42476b60e5f478830
opm-simulators = cf1c21edccbe4544cab0f57956a6b6159892d66e

* update reference data for udq

Reason: OPM/opm-simulators#2210

opm-common     = 1534570b3d509087071f9b7e9676108188906c05
opm-grid       = d88a109d1da1b11c22eff961e3658dbee4869d21
opm-material   = e158bc8cb8d228cb85c8ab56427a189e82c75193
opm-models     = 52201845a4212b454add01f42476b60e5f478830
opm-simulators = 5af215feca56c37b862c125a2a1763296f22399d

* update reference data for wsegsicd

Reason: OPM/opm-simulators#2178

opm-common     = 1534570b3d509087071f9b7e9676108188906c05
opm-grid       = d88a109d1da1b11c22eff961e3658dbee4869d21
opm-material   = e158bc8cb8d228cb85c8ab56427a189e82c75193
opm-models     = 52201845a4212b454add01f42476b60e5f478830
opm-simulators = a452d3ef445c1d2f8f69696545afbc2e70576099

* update reference data for wsegsicd

Reason: OPM/opm-common#1272

opm-common     = 235f8483f1f6ff4c503996f2494a4813fbb7e7a0
opm-grid       = d88a109d1da1b11c22eff961e3658dbee4869d21
opm-material   = e158bc8cb8d228cb85c8ab56427a189e82c75193
opm-models     = 52201845a4212b454add01f42476b60e5f478830
opm-simulators = 235f8483f1f6ff4c503996f2494a4813fbb7e7a0

* update reference data for wecon_wtest

Reason: OPM/opm-simulators#2225

opm-common     = 964fba4ffb8768657bf801fd037759a6a744dca7
opm-grid       = 88a88cd130b4068474fa9d3f081b8ad94e579115
opm-material   = 12addf4d65499c17f076976754e72c221f44bf62
opm-models     = 52201845a4212b454add01f42476b60e5f478830
opm-simulators = 221d6a60b930774401745698504d8ca509d13747

* Added multiple well modelling test cases

* Added multiple well modelling test cases

* update reference data for spe9group udq norne_init

Reason: OPM/opm-simulators#2228

opm-common     = 61c698b9c2f570aba9f746601c1e0850d1a11603
opm-grid       = 88a88cd130b4068474fa9d3f081b8ad94e579115
opm-material   = a4153ddf6995df8d83f706549a12637740f968a7
opm-models     = 52201845a4212b454add01f42476b60e5f478830
opm-simulators = fce80785d166044de5eb8b055ed6df529baa47fa

* MULT Tests

New set of MULT test cases and documentation. See EIPC OPM Flow MULT Runs Rev-2.pdf file for documtation.

* update reference data for spe12p spe1nowells spe1rockcomp spe12 spe1oilgas spe1thermal spe1 spe1_metric_vfp1 ctaquifer_2d_oilwater fetkovich_2d spe3 spe9 spe9group msw_2d_h msw_3d_hfa polymer_oilwater polymer_injectivity polymer2d spe5 wecon_wtest msw_model_1 base_model_1 faults_model_1 base_model2 multregt_model2 udq multxyz_model2 multflt_model2 multpvv_model2 swatinit_model2 endscale_model2 hysteresis_model2 multiply_tranxyz_model2 editnnc_model2 wsegsicd nnc spe1_foam norne_init

Reason: OPM/opm-common#1195

opm-common     = a640af2a8d245b8a0642ff87b81f8e6a7de2314c
opm-grid       = 88a88cd130b4068474fa9d3f081b8ad94e579115
opm-material   = a4153ddf6995df8d83f706549a12637740f968a7
opm-models     = 52201845a4212b454add01f42476b60e5f478830
opm-simulators = a640af2a8d245b8a0642ff87b81f8e6a7de2314c

* Updated documentation

Updated documentation PDF file to fix minor typos.

* update reference data for udq

Reason: OPM/opm-simulators#2229

opm-common     = 7cfb51dfe6b335f31d126ca9bf195609efdab834
opm-grid       = 260a49ed4466222a8cdb2e9a4600985c80ce9c6f
opm-material   = 781769daf1afd3b6fdb33a7390b5845c36aaf1c5
opm-models     = 52201845a4212b454add01f42476b60e5f478830
opm-simulators = 85c8bb2001c31f529237429634dc3103014c2bb7

* add WEFAC and WELTARG to SPE9_CP_SHORT

* sync restart and base case

* update reference data for spe9

Reason: OPM/opm-simulators#2235

opm-common     = 7cfb51dfe6b335f31d126ca9bf195609efdab834
opm-grid       = 260a49ed4466222a8cdb2e9a4600985c80ce9c6f
opm-material   = 781769daf1afd3b6fdb33a7390b5845c36aaf1c5
opm-models     = 52201845a4212b454add01f42476b60e5f478830
opm-simulators = 64aab4deec5d93e4b52e86bcbe06ec6382646c99

* Remove extra trailing '/' after SKIPREST

* Added additional cases and upated documentation

Added additional test cases for the 3D model, updated documentation and fixed some inconsistencies in the documentation.

* update reference data for spe12p spe9 spe9group polymer_injectivity base_model_1 base_model2 multregt_model2 udq multxyz_model2 multflt_model2 multpvv_model2 swatinit_model2 endscale_model2 hysteresis_model2 multiply_tranxyz_model2 editnnc_model2

Reason: OPM/opm-simulators#2252

opm-common     = a2def0ea5b8f8c2786c2542550f88ffa318e1b2c
opm-grid       = 260a49ed4466222a8cdb2e9a4600985c80ce9c6f
opm-material   = c0896ee8b6aba6179b4c5ff925c242805a476ad2
opm-models     = 52201845a4212b454add01f42476b60e5f478830
opm-simulators = b71e6a514477bf27e5d9629c583036528c4aebb0

* update reference data for spe9group udq

Reason: OPM/opm-simulators#2239

opm-common     = a2def0ea5b8f8c2786c2542550f88ffa318e1b2c
opm-grid       = 260a49ed4466222a8cdb2e9a4600985c80ce9c6f
opm-material   = c0896ee8b6aba6179b4c5ff925c242805a476ad2
opm-models     = 52201845a4212b454add01f42476b60e5f478830
opm-simulators = 528fb8b648d855a0a6854e0245171f39fc183e0d

* Add -- $REPORT_STEP to DATES keywords - to simplify debugging

* Update with DATA files only

Delate case results stored in ZIP files, deleted PDF documtation file. Re-commented DATA files to Equinor standard.

* Renamed files and added numerical aquifer test model

* Renamed files and added numerical aquifer test model

* updated norne prediction cases 2A -> 4E with multi-segment wells and standard wells

* updated with wsegiter and shut for automatic shutin of MS wells

* Add test case for brine module

* reference solution flow

* change from SPE1CASE2_BRINE to SPE1CASE1_BRINE

* update reference data for spe1thermal

Reason: OPM/opm-common#1298
        OPM/opm-material#380
        OPM/opm-simulators#2213

opm-common     = 2e3cbc8221f1324f91519358d2764b23a189f5e6
opm-grid       = 260a49ed4466222a8cdb2e9a4600985c80ce9c6f
opm-material   = 6a5a4be9f8a61880fd2bcd410c0d15a28af3d0e1
opm-models     = 62499896def3880315e80aa915e8399aa54da688
opm-simulators = 2e3cbc8221f1324f91519358d2764b23a189f5e6

* Remove Empty RFT Regression Test Output Files

These were added as a result of a bug in the RFT file-writing code
that ended up creating RFT files even if no RFT output was
requested.

* Modify SCHEDULE section to include DATES corresponding to restart

* Add symbolic link to simulation reference data.

* update case: wecon+max_wgr, strong aquifer support

Co-authored-by: Atgeirr Flø Rasmussen <[email protected]>
Co-authored-by: Joakim Hove <[email protected]>
Co-authored-by: Arne Morten Kvarving <[email protected]>
Co-authored-by: Kai Bao <[email protected]>
Co-authored-by: Alf Birger Rustad <[email protected]>
Co-authored-by: Bård Skaflestad <[email protected]>
Co-authored-by: Roger Nybø <[email protected]>
Co-authored-by: Tor Harald Sandve <[email protected]>

aquifer-fetkovich/2D_FETKOVICHAQUIFER.DATA

@@ -99,6 +99,9 @@ TOPS
 20*2575
 20*2600 /
 
+ACTNUM
+49*1 2*0 29*1 0 18*1 0/
+
 --------------------------------------------------------
 --
 --  	Input of grid parametres
@@ -582,15 +585,14 @@ EQUIL
    2525.   270   2600    0.0  2200.  0.0   1*   0   0/
 
 AQUFETP
-    1   2512.5    290    1.9e8   3.0e-5   5 1 /
+    1   2512.5    290    1.9e8   3.0e-5   50/
+    2   2512.5    1*     1.9e8   3.0e-5   50/
 /
 
 AQUANCON
 -- Aq#     I1 I2  J1   J2  K1 K2 FACE
-  1      1  1  1    1   1  5  J- 1.0 1.0 NO/
---    1      1  33  1    33   1  2  J+  1.0 1.0 NO/
---    1      1  33  1    33   1  2  I-  1.0 1.0 NO/
---    1      1  33  1    33   1  2  I+  1.0 1.0 NO/
+  1     1   2    1   1   1   5  I-    0.8         1*         NO/
+  2     19  20   1   1   1   5  I+    1.         1*         NO/
 /
 
 DEBUG

model2/include/hist_schedule.sch

@@ -44,7 +44,7 @@ WRFTPLT
 /
 
 
-DATES
+DATES  -- 1
  2 'NOV' 2018 /
 /
 
@@ -56,7 +56,7 @@ WCONINJH
    INJ1   GAS   OPEN   116286	1*	0	/
 /
 
-DATES
+DATES  -- 2
  1 'DEC' 2018 /
 /
 
@@ -80,7 +80,7 @@ WRFTPLT
    'PROD2'       'YES'        'NO'        'NO' /
 /
 
-DATES
+DATES  -- 3
  2 'DEC' 2018 /
 /
 
@@ -89,7 +89,7 @@ WCONHIST
 /
 
 
-DATES
+DATES  -- 4
  15 'DEC' 2018 /
 /
 
@@ -103,7 +103,7 @@ WCONINJH
    INJ1   GAS   OPEN   334756	1*	0	/
 /
 
-DATES
+DATES  -- 5
  1 'JAN' 2019 /
 /
 
@@ -116,7 +116,7 @@ WCONINJH
    INJ1   GAS   OPEN   350085	1*	0	/
 /
 
-DATES
+DATES  -- 6
  1 'FEB' 2019 /
 /
 
@@ -142,15 +142,15 @@ WRFTPLT
    'PROD3'       'YES'        'NO'        'NO' /
 /
 
-DATES
+DATES  -- 7
  2 'FEB' 2019 /
 /
 
 WCONHIST
   'PROD3'  'SHUT'      'RESV'      0.000      0.000      0.000  5* /
 /
 
-DATES
+DATES  -- 8
  10 'FEB' 2019 /
 /
 
@@ -165,7 +165,7 @@ WCONINJH
    INJ1   GAS   OPEN   548443	1*	0	/
 /
 
-DATES
+DATES  -- 9
  1 'MAR' 2019 /
 /
 
@@ -179,7 +179,7 @@ WCONINJH
    INJ1   GAS   OPEN   541836	1*	0	/
 /
 
-DATES
+DATES  -- 10
  1 'APR' 2019 /
 /
 
@@ -202,15 +202,15 @@ WRFTPLT
   'INJ2'     'YES'        'NO'        'NO' /
 /
 
-DATES
+DATES  -- 11
  2 'APR' 2019 /
 /
 
 WCONHIST
   'INJ2'  'SHUT'      'RESV'      0.000      0.000      0.000  5* /
 /
 
-DATES
+DATES  -- 12
  12 'APR' 2019 /
 /
 
@@ -226,7 +226,7 @@ WCONINJH
    INJ2   WATER   OPEN     5500	1*	0	/
 /
 
-DATES
+DATES  -- 13
  1 'MAY' 2019 /
 /
 
@@ -241,7 +241,7 @@ WCONINJH
    INJ2   WATER   OPEN     5500	1*	0	/
 /
 
-DATES
+DATES  -- 14
  1 'JUN' 2019 /
 /
 
@@ -256,7 +256,7 @@ WCONINJH
    INJ2   WATER   OPEN     5500	1*	0	/
 /
 
-DATES
+DATES  -- 15
  1 'JLY' 2019 /
 /
 
@@ -271,7 +271,7 @@ WCONINJH
    INJ2   WATER   OPEN     5500	1*	0	/
 /
 
-DATES
+DATES  -- 16
  1 'AUG' 2019 /
 /
 
@@ -286,7 +286,7 @@ WCONINJH
    INJ2   WATER   OPEN     5500	1*	0	/
 /
 
-DATES
+DATES  -- 17
  1 'SEP' 2019 /
 /
 
@@ -312,7 +312,7 @@ WCONINJH
    INJ2   WATER   OPEN     5500	1*	0	/
 /
 
-DATES
+DATES  -- 18
  1 'OCT' 2019 /
 /
 
@@ -327,7 +327,7 @@ WCONINJH
    INJ2   WATER   OPEN     5500	1*	0	/
 /
 
-DATES
+DATES  -- 19
  1 'NOV' 2019 /
 /
 
@@ -342,7 +342,7 @@ WCONINJH
    INJ2   WATER   OPEN     5500	1*	0	/
 /
 
-DATES
+DATES  -- 20
  1 'DEC' 2019 /
 /
 
@@ -357,7 +357,7 @@ WCONINJH
    INJ2   WATER   OPEN     5500	1*	0	/
 /
 
-DATES
+DATES  -- 21
  1 'JAN' 2020 /
 /
 
@@ -372,7 +372,7 @@ WCONINJH
    INJ2   GAS   OPEN   701627	1*	0	/
 /
 
-DATES
+DATES  -- 22
  1 'FEB' 2020 /
 /
 
@@ -387,7 +387,7 @@ WCONINJH
    INJ2   GAS   OPEN   733421	1*	0	/
 /
 
-DATES
+DATES  -- 23
  1 'MAR' 2020 /
 /
 
@@ -402,7 +402,7 @@ WCONINJH
    INJ2   GAS   OPEN   801950	1*	0	/
 /
 
-DATES
+DATES  -- 24
  1 'APR' 2020 /
 /
 
@@ -417,7 +417,7 @@ WCONINJH
    INJ2   GAS   OPEN   932786	1*	0	/
 /
 
-DATES
+DATES  -- 25
  1 'MAY' 2020 /
 /
 
@@ -432,7 +432,7 @@ WCONINJH
    INJ2   GAS   OPEN   900347	1*	0	/
 /
 
-DATES
+DATES  -- 26
  1 'JUN' 2020 /
 /
 
@@ -447,7 +447,7 @@ WCONINJH
    INJ2   GAS   OPEN  1023171	1*	0	/
 /
 
-DATES
+DATES  -- 27
  1 'JLY' 2020 /
 /
 
@@ -462,7 +462,7 @@ WCONINJH
    INJ2   WATER   OPEN     5500	1*	0	/
 /
 
-DATES
+DATES  -- 28
  1 'AUG' 2020 /
 /
 
@@ -477,7 +477,7 @@ WCONINJH
    INJ2   WATER   OPEN     5500	1*	0	/
 /
 
-DATES
+DATES  -- 29
  1 'SEP' 2020 /
 /
 
@@ -492,7 +492,7 @@ WCONINJH
    INJ2   WATER   OPEN     5500	1*	0	/
 /
 
-DATES
+DATES  -- 30
  1 'OCT' 2020 /
 /
 
@@ -507,7 +507,7 @@ WCONINJH
    INJ2   WATER   OPEN     5500	1*	0	/
 /
 
-DATES
+DATES  -- 31
  1 'NOV' 2020 /
 /
 
@@ -522,7 +522,7 @@ WCONINJH
    INJ2   WATER   OPEN     5500	1*	0	/
 /
 
-DATES
+DATES  -- 32
  1 'DEC' 2020 /
 /
 
@@ -537,7 +537,7 @@ WCONINJH
    INJ2   WATER   OPEN     5500	1*	0	/
 /
 
-DATES
+DATES  -- 33
  1 'JAN' 2021 /
 /
 
@@ -552,7 +552,7 @@ WCONINJH
    INJ2   GAS   OPEN  2283203	1*	0	/
 /
 
-DATES
+DATES  -- 34
  1 'FEB' 2021 /
 /
 
@@ -567,7 +567,7 @@ WCONINJH
    INJ2   GAS   OPEN  2197936	1*	0	/
 /
 
-DATES
+DATES  -- 35
  1 'MAR' 2021 /
 /
 
@@ -582,7 +582,7 @@ WCONINJH
    INJ2   GAS   OPEN  2014074	1*	0	/
 /
 
-DATES
+DATES  -- 36
  1 'APR' 2021 /
 /
 
@@ -597,7 +597,7 @@ WCONINJH
    INJ2   GAS   OPEN  2211744	1*	0	/
 /
 
-DATES
+DATES  -- 37
  1 'MAY' 2021 /
 /
 
@@ -612,7 +612,7 @@ WCONINJH
    INJ2   GAS   OPEN  2484165	1*	0	/
 /
 
-DATES
+DATES  -- 38
  1 'JUN' 2021 /
 /
 
@@ -627,6 +627,6 @@ WCONINJH
    INJ2   GAS   OPEN  2716987	1*	0	/
 /
 
-DATES
+DATES  -- 39
  1 'JLY' 2021 /
 /