From 1889e2ab1cb9bc44d4791985d181181a253caf4e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?H=C3=A5vard=20Berland?= Date: Fri, 20 Dec 2024 11:48:08 +0100 Subject: [PATCH] Merge EGG.DATA and EGG_FLOW.DATA Removing QUIESC from EGG.DATA makes it possible to merge these two decks into one, and fixes an otherwise non-functional EGG_FLOW setup. This allows future CI tests on Everest with flow. --- .../everest/egg/eclipse/include/EGG.DATA | 3 - .../everest/egg/eclipse/include/EGG_FLOW.DATA | 487 ------------------ .../realization-0/eclipse/model/EGG_FLOW.DATA | 1 - .../realization-1/eclipse/model/EGG_FLOW.DATA | 1 - .../realization-2/eclipse/model/EGG_FLOW.DATA | 1 - .../everest/egg/everest/model/config_flow.yml | 4 +- 6 files changed, 2 insertions(+), 495 deletions(-) delete mode 100644 test-data/everest/egg/eclipse/include/EGG_FLOW.DATA delete mode 120000 test-data/everest/egg/eclipse/include/realizations/realization-0/eclipse/model/EGG_FLOW.DATA delete mode 120000 test-data/everest/egg/eclipse/include/realizations/realization-1/eclipse/model/EGG_FLOW.DATA delete mode 120000 test-data/everest/egg/eclipse/include/realizations/realization-2/eclipse/model/EGG_FLOW.DATA diff --git a/test-data/everest/egg/eclipse/include/EGG.DATA b/test-data/everest/egg/eclipse/include/EGG.DATA index cb56f279590..25e1cdf8c64 100644 --- a/test-data/everest/egg/eclipse/include/EGG.DATA +++ b/test-data/everest/egg/eclipse/include/EGG.DATA @@ -25,9 +25,6 @@ NUMRES ENDSCALE 'NODIR' 'REVERS' 1 20 / -EQLOPTS - 'QUIESC' / - TABDIMS 2* 24 2* 20 20 1* 1 7* / EQLDIMS diff --git a/test-data/everest/egg/eclipse/include/EGG_FLOW.DATA b/test-data/everest/egg/eclipse/include/EGG_FLOW.DATA deleted file mode 100644 index 6f474bcb5a4..00000000000 --- a/test-data/everest/egg/eclipse/include/EGG_FLOW.DATA +++ /dev/null @@ -1,487 +0,0 @@ --- <+> Start of deck ECL - --- <+> RUNSPEC Section - -RUNSPEC - -TITLE -EGG_WFL - -DIMENS - 60 60 7 / - -METRIC - -OIL -GAS -WATER -DISGAS -VAPOIL - -NUMRES - 1 / - -ENDSCALE - 'NODIR' 'REVERS' 1 20 / - - -TABDIMS - 2* 24 2* 20 20 1* 1 7* / -EQLDIMS - 2* 100 2* / -REGDIMS - 6* / -WELLDIMS - 12 100 4 12 / -VFPPDIMS - 6* / -VFPIDIMS - 3* / -AQUDIMS - 2* 1 3* / - - -START -31 'DEC' 1999 / - --- <-> RUNSPEC Section - --- <+> GRID Section --- Input and output files format -UNIFIN -UNIFOUT - - -GRID - -INIT - -SPECGRID - 60 60 7 1 F / - -INCLUDE - '../include/grid/active.inc' / - -DX - 25200*8 / - - -DY - 25200*8 / - - -DZ - 25200*4 / - -TOPS - 3600*4000 3600*4004 3600*4008 3600*4012 3600*4016 3600*4020 3600*4024/ - -INCLUDE - '../include/grid/PERM.INC' / - -COPY -PERMX PERMY / - -COPY -PERMX PERMZ / - -MULTIPLY -PERMZ 0.1 / - -NTG - 25200*1 / - -PORO - 25200*0.2 / - - -INIT - --- <-> GRID Section - - --- <+> PROPS Section - -EDIT - -PROPS - -EQUALS - SWL 0.05 / Connate water saturation - SWU 1.0 / Maximum water saturation - SGCR 0.05 / Critical gas saturation - SOWCR 0.1 / Residual oil saturation after water-flood - SOGCR 0.05 / Residual oil sat. after gas-flood -/ - -COPY - SWL SWCR / - SWL SGU / -/ - -MULTIPLY - SGU -1 / -/ -ADD - SGU 1 / -/ - -SWFN - 0.000000 0.000000 0.000000 - 0.006819 0.003554 0.000000 - 0.027091 0.013908 0.000000 - 0.060263 0.025952 0.000000 - 0.105430 0.044108 0.000000 - 0.161359 0.068765 0.000000 - 0.226526 0.101539 0.000000 - 0.299152 0.145360 0.000000 - 0.377257 0.193942 0.000000 - 0.458710 0.244954 0.000000 - 0.541290 0.308844 0.000000 - 0.622743 0.394668 0.000000 - 0.700848 0.491067 0.000000 - 0.773474 0.593135 0.000000 - 0.838641 0.699496 0.000000 - 0.894570 0.800074 0.000000 - 0.939737 0.888146 0.000000 - 0.972909 0.949655 0.000000 - 0.993181 0.987216 0.000000 - 1.000000 1.000000 0.000000 -/ -SOF3 - 0.000000 0.000000 0.000000 - 0.006819 0.000686 0.002515 - 0.027091 0.002746 0.013164 - 0.060263 0.006794 0.034361 - 0.105430 0.014497 0.067229 - 0.161359 0.026915 0.112035 - 0.226526 0.045924 0.168322 - 0.299152 0.073425 0.235001 - 0.377257 0.111978 0.310431 - 0.458710 0.166662 0.392506 - 0.541290 0.228933 0.478758 - 0.622743 0.297987 0.566462 - 0.700848 0.383686 0.652753 - 0.773474 0.495582 0.734742 - 0.838641 0.617999 0.809639 - 0.894570 0.732288 0.874857 - 0.939737 0.839305 0.928127 - 0.972909 0.926725 0.967580 - 0.993181 0.980640 0.991823 - 1.000000 1.000000 1.000 -/ -SGFN - 0.0 0.0 0.000 - 0.006819 0.000563 0.000 - 0.027091 0.004459 0.000 - 0.060263 0.014794 0.000 - 0.105430 0.034233 0.000 - 0.161359 0.064817 0.000 - 0.226526 0.107814 0.000 - 0.299152 0.163621 0.000 - 0.377257 0.231716 0.000 - 0.458710 0.310676 0.000 - 0.541290 0.398240 0.000 - 0.622743 0.491432 0.000 - 0.700848 0.586727 0.000 - 0.773474 0.680250 0.000 - 0.838641 0.768005 0.000 - 0.894570 0.846100 0.000 - 0.939737 0.910981 0.000 - 0.972909 0.959640 0.000 - 0.993181 0.989789 0.000 - 1.0 1.000000 0.000 -/ -PVTG - 20.00 0.00002448 0.061895 0.01299 - 0.00001224 0.061810 0.01300 - 0.00000000 0.061725 0.01300 / - 40.00 0.00000628 0.030252 0.01383 - 0.00000314 0.030249 0.01383 - 0.00000000 0.030245 0.01383 / - 60.00 0.00000585 0.019844 0.01450 - 0.00000292 0.019845 0.01450 - 0.00000000 0.019846 0.01449 / - 80.00 0.00000728 0.014686 0.01520 - 0.00000364 0.014689 0.01519 - 0.00000000 0.014692 0.01518 / - 100.00 0.00001017 0.011627 0.01596 - 0.00000509 0.011633 0.01595 - 0.00000000 0.011638 0.01593 / - 120.00 0.00001485 0.009619 0.01682 - 0.00000743 0.009627 0.01679 - 0.00000000 0.009635 0.01676 / - 140.00 0.00002182 0.008213 0.01780 - 0.00001091 0.008224 0.01774 - 0.00000000 0.008235 0.01767 / - 160.00 0.00003155 0.007184 0.01890 - 0.00001577 0.007198 0.01878 - 0.00000000 0.007212 0.01866 / - 197.66 0.00006327 0.005820 0.02160 - 0.00003164 0.005840 0.02122 - 0.00000000 0.005860 0.02086 / - 231.13 0.00010861 0.005042 0.02477 - 0.00005431 0.005061 0.02389 - 0.00000000 0.005082 0.02306 / - 261.31 0.00016781 0.004561 0.02844 - 0.00008391 0.004571 0.02672 - 0.00000000 0.004584 0.02515 / - 288.87 0.00024205 0.004255 0.03272 - 0.00012103 0.004243 0.02976 - 0.00000000 0.004241 0.02711 / - 314.34 0.00033405 0.004062 0.03783 - 0.00016703 0.004017 0.03311 - 0.00000000 0.003990 0.02893 / - 338.20 0.00044866 0.003953 0.04410 - 0.00022433 0.003860 0.03693 - 0.00000000 0.003797 0.03065 / - 360.83 0.00059341 0.003915 0.05210 - 0.00029670 0.003756 0.04150 - 0.00000000 0.003644 0.03227 / - 382.58 0.00077814 0.003947 0.06273 - 0.00038907 0.003698 0.04725 - 0.00000000 0.003518 0.03382 / - 403.60 0.00100943 0.004048 0.07723 - 0.00050471 0.003683 0.05472 - 0.00000000 0.003413 0.03529 / - 423.77 0.00127517 0.004207 0.09631 - 0.00063758 0.003705 0.06418 - 0.00000000 0.003325 0.03664 / -450.00 0.00127517 0.004207 0.09631 - 0.00063758 0.003705 0.06418 - 0.00000000 0.003325 0.03664 / -/ - - - -PVTO - 19.6 20.00 1.12324 0.96519 - 55.00 1.11698 1.03237 - 90.00 1.11127 1.10051 - 125.00 1.10602 1.16942 - 160.00 1.10119 1.23890 - 195.00 1.09672 1.30876 - 230.00 1.09256 1.37884 - 265.00 1.08868 1.44899 - 300.00 1.08504 1.51908 - 335.00 1.08164 1.58903 - 370.00 1.07843 1.65876 / - - 31.5 40.00 1.15981 0.85738 - 75.00 1.15288 0.91402 - 110.00 1.14657 0.97137 - 145.00 1.14079 1.02927 - 180.00 1.13546 1.08759 - 215.00 1.13053 1.14617 - 250.00 1.12595 1.20488 - 285.00 1.12168 1.26360 - 320.00 1.11768 1.32224 - 355.00 1.11394 1.38073 - 390.00 1.11042 1.43898 / - - 42.4 60.00 1.191 0.7868 - 95.00 1.184 0.8364 - 130.00 1.177 0.8866 - 165.00 1.171 0.9371 - 200.00 1.165 0.9880 - 235.00 1.160 1.0390 - 270.00 1.155 1.0902 - 305.00 1.150 1.1413 - 340.00 1.146 1.1922 - 375.00 1.142 1.2431 - 410.00 1.138 1.2936 / - 53.4 80.00 1.222 0.7175 - 115.00 1.214 0.7608 - 150.00 1.206 0.8045 - 185.00 1.200 0.8485 - 220.00 1.194 0.8928 - 255.00 1.188 0.9371 - 290.00 1.183 0.9815 - 325.00 1.178 1.0258 - 360.00 1.173 1.0700 - 395.00 1.169 1.1141 - 430.00 1.165 1.1579 / - 64.6 100.00 1.252 0.6544 - 135.00 1.244 0.6923 - 170.00 1.236 0.7305 - 205.00 1.229 0.7689 - 240.00 1.222 0.8075 - 275.00 1.216 0.8461 - 310.00 1.211 0.8847 - 345.00 1.205 0.9233 - 380.00 1.200 0.9618 - 415.00 1.196 1.0000 - 450.00 1.191 1.0381 / - 76.3 120.00 1.284 0.5978 - 155.00 1.275 0.6312 - 190.00 1.266 0.6648 - 225.00 1.259 0.6985 - 260.00 1.252 0.7323 - 295.00 1.245 0.7661 - 330.00 1.239 0.7999 - 365.00 1.234 0.8337 - 400.00 1.229 0.8673 - 435.00 1.224 0.9007 - 470.00 1.219 0.9340 / - 88.5 140.00 1.316 0.5477 - 175.00 1.307 0.5749 - 210.00 1.298 0.6020 - 245.00 1.290 0.6290 - 280.00 1.282 0.6559 - 315.00 1.276 0.6827 - 350.00 1.269 0.7095 - 385.00 1.263 0.7362 - 420.00 1.258 0.7629 - 455.00 1.253 0.7895 - 490.00 1.248 0.8161 / - 101.3 160.00 1.350 0.5020 - 195.00 1.340 0.5227 - 230.00 1.331 0.5432 - 265.00 1.322 0.5635 - 300.00 1.314 0.5835 - 335.00 1.307 0.6034 - 370.00 1.300 0.6231 - 405.00 1.294 0.6426 - 440.00 1.288 0.6620 - 475.00 1.283 0.6813 / - 114.7 180.00 1.385 0.4636 - 215.00 1.375 0.4820 - 250.00 1.365 0.5003 - 285.00 1.356 0.5183 - 320.00 1.347 0.5362 - 355.00 1.340 0.5538 - 390.00 1.333 0.5712 - 425.00 1.326 0.5885 - 460.00 1.320 0.6055 - 495.00 1.314 0.6222 / - 128.9 200.00 1.422 0.4290 - 235.00 1.411 0.4455 - 270.00 1.401 0.4618 - 305.00 1.391 0.4779 - 340.00 1.382 0.4938 - 375.00 1.374 0.5096 - 410.00 1.367 0.5252 - 445.00 1.360 0.5406 - 480.00 1.353 0.5558 / - 143.8 220.00 1.461 0.3977 - 255.00 1.449 0.4125 - 290.00 1.438 0.4271 - 325.00 1.428 0.4415 - 360.00 1.419 0.4558 - 395.00 1.410 0.4699 - 430.00 1.402 0.4839 - 465.00 1.395 0.4977 / - 159.5 240.00 1.502 0.3692 - 275.00 1.489 0.3825 - 310.00 1.478 0.3956 - 345.00 1.467 0.4086 - 380.00 1.458 0.4214 - 415.00 1.449 0.4341 - 450.00 1.440 0.4466 - 485.00 1.432 0.4590 / - 184.0 268.79 1.565 0.3324 - 303.79 1.551 0.3438 - 338.79 1.539 0.3551 - 373.79 1.528 0.3663 - 408.79 1.517 0.3774 - 443.79 1.508 0.3883 - 478.79 1.499 0.3991 / - 226.3 306.18 1.679 0.2855 - 341.18 1.664 0.2949 - 376.18 1.650 0.3041 - 411.18 1.637 0.3132 - 446.18 1.625 0.3222 - 481.18 1.614 0.3311 / - 268.6 339.93 1.792 0.2517 - 374.93 1.775 0.2597 - 409.93 1.760 0.2675 - 444.93 1.746 0.2751 - 479.93 1.732 0.2827 / - 310.9 371.44 1.903 0.2265 - 406.44 1.885 0.2333 - 441.44 1.868 0.2401 - 476.44 1.853 0.2468 / - 353.3 401.66 2.013 0.2071 - 436.66 1.993 0.2132 - 471.66 1.975 0.2192 / -/ -PVTW - 344.83 1.0292 4.002E-05 0.36000 0.00E+00 / - -ROCK - 383.0 4.12E-05 / - - -DENSITY - 842.3 1001.1 0.900 / - - --- <-> PROPS Section - --- <+> REGIONS Section - -REGIONS - --- <-> REGIONS Section - --- <+> SOLUTION Section - -SOLUTION - -EQUIL - 4000 400.0 5000.0 0.0 500 0.0 1 1 / - -RVVD - 2000 0.0 - 4000 0.0 / - -RSVD - 1500 184.0 - 4000 184.0 / - ---RPTSOL --- RESTART=2 FIP=3/ - ---RPTSOL --- RESTART=2 / - --- <-> SOLUTION Section - --- <+> SUMMARY Section - --- --- ************************************************************************************** --- In this section simulation output data to be written to summary file are defined --- ************************************************************************************** - -SUMMARY - --- *************************************************** - - --- --------------------------------------------------- --- Summary data to be written to summary file --- --- Outputs the date to the summary file -DATE - -INCLUDE -'../include/summary/example_summary.txt' / - - ---ALL - -RPTONLY - --- <-> SUMMARY Section - --- <+> SCHEDULE Section - -SCHEDULE - -INCLUDE - '../include/schedule/events.sch' / - -INCLUDE - '../include/schedule/schedule.sch' / --- END OF DECK diff --git a/test-data/everest/egg/eclipse/include/realizations/realization-0/eclipse/model/EGG_FLOW.DATA b/test-data/everest/egg/eclipse/include/realizations/realization-0/eclipse/model/EGG_FLOW.DATA deleted file mode 120000 index 931f4143326..00000000000 --- a/test-data/everest/egg/eclipse/include/realizations/realization-0/eclipse/model/EGG_FLOW.DATA +++ /dev/null @@ -1 +0,0 @@ -../../../../EGG_FLOW.DATA \ No newline at end of file diff --git a/test-data/everest/egg/eclipse/include/realizations/realization-1/eclipse/model/EGG_FLOW.DATA b/test-data/everest/egg/eclipse/include/realizations/realization-1/eclipse/model/EGG_FLOW.DATA deleted file mode 120000 index 931f4143326..00000000000 --- a/test-data/everest/egg/eclipse/include/realizations/realization-1/eclipse/model/EGG_FLOW.DATA +++ /dev/null @@ -1 +0,0 @@ -../../../../EGG_FLOW.DATA \ No newline at end of file diff --git a/test-data/everest/egg/eclipse/include/realizations/realization-2/eclipse/model/EGG_FLOW.DATA b/test-data/everest/egg/eclipse/include/realizations/realization-2/eclipse/model/EGG_FLOW.DATA deleted file mode 120000 index 931f4143326..00000000000 --- a/test-data/everest/egg/eclipse/include/realizations/realization-2/eclipse/model/EGG_FLOW.DATA +++ /dev/null @@ -1 +0,0 @@ -../../../../EGG_FLOW.DATA \ No newline at end of file diff --git a/test-data/everest/egg/everest/model/config_flow.yml b/test-data/everest/egg/everest/model/config_flow.yml index 84df09e0cd8..be1a3e27419 100644 --- a/test-data/everest/egg/everest/model/config_flow.yml +++ b/test-data/everest/egg/everest/model/config_flow.yml @@ -1,5 +1,5 @@ definitions: - eclbase: eclipse/model/EGG_FLOW + eclbase: eclipse/model/EGG wells: - { name: PROD1 } @@ -87,7 +87,7 @@ optimization: model: realizations: [0, 1, 2] - data_file: ../../eclipse/include/realizations/realization-r{{realization}}/eclipse/model/EGG_FLOW.DATA + data_file: ../../eclipse/include/realizations/realization-r{{realization}}/eclipse/model/EGG.DATA environment: simulation_folder: egg_simulations