diff --git a/.github/workflows/flownet.yml b/.github/workflows/flownet.yml index 2a096fca0..bfe8b2379 100644 --- a/.github/workflows/flownet.yml +++ b/.github/workflows/flownet.yml @@ -20,6 +20,8 @@ jobs: strategy: matrix: python-version: ['3.6', '3.7'] + flownet-model: ['norne'] + env: VENV_PATH: ${{ github.workspace }}/flownet_venv PYTHONPATH: ${{ github.workspace }}/flownet_venv/lib/python${{ matrix.python-version }}/dist-packages @@ -46,8 +48,20 @@ jobs: if: steps.cache-venv.outputs.cache-hit != 'true' run: bash ./build_environment.sh $VENV_PATH /usr/bin/flow - - name: 🏗️ Extract Norne Dataset - run: tar -zxvf tests/data/norne.tar.gz -C tests/data/ + - name: 🍿 Download FlowNet test data + env: + INPUT_MODEL_FOLDER: ./flownet-testdata/${{ matrix.flownet-model }}/input_model + # If you want the CI to (temporarily) run against your fork of the testdada, + # change the value her from "equinor" to your username. + TESTDATA_REPO_OWNER: anders-kiaer + # If you want the CI to (temporarily) run against another branch than master, + # change the value her from "master" to the relevant branch name. + TESTDATA_REPO_BRANCH: adjust_for_ci + run: | + git clone --depth 1 --branch $TESTDATA_REPO_BRANCH https://github.com/$TESTDATA_REPO_OWNER/flownet-testdata.git + if [ -f "$INPUT_MODEL_FOLDER/${{ matrix.flownet-model }}.tar.gz" ]; then + tar -zxvf $INPUT_MODEL_FOLDER/${{ matrix.flownet-model }}.tar.gz -C $INPUT_MODEL_FOLDER + fi - name: 📦 Install FlowNet run: | @@ -75,15 +89,13 @@ jobs: run: | source $VENV_PATH/bin/activate webviz certificate --force - pytest --cov=flownet --cov-fail-under=50 ./tests + pytest --cov=flownet --cov-fail-under=29 ./tests - name: 🚀 Run full FlowNet example run: | source $VENV_PATH/bin/activate - pushd examples - flownet ahm ../tests/configs/norne_parameters.yml ./some_ahm_run - flownet pred ../tests/configs/norne_pred.yml ./some_pred_run ./some_ahm_run - popd + flownet ahm ./flownet-testdata/${{ matrix.flownet-model }}/ci_config/assisted_history_matching.yml ./some_ahm_run + flownet pred ./flownet-testdata/${{ matrix.flownet-model }}/ci_config/prediction.yml ./some_pred_run ./some_ahm_run - name: 📚 Build documentation run: | diff --git a/examples/brugge_parameters.yml b/examples/brugge_parameters.yml deleted file mode 100644 index e69de29bb..000000000 diff --git a/examples/norne_parameters.yml b/examples/norne_parameters.yml deleted file mode 100644 index 3a6913966..000000000 --- a/examples/norne_parameters.yml +++ /dev/null @@ -1,122 +0,0 @@ -name: Norne - -flownet: - data_source: - input_case: ../tests/data/norne/NORNE_ATW2013 - phases: - - oil - - gas - - vapoil - - disgas - - water - pvt: - rsvd: ./norne_static/rsvd.csv - cell_length: 100 - additional_flow_nodes: 100 - additional_node_candidates: 1000 - hull_factor: 1.2 - random_seed: 123456 - perforation_handling_strategy: bottom_point - fast_pyscal: True - training_set_end_date: 2005-01-31 #YYYY-MM-DD. If defined training set fraction is calculated from this date - fault_tolerance: 0.1 - -ert: - static_include_files: ./norne_static - realizations: - num_realizations: 10 - required_success_percent: 70 - max_runtime: 600 # Maximum runtime of on single realization in seconds - queue: - system: LOCAL # LOCAL or LSF - name: mr # ignored when system is LOCAL - max_running: 10 # Maximum number of simultaneous runs - ensemble_weights: - - 4 - - 3 - - 2 - - 1 - - 1 - - 1 - -model_parameters: - permeability: - min: 0.1 - max: 5000 - porosity: - min: 0.01 - max: 0.4 - bulkvolume_mult: - mean: 1 - max: 2 - fault_mult: - min: 1.0e-3 - max: 1 - loguniform: True - relative_permeability: - scheme: global - swirr: - min: 0.01 - max: 0.04 - swl: - min: 0.05 - max: 0.09 - swcr: - min: 0.30 - max: 0.35 - sorw: - min: 0.2 - max: 0.3 - sorg: - min: 0.4 - max: 0.5 - sgcr: - min: 0.03 - max: 0.08 - krwend: - min: 0.5 - max: 0.7 - krowend: - min: 0.3 - max: 0.5 - krgend: - min: 0.9 - max: 1.0 - krogend: - min: 0.9 - max: 1.0 - nw: - min: 0.5 - max: 2.5 - now: - min: 0.5 - max: 1.0 - ng: - min: 1.0 - max: 1.5 - nog: - min: 1.5 - max: 2.0 - equil: - scheme: individual - datum_pressure: - min: 250 - max: 275 - owc_depth: - min: 2675 - max: 2725 - goc_depth: - min: 2575 - max: 2600 - rock_compressibility: - reference_pressure: 277 - min: 4.8e-5 - max: 5.2e-5 - aquifer: - scheme: individual - fraction: 0.25 - delta_depth: 1000 - size_in_bulkvolumes: - min: 1.0e-6 - max: 2 - loguniform: True diff --git a/examples/norne_pred.yml b/examples/norne_pred.yml deleted file mode 100644 index 78b32a5ea..000000000 --- a/examples/norne_pred.yml +++ /dev/null @@ -1,15 +0,0 @@ -name: Norne - -ert: - pred_schedule_file: ./trivial_prediction_schedule.sch - static_include_files: ./norne_static - realizations: - num_realizations: 10 - required_success_percent: 20 - max_runtime: 300 # Maximum runtime of on single realization in seconds - simulator: - name: Flow - queue: - system: LOCAL # LOCAL or LSF - name: mr # ignored when system is LOCAL - max_running: 10 # Maximum number of simultaneous runs diff --git a/examples/norne_static/PROPS.inc b/examples/norne_static/PROPS.inc deleted file mode 100644 index 9bb6ea13d..000000000 --- a/examples/norne_static/PROPS.inc +++ /dev/null @@ -1,442 +0,0 @@ --- This reservoir simulation deck is made available under the Open Database --- License: http://opendatacommons.org/licenses/odbl/1.0/. Any rights in --- individual contents of the database are licensed under the Database Contents --- License: http://opendatacommons.org/licenses/dbcl/1.0/ - --- Copyright (C) 2015 Statoil - -PVTG - --- PRESSURE RSG B-GAS VISCOSITY --- BAR (CP) - - 50.00 0.00000497 0.024958 0.01441 - 0.00000248 0.024958 0.01440 - 0.00000000 0.024958 0.01440 / - - 70.00 0.00000521 0.017639 0.01491 - 0.00000261 0.017641 0.01490 - 0.00000000 0.017643 0.01490 / - - 90.00 0.00000627 0.013608 0.01547 - 0.00000313 0.013611 0.01546 - 0.00000000 0.013615 0.01544 / - - 110.00 0.00000798 0.011072 0.01609 - 0.00000399 0.011076 0.01607 - 0.00000000 0.011081 0.01605 / - - 130.00 0.00001041 0.009340 0.01677 - 0.00000520 0.009346 0.01674 - 0.00000000 0.009352 0.01671 / - - 150.00 0.00001365 0.008092 0.01752 - 0.00000683 0.008099 0.01748 - 0.00000000 0.008106 0.01743 / - - 170.00 0.00001786 0.007156 0.01834 - 0.00000893 0.007164 0.01827 - 0.00000000 0.007172 0.01819 / - - 190.00 0.00002316 0.006433 0.01923 - 0.00001158 0.006442 0.01912 - 0.00000000 0.006451 0.01900 / - - 210.00 0.00002972 0.005861 0.02019 - 0.00001486 0.005871 0.02001 - 0.00000000 0.005881 0.01984 / - - 230.00 0.00003767 0.005402 0.02121 - 0.00001883 0.005412 0.02095 - 0.00000000 0.005422 0.02071 / - - 250.80 0.00004756 0.005013 0.02234 - 0.00002378 0.005022 0.02197 - 0.00000000 0.005032 0.02162 / - - 268.42 0.00005757 0.004737 0.02335 - 0.00002878 0.004746 0.02287 - 0.00000000 0.004754 0.02240 / - - 285.33 0.00006853 0.004511 0.02438 - 0.00003427 0.004518 0.02375 - 0.00000000 0.004525 0.02315 / - - 301.59 0.00008041 0.004323 0.02542 - 0.00004020 0.004327 0.02463 - 0.00000000 0.004332 0.02387 / - - 317.23 0.00009313 0.004165 0.02648 - 0.00004657 0.004166 0.02549 - 0.00000000 0.004169 0.02456 / - - 332.29 0.00010668 0.004031 0.02755 - 0.00005334 0.004029 0.02634 - 0.00000000 0.004028 0.02522 / - - 346.80 0.00012100 0.003917 0.02863 - 0.00006050 0.003911 0.02719 - 0.00000000 0.003906 0.02585 / - - 360.80 0.00013607 0.003819 0.02974 - 0.00006803 0.003808 0.02803 - 0.00000000 0.003799 0.02645 / - - 374.31 0.00015188 0.003735 0.03087 - 0.00007594 0.003718 0.02887 - 0.00000000 0.003705 0.02703 / - - 387.36 0.00016843 0.003662 0.03202 - 0.00008421 0.003639 0.02970 - 0.00000000 0.003621 0.02758 / - - 399.99 0.00018571 0.003598 0.03320 - 0.00009286 0.003570 0.03053 - 0.00000000 0.003545 0.02810 / - - 412.21 0.00020375 0.003543 0.03442 - 0.00010188 0.003508 0.03137 - 0.00000000 0.003477 0.02861 / - - 424.05 0.00022256 0.003496 0.03566 - 0.00011128 0.003453 0.03220 - 0.00000000 0.003416 0.02909 / - - 435.53 0.00024218 0.003454 0.03695 - 0.00012109 0.003404 0.03305 - 0.00000000 0.003360 0.02956 / - - 446.68 0.00026266 0.003419 0.03828 - 0.00013133 0.003360 0.03390 - 0.00000000 0.003309 0.03000 / - - 457.51 0.00028404 0.003388 0.03967 - 0.00014202 0.003320 0.03477 - 0.00000000 0.003262 0.03043 / - - 468.04 0.00030639 0.003362 0.04110 - 0.00015319 0.003285 0.03566 - 0.00000000 0.003218 0.03085 / - - 478.30 0.00032980 0.003341 0.04261 - 0.00016490 0.003253 0.03656 - 0.00000000 0.003178 0.03125 / - - 488.30 0.00035436 0.003323 0.04418 - 0.00017718 0.003225 0.03749 - 0.00000000 0.003140 0.03164 / - - 498.06 0.00038020 0.003310 0.04583 - 0.00019010 0.003200 0.03845 - 0.00000000 0.003105 0.03202 / - - 507.59 0.00040745 0.003300 0.04758 - 0.00020373 0.003178 0.03944 - 0.00000000 0.003073 0.03238 / - - 516.92 0.00043630 0.003293 0.04943 - 0.00021815 0.003158 0.04048 - 0.00000000 0.003042 0.03273 / - - 526.06 0.00046694 0.003290 0.05141 - 0.00023347 0.003141 0.04156 - 0.00000000 0.003013 0.03308 / - - 535.02 0.00049963 0.003291 0.05353 - 0.00024981 0.003126 0.04271 - 0.00000000 0.002986 0.03342 / - - 543.83 0.00053469 0.003295 0.05582 - 0.00026734 0.003114 0.04393 - 0.00000000 0.002960 0.03374 / - - 552.49 0.00057251 0.003303 0.05830 - 0.00028625 0.003105 0.04523 - 0.00000000 0.002935 0.03407 / - - 561.04 0.00061359 0.003315 0.06103 - 0.00030679 0.003098 0.04664 - 0.00000000 0.002912 0.03438 / - - 569.48 0.00065855 0.003332 0.06405 - 0.00032928 0.003093 0.04818 - 0.00000000 0.002890 0.03469 / - - 577.82 0.00070820 0.003354 0.06744 - 0.00035410 0.003092 0.04988 - 0.00000000 0.002868 0.03500 / - - 586.09 0.00076355 0.003382 0.07127 - 0.00038178 0.003094 0.05178 - 0.00000000 0.002847 0.03530 / - - 594.29 0.00082592 0.003418 0.07567 - 0.00041296 0.003099 0.05394 - 0.00000000 0.002828 0.03560 / -/ - -PVTO - --- RSO PRESSURE B-OIL VISCOSITY --- (BAR) (CP) - - 20.59 50.00 1.10615 1.180 - 75.00 1.10164 1.247 - 100.00 1.09744 1.315 - 125.00 1.09351 1.384 - 150.00 1.08984 1.453 / - - 28.19 70.00 1.12522 1.066 - 95.00 1.12047 1.124 - 120.00 1.11604 1.182 - 145.00 1.11191 1.241 - 170.00 1.10804 1.300 / - - 36.01 90.00 1.14458 0.964 - 115.00 1.13959 1.014 - 140.00 1.13494 1.064 - 165.00 1.13060 1.115 - 190.00 1.12653 1.166 / - - 44.09 110.00 1.16437 0.880 - 135.00 1.15915 0.924 - 160.00 1.15428 0.968 - 185.00 1.14973 1.012 - 210.00 1.14547 1.056 / - - 52.46 130.00 1.18467 0.805 - 155.00 1.17921 0.843 - 180.00 1.17413 0.882 - 205.00 1.16937 0.920 - 230.00 1.16491 0.959 / - - 61.13 150.00 1.20555 0.746 - 175.00 1.19985 0.780 - 200.00 1.19454 0.814 - 225.00 1.18958 0.849 - 250.00 1.18492 0.883 / - - 70.14 170.00 1.22704 0.698 - 195.00 1.22111 0.729 - 220.00 1.21558 0.759 - 245.00 1.21040 0.790 - 270.00 1.20555 0.821 / - - 79.50 190.00 1.24922 0.658 - 215.00 1.24305 0.686 - 240.00 1.23729 0.714 - 265.00 1.23190 0.742 - 290.00 1.22685 0.770 / - - 89.24 210.00 1.27214 0.637 - 235.00 1.26573 0.664 - 260.00 1.25974 0.693 - 285.00 1.25414 0.725 - 310.00 1.24888 0.760 / - - 99.39 230.00 1.29586 0.622 - 255.00 1.28921 0.641 - 280.00 1.28300 0.661 - 305.00 1.27718 0.680 - 330.00 1.27171 0.699 / - - 110.41 250.80 1.32148 0.610 - 275.80 1.31457 0.628 - 300.80 1.30812 0.647 - 325.80 1.30207 0.665 - 350.80 1.29638 0.682 / - - 120.32 268.42 1.34449 0.576 - 293.42 1.33735 0.593 - 318.42 1.33068 0.609 - 343.42 1.32442 0.626 - 368.42 1.31853 0.642 / - - 130.23 285.33 1.36737 0.5335 - 310.33 1.36001 0.5487 - 335.33 1.35313 0.5638 - 360.33 1.34667 0.5787 - 385.33 1.34059 0.5934 / - - 140.12 301.59 1.39015 0.4956 - 326.59 1.38257 0.5094 - 351.59 1.37548 0.5230 - 376.59 1.36882 0.5365 - 401.59 1.36255 0.5498 / - - 150.01 317.23 1.41282 0.4614 - 342.23 1.40503 0.4739 - 367.23 1.39773 0.4863 - 392.23 1.39088 0.4986 - 417.23 1.38443 0.5107 / - - 159.89 332.29 1.43539 0.43042 - 357.29 1.42739 0.44183 - 382.29 1.41990 0.45312 - 407.29 1.41286 0.46430 - 432.29 1.40622 0.47537 / - - 169.76 346.80 1.45788 0.41191 - 371.80 1.44967 0.42260 - 396.80 1.44198 0.43318 - 421.80 1.43475 0.44365 - 446.80 1.42794 0.45402 / - - 179.63 360.80 1.48028 0.39503 - 385.80 1.47187 0.40508 - 410.80 1.46398 0.41502 - 435.80 1.45657 0.42487 - 460.80 1.44958 0.43461 / - - 189.48 374.31 1.50260 0.37959 - 399.31 1.49399 0.38907 - 424.31 1.48591 0.39845 - 449.31 1.47832 0.40773 - 474.31 1.47116 0.41692 / - - 199.34 387.36 1.52484 0.36543 - 412.36 1.51603 0.37439 - 437.36 1.50777 0.38326 - 462.36 1.50000 0.39203 - 487.36 1.49267 0.40072 / - - 209.18 399.99 1.54700 0.35239 - 424.99 1.53800 0.36089 - 449.99 1.52956 0.36929 - 474.99 1.52161 0.37762 - 499.99 1.51411 0.38585 / - - 219.02 412.21 1.56910 0.34035 - 437.21 1.55991 0.34843 - 462.21 1.55128 0.35642 - 487.21 1.54316 0.36433 - 512.21 1.53549 0.37216 / - - 228.85 424.05 1.59112 0.32921 - 449.05 1.58174 0.33691 - 474.05 1.57294 0.34453 - 499.05 1.56464 0.35206 - 524.05 1.55681 0.35952 / - - 238.67 435.53 1.61307 0.31888 - 460.53 1.60351 0.32623 - 485.53 1.59453 0.33350 - 510.53 1.58606 0.34070 - 535.53 1.57807 0.34782 / - - 248.48 446.68 1.63496 0.30927 - 471.68 1.62522 0.31630 - 496.68 1.61606 0.32326 - 521.68 1.60743 0.33014 - 546.68 1.59927 0.33695 / - - 258.29 457.51 1.65678 0.30032 - 482.51 1.64686 0.30706 - 507.51 1.63753 0.31373 - 532.51 1.62873 0.32032 - 557.51 1.62042 0.32685 / - - 268.09 468.04 1.67853 0.29196 - 493.04 1.66843 0.29843 - 518.04 1.65893 0.30483 - 543.04 1.64997 0.31117 - 568.04 1.64150 0.31743 / - - 277.89 478.30 1.70022 0.28414 - 503.30 1.68994 0.29037 - 528.30 1.68028 0.29652 - 553.30 1.67116 0.30261 - 578.30 1.66253 0.30864 / - - 287.68 488.30 1.72184 0.27681 - 513.30 1.71139 0.28281 - 538.30 1.70156 0.28874 - 563.30 1.69228 0.29460 - 588.30 1.68350 0.30040 / - - 297.46 498.06 1.74339 0.26994 - 523.06 1.73277 0.27572 - 548.06 1.72278 0.28144 - 573.06 1.71334 0.28709 - 598.06 1.70442 0.29269 / - - 307.23 507.59 1.76487 0.26347 - 532.59 1.75409 0.26906 - 557.59 1.74393 0.27458 - 582.59 1.73434 0.28004 - 607.59 1.72527 0.28544 / - - 317.00 516.92 1.78628 0.25738 - 541.92 1.77533 0.26279 - 566.92 1.76502 0.26812 - 591.92 1.75528 0.27340 - 616.92 1.74606 0.27863 / - - 326.76 526.06 1.80761 0.25165 - 551.06 1.79651 0.25688 - 576.06 1.78604 0.26204 - 601.06 1.77615 0.26716 - 626.06 1.76679 0.27221 / - - 336.51 535.02 1.82887 0.24623 - 560.02 1.81761 0.25130 - 585.02 1.80699 0.25631 - 610.02 1.79696 0.26126 - 635.02 1.78746 0.26616 / - - 346.26 543.83 1.85005 0.24112 - 568.83 1.83864 0.24603 - 593.83 1.82787 0.25089 - 618.83 1.81770 0.25570 - 643.83 1.80806 0.26045 / - - 356.00 552.49 1.87115 0.23628 - 577.49 1.85959 0.24105 - 602.49 1.84868 0.24577 - 627.49 1.83836 0.25043 - 652.49 1.82858 0.25505 / - - 365.73 561.04 1.89217 0.23170 - 586.04 1.88046 0.23634 - 611.04 1.86940 0.24092 - 636.04 1.85895 0.24546 - 661.04 1.84904 0.24994 / - - 375.46 569.48 1.91309 0.22736 - 594.48 1.90124 0.23187 - 619.48 1.89004 0.23633 - 644.48 1.87946 0.24074 - 669.48 1.86942 0.24510 / - - 385.18 577.82 1.93391 0.22325 - 602.82 1.92192 0.22764 - 627.82 1.91060 0.23198 - 652.82 1.89988 0.23627 - 677.82 1.88971 0.24052 / - - 394.89 586.09 1.95464 0.21934 - 611.09 1.94252 0.22362 - 636.09 1.93106 0.22785 - 661.09 1.92021 0.23204 - 686.09 1.90993 0.23617 / - - 404.60 594.29 1.97527 0.21564 - 619.29 1.96301 0.21981 - 644.29 1.95143 0.22393 - 669.29 1.94046 0.22801 - 694.29 1.93005 0.23204 / -/ - --- ================================================================== --- PVT PROPERTIES OF WATER --- --- REF.PRES. REF.FVF. COMPR. REF.VISC. VISCOSIBILITY --- ========================================================== -PVTW - 277.0 1.038 4.67E-5 0.318 0.0 / - ---------------------------------------------------------------------- --- SURFACE DENSITIE OF RESERVOIR FLUIDS --- OIL WATER GAS -DENSITY - 859.5 1033.0 0.854 / diff --git a/examples/norne_static/SOLUTION.inc b/examples/norne_static/SOLUTION.inc deleted file mode 100644 index e69de29bb..000000000 diff --git a/examples/norne_static/rsvd.csv b/examples/norne_static/rsvd.csv deleted file mode 100644 index 084591ee1..000000000 --- a/examples/norne_static/rsvd.csv +++ /dev/null @@ -1,4 +0,0 @@ -2582.0,120.25 -2597.0,110.00 -2660.7,106.77 -2697.9,106.77 diff --git a/src/flownet/config_parser/_config_parser.py b/src/flownet/config_parser/_config_parser.py index d4862ad52..b64886c6c 100644 --- a/src/flownet/config_parser/_config_parser.py +++ b/src/flownet/config_parser/_config_parser.py @@ -611,12 +611,11 @@ def _to_abs_path(path: Optional[str]) -> str: ) for suffix in [".DATA", ".EGRID", ".UNRST", ".UNSMRY", ".SMSPEC"]: - if ( - not pathlib.Path(config.flownet.data_source.input_case) - .with_suffix(suffix) - .is_file() - ): - raise ValueError(f"The input case {suffix} file does not exist") + input_file = pathlib.Path(config.flownet.data_source.input_case).with_suffix( + suffix + ) + if not input_file.is_file(): + raise ValueError(f"The file {input_file} does not exist") if config.flownet.training_set_end_date and config.flownet.training_set_fraction: raise ValueError( diff --git a/tests/configs/norne_parameters.yml b/tests/configs/norne_parameters.yml deleted file mode 100644 index 7f3da06b9..000000000 --- a/tests/configs/norne_parameters.yml +++ /dev/null @@ -1,114 +0,0 @@ -name: Norne - -flownet: - data_source: - input_case: ../data/norne/NORNE_ATW2013 - phases: - - oil - - gas - - vapoil - - disgas - - water - cell_length: 100 - additional_flow_nodes: 100 - additional_node_candidates: 1000 - hull_factor: 1.2 - random_seed: 999 - perforation_handling_strategy: bottom_point - fast_pyscal: True - training_set_end_date: 2005-01-31 #YYYY-MM-DD. If defined training set fraction is calculated from this date - fault_tolerance: 0.1 - -ert: - static_include_files: ../../examples/norne_static - realizations: - num_realizations: 2 - required_success_percent: 40 - max_runtime: 600 - queue: - system: LOCAL - name: mr - max_running: 2 - ensemble_weights: - - 1 - -model_parameters: - permeability: - min: 0.1 - max: 5000 - porosity: - min: 0.05 - max: 0.3 - bulkvolume_mult: - mean: 0.17 - max: 0.68 - fault_mult: - min: 0.9 - max: 1.1 - relative_permeability: - scheme: global - swirr: - min: 0.01 - max: 0.04 - swl: - min: 0.05 - max: 0.09 - swcr: - min: 0.30 - max: 0.35 - sorw: - min: 0.2 - max: 0.3 - sorg: - min: 0.4 - max: 0.5 - sgcr: - min: 0.03 - max: 0.08 - krwend: - min: 0.5 - max: 0.7 - krowend: - min: 0.3 - max: 0.5 - krgend: - min: 0.9 - max: 1.0 - krogend: - min: 0.9 - max: 1.0 - nw: - min: 0.5 - max: 2.5 - now: - min: 0.5 - max: 1.0 - ng: - min: 1.0 - max: 1.5 - nog: - min: 1.5 - max: 2.0 - equil: - datum_depth: 2575 - datum_pressure: - min: 250 - max: 275 - owc_depth: - min: 2675 - max: 2725 - goc_depth: - min: 2575 - max: 2600 - rock_compressibility: - reference_pressure: 277 - min: 4.8e-5 - max: 5.2e-5 - aquifer: - scheme: individual - fraction: 0.25 - delta_depth: 1000 - size_in_bulkvolumes: - min: 1 - max: 2 - loguniform: True diff --git a/tests/configs/norne_pred.yml b/tests/configs/norne_pred.yml deleted file mode 100644 index 6ad9511dd..000000000 --- a/tests/configs/norne_pred.yml +++ /dev/null @@ -1,15 +0,0 @@ -name: Norne - -ert: - static_include_files: ../../examples/norne_static - pred_schedule_file: ../../examples/trivial_prediction_schedule.sch - realizations: - num_realizations: 2 - required_success_percent: 20 - max_runtime: 300 # Maximum runtime of on single realization in seconds - simulator: - name: Flow - queue: - system: LOCAL # LOCAL or LSF - name: mr # ignored when system is LOCAL - max_running: 10 # Maximum number of simultaneous runs diff --git a/tests/data/norne.tar.gz b/tests/data/norne.tar.gz deleted file mode 100644 index 4bb2cc4c2..000000000 Binary files a/tests/data/norne.tar.gz and /dev/null differ diff --git a/tests/test_config_parser.py b/tests/test_config_parser.py index 491c05218..a3dcfc8ef 100644 --- a/tests/test_config_parser.py +++ b/tests/test_config_parser.py @@ -8,10 +8,6 @@ CONFIG_FOLDER = pathlib.Path(__file__).resolve().parent / "configs" -def test_ci_config() -> None: - parse_config(CONFIG_FOLDER / "norne_parameters.yml") - - def test_invalid_configuration() -> None: with pytest.raises(ValueError): parse_config(CONFIG_FOLDER / "missing_arguments.yml") diff --git a/tests/test_flow_import.py b/tests/test_flow_import.py deleted file mode 100644 index 8fbcecb52..000000000 --- a/tests/test_flow_import.py +++ /dev/null @@ -1,60 +0,0 @@ -import pathlib - -import pandas as pd - -from flownet import data -from flownet.network_model import create_connections, NetworkModel -from flownet.realization import SimulationRealization, Schedule -from flownet.utils import write_grdecl_file -from flownet.config_parser import parse_config - - -CONFIG_FOLDER = pathlib.Path(__file__).resolve().parent / "configs" - - -def test_flow_import(tmp_path: pathlib.Path) -> None: - - config = parse_config(CONFIG_FOLDER / "norne_parameters.yml") - model_cross_section_area = 40 # m^2 - - # Load production and well coordinate data - field_data = data.FlowData( - config.flownet.data_source.input_case, - perforation_handling_strategy="bottom_point", - ) - df_production_data: pd.DataFrame = field_data.production - df_coordinates: pd.DataFrame = field_data.coordinates - - # Generate connections based on well coordinates - df_connections: pd.DataFrame = create_connections(df_coordinates, config) - - # Create FlowNet model - network = NetworkModel( - df_connections, - cell_length=config.flownet.cell_length, - area=model_cross_section_area, - ) - - schedule = Schedule(network, df_production_data, config.name) - - # Add dynamic variables - one row per active cell - df_dynamic_properties = pd.DataFrame(index=network.grid.index) - df_dynamic_properties["PORO"] = 0.2 - df_dynamic_properties["PERMX"] = 1000 - df_dynamic_properties["PERMY"] = 1000 - df_dynamic_properties["PERMZ"] = 1000 - - includes = { - "GRID": write_grdecl_file( # type: ignore[operator] - df_dynamic_properties, "PERMX" - ) - + write_grdecl_file(df_dynamic_properties, "PERMY") # type: ignore[operator] - + write_grdecl_file(df_dynamic_properties, "PERMZ") # type: ignore[operator] - + write_grdecl_file(df_dynamic_properties, "PORO") # type: ignore[operator] - } - - # Setup the simulation model - realization = SimulationRealization(network, schedule, includes) - - # Build the model - realization.create_model(tmp_path)