Skip to content
Snippets Groups Projects
Commit 67f91f49 authored by Bernd Flemisch's avatar Bernd Flemisch
Browse files

CTest: also test MPFA-L method. Add corresponding reference solution. Correct some typos. 

git-svn-id: svn://svn.iws.uni-stuttgart.de/DUMUX/dumux/trunk@9238 2fb0f335-1f38-0410-981e-8018bf24f1b0
parent 05872a84
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
CMakeLists.txt
+ 2
− 1
View file @ 67f91f49
......@@ -471,7 +471,8 @@ add_test(test_diffusion bin/runTest.sh references/diffusion-reference.vtu
add_test(test_dec1p bin/runTest.sh references/test_1p-reference.vtu test_1p-00001.vtu test/decoupled/1p/test_dec1p -ParameterFile test/decoupled/1p/test_1p.input)
add_test(test_transport bin/runTest.sh references/test_transport-reference.vtu test_transport-00006.vtu test/decoupled/2p/test_transport -Grid.File test/decoupled/2p/grids/test_transport.dgf)
add_test(test_impes bin/runTest.sh references/test_impes-reference.vtu test_impes-00013.vtu test/decoupled/2p/test_impes)
add_test(test_mpfa2p bin/runTest.sh references/test_mpfa2p-reference.vtu test_mpfa2p-00007.vtu test/decoupled/2p/test_mpfa2p)
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_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)
......
test/decoupled/2p/test_mpfa2p.input
+ 1
− 1
View file @ 67f91f49
############################################################
# Parameter file for test_mpfa2p.cc
# Everything behind a '#' is a comment.
# Type "./test_transport --help" for more information.
# Type "./test_mpfa2p --help" for more information.
############################################################
############################################################
......
test/decoupled/2p/test_mpfa2pproblem.hh
+ 1
− 1
View file @ 67f91f49
......@@ -125,7 +125,7 @@ NEW_TYPE_TAG(MPFALAdaptiveTwoPTestProblem, INHERITS_FROM(FVMPFALPressureTwoPAdap
*
* <tt>./test_mpfa2p</tt>,
*
* Additioinally, the numerical model can be switched by executing with the parameter "ModelType":
* Additionally, the numerical model can be switched by executing with the parameter "ModelType":
*
* <tt>./test_mpfa2p --ModelType=...</tt>,
*
......
test/decoupled/2p/test_mpfal2p-reference.vtu 0 → 100644
+ 126
− 0
View file @ 67f91f49
<?xml version="1.0"?>
<VTKFile type="UnstructuredGrid" version="0.1" byte_order="LittleEndian">
<UnstructuredGrid>
<Piece NumberOfCells="100" NumberOfPoints="121">
<CellData Scalars="wetting potential">
<DataArray type="Float32" Name="wetting potential" NumberOfComponents="1" format="ascii">
100181 100435 100634 100798 100882 100756 100608 100458 100305 100140 100209 100448
100643 100819 100934 100761 100609 100458 100308 100169 100285 100472 100657 100854
101059 101172 101363 101820 101030 100235 100355 100494 100668 100886 101236 101588
101927 103026 101587 100212 100285 101551 102377 101942 101450 101595 101721 101386
100798 100174 100189 102476 103891 102964 101577 101602 101648 101151 100563 100150
100131 100475 101013 103773 104038 104017 103200 100811 100424 100127 100115 100354
100612 104806 106112 106110 104814 100581 100341 100112 100110 100324 100528 100884
102171 102163 100861 100502 100311 100107 100109 100320 100528 100810 101241 101229
100784 100504 100307 100105
</DataArray>
<DataArray type="Float32" Name="wetting saturation" NumberOfComponents="1" format="ascii">
1 1 1 1 1 1 1 1 1 1 0.999944 1
1 1 1 1 1 1 1 0.993708 0.964786 1 1 1
1 1 0.99981 0.998789 0.999723 0.878958 0.809359 0.999943 1 1 0.998122 0.915612
0.429419 0.240657 0.287893 0.776332 0.736877 0.999399 0.99824 0.999625 0.923737 0.999991 0.963424 0.56438
0.73134 0.988434 0.708671 0.214496 0.207329 0.514697 0.823319 0.999915 0.976573 0.626967 0.844354 0.997189
0.961564 0.617044 0.460227 0.996759 0.99406 0.99407 0.99628 0.616475 0.869689 0.998433 0.998359 0.887138
0.62054 0.155622 0.157507 0.157504 0.155841 0.614653 0.898365 0.999191 0.999999 0.988317 0.807678 0.354803
0.262015 0.261169 0.34195 0.803853 0.988146 1 1 0.99998 0.973049 0.850869 0.593308 0.593036
0.847216 0.969938 0.999975 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
6 7 0 8 7 0 10 7 0 12 7 0
14 7 0 16 7 0 18 7 0 20 7 0
0 8 0 2 8 0 4 8 0 6 8 0
8 8 0 10 8 0 12 8 0 14 8 0
16 8 0 18 8 0 20 8 0 0 9 0
2 9 0 4 9 0 6 9 0 8 9 0
10 9 0 12 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 8 10 0 10 10 0
12 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 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>
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment