diff --git a/test/porousmediumflow/1p/implicit/CMakeLists.txt b/test/porousmediumflow/1p/implicit/CMakeLists.txt index 934cb447ba0951ef64dafb13914ae72f462b502c..3bcd9db4fd6fcc24b1151ccd6e9fea8933a3ca57 100644 --- a/test/porousmediumflow/1p/implicit/CMakeLists.txt +++ b/test/porousmediumflow/1p/implicit/CMakeLists.txt @@ -5,8 +5,6 @@ add_gstat_file_links() dune_symlink_to_source_files(FILES "tubesconvergencetest.py") -add_executable(test_mpfa1p EXCLUDE_FROM_ALL test_mpfa1p.cc) - # isothermal tests add_dumux_test(test_box1p test_box1p test_box1p.cc python ${CMAKE_SOURCE_DIR}/bin/testing/runtest.py @@ -29,6 +27,13 @@ add_dumux_test(test_cc1p test_cc1p test_cc1p.cc ${CMAKE_CURRENT_BINARY_DIR}/1ptestcc-00001.vtu --command "${CMAKE_CURRENT_BINARY_DIR}/test_cc1p") +add_dumux_test(test_ccmpfa1p test_ccmpfa1p test_ccmpfa1p.cc + python ${CMAKE_SOURCE_DIR}/bin/testing/runtest.py + --script fuzzy + --files ${CMAKE_SOURCE_DIR}/test/references/1ptestccmpfa-reference.vtu + ${CMAKE_CURRENT_BINARY_DIR}/1ptestccmpfa-00001.vtu + --command "${CMAKE_CURRENT_BINARY_DIR}/test_ccmpfa1p") + add_dumux_test(test_cc1pwithamg test_cc1pwithamg test_cc1pwithamg.cc python ${CMAKE_SOURCE_DIR}/bin/testing/runtest.py --script fuzzy diff --git a/test/porousmediumflow/1p/implicit/test_mpfa1p.cc b/test/porousmediumflow/1p/implicit/test_ccmpfa1p.cc similarity index 100% rename from test/porousmediumflow/1p/implicit/test_mpfa1p.cc rename to test/porousmediumflow/1p/implicit/test_ccmpfa1p.cc diff --git a/test/porousmediumflow/1p/implicit/test_mpfa1p.input b/test/porousmediumflow/1p/implicit/test_ccmpfa1p.input similarity index 80% rename from test/porousmediumflow/1p/implicit/test_mpfa1p.input rename to test/porousmediumflow/1p/implicit/test_ccmpfa1p.input index 6b3398d5bb886a77524dbc36ab21127218d606d8..a94210a2d1f8528e51adbc157b40679bd070f7df 100644 --- a/test/porousmediumflow/1p/implicit/test_mpfa1p.input +++ b/test/porousmediumflow/1p/implicit/test_ccmpfa1p.input @@ -7,7 +7,7 @@ UpperRight = 1 1 Cells = 10 10 [Problem] -Name = 1ptestmpfao # name passed to the output routines +Name = 1ptestccmpfa # name passed to the output routines [SpatialParams] LensLowerLeft = 0.2 0.2 # [m] diff --git a/test/references/1ptestccmpfa-reference.vtu b/test/references/1ptestccmpfa-reference.vtu new file mode 100644 index 0000000000000000000000000000000000000000..6e48b26ed74af2200a362070c1d30c182845e4d1 --- /dev/null +++ b/test/references/1ptestccmpfa-reference.vtu @@ -0,0 +1,126 @@ +<?xml version="1.0"?> +<VTKFile type="UnstructuredGrid" version="0.1" byte_order="LittleEndian"> + <UnstructuredGrid> + <Piece NumberOfCells="100" NumberOfPoints="121"> + <CellData Scalars="p"> + <DataArray type="Float32" Name="p" NumberOfComponents="1" format="ascii"> + 195910 196468 197745 198513 198838 198838 198513 197745 196468 195910 187172 188685 + 193744 195981 196839 196839 195981 193744 188685 187172 176921 177358 182672 186426 + 187727 187727 186426 182672 177358 176921 166234 166361 168478 170921 171947 171947 + 170921 168478 166361 166234 155421 155448 156036 156830 157194 157194 156830 156036 + 155448 155421 144579 144552 143964 143170 142806 142806 143170 143964 144552 144579 + 133766 133639 131522 129079 128053 128053 129079 131522 133639 133766 123079 122642 + 117328 113574 112273 112273 113574 117328 122642 123079 112828 111315 106256 104019 + 103161 103161 104019 106256 111315 112828 104090 103532 102255 101487 101162 101162 + 101487 102255 103532 104090 + </DataArray> + <DataArray type="Float32" Name="process rank" NumberOfComponents="1" format="ascii"> + 0 0 0 0 0 0 0 0 0 0 0 0 + 0 0 0 0 0 0 0 0 0 0 0 0 + 0 0 0 0 0 0 0 0 0 0 0 0 + 0 0 0 0 0 0 0 0 0 0 0 0 + 0 0 0 0 0 0 0 0 0 0 0 0 + 0 0 0 0 0 0 0 0 0 0 0 0 + 0 0 0 0 0 0 0 0 0 0 0 0 + 0 0 0 0 0 0 0 0 0 0 0 0 + 0 0 0 0 + </DataArray> + </CellData> + <Points> + <DataArray type="Float32" Name="Coordinates" NumberOfComponents="3" format="ascii"> + 0 0 0 0.1 0 0 0 0.1 0 0.1 0.1 0 + 0.2 0 0 0.2 0.1 0 0.3 0 0 0.3 0.1 0 + 0.4 0 0 0.4 0.1 0 0.5 0 0 0.5 0.1 0 + 0.6 0 0 0.6 0.1 0 0.7 0 0 0.7 0.1 0 + 0.8 0 0 0.8 0.1 0 0.9 0 0 0.9 0.1 0 + 1 0 0 1 0.1 0 0 0.2 0 0.1 0.2 0 + 0.2 0.2 0 0.3 0.2 0 0.4 0.2 0 0.5 0.2 0 + 0.6 0.2 0 0.7 0.2 0 0.8 0.2 0 0.9 0.2 0 + 1 0.2 0 0 0.3 0 0.1 0.3 0 0.2 0.3 0 + 0.3 0.3 0 0.4 0.3 0 0.5 0.3 0 0.6 0.3 0 + 0.7 0.3 0 0.8 0.3 0 0.9 0.3 0 1 0.3 0 + 0 0.4 0 0.1 0.4 0 0.2 0.4 0 0.3 0.4 0 + 0.4 0.4 0 0.5 0.4 0 0.6 0.4 0 0.7 0.4 0 + 0.8 0.4 0 0.9 0.4 0 1 0.4 0 0 0.5 0 + 0.1 0.5 0 0.2 0.5 0 0.3 0.5 0 0.4 0.5 0 + 0.5 0.5 0 0.6 0.5 0 0.7 0.5 0 0.8 0.5 0 + 0.9 0.5 0 1 0.5 0 0 0.6 0 0.1 0.6 0 + 0.2 0.6 0 0.3 0.6 0 0.4 0.6 0 0.5 0.6 0 + 0.6 0.6 0 0.7 0.6 0 0.8 0.6 0 0.9 0.6 0 + 1 0.6 0 0 0.7 0 0.1 0.7 0 0.2 0.7 0 + 0.3 0.7 0 0.4 0.7 0 0.5 0.7 0 0.6 0.7 0 + 0.7 0.7 0 0.8 0.7 0 0.9 0.7 0 1 0.7 0 + 0 0.8 0 0.1 0.8 0 0.2 0.8 0 0.3 0.8 0 + 0.4 0.8 0 0.5 0.8 0 0.6 0.8 0 0.7 0.8 0 + 0.8 0.8 0 0.9 0.8 0 1 0.8 0 0 0.9 0 + 0.1 0.9 0 0.2 0.9 0 0.3 0.9 0 0.4 0.9 0 + 0.5 0.9 0 0.6 0.9 0 0.7 0.9 0 0.8 0.9 0 + 0.9 0.9 0 1 0.9 0 0 1 0 0.1 1 0 + 0.2 1 0 0.3 1 0 0.4 1 0 0.5 1 0 + 0.6 1 0 0.7 1 0 0.8 1 0 0.9 1 0 + 1 1 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 69 80 79 + 69 70 81 80 70 71 82 81 71 72 83 82 + 72 73 84 83 73 74 85 84 74 75 86 85 + 75 76 87 86 77 78 89 88 78 79 90 89 + 79 80 91 90 80 81 92 91 81 82 93 92 + 82 83 94 93 83 84 95 94 84 85 96 95 + 85 86 97 96 86 87 98 97 88 89 100 99 + 89 90 101 100 90 91 102 101 91 92 103 102 + 92 93 104 103 93 94 105 104 94 95 106 105 + 95 96 107 106 96 97 108 107 97 98 109 108 + 99 100 111 110 100 101 112 111 101 102 113 112 + 102 103 114 113 103 104 115 114 104 105 116 115 + 105 106 117 116 106 107 118 117 107 108 119 118 + 108 109 120 119 + </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 + </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 + </DataArray> + </Cells> + </Piece> + </UnstructuredGrid> +</VTKFile>