diff --git a/test/porousmediumflow/1pnc/implicit/CMakeLists.txt b/test/porousmediumflow/1pnc/implicit/CMakeLists.txt index dd29407b3220678ef64bb4b4512daa9ce4b8bfdb..41b04667c0a3c2bf2adf5ccb334161f7168255e8 100644 --- a/test/porousmediumflow/1pnc/implicit/CMakeLists.txt +++ b/test/porousmediumflow/1pnc/implicit/CMakeLists.txt @@ -80,8 +80,8 @@ dune_add_test(NAME test_1p2cni_convection_tpfa COMPILE_DEFINITIONS TYPETAG=OnePTwoCNIConvectionCCTpfaProblem COMMAND ${CMAKE_SOURCE_DIR}/bin/testing/runtest.py CMD_ARGS --script fuzzy - --files ${CMAKE_SOURCE_DIR}/test/references/1p2cniccconduction-reference.vtu - ${CMAKE_CURRENT_BINARY_DIR}/1p2cni_convectiontest_tpfa-00006.vtu + --files ${CMAKE_SOURCE_DIR}/test/references/1p2cniccconvection-reference.vtu + ${CMAKE_CURRENT_BINARY_DIR}/1p2cni_convectiontest_tpfa-00010.vtu --command "${CMAKE_CURRENT_BINARY_DIR}/test_1p2cni_convection_tpfa test_1p2cni_convection_fv.input -Problem.Name 1p2cni_convectiontest_tpfa" --zeroThreshold {"velocity_w \(m/s\)_0":1e-9}) @@ -92,6 +92,6 @@ dune_add_test(NAME test_1p2cni_convection_mpfa COMPILE_DEFINITIONS TYPETAG=OnePTwoCNIConvectionCCMpfaProblem COMMAND ${CMAKE_SOURCE_DIR}/bin/testing/runtest.py CMD_ARGS --script fuzzy - --files ${CMAKE_SOURCE_DIR}/test/references/1p2cniccmpfaconduction-reference.vtu - ${CMAKE_CURRENT_BINARY_DIR}/1p2cni_convectiontest_mpfa-00006.vtu + --files ${CMAKE_SOURCE_DIR}/test/references/1p2cniccmpfaconvection-reference.vtu + ${CMAKE_CURRENT_BINARY_DIR}/1p2cni_convectiontest_mpfa-00010.vtu --command "${CMAKE_CURRENT_BINARY_DIR}/test_1p2cni_convection_mpfa test_1p2cni_convection_fv.input -Problem.Name 1p2cni_convectiontest_mpfa -Vtk.AddVelocity false") diff --git a/test/references/1p2cniccconvection-reference.vtu b/test/references/1p2cniccconvection-reference.vtu index af8da1a5125e36f5718a93f8dc23c0158677cfac..06409a151dfe8431567747aa4aef93fdf6fdd1eb 100644 --- a/test/references/1p2cniccconvection-reference.vtu +++ b/test/references/1p2cniccconvection-reference.vtu @@ -2,8 +2,8 @@ <VTKFile type="UnstructuredGrid" version="0.1" byte_order="LittleEndian"> <UnstructuredGrid> <Piece NumberOfCells="80" NumberOfPoints="162"> - <CellData Scalars="P" Vectors="velocity"> - <DataArray type="Float32" Name="P" NumberOfComponents="1" format="ascii"> + <CellData Scalars="pressure" Vectors="velocity_w (m/s)"> + <DataArray type="Float32" Name="pressure" NumberOfComponents="1" format="ascii"> 121447 121183 120919 120654 120390 120126 119862 119597 119333 119069 118804 118539 118274 118009 117743 117476 117209 116941 116673 116405 116135 115866 115596 115326 115055 114784 114514 114243 113972 113700 113429 113158 112887 112615 112344 112073 @@ -21,7 +21,7 @@ 5290.4 5019.1 4747.8 4476.5 4205.2 3933.89 3662.59 3391.29 3119.99 2848.68 2577.38 2306.08 2034.77 1763.47 1492.17 1220.87 949.562 678.259 406.955 135.652 </DataArray> - <DataArray type="Float32" Name="velocity" NumberOfComponents="3" format="ascii"> + <DataArray type="Float32" Name="velocity_w (m/s)" NumberOfComponents="3" format="ascii"> 0.0001 0 0 0.0001 0 0 0.0001 0 0 0.0001 0 0 0.0001 0 0 0.0001 0 0 0.0001 0 0 0.0001 0 0 9.99999e-05 0 0 9.99997e-05 0 0 9.99994e-05 0 0 9.99991e-05 0 0 diff --git a/test/references/1p2cniccmpfaconvection-reference.vtu b/test/references/1p2cniccmpfaconvection-reference.vtu index be6dc5a606cdab6fbb3a221cea2be6a03521c4b2..988ce7821724562bda21e6a9c97799a20cf51f87 100644 --- a/test/references/1p2cniccmpfaconvection-reference.vtu +++ b/test/references/1p2cniccmpfaconvection-reference.vtu @@ -2,8 +2,8 @@ <VTKFile type="UnstructuredGrid" version="0.1" byte_order="LittleEndian"> <UnstructuredGrid> <Piece NumberOfCells="80" NumberOfPoints="162"> - <CellData Scalars="P"> - <DataArray type="Float32" Name="P" NumberOfComponents="1" format="ascii"> + <CellData Scalars="pressure"> + <DataArray type="Float32" Name="pressure" NumberOfComponents="1" format="ascii"> 121447 121183 120919 120654 120390 120126 119862 119597 119333 119069 118804 118539 118274 118009 117743 117476 117209 116941 116673 116405 116135 115866 115596 115326 115055 114784 114514 114243 113972 113700 113429 113158 112887 112615 112344 112073 @@ -15,7 +15,7 @@ <DataArray type="Float32" Name="delp" NumberOfComponents="1" format="ascii"> 21447.2 21183 20918.7 20654.5 20390.2 20126 19861.7 19597.4 19333.1 19068.6 18804 18539.1 18274 18008.5 17742.6 17476.1 17209.1 16941.5 16673.3 16404.6 16135.5 15865.9 15596 15325.7 - 15055.2 14784.5 14513.6 14242.6 13971.6 13700.4 13429.2 13158 12886.7 12615.5 12344.2 12072.9 + 15055.2 14784.5 14513.6 14242.6 13971.5 13700.4 13429.2 13158 12886.7 12615.5 12344.2 12072.9 11801.6 11530.3 11259 10987.7 10716.4 10445.1 10173.8 9902.53 9631.23 9359.92 9088.62 8817.32 8546.02 8274.72 8003.42 7732.12 7460.82 7189.52 6918.21 6646.91 6375.61 6104.31 5833.01 5561.71 5290.4 5019.1 4747.8 4476.5 4205.2 3933.89 3662.59 3391.29 3119.99 2848.68 2577.38 2306.08 @@ -67,9 +67,9 @@ 998.79 998.79 998.79 998.79 998.79 998.789 998.789 998.789 </DataArray> <DataArray type="Float32" Name="mu" NumberOfComponents="1" format="ascii"> - 0.00105696 0.00105696 0.00105697 0.00105697 0.001057 0.00105706 0.0010572 0.00105744 0.00105785 0.00105847 0.00105933 0.00106047 - 0.00106196 0.00106384 0.00106594 0.00106817 0.00107044 0.00107266 0.00107476 0.00107668 0.00107839 0.00107986 0.00108109 0.0010821 - 0.00108291 0.00108354 0.00108402 0.00108438 0.00108465 0.00108484 0.00108498 0.00108508 0.00108514 0.00108519 0.00108522 0.00108524 + 0.00105696 0.00105696 0.00105697 0.00105697 0.001057 0.00105706 0.0010572 0.00105744 0.00105785 0.00105847 0.00105934 0.00106047 + 0.00106196 0.00106385 0.00106595 0.00106817 0.00107044 0.00107266 0.00107476 0.00107668 0.00107839 0.00107985 0.00108109 0.0010821 + 0.0010829 0.00108354 0.00108402 0.00108438 0.00108465 0.00108484 0.00108498 0.00108508 0.00108514 0.00108519 0.00108522 0.00108524 0.00108525 0.00108526 0.00108527 0.00108527 0.00108527 0.00108527 0.00108528 0.00108528 0.00108528 0.00108528 0.00108528 0.00108528 0.00108528 0.00108528 0.00108528 0.00108528 0.00108528 0.00108528 0.00108528 0.00108528 0.00108528 0.00108528 0.00108528 0.00108528 0.00108528 0.00108528 0.00108528 0.00108528 0.00108528 0.00108528 0.00108528 0.00108528 0.00108528 0.00108528 0.00108528 0.00108528 @@ -85,8 +85,8 @@ 0 0 0 0 0 0 0 0 </DataArray> <DataArray type="Float32" Name="temperature" NumberOfComponents="1" format="ascii"> - 291 291 291 291 290.999 290.996 290.991 290.981 290.965 290.94 290.906 290.861 - 290.805 290.74 290.667 290.591 290.512 290.436 290.363 290.297 290.238 290.188 290.145 290.111 + 291 291 291 291 290.999 290.996 290.991 290.981 290.965 290.94 290.906 290.86 + 290.805 290.74 290.667 290.59 290.512 290.436 290.363 290.297 290.239 290.188 290.145 290.111 290.083 290.061 290.044 290.032 290.023 290.016 290.011 290.008 290.006 290.004 290.003 290.002 290.002 290.002 290.001 290.001 290.001 290.001 290.001 290.001 290.001 290.001 290.001 290.001 290.001 290.001 290.001 290.001 290.001 290.001 290.001 290.001 290.001 290.001 290.001 290.001