From 849d3b2e6d8c252cec3e7496f6c51743b3a819dd Mon Sep 17 00:00:00 2001 From: Bernd Flemisch <bernd@iws.uni-stuttgart.de> Date: Tue, 9 Oct 2012 09:41:22 +0000 Subject: [PATCH] MPFA-L: also test adaptive variant to increase code coverage git-svn-id: svn://svn.iws.uni-stuttgart.de/DUMUX/dumux/trunk@9256 2fb0f335-1f38-0410-981e-8018bf24f1b0 --- CMakeLists.txt | 2 + .../2p/test_mpfal2padaptive-reference.vtu | 183 ++++++++++++++++++ 2 files changed, 185 insertions(+) create mode 100644 test/decoupled/2p/test_mpfal2padaptive-reference.vtu diff --git a/CMakeLists.txt b/CMakeLists.txt index 70695f4d94..2c73b7b049 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -411,6 +411,7 @@ file(COPY test/decoupled/2p/test_impes-reference.vtu DESTINATION references) file(COPY test/decoupled/2p/test_impes.input DESTINATION test/decoupled/2p) file(COPY test/decoupled/2p/test_mpfao2p-reference.vtu DESTINATION references) file(COPY test/decoupled/2p/test_mpfal2p-reference.vtu DESTINATION references) +file(COPY test/decoupled/2p/test_mpfal2padaptive-reference.vtu DESTINATION references) file(COPY test/decoupled/2p/test_mpfa2p.input DESTINATION test/decoupled/2p) file(COPY test/decoupled/2p/test_2padaptive-reference.vtu DESTINATION references) file(COPY test/decoupled/2p/test_impesadaptive.input DESTINATION test/decoupled/2p) @@ -474,6 +475,7 @@ add_test(test_transport bin/runTest.sh references/test_transport-referenc add_test(test_impes bin/runTest.sh references/test_impes-reference.vtu test_impes-00013.vtu test/decoupled/2p/test_impes) add_test(test_mpfao2p bin/runTest.sh references/test_mpfao2p-reference.vtu test_mpfa2p-00007.vtu test/decoupled/2p/test_mpfa2p -ModelType MPFAO) add_test(test_mpfal2p bin/runTest.sh references/test_mpfal2p-reference.vtu test_mpfa2p-00007.vtu test/decoupled/2p/test_mpfa2p -ModelType MPFAL) +add_test(test_mpfal2padaptive bin/runTest.sh references/test_mpfal2padaptive-reference.vtu test_mpfa2p-00004.vtu test/decoupled/2p/test_mpfa2p -ModelType MPFALAdaptive -TimeManager.TEnd 2e4) add_test(test_impesadaptive bin/runTest.sh references/test_2padaptive-reference.vtu test_2padaptive-00007.vtu test/decoupled/2p/test_impesadaptive) add_test(test_adaptive2p2c bin/runTest.sh references/test_adaptive2p2c-reference.vtu test_adaptive2p2c-00008.vtu test/decoupled/2p2c/test_adaptive2p2c) add_test(test_dec2p2c bin/runTest.sh references/test_dec2p2c-reference.vtu test_dec2p2c-00021.vtu test/decoupled/2p2c/test_dec2p2c) diff --git a/test/decoupled/2p/test_mpfal2padaptive-reference.vtu b/test/decoupled/2p/test_mpfal2padaptive-reference.vtu new file mode 100644 index 0000000000..b27d9854c9 --- /dev/null +++ b/test/decoupled/2p/test_mpfal2padaptive-reference.vtu @@ -0,0 +1,183 @@ +<?xml version="1.0"?> +<VTKFile type="UnstructuredGrid" version="0.1" byte_order="LittleEndian"> + <UnstructuredGrid> + <Piece NumberOfCells="160" NumberOfPoints="191"> + <CellData Scalars="wetting potential"> + <DataArray type="Float32" Name="wetting potential" NumberOfComponents="1" format="ascii"> + 100032 100094 100153 100205 100233 100198 100156 100113 100071 100027 100033 100095 + 100155 100211 100249 100199 100156 100113 100071 100029 100035 100096 100158 100221 + 100287 100309 100298 100240 100144 100036 100039 100097 100160 100231 100341 100424 + 100447 100371 100232 100061 100048 100198 100343 100434 100402 100440 100472 100386 + 100240 100074 100082 100318 100532 100656 100454 100456 100526 100417 100253 100081 + 100097 100324 100488 100600 100609 100494 100769 100952 101485 100806 101028 101230 + 102731 102195 101233 101012 102194 102731 100877 100665 100710 101457 100497 100398 + 100413 100517 100267 100087 100105 100330 100500 100617 100629 100506 100799 101833 + 101043 100782 102800 103548 101733 101189 103548 102810 101156 101726 101842 100716 + 100708 100971 100534 100426 100438 100554 100280 100092 100109 100335 100572 100776 + 100930 100893 100767 101060 101237 101119 100993 101222 101018 100947 101102 100867 + 100707 100701 100832 100506 100290 100095 100110 100337 100574 100759 100869 100859 + 100754 100954 101051 101018 100936 101033 100906 100888 101000 100810 100696 100692 + 100800 100512 100295 100096 + </DataArray> + <DataArray type="Float32" Name="wetting saturation" NumberOfComponents="1" format="ascii"> + 1 1 1 1 1 1 1 1 1 1 1 1 + 1 1 1 1 1 1 1 1 1 1 1 1 + 1 1 1 1 1 1 1 1 1 1 1 1 + 1 1 1 1 1 1 1 1 1 1 1 1 + 1 1 1 1 1 0.999591 1 1 0.999099 1 1 1 + 1 1 0.999958 0.99993 0.997925 0.999958 0.907807 1 1 0.766998 1 1 + 1 1 1 1 1 1 1 0.886251 0.756094 1 0.999899 0.999961 + 0.999961 0.997295 1 1 1 1 0.999878 0.990273 0.999878 0.999878 0.71486 0.188385 + 0.654468 0.986085 0.204551 0.197378 0.336005 0.47959 0.197277 0.204563 0.468253 0.334592 0.19252 0.708276 + 0.981903 0.639494 0.988976 0.999878 0.999878 0.999878 1 1 1 1 1 0.999994 + 0.98724 0.993297 0.999994 0.79653 0.5924 0.61159 0.835985 0.591351 0.789076 0.829183 0.611477 0.984723 + 0.999993 0.999995 0.99192 1 1 1 1 1 1 0.999987 0.995981 0.997978 + 0.999987 0.859777 0.610879 0.609594 0.888706 0.610817 0.85357 0.883536 0.609565 0.995159 0.999987 0.999987 + 0.997599 1 1 1 + </DataArray> + </CellData> + <Points> + <DataArray type="Float32" Name="Coordinates" NumberOfComponents="3" format="ascii"> + 0 0 0 2 0 0 0 1 0 2 1 0 + 4 0 0 4 1 0 6 0 0 6 1 0 + 8 0 0 8 1 0 10 0 0 10 1 0 + 12 0 0 12 1 0 14 0 0 14 1 0 + 16 0 0 16 1 0 18 0 0 18 1 0 + 20 0 0 20 1 0 0 2 0 2 2 0 + 4 2 0 6 2 0 8 2 0 10 2 0 + 12 2 0 14 2 0 16 2 0 18 2 0 + 20 2 0 0 3 0 2 3 0 4 3 0 + 6 3 0 8 3 0 10 3 0 12 3 0 + 14 3 0 16 3 0 18 3 0 20 3 0 + 0 4 0 2 4 0 4 4 0 6 4 0 + 8 4 0 10 4 0 12 4 0 14 4 0 + 16 4 0 18 4 0 20 4 0 0 5 0 + 2 5 0 4 5 0 6 5 0 8 5 0 + 10 5 0 12 5 0 14 5 0 16 5 0 + 18 5 0 20 5 0 0 6 0 2 6 0 + 4 6 0 6 6 0 8 6 0 10 6 0 + 12 6 0 14 6 0 16 6 0 18 6 0 + 20 6 0 0 7 0 2 7 0 4 7 0 + 5 6 0 4 6.5 0 5 6.5 0 6 6.5 0 + 5 7 0 6 7 0 7 6 0 7 6.5 0 + 8 6.5 0 7 7 0 8 7 0 9 6 0 + 9 6.5 0 10 6.5 0 9 7 0 10 7 0 + 11 6 0 11 6.5 0 12 6.5 0 11 7 0 + 12 7 0 13 6 0 13 6.5 0 14 6.5 0 + 13 7 0 14 7 0 15 6 0 15 6.5 0 + 16 6.5 0 15 7 0 16 7 0 18 7 0 + 20 7 0 0 8 0 2 8 0 4 8 0 + 4 7.5 0 5 7.5 0 6 7.5 0 5 8 0 + 6 8 0 7 7.5 0 8 7.5 0 7 8 0 + 8 8 0 9 7.5 0 10 7.5 0 9 8 0 + 10 8 0 11 7.5 0 12 7.5 0 11 8 0 + 12 8 0 13 7.5 0 14 7.5 0 13 8 0 + 14 8 0 15 7.5 0 16 7.5 0 15 8 0 + 16 8 0 18 8 0 20 8 0 0 9 0 + 2 9 0 4 9 0 6 9 0 6 8.5 0 + 7 8.5 0 8 8.5 0 7 9 0 8 9 0 + 9 8.5 0 10 8.5 0 9 9 0 10 9 0 + 11 8.5 0 12 8.5 0 11 9 0 12 9 0 + 13 8.5 0 14 8.5 0 13 9 0 14 9 0 + 16 9 0 18 9 0 20 9 0 0 10 0 + 2 10 0 4 10 0 6 10 0 6 9.5 0 + 7 9.5 0 8 9.5 0 7 10 0 8 10 0 + 9 9.5 0 10 9.5 0 9 10 0 10 10 0 + 11 9.5 0 12 9.5 0 11 10 0 12 10 0 + 13 9.5 0 14 9.5 0 13 10 0 14 10 0 + 16 10 0 18 10 0 20 10 0 + </DataArray> + </Points> + <Cells> + <DataArray type="Int32" Name="connectivity" NumberOfComponents="1" format="ascii"> + 0 1 3 2 1 4 5 3 4 6 7 5 + 6 8 9 7 8 10 11 9 10 12 13 11 + 12 14 15 13 14 16 17 15 16 18 19 17 + 18 20 21 19 2 3 23 22 3 5 24 23 + 5 7 25 24 7 9 26 25 9 11 27 26 + 11 13 28 27 13 15 29 28 15 17 30 29 + 17 19 31 30 19 21 32 31 22 23 34 33 + 23 24 35 34 24 25 36 35 25 26 37 36 + 26 27 38 37 27 28 39 38 28 29 40 39 + 29 30 41 40 30 31 42 41 31 32 43 42 + 33 34 45 44 34 35 46 45 35 36 47 46 + 36 37 48 47 37 38 49 48 38 39 50 49 + 39 40 51 50 40 41 52 51 41 42 53 52 + 42 43 54 53 44 45 56 55 45 46 57 56 + 46 47 58 57 47 48 59 58 48 49 60 59 + 49 50 61 60 50 51 62 61 51 52 63 62 + 52 53 64 63 53 54 65 64 55 56 67 66 + 56 57 68 67 57 58 69 68 58 59 70 69 + 59 60 71 70 60 61 72 71 61 62 73 72 + 62 63 74 73 63 64 75 74 64 65 76 75 + 66 67 78 77 67 68 79 78 68 80 82 81 + 80 69 83 82 82 83 85 84 81 82 84 79 + 69 86 87 83 86 70 88 87 87 88 90 89 + 83 87 89 85 70 91 92 88 91 71 93 92 + 92 93 95 94 88 92 94 90 71 96 97 93 + 96 72 98 97 97 98 100 99 93 97 99 95 + 72 101 102 98 101 73 103 102 102 103 105 104 + 98 102 104 100 73 106 107 103 106 74 108 107 + 107 108 110 109 103 107 109 105 74 75 111 110 + 75 76 112 111 77 78 114 113 78 79 115 114 + 79 84 117 116 84 85 118 117 117 118 120 119 + 116 117 119 115 85 89 121 118 89 90 122 121 + 121 122 124 123 118 121 123 120 90 94 125 122 + 94 95 126 125 125 126 128 127 122 125 127 124 + 95 99 129 126 99 100 130 129 129 130 132 131 + 126 129 131 128 100 104 133 130 104 105 134 133 + 133 134 136 135 130 133 135 132 105 109 137 134 + 109 110 138 137 137 138 140 139 134 137 139 136 + 110 111 141 140 111 112 142 141 113 114 144 143 + 114 115 145 144 115 120 146 145 120 123 148 147 + 123 124 149 148 148 149 151 150 147 148 150 146 + 124 127 152 149 127 128 153 152 152 153 155 154 + 149 152 154 151 128 131 156 153 131 132 157 156 + 156 157 159 158 153 156 158 155 132 135 160 157 + 135 136 161 160 160 161 163 162 157 160 162 159 + 136 140 164 163 140 141 165 164 141 142 166 165 + 143 144 168 167 144 145 169 168 145 146 170 169 + 146 150 172 171 150 151 173 172 172 173 175 174 + 171 172 174 170 151 154 176 173 154 155 177 176 + 176 177 179 178 173 176 178 175 155 158 180 177 + 158 159 181 180 180 181 183 182 177 180 182 179 + 159 162 184 181 162 163 185 184 184 185 187 186 + 181 184 186 183 163 164 188 187 164 165 189 188 + 165 166 190 189 + </DataArray> + <DataArray type="Int32" Name="offsets" NumberOfComponents="1" format="ascii"> + 4 8 12 16 20 24 28 32 36 40 44 48 + 52 56 60 64 68 72 76 80 84 88 92 96 + 100 104 108 112 116 120 124 128 132 136 140 144 + 148 152 156 160 164 168 172 176 180 184 188 192 + 196 200 204 208 212 216 220 224 228 232 236 240 + 244 248 252 256 260 264 268 272 276 280 284 288 + 292 296 300 304 308 312 316 320 324 328 332 336 + 340 344 348 352 356 360 364 368 372 376 380 384 + 388 392 396 400 404 408 412 416 420 424 428 432 + 436 440 444 448 452 456 460 464 468 472 476 480 + 484 488 492 496 500 504 508 512 516 520 524 528 + 532 536 540 544 548 552 556 560 564 568 572 576 + 580 584 588 592 596 600 604 608 612 616 620 624 + 628 632 636 640 + </DataArray> + <DataArray type="UInt8" Name="types" NumberOfComponents="1" format="ascii"> + 9 9 9 9 9 9 9 9 9 9 9 9 + 9 9 9 9 9 9 9 9 9 9 9 9 + 9 9 9 9 9 9 9 9 9 9 9 9 + 9 9 9 9 9 9 9 9 9 9 9 9 + 9 9 9 9 9 9 9 9 9 9 9 9 + 9 9 9 9 9 9 9 9 9 9 9 9 + 9 9 9 9 9 9 9 9 9 9 9 9 + 9 9 9 9 9 9 9 9 9 9 9 9 + 9 9 9 9 9 9 9 9 9 9 9 9 + 9 9 9 9 9 9 9 9 9 9 9 9 + 9 9 9 9 9 9 9 9 9 9 9 9 + 9 9 9 9 9 9 9 9 9 9 9 9 + 9 9 9 9 9 9 9 9 9 9 9 9 + 9 9 9 9 + </DataArray> + </Cells> + </Piece> + </UnstructuredGrid> +</VTKFile> -- GitLab