From ca3d72ddc3cd7f939fe365af9d90ff16049f93ff Mon Sep 17 00:00:00 2001 From: Denis Davydov Date: Sun, 12 Nov 2017 20:47:02 +0100 Subject: [PATCH] filter out binary data from XML output for some data_out tests --- tests/base/data_out_base_vtu.cc | 13 +- .../data_out_base_vtu.with_zlib=true.output | 110 ++++---- .../data_out_base_vtu.with_zlib=true.output.2 | 215 ---------------- tests/base/data_out_base_vtu_cycle.cc | 13 +- ...a_out_base_vtu_cycle.with_zlib=true.output | 110 ++++---- ...out_base_vtu_cycle.with_zlib=true.output.2 | 230 ----------------- tests/base/data_out_base_vtu_time.cc | 13 +- ...ta_out_base_vtu_time.with_zlib=true.output | 110 ++++---- ..._out_base_vtu_time.with_zlib=true.output.2 | 230 ----------------- .../base/data_out_base_vtu_time_and_cycle.cc | 13 +- ...e_vtu_time_and_cycle.with_zlib=true.output | 110 ++++---- ...vtu_time_and_cycle.with_zlib=true.output.2 | 235 ------------------ tests/tests.h | 39 +++ 13 files changed, 251 insertions(+), 1190 deletions(-) delete mode 100644 tests/base/data_out_base_vtu.with_zlib=true.output.2 delete mode 100644 tests/base/data_out_base_vtu_cycle.with_zlib=true.output.2 delete mode 100644 tests/base/data_out_base_vtu_time.with_zlib=true.output.2 delete mode 100644 tests/base/data_out_base_vtu_time_and_cycle.with_zlib=true.output.2 diff --git a/tests/base/data_out_base_vtu.cc b/tests/base/data_out_base_vtu.cc index 510ac6ab23..02ec04a1ad 100644 --- a/tests/base/data_out_base_vtu.cc +++ b/tests/base/data_out_base_vtu.cc @@ -57,10 +57,13 @@ void check_all(std::ostream &log) int main() { + std::stringstream ss; + check_all<1,1>(ss); + check_all<1,2>(ss); + check_all<2,2>(ss); + check_all<2,3>(ss); + check_all<3,3>(ss); + std::ofstream logfile("output"); - check_all<1,1>(logfile); - check_all<1,2>(logfile); - check_all<2,2>(logfile); - check_all<2,3>(logfile); - check_all<3,3>(logfile); + filter_out_xml_key(ss, "DataArray",logfile); } diff --git a/tests/base/data_out_base_vtu.with_zlib=true.output b/tests/base/data_out_base_vtu.with_zlib=true.output index 969ad95726..15647ecca2 100644 --- a/tests/base/data_out_base_vtu.with_zlib=true.output +++ b/tests/base/data_out_base_vtu.with_zlib=true.output @@ -11,32 +11,28 @@ -AQAAAFABAABQAQAANQAAAA==eNpjYMAHPtiTJv4DhziDA7Hiq1eBABOGeFgoCLDiMIeDRHEuHOI8OMT5cIgLYIgDAH+pDF0= - + -AQAAAFAAAABQAAAAKQAAAA==eNotw8cNACAQA0HDkY7Qf7vswyONJBVWhjd2Dp++mNx+/PrjBxBcAI0= - + -AQAAACgAAAAoAAAAIgAAAA==eNpjYmBgYAFiNiDmAGIuIOYBYj4gFgBiISAWAWIABwgAbw== - + -AQAAAAoAAAAKAAAACwAAAA==eNpjZoYBAACvAB8= - + -AQAAAHAAAABwAAAALgAAAA==eNpjYEAGH+xR6R9QmsEBiV6wahUTiE4IDWWFinOg0VxQmgdK80FpAQcAUAIJXw== + -AQAAAHAAAABwAAAAFgAAAA==eNpjYMAGPthjpxkc8NMcBGkAb/wF9g== + -AQAAAHAAAABwAAAAFgAAAA==eNpjYMAGPthjpxkc8NMcBGkAb/wF9g== + -AQAAAHAAAABwAAAAFgAAAA==eNpjYMAGPthjpxkc8NMcBGkAb/wF9g== + -AQAAAHAAAABwAAAAGQAAAA==eNpjYEAGH+wZsPMd8ItzECkv4AAAaTsGXQ== + @@ -54,32 +50,28 @@ AQAAAHAAAABwAAAAGQAAAA==eNpjYEAGH+wZsPMd8ItzECkv4AAAaTsGXQ== -AQAAAFABAABQAQAASgAAAA==eNpjYMAHPtij0oTEf9ij0nDggEbjFF+9CgSYHGA0TDwsFARYHWA0qjEcDqg0IXEuB1QaBngcUGkY4HNApWFAwAGVZmAAAJsiGLk= - + -AQAAAFAAAABQAAAAKQAAAA==eNotw8cNACAQA0HDkY7Qf7vswyONJBVWhjd2Dp++mNx+/PrjBxBcAI0= - + -AQAAACgAAAAoAAAAIgAAAA==eNpjYmBgYAFiNiDmAGIuIOYBYj4gFgBiISAWAWIABwgAbw== - + -AQAAAAoAAAAKAAAACwAAAA==eNpjZoYBAACvAB8= - + -AQAAAHAAAABwAAAALgAAAA==eNpjYEAGH+xR6R9QmsEBiV6wahUTiE4IDWWFinOg0VxQmgdK80FpAQcAUAIJXw== + -AQAAAHAAAABwAAAAFgAAAA==eNpjYMAGPthjpxkc8NMcBGkAb/wF9g== + -AQAAAHAAAABwAAAAFgAAAA==eNpjYMAGPthjpxkc8NMcBGkAb/wF9g== + -AQAAAHAAAABwAAAAFgAAAA==eNpjYMAGPthjpxkc8NMcBGkAb/wF9g== + -AQAAAHAAAABwAAAAGQAAAA==eNpjYEAGH+wZsPMd8ItzECkv4AAAaTsGXQ== + @@ -97,32 +89,28 @@ AQAAAHAAAABwAAAAGQAAAA==eNpjYEAGH+wZsPMd8ItzECkv4AAAaTsGXQ== -AQAAABAFAAAQBQAAoAAAAA==eNqVkMsKw0AIAKVQWETEP2p+ovnI5Od63GPJwS3YTB7enIWZRJGj+bzk1nvuV3kHLtOxp4Ong6eDJ9+rp/Kxn/J12ebxx+f3Nk/wNPQX3/BXnv7K07/PZSrfNfyV5155+vd5/k+D+zS4T4P7XOUK3IA78DjpKnQVugpdha5C16Br0DXoGnQNug5dh65D16Hr0A3oBnQDugHdH/8CMeJb0Q== - + -AQAAAOABAADgAQAAogAAAA==eNpNi8cSgkAQBdecAyJiDggiiGD8/1/zTVUfPHRtV+8b55yriYaoi6Zoia7o4G3R+2v2DkQft78hbSTGYiY8fCJ8mvlUzGkefSEC3HpI89kuaQF9LVa49Q0tZLul7cRenEWEH0RMMz+KhGZ+EhdaxO4qUtx2GS1ml9MSbm+0lN1dFLjtSlrGrqLl3D5oBbuXeOK2e9NKdh9axe2X9gNQBw2p - + -AQAAAHgAAAB4AAAATAAAAA==eNoNw5EShFAAAMAHQRAEQRAEQRAEwUEQBEEQBEEQBEEQBH3+7c5sFEKITUzNzC0sraxtbO382Ts4Ojm7uLq5e3h6efv4+vkHNocHRQ== - + -AQAAAB4AAAAeAAAACwAAAA==eNrj5MQHABB3AQ8= - + -AQAAALABAACwAQAANgAAAA==eNpjYEAGH+wZsPJh9A+YvAN54mB6wapVTCA6ITSUFSrOQSd5GM0FpXmgNB+UFhj06gCiMiHx + -AQAAALABAACwAQAAMwAAAA==eNpjYMAGPtgTR//AQTM4kEEvWLWKCR+dEBrKio8GAg4q0VxE0jxE0nxE0gIEaQDf2iHx + -AQAAALABAACwAQAAFwAAAA==eNpjYCAGfLCnDs3gMLA0x5CnAc+qFbA= + -AQAAALABAACwAQAAFwAAAA==eNpjYCAGfLCnDs3gMLA0x5CnAc+qFbA= + -AQAAALABAACwAQAAUAAAAA==eNpjYEAGH+yhDAcIxeHAQJS8AJQWgdISUFoGSitQ2RwlKK0CpdWgtAaU1oLSOlBab5DYbwClDaG0EZQ2htImUNoUSptBaXMobeEAANfTFck= + @@ -140,32 +128,28 @@ AQAAALABAACwAQAAUAAAAA==eNpjYEAGH+yhDAcIxeHAQJS8AJQWgdISUFoGSitQ2RwlKK0CpdWgtAaU -AQAAABAFAAAQBQAA0gAAAA==eNqNUVsOgjAQRCNJQ2rT8tLb2EvAIfFyfvJpEAbDtGPsz2Rmt9PdaVH8Oq/HnzweOdAIHTgLzn7MuW8m/RLzdSN8Tcz7WvIBeqEX8Tkt55zwcVhOuetHbmJ+nvQ+OPC09efr1e4H/dM2XJM5pq2f3xu3/iMvKYfv+6t/EPt4ygf3QpLHOk9N94Gt0IGV4JZ0cEe6S/bLc/atCJ2oe6pDD1SHXou5vZgjELfkw3M15GdFzo58eM9G5NoSB3Yij17k3oocO5FLL/7zRhx4j28uS4pw - + -AQAAAOABAADgAQAAogAAAA==eNpNi8cSgkAQBdecAyJiDggiiGD8/1/zTVUfPHRtV+8b55yriYaoi6Zoia7o4G3R+2v2DkQft78hbSTGYiY8fCJ8mvlUzGkefSEC3HpI89kuaQF9LVa49Q0tZLul7cRenEWEH0RMMz+KhGZ+EhdaxO4qUtx2GS1ml9MSbm+0lN1dFLjtSlrGrqLl3D5oBbuXeOK2e9NKdh9axe2X9gNQBw2p - + -AQAAAHgAAAB4AAAATAAAAA==eNoNw5EShFAAAMAHQRAEQRAEQRAEwUEQBEEQBEEQBEEQBH3+7c5sFEKITUzNzC0sraxtbO382Ts4Ojm7uLq5e3h6efv4+vkHNocHRQ== - + -AQAAAB4AAAAeAAAACwAAAA==eNrj5MQHABB3AQ8= - + -AQAAALABAACwAQAANgAAAA==eNpjYEAGH+wZsPJh9A+YvAN54mB6wapVTCA6ITSUFSrOQSd5GM0FpXmgNB+UFhj06gCiMiHx + -AQAAALABAACwAQAAMwAAAA==eNpjYMAGPtgTR//AQTM4kEEvWLWKCR+dEBrKio8GAg4q0VxE0jxE0nxE0gIEaQDf2iHx + -AQAAALABAACwAQAAFwAAAA==eNpjYCAGfLCnDs3gMLA0x5CnAc+qFbA= + -AQAAALABAACwAQAAFwAAAA==eNpjYCAGfLCnDs3gMLA0x5CnAc+qFbA= + -AQAAALABAACwAQAAUAAAAA==eNpjYEAGH+yhDAcIxeHAQJS8AJQWgdISUFoGSitQ2RwlKK0CpdWgtAaU1oLSOlBab5DYbwClDaG0EZQ2htImUNoUSptBaXMobeEAANfTFck= + @@ -183,32 +167,28 @@ AQAAALABAACwAQAAUAAAAA==eNpjYEAGH+yhDAcIxeHAQJS8AJQWgdISUFoGSitQ2RwlKK0CpdWgtAaU -AQAAAAAVAAAAFQAAtwEAAA==eNqdljtuxDAMRIUAAQxCIOZGySWSQyaX29LlYgsV0e4zh3FDaGz+hh95jKvn9jFa79fZ1SN9+q4rT8DHZ0/vBHzZcf2cgK+zGxfFR/5In+SeV5U36e15VTyRH+LrZsZNcVR1IH1f/v48nrcn/Pvr8byD3mHbW+cdX/Zf+z/suNZ3O77Or/M47Pz+xnFAHAfo1zwRX5TndXzPdknu/O/23bqRvZ3/3b5bf4pr5/81P3UfUX7UT9d9MEp+iRfKp+prskty57+aD6ob2dv5r+aM6k9xXc/bMPuY87vup2HWiXm65muYcTDf/5MB+AQ8AVfTTwA+AU/A1cwjAJ+AJ+Bq8hSAT8ATcDXrEIBPwBNwNescJu9R8KVmH5GcgCfgavYp+ZmAJ+BqzgHlMQFPwNWcM+JpAp6AqznHYc7tLOZNzT0RZl1nUQ819xD5I5mAq7nnorCXcE7w6+7RKOIV+BV85+7pMPd+FvtazXsgzL2QxTyrec+E2TdZ1FvNeyxMu5VU856Moh9l+lHzHg7zv0FFHmre82HeKxVPav5HhLl3qjqo+Z8SZl9WdVbzPyjMuKs+epZ3Ou4XOQ== - + -AQAAAIAMAACADAAAVwMAAA==eNptkVVTEFAQRrG7u7ADu7tbwQ7s7u7uRrEbDMTuQsXu7hbzr/jtzHnauQ/n5e7Zb2fuFxEREZFOZBDpRUaRSWQRmUVWkU3kFDlEPpFfFBIFmWUXuXBsVkAUxsnBex6Rmx17LyqKMLPdvDiF2C2G4+8VFyVEpCgVuGezkqI0jr9XiveyokzgXiS75XDKiwqiiqgs6on6orFoxKyiiMKxWQPRBMdmlURVHJs1FE1xKrNXXVQj0/aai2bMbK8GTmP2WuBEkV0TpwnZLXGqsVdb1CLT9lqLVsxsrw5Oc/ba4NQguy5OC7Lb4vj/aCfai86iU+A/bNZBdMHx/2GzjqIrjv+PTuzFiOjAf3RmrxuO/48uZHfH8f8RzV5P0SPwHzHs9cLx/9GN7N44/j/6iL5igIgN/IfN+omBOP4/bNZfDMLx/xHL3hAxOPAfA9gbiuP/YyDZw3D8fwxmb4QYHviPIeyNxPH/MZTsUTijxRgxUUwQS8RSsUqsZDZWTMKx2TKxGsdm48RkHJstF2twbDZeTMGx2QqxFmcCudPEVG5a7nqxjpnlTsdZRe4GnEnkzsBZTW4czmRuz8RZw+2NOFPJnS1mcdNy48UmZpY7B2c9uZtxppM7F2cDuVtwZnB7Hk4ct7fizCJ3gZjPTcvdLrYxs9yFOPHk7sCZQ+4inM3k7sSZy+3FOFu4vQvH971b7BGJIiHQt832igM4vm+b7RMHcXzfNtsvDuH4vhPITRKHA30nknsEx/d9gNxkHN/3QW4fxfF9Hyb3uDgW6DuJ3BM4vu8j5J7E8X0nc/sUju/7GLlnxOlA38fJPYvj+z5B7jkc3/dJbp/H8X1fEBdFirga6Ntml8Q1HN+3zS6L6zi+b5tdETdwfN9Xyb0pUgN9p5B7C8f3fY3c2zi+7+vcvoPj+04l9564G+j7Jrn3cXzft8h9gOP7vs3thzi+77vkPhaPAn3fI/cJju/7PrlPcXzfD7j9DMf3/Vy8EG/Fm0DfNnsp3uH4vm32SrzH8X3b7LX4gOP7fkPuJ/Ex0Pdbcj/j+L7fkfsFx/f9nttfcXzfH8n9Lr4F+v5E7g8c3/dnctNwfN9fuP0Tx/f9jdzf4leg7+/k/sHxff8g9y+O7zuN2/9w/gOh1n+I - + -AQAAAJABAACQAQAAmAAAAA==eNoNzRGAhEAAAMD9fzkMwzA8DMMwDMMwDMPDMAzDMAzDMAzDw/AHhucVQoiISUh5k5FTUFJR09DS0fNhYGRiZmFlY+fg5OLmy0P4CeFFRExCypuMnIKSipqGlo6eDwMjEzMLKxs7BycXN18ewq+fiJiElDcZOQUlFTUNLR09HwZGJmYWVjZ2Dk4ubr48hD8/ETEJ/xaiL0A= - + -AQAAAGQAAABkAAAADAAAAA==eNrj4aE9AADtHASx - + -AQAAAAAHAAAABwAAQAAAAA==eNpjYEAGH+wZyOLD6B8weYfhIQ6mF6xaxQSiE0JDWaHiHKPyI0IeRnNBaR4ozQelBUbVjaobVTeE1QEAes2Cfw== + -AQAAAAAHAAAABwAASwAAAA==eNpjYMAGPtij0oTkcdE/cNAMDtjpwWYOXnrBqlVM+OiE0FBWfDQQcBCgR+0fWPuJpbmIpHmIpPmIpAWIpEf9MeqPUX9gowFLHIJ/ + -AQAAAAAHAAAABwAAOAAAAA==eNpjYCAGfLCnD/2DSjSDwzCgF6xaxTSQdEJoKOtA0kDAMUpTheYaJjTPMKH5hgktMORpAO0qgn8= + -AQAAAAAHAAAABwAAHwAAAA==eNpjYKAG+GA/PGkGh1F6JNMco/QoPUoPYxoAo8lTHg== + -AQAAAAAHAAAABwAA4wAAAA==eNrt0TlKZVEYhdEdGhoYGFQgIiIiopZ9e+3K3mevZTuVf2hnSA5B4a3AARiJJ1n3Y3OCy0m+nvctH12fAQ5yiMP80+Vb7o9wlGMc5wQnOcVpznCWc/zLeS5wkUtc5gpXf/h/rXGdG9zkFru+xWxrZkczu5rZ08y+Zv5p5kAzh5o50syxZk40c6qZM82ca6ane7/v//v+n+eib8diYy7tLDbmys5iY67tLDbmxs5iY27tLDbmzs5iY+7tLDbmwc5iY/7bWWzMo53FxjzZWWzMs53FxrzYWWzMq53Fxrx1H/t9lj8= + diff --git a/tests/base/data_out_base_vtu.with_zlib=true.output.2 b/tests/base/data_out_base_vtu.with_zlib=true.output.2 deleted file mode 100644 index 04dae23caf..0000000000 --- a/tests/base/data_out_base_vtu.with_zlib=true.output.2 +++ /dev/null @@ -1,215 +0,0 @@ -============================== -11.vtu -============================== - - - - - - - -AQAAAFABAABQAQAANQAAAA==eNpjYMAHPtiTJv4DhziDA7Hiq1eBABOGeFgoCLDiMIeDRHEuHOI8OMT5cIgLYIgDAH+pDF0= - - - - - -AQAAAFAAAABQAAAAKQAAAA==eNotw8cNACAQA0HDkY7Qf7vswyONJBVWhjd2Dp++mNx+/PrjBxBcAI0= - - -AQAAACgAAAAoAAAAIgAAAA==eNpjYmBgYAFiNiDmAGIuIOYBYj4gFgBiISAWAWIABwgAbw== - - -AQAAAAoAAAAKAAAACwAAAA==eNpjZoYBAACvAB8= - - - - -AQAAAHAAAABwAAAALgAAAA==eNpjYEAGH+xR6R9QmsEBiV6wahUTiE4IDWWFinOg0VxQmgdK80FpAQcAUAIJXw== - -AQAAAHAAAABwAAAAFgAAAA==eNpjYMAGPthjpxkc8NMcBGkAb/wF9g== - -AQAAAHAAAABwAAAAFgAAAA==eNpjYMAGPthjpxkc8NMcBGkAb/wF9g== - -AQAAAHAAAABwAAAAFgAAAA==eNpjYMAGPthjpxkc8NMcBGkAb/wF9g== - -AQAAAHAAAABwAAAAGQAAAA==eNpjYEAGH+wZsPMd8ItzECkv4AAAaTsGXQ== - - - - -============================== -12.vtu -============================== - - - - - - - -AQAAAFABAABQAQAASgAAAA==eNpjYMAHPtij0oTEf9ij0nDggEbjFF+9CgSYHGA0TDwsFARYHWA0qjEcDqg0IXEuB1QaBngcUGkY4HNApWFAwAGVZmAAAJsiGLk= - - - - - -AQAAAFAAAABQAAAAKQAAAA==eNotw8cNACAQA0HDkY7Qf7vswyONJBVWhjd2Dp++mNx+/PrjBxBcAI0= - - -AQAAACgAAAAoAAAAIgAAAA==eNpjYmBgYAFiNiDmAGIuIOYBYj4gFgBiISAWAWIABwgAbw== - - -AQAAAAoAAAAKAAAACwAAAA==eNpjZoYBAACvAB8= - - - - -AQAAAHAAAABwAAAALgAAAA==eNpjYEAGH+xR6R9QmsEBiV6wahUTiE4IDWWFinOg0VxQmgdK80FpAQcAUAIJXw== - -AQAAAHAAAABwAAAAFgAAAA==eNpjYMAGPthjpxkc8NMcBGkAb/wF9g== - -AQAAAHAAAABwAAAAFgAAAA==eNpjYMAGPthjpxkc8NMcBGkAb/wF9g== - -AQAAAHAAAABwAAAAFgAAAA==eNpjYMAGPthjpxkc8NMcBGkAb/wF9g== - -AQAAAHAAAABwAAAAGQAAAA==eNpjYEAGH+wZsPMd8ItzECkv4AAAaTsGXQ== - - - - -============================== -22.vtu -============================== - - - - - - - -AQAAABAFAAAQBQAAoQAAAA==eNqVkMEJwzAMAEWhYIQQ2qhZIh2yXa5PP0secoiaS1L9fIY7WyJH83nIX/d5vso7cJmOPR08HTwdPHlfPZWP8yl/v5a5/fDnvMwdPA39xTf8lae/8vTvc5nm7buGv/L0V57+fZ7/abCfBvtpsJ+rXIEbcAceJ12FrkJXoavQVegadA26Bl2DrkHXoevQdeg6dB26Ad2AbkA3oLvyLyYyW80= - - - - - -AQAAAOABAADgAQAAogAAAA==eNpNi8cSgkAQBdecAyJiDggiiGD8/1/zTVUfPHRtV+8b55yriYaoi6Zoia7o4G3R+2v2DkQft78hbSTGYiY8fCJ8mvlUzGkefSEC3HpI89kuaQF9LVa49Q0tZLul7cRenEWEH0RMMz+KhGZ+EhdaxO4qUtx2GS1ml9MSbm+0lN1dFLjtSlrGrqLl3D5oBbuXeOK2e9NKdh9axe2X9gNQBw2p - - -AQAAAHgAAAB4AAAATAAAAA==eNoNw5EShFAAAMAHQRAEQRAEQRAEwUEQBEEQBEEQBEEQBH3+7c5sFEKITUzNzC0sraxtbO382Ts4Ojm7uLq5e3h6efv4+vkHNocHRQ== - - -AQAAAB4AAAAeAAAACwAAAA==eNrj5MQHABB3AQ8= - - - - -AQAAALABAACwAQAANgAAAA==eNpjYEAGH+wZsPJh9A+YvAN54mB6wapVTCA6ITSUFSrOQSd5GM0FpXmgNB+UFhj06gCiMiHx - -AQAAALABAACwAQAAMwAAAA==eNpjYMAGPtgTR//AQTM4kEEvWLWKCR+dEBrKio8GAg4q0VxE0jxE0nxE0gIEaQDf2iHx - -AQAAALABAACwAQAAFwAAAA==eNpjYCAGfLCnDs3gMLA0x5CnAc+qFbA= - -AQAAALABAACwAQAAFwAAAA==eNpjYCAGfLCnDs3gMLA0x5CnAc+qFbA= - -AQAAALABAACwAQAAUAAAAA==eNpjYEAGH+yhDAcIxeHAQJS8AJQWgdISUFoGSitQ2RwlKK0CpdWgtAaU1oLSOlBab5DYbwClDaG0EZQ2htImUNoUSptBaXMobeEAANfTFck= - - - - -============================== -23.vtu -============================== - - - - - - - -AQAAABAFAAAQBQAA0gAAAA==eNqNUVsOgjAQRCNJQ2rT8tLb2EvAIfFyfvJpEAbDtGPsz2Rmt9PdaVH8Oq/HnzweOdAIHTgLzn7MuW8m/RLzdSN8Tcz7WvIBeqEX8Tkt55zwcVhOuetHbmJ+nvQ+OPC09efr1e4H/dM2XJM5pq2f3xu3/iMvKYfv+6t/EPt4ygf3QpLHOk9N94Gt0IGV4JZ0cEe6S/bLc/atCJ2oe6pDD1SHXou5vZgjELfkw3M15GdFzo58eM9G5NoSB3Yij17k3oocO5FLL/7zRhx4j28uS4pw - - - - - -AQAAAOABAADgAQAAogAAAA==eNpNi8cSgkAQBdecAyJiDggiiGD8/1/zTVUfPHRtV+8b55yriYaoi6Zoia7o4G3R+2v2DkQft78hbSTGYiY8fCJ8mvlUzGkefSEC3HpI89kuaQF9LVa49Q0tZLul7cRenEWEH0RMMz+KhGZ+EhdaxO4qUtx2GS1ml9MSbm+0lN1dFLjtSlrGrqLl3D5oBbuXeOK2e9NKdh9axe2X9gNQBw2p - - -AQAAAHgAAAB4AAAATAAAAA==eNoNw5EShFAAAMAHQRAEQRAEQRAEwUEQBEEQBEEQBEEQBH3+7c5sFEKITUzNzC0sraxtbO382Ts4Ojm7uLq5e3h6efv4+vkHNocHRQ== - - -AQAAAB4AAAAeAAAACwAAAA==eNrj5MQHABB3AQ8= - - - - -AQAAALABAACwAQAANgAAAA==eNpjYEAGH+wZsPJh9A+YvAN54mB6wapVTCA6ITSUFSrOQSd5GM0FpXmgNB+UFhj06gCiMiHx - -AQAAALABAACwAQAAMwAAAA==eNpjYMAGPtgTR//AQTM4kEEvWLWKCR+dEBrKio8GAg4q0VxE0jxE0nxE0gIEaQDf2iHx - -AQAAALABAACwAQAAFwAAAA==eNpjYCAGfLCnDs3gMLA0x5CnAc+qFbA= - -AQAAALABAACwAQAAFwAAAA==eNpjYCAGfLCnDs3gMLA0x5CnAc+qFbA= - -AQAAALABAACwAQAAUAAAAA==eNpjYEAGH+yhDAcIxeHAQJS8AJQWgdISUFoGSitQ2RwlKK0CpdWgtAaU1oLSOlBab5DYbwClDaG0EZQ2htImUNoUSptBaXMobeEAANfTFck= - - - - -============================== -33.vtu -============================== - - - - - - - -AQAAAAAVAAAAFQAAtwEAAA==eNqdljtuxDAMRIUAAQxCIOZGySWSQyaX29LlYgsV0e4zh3FDaGz+hh95jKvn9jFa79fZ1SN9+q4rT8DHZ0/vBHzZcf2cgK+zGxfFR/5In+SeV5U36e15VTyRH+LrZsZNcVR1IH1f/v48nrcn/Pvr8byD3mHbW+cdX/Zf+z/suNZ3O77Or/M47Pz+xnFAHAfo1zwRX5TndXzPdknu/O/23bqRvZ3/3b5bf4pr5/81P3UfUX7UT9d9MEp+iRfKp+prskty57+aD6ob2dv5r+aM6k9xXc/bMPuY87vup2HWiXm65muYcTDf/5MB+AQ8AVfTTwA+AU/A1cwjAJ+AJ+Bq8hSAT8ATcDXrEIBPwBNwNescJu9R8KVmH5GcgCfgavYp+ZmAJ+BqzgHlMQFPwNWcM+JpAp6AqznHYc7tLOZNzT0RZl1nUQ819xD5I5mAq7nnorCXcE7w6+7RKOIV+BV85+7pMPd+FvtazXsgzL2QxTyrec+E2TdZ1FvNeyxMu5VU856Moh9l+lHzHg7zv0FFHmre82HeKxVPav5HhLl3qjqo+Z8SZl9WdVbzPyjMuKs+epZ3Ou4XOQ== - - - - - -AQAAAIAMAACADAAAVwMAAA==eNptkVVTEFAQRrG7u7ADu7tbwQ7s7u7uRrEbDMTuQsXu7hbzr/jtzHnauQ/n5e7Zb2fuFxEREZFOZBDpRUaRSWQRmUVWkU3kFDlEPpFfFBIFmWUXuXBsVkAUxsnBex6Rmx17LyqKMLPdvDiF2C2G4+8VFyVEpCgVuGezkqI0jr9XiveyokzgXiS75XDKiwqiiqgs6on6orFoxKyiiMKxWQPRBMdmlURVHJs1FE1xKrNXXVQj0/aai2bMbK8GTmP2WuBEkV0TpwnZLXGqsVdb1CLT9lqLVsxsrw5Oc/ba4NQguy5OC7Lb4vj/aCfai86iU+A/bNZBdMHx/2GzjqIrjv+PTuzFiOjAf3RmrxuO/48uZHfH8f8RzV5P0SPwHzHs9cLx/9GN7N44/j/6iL5igIgN/IfN+omBOP4/bNZfDMLx/xHL3hAxOPAfA9gbiuP/YyDZw3D8fwxmb4QYHviPIeyNxPH/MZTsUTijxRgxUUwQS8RSsUqsZDZWTMKx2TKxGsdm48RkHJstF2twbDZeTMGx2QqxFmcCudPEVG5a7nqxjpnlTsdZRe4GnEnkzsBZTW4czmRuz8RZw+2NOFPJnS1mcdNy48UmZpY7B2c9uZtxppM7F2cDuVtwZnB7Hk4ct7fizCJ3gZjPTcvdLrYxs9yFOPHk7sCZQ+4inM3k7sSZy+3FOFu4vQvH971b7BGJIiHQt832igM4vm+b7RMHcXzfNtsvDuH4vhPITRKHA30nknsEx/d9gNxkHN/3QW4fxfF9Hyb3uDgW6DuJ3BM4vu8j5J7E8X0nc/sUju/7GLlnxOlA38fJPYvj+z5B7jkc3/dJbp/H8X1fEBdFirga6Ntml8Q1HN+3zS6L6zi+b5tdETdwfN9Xyb0pUgN9p5B7C8f3fY3c2zi+7+vcvoPj+04l9564G+j7Jrn3cXzft8h9gOP7vs3thzi+77vkPhaPAn3fI/cJju/7PrlPcXzfD7j9DMf3/Vy8EG/Fm0DfNnsp3uH4vm32SrzH8X3b7LX4gOP7fkPuJ/Ex0Pdbcj/j+L7fkfsFx/f9nttfcXzfH8n9Lr4F+v5E7g8c3/dnctNwfN9fuP0Tx/f9jdzf4leg7+/k/sHxff8g9y+O7zuN2/9w/gOh1n+I - - -AQAAAJABAACQAQAAmAAAAA==eNoNzRGAhEAAAMD9fzkMwzA8DMMwDMMwDMPDMAzDMAzDMAzDw/AHhucVQoiISUh5k5FTUFJR09DS0fNhYGRiZmFlY+fg5OLmy0P4CeFFRExCypuMnIKSipqGlo6eDwMjEzMLKxs7BycXN18ewq+fiJiElDcZOQUlFTUNLR09HwZGJmYWVjZ2Dk4ubr48hD8/ETEJ/xaiL0A= - - -AQAAAGQAAABkAAAADAAAAA==eNrj4aE9AADtHASx - - - - -AQAAAAAHAAAABwAAQAAAAA==eNpjYEAGH+wZyOLD6B8weYfhIQ6mF6xaxQSiE0JDWaHiHKPyI0IeRnNBaR4ozQelBUbVjaobVTeE1QEAes2Cfw== - -AQAAAAAHAAAABwAASwAAAA==eNpjYMAGPtij0oTkcdE/cNAMDtjpwWYOXnrBqlVM+OiE0FBWfDQQcBCgR+0fWPuJpbmIpHmIpPmIpAWIpEf9MeqPUX9gowFLHIJ/ - -AQAAAAAHAAAABwAAOAAAAA==eNpjYCAGfLCnD/2DSjSDwzCgF6xaxTSQdEJoKOtA0kDAMUpTheYaJjTPMKH5hgktMORpAO0qgn8= - -AQAAAAAHAAAABwAAHwAAAA==eNpjYKAG+GA/PGkGh1F6JNMco/QoPUoPYxoAo8lTHg== - -AQAAAAAHAAAABwAA4wAAAA==eNrt0TlKZVEYhdEdGhoYGFQgIiIiopZ9e+3K3mevZTuVf2hnSA5B4a3AARiJJ1n3Y3OCy0m+nvctH12fAQ5yiMP80+Vb7o9wlGMc5wQnOcVpznCWc/zLeS5wkUtc5gpXf/h/rXGdG9zkFru+xWxrZkczu5rZ08y+Zv5p5kAzh5o50syxZk40c6qZM82ca6ane7/v//v+n+eib8diYy7tLDbmys5iY67tLDbmxs5iY27tLDbmzs5iY+7tLDbmwc5iY/7bWWzMo53FxjzZWWzMs53FxrzYWWzMq53Fxrx1H/t9lj8= - - - - diff --git a/tests/base/data_out_base_vtu_cycle.cc b/tests/base/data_out_base_vtu_cycle.cc index 8751403558..8ded009af6 100644 --- a/tests/base/data_out_base_vtu_cycle.cc +++ b/tests/base/data_out_base_vtu_cycle.cc @@ -63,10 +63,13 @@ void check_all(std::ostream &log) int main() { + std::stringstream ss; + check_all<1,1>(ss); + check_all<1,2>(ss); + check_all<2,2>(ss); + check_all<2,3>(ss); + check_all<3,3>(ss); + std::ofstream logfile("output"); - check_all<1,1>(logfile); - check_all<1,2>(logfile); - check_all<2,2>(logfile); - check_all<2,3>(logfile); - check_all<3,3>(logfile); + filter_out_xml_key(ss, "DataArray",logfile); } diff --git a/tests/base/data_out_base_vtu_cycle.with_zlib=true.output b/tests/base/data_out_base_vtu_cycle.with_zlib=true.output index 9a38513525..56fe23cc69 100644 --- a/tests/base/data_out_base_vtu_cycle.with_zlib=true.output +++ b/tests/base/data_out_base_vtu_cycle.with_zlib=true.output @@ -14,32 +14,28 @@ -AQAAAFABAABQAQAANQAAAA==eNpjYMAHPtiTJv4DhziDA7Hiq1eBABOGeFgoCLDiMIeDRHEuHOI8OMT5cIgLYIgDAH+pDF0= - + -AQAAAFAAAABQAAAAKQAAAA==eNotw8cNACAQA0HDkY7Qf7vswyONJBVWhjd2Dp++mNx+/PrjBxBcAI0= - + -AQAAACgAAAAoAAAAIgAAAA==eNpjYmBgYAFiNiDmAGIuIOYBYj4gFgBiISAWAWIABwgAbw== - + -AQAAAAoAAAAKAAAACwAAAA==eNpjZoYBAACvAB8= - + -AQAAAHAAAABwAAAALgAAAA==eNpjYEAGH+xR6R9QmsEBiV6wahUTiE4IDWWFinOg0VxQmgdK80FpAQcAUAIJXw== + -AQAAAHAAAABwAAAAFgAAAA==eNpjYMAGPthjpxkc8NMcBGkAb/wF9g== + -AQAAAHAAAABwAAAAFgAAAA==eNpjYMAGPthjpxkc8NMcBGkAb/wF9g== + -AQAAAHAAAABwAAAAFgAAAA==eNpjYMAGPthjpxkc8NMcBGkAb/wF9g== + -AQAAAHAAAABwAAAAGQAAAA==eNpjYEAGH+wZsPMd8ItzECkv4AAAaTsGXQ== + @@ -60,32 +56,28 @@ AQAAAHAAAABwAAAAGQAAAA==eNpjYEAGH+wZsPMd8ItzECkv4AAAaTsGXQ== -AQAAAFABAABQAQAASgAAAA==eNpjYMAHPtij0oTEf9ij0nDggEbjFF+9CgSYHGA0TDwsFARYHWA0qjEcDqg0IXEuB1QaBngcUGkY4HNApWFAwAGVZmAAAJsiGLk= - + -AQAAAFAAAABQAAAAKQAAAA==eNotw8cNACAQA0HDkY7Qf7vswyONJBVWhjd2Dp++mNx+/PrjBxBcAI0= - + -AQAAACgAAAAoAAAAIgAAAA==eNpjYmBgYAFiNiDmAGIuIOYBYj4gFgBiISAWAWIABwgAbw== - + -AQAAAAoAAAAKAAAACwAAAA==eNpjZoYBAACvAB8= - + -AQAAAHAAAABwAAAALgAAAA==eNpjYEAGH+xR6R9QmsEBiV6wahUTiE4IDWWFinOg0VxQmgdK80FpAQcAUAIJXw== + -AQAAAHAAAABwAAAAFgAAAA==eNpjYMAGPthjpxkc8NMcBGkAb/wF9g== + -AQAAAHAAAABwAAAAFgAAAA==eNpjYMAGPthjpxkc8NMcBGkAb/wF9g== + -AQAAAHAAAABwAAAAFgAAAA==eNpjYMAGPthjpxkc8NMcBGkAb/wF9g== + -AQAAAHAAAABwAAAAGQAAAA==eNpjYEAGH+wZsPMd8ItzECkv4AAAaTsGXQ== + @@ -106,32 +98,28 @@ AQAAAHAAAABwAAAAGQAAAA==eNpjYEAGH+wZsPMd8ItzECkv4AAAaTsGXQ== -AQAAABAFAAAQBQAAoAAAAA==eNqVkMsKw0AIAKVQWETEP2p+ovnI5Od63GPJwS3YTB7enIWZRJGj+bzk1nvuV3kHLtOxp4Ong6eDJ9+rp/Kxn/J12ebxx+f3Nk/wNPQX3/BXnv7K07/PZSrfNfyV5155+vd5/k+D+zS4T4P7XOUK3IA78DjpKnQVugpdha5C16Br0DXoGnQNug5dh65D16Hr0A3oBnQDugHdH/8CMeJb0Q== - + -AQAAAOABAADgAQAAogAAAA==eNpNi8cSgkAQBdecAyJiDggiiGD8/1/zTVUfPHRtV+8b55yriYaoi6Zoia7o4G3R+2v2DkQft78hbSTGYiY8fCJ8mvlUzGkefSEC3HpI89kuaQF9LVa49Q0tZLul7cRenEWEH0RMMz+KhGZ+EhdaxO4qUtx2GS1ml9MSbm+0lN1dFLjtSlrGrqLl3D5oBbuXeOK2e9NKdh9axe2X9gNQBw2p - + -AQAAAHgAAAB4AAAATAAAAA==eNoNw5EShFAAAMAHQRAEQRAEQRAEwUEQBEEQBEEQBEEQBH3+7c5sFEKITUzNzC0sraxtbO382Ts4Ojm7uLq5e3h6efv4+vkHNocHRQ== - + -AQAAAB4AAAAeAAAACwAAAA==eNrj5MQHABB3AQ8= - + -AQAAALABAACwAQAANgAAAA==eNpjYEAGH+wZsPJh9A+YvAN54mB6wapVTCA6ITSUFSrOQSd5GM0FpXmgNB+UFhj06gCiMiHx + -AQAAALABAACwAQAAMwAAAA==eNpjYMAGPtgTR//AQTM4kEEvWLWKCR+dEBrKio8GAg4q0VxE0jxE0nxE0gIEaQDf2iHx + -AQAAALABAACwAQAAFwAAAA==eNpjYCAGfLCnDs3gMLA0x5CnAc+qFbA= + -AQAAALABAACwAQAAFwAAAA==eNpjYCAGfLCnDs3gMLA0x5CnAc+qFbA= + -AQAAALABAACwAQAAUAAAAA==eNpjYEAGH+yhDAcIxeHAQJS8AJQWgdISUFoGSitQ2RwlKK0CpdWgtAaU1oLSOlBab5DYbwClDaG0EZQ2htImUNoUSptBaXMobeEAANfTFck= + @@ -152,32 +140,28 @@ AQAAALABAACwAQAAUAAAAA==eNpjYEAGH+yhDAcIxeHAQJS8AJQWgdISUFoGSitQ2RwlKK0CpdWgtAaU -AQAAABAFAAAQBQAA0gAAAA==eNqNUVsOgjAQRCNJQ2rT8tLb2EvAIfFyfvJpEAbDtGPsz2Rmt9PdaVH8Oq/HnzweOdAIHTgLzn7MuW8m/RLzdSN8Tcz7WvIBeqEX8Tkt55zwcVhOuetHbmJ+nvQ+OPC09efr1e4H/dM2XJM5pq2f3xu3/iMvKYfv+6t/EPt4ygf3QpLHOk9N94Gt0IGV4JZ0cEe6S/bLc/atCJ2oe6pDD1SHXou5vZgjELfkw3M15GdFzo58eM9G5NoSB3Yij17k3oocO5FLL/7zRhx4j28uS4pw - + -AQAAAOABAADgAQAAogAAAA==eNpNi8cSgkAQBdecAyJiDggiiGD8/1/zTVUfPHRtV+8b55yriYaoi6Zoia7o4G3R+2v2DkQft78hbSTGYiY8fCJ8mvlUzGkefSEC3HpI89kuaQF9LVa49Q0tZLul7cRenEWEH0RMMz+KhGZ+EhdaxO4qUtx2GS1ml9MSbm+0lN1dFLjtSlrGrqLl3D5oBbuXeOK2e9NKdh9axe2X9gNQBw2p - + -AQAAAHgAAAB4AAAATAAAAA==eNoNw5EShFAAAMAHQRAEQRAEQRAEwUEQBEEQBEEQBEEQBH3+7c5sFEKITUzNzC0sraxtbO382Ts4Ojm7uLq5e3h6efv4+vkHNocHRQ== - + -AQAAAB4AAAAeAAAACwAAAA==eNrj5MQHABB3AQ8= - + -AQAAALABAACwAQAANgAAAA==eNpjYEAGH+wZsPJh9A+YvAN54mB6wapVTCA6ITSUFSrOQSd5GM0FpXmgNB+UFhj06gCiMiHx + -AQAAALABAACwAQAAMwAAAA==eNpjYMAGPtgTR//AQTM4kEEvWLWKCR+dEBrKio8GAg4q0VxE0jxE0nxE0gIEaQDf2iHx + -AQAAALABAACwAQAAFwAAAA==eNpjYCAGfLCnDs3gMLA0x5CnAc+qFbA= + -AQAAALABAACwAQAAFwAAAA==eNpjYCAGfLCnDs3gMLA0x5CnAc+qFbA= + -AQAAALABAACwAQAAUAAAAA==eNpjYEAGH+yhDAcIxeHAQJS8AJQWgdISUFoGSitQ2RwlKK0CpdWgtAaU1oLSOlBab5DYbwClDaG0EZQ2htImUNoUSptBaXMobeEAANfTFck= + @@ -198,32 +182,28 @@ AQAAALABAACwAQAAUAAAAA==eNpjYEAGH+yhDAcIxeHAQJS8AJQWgdISUFoGSitQ2RwlKK0CpdWgtAaU -AQAAAAAVAAAAFQAAtwEAAA==eNqdljtuxDAMRIUAAQxCIOZGySWSQyaX29LlYgsV0e4zh3FDaGz+hh95jKvn9jFa79fZ1SN9+q4rT8DHZ0/vBHzZcf2cgK+zGxfFR/5In+SeV5U36e15VTyRH+LrZsZNcVR1IH1f/v48nrcn/Pvr8byD3mHbW+cdX/Zf+z/suNZ3O77Or/M47Pz+xnFAHAfo1zwRX5TndXzPdknu/O/23bqRvZ3/3b5bf4pr5/81P3UfUX7UT9d9MEp+iRfKp+prskty57+aD6ob2dv5r+aM6k9xXc/bMPuY87vup2HWiXm65muYcTDf/5MB+AQ8AVfTTwA+AU/A1cwjAJ+AJ+Bq8hSAT8ATcDXrEIBPwBNwNescJu9R8KVmH5GcgCfgavYp+ZmAJ+BqzgHlMQFPwNWcM+JpAp6AqznHYc7tLOZNzT0RZl1nUQ819xD5I5mAq7nnorCXcE7w6+7RKOIV+BV85+7pMPd+FvtazXsgzL2QxTyrec+E2TdZ1FvNeyxMu5VU856Moh9l+lHzHg7zv0FFHmre82HeKxVPav5HhLl3qjqo+Z8SZl9WdVbzPyjMuKs+epZ3Ou4XOQ== - + -AQAAAIAMAACADAAAVwMAAA==eNptkVVTEFAQRrG7u7ADu7tbwQ7s7u7uRrEbDMTuQsXu7hbzr/jtzHnauQ/n5e7Zb2fuFxEREZFOZBDpRUaRSWQRmUVWkU3kFDlEPpFfFBIFmWUXuXBsVkAUxsnBex6Rmx17LyqKMLPdvDiF2C2G4+8VFyVEpCgVuGezkqI0jr9XiveyokzgXiS75XDKiwqiiqgs6on6orFoxKyiiMKxWQPRBMdmlURVHJs1FE1xKrNXXVQj0/aai2bMbK8GTmP2WuBEkV0TpwnZLXGqsVdb1CLT9lqLVsxsrw5Oc/ba4NQguy5OC7Lb4vj/aCfai86iU+A/bNZBdMHx/2GzjqIrjv+PTuzFiOjAf3RmrxuO/48uZHfH8f8RzV5P0SPwHzHs9cLx/9GN7N44/j/6iL5igIgN/IfN+omBOP4/bNZfDMLx/xHL3hAxOPAfA9gbiuP/YyDZw3D8fwxmb4QYHviPIeyNxPH/MZTsUTijxRgxUUwQS8RSsUqsZDZWTMKx2TKxGsdm48RkHJstF2twbDZeTMGx2QqxFmcCudPEVG5a7nqxjpnlTsdZRe4GnEnkzsBZTW4czmRuz8RZw+2NOFPJnS1mcdNy48UmZpY7B2c9uZtxppM7F2cDuVtwZnB7Hk4ct7fizCJ3gZjPTcvdLrYxs9yFOPHk7sCZQ+4inM3k7sSZy+3FOFu4vQvH971b7BGJIiHQt832igM4vm+b7RMHcXzfNtsvDuH4vhPITRKHA30nknsEx/d9gNxkHN/3QW4fxfF9Hyb3uDgW6DuJ3BM4vu8j5J7E8X0nc/sUju/7GLlnxOlA38fJPYvj+z5B7jkc3/dJbp/H8X1fEBdFirga6Ntml8Q1HN+3zS6L6zi+b5tdETdwfN9Xyb0pUgN9p5B7C8f3fY3c2zi+7+vcvoPj+04l9564G+j7Jrn3cXzft8h9gOP7vs3thzi+77vkPhaPAn3fI/cJju/7PrlPcXzfD7j9DMf3/Vy8EG/Fm0DfNnsp3uH4vm32SrzH8X3b7LX4gOP7fkPuJ/Ex0Pdbcj/j+L7fkfsFx/f9nttfcXzfH8n9Lr4F+v5E7g8c3/dnctNwfN9fuP0Tx/f9jdzf4leg7+/k/sHxff8g9y+O7zuN2/9w/gOh1n+I - + -AQAAAJABAACQAQAAmAAAAA==eNoNzRGAhEAAAMD9fzkMwzA8DMMwDMMwDMPDMAzDMAzDMAzDw/AHhucVQoiISUh5k5FTUFJR09DS0fNhYGRiZmFlY+fg5OLmy0P4CeFFRExCypuMnIKSipqGlo6eDwMjEzMLKxs7BycXN18ewq+fiJiElDcZOQUlFTUNLR09HwZGJmYWVjZ2Dk4ubr48hD8/ETEJ/xaiL0A= - + -AQAAAGQAAABkAAAADAAAAA==eNrj4aE9AADtHASx - + -AQAAAAAHAAAABwAAQAAAAA==eNpjYEAGH+wZyOLD6B8weYfhIQ6mF6xaxQSiE0JDWaHiHKPyI0IeRnNBaR4ozQelBUbVjaobVTeE1QEAes2Cfw== + -AQAAAAAHAAAABwAASwAAAA==eNpjYMAGPtij0oTkcdE/cNAMDtjpwWYOXnrBqlVM+OiE0FBWfDQQcBCgR+0fWPuJpbmIpHmIpPmIpAWIpEf9MeqPUX9gowFLHIJ/ + -AQAAAAAHAAAABwAAOAAAAA==eNpjYCAGfLCnD/2DSjSDwzCgF6xaxTSQdEJoKOtA0kDAMUpTheYaJjTPMKH5hgktMORpAO0qgn8= + -AQAAAAAHAAAABwAAHwAAAA==eNpjYKAG+GA/PGkGh1F6JNMco/QoPUoPYxoAo8lTHg== + -AQAAAAAHAAAABwAA4wAAAA==eNrt0TlKZVEYhdEdGhoYGFQgIiIiopZ9e+3K3mevZTuVf2hnSA5B4a3AARiJJ1n3Y3OCy0m+nvctH12fAQ5yiMP80+Vb7o9wlGMc5wQnOcVpznCWc/zLeS5wkUtc5gpXf/h/rXGdG9zkFru+xWxrZkczu5rZ08y+Zv5p5kAzh5o50syxZk40c6qZM82ca6ane7/v//v+n+eib8diYy7tLDbmys5iY67tLDbmxs5iY27tLDbmzs5iY+7tLDbmwc5iY/7bWWzMo53FxjzZWWzMs53FxrzYWWzMq53Fxrx1H/t9lj8= + diff --git a/tests/base/data_out_base_vtu_cycle.with_zlib=true.output.2 b/tests/base/data_out_base_vtu_cycle.with_zlib=true.output.2 deleted file mode 100644 index f767e89eb8..0000000000 --- a/tests/base/data_out_base_vtu_cycle.with_zlib=true.output.2 +++ /dev/null @@ -1,230 +0,0 @@ -============================== -11.vtu -============================== - - - - - -42 - - - - -AQAAAFABAABQAQAANQAAAA==eNpjYMAHPtiTJv4DhziDA7Hiq1eBABOGeFgoCLDiMIeDRHEuHOI8OMT5cIgLYIgDAH+pDF0= - - - - - -AQAAAFAAAABQAAAAKQAAAA==eNotw8cNACAQA0HDkY7Qf7vswyONJBVWhjd2Dp++mNx+/PrjBxBcAI0= - - -AQAAACgAAAAoAAAAIgAAAA==eNpjYmBgYAFiNiDmAGIuIOYBYj4gFgBiISAWAWIABwgAbw== - - -AQAAAAoAAAAKAAAACwAAAA==eNpjZoYBAACvAB8= - - - - -AQAAAHAAAABwAAAALgAAAA==eNpjYEAGH+xR6R9QmsEBiV6wahUTiE4IDWWFinOg0VxQmgdK80FpAQcAUAIJXw== - -AQAAAHAAAABwAAAAFgAAAA==eNpjYMAGPthjpxkc8NMcBGkAb/wF9g== - -AQAAAHAAAABwAAAAFgAAAA==eNpjYMAGPthjpxkc8NMcBGkAb/wF9g== - -AQAAAHAAAABwAAAAFgAAAA==eNpjYMAGPthjpxkc8NMcBGkAb/wF9g== - -AQAAAHAAAABwAAAAGQAAAA==eNpjYEAGH+wZsPMd8ItzECkv4AAAaTsGXQ== - - - - -============================== -12.vtu -============================== - - - - - -42 - - - - -AQAAAFABAABQAQAASgAAAA==eNpjYMAHPtij0oTEf9ij0nDggEbjFF+9CgSYHGA0TDwsFARYHWA0qjEcDqg0IXEuB1QaBngcUGkY4HNApWFAwAGVZmAAAJsiGLk= - - - - - -AQAAAFAAAABQAAAAKQAAAA==eNotw8cNACAQA0HDkY7Qf7vswyONJBVWhjd2Dp++mNx+/PrjBxBcAI0= - - -AQAAACgAAAAoAAAAIgAAAA==eNpjYmBgYAFiNiDmAGIuIOYBYj4gFgBiISAWAWIABwgAbw== - - -AQAAAAoAAAAKAAAACwAAAA==eNpjZoYBAACvAB8= - - - - -AQAAAHAAAABwAAAALgAAAA==eNpjYEAGH+xR6R9QmsEBiV6wahUTiE4IDWWFinOg0VxQmgdK80FpAQcAUAIJXw== - -AQAAAHAAAABwAAAAFgAAAA==eNpjYMAGPthjpxkc8NMcBGkAb/wF9g== - -AQAAAHAAAABwAAAAFgAAAA==eNpjYMAGPthjpxkc8NMcBGkAb/wF9g== - -AQAAAHAAAABwAAAAFgAAAA==eNpjYMAGPthjpxkc8NMcBGkAb/wF9g== - -AQAAAHAAAABwAAAAGQAAAA==eNpjYEAGH+wZsPMd8ItzECkv4AAAaTsGXQ== - - - - -============================== -22.vtu -============================== - - - - - -42 - - - - -AQAAABAFAAAQBQAAoQAAAA==eNqVkMEJwzAMAEWhYIQQ2qhZIh2yXa5PP0secoiaS1L9fIY7WyJH83nIX/d5vso7cJmOPR08HTwdPHlfPZWP8yl/v5a5/fDnvMwdPA39xTf8lae/8vTvc5nm7buGv/L0V57+fZ7/abCfBvtpsJ+rXIEbcAceJ12FrkJXoavQVegadA26Bl2DrkHXoevQdeg6dB26Ad2AbkA3oLvyLyYyW80= - - - - - -AQAAAOABAADgAQAAogAAAA==eNpNi8cSgkAQBdecAyJiDggiiGD8/1/zTVUfPHRtV+8b55yriYaoi6Zoia7o4G3R+2v2DkQft78hbSTGYiY8fCJ8mvlUzGkefSEC3HpI89kuaQF9LVa49Q0tZLul7cRenEWEH0RMMz+KhGZ+EhdaxO4qUtx2GS1ml9MSbm+0lN1dFLjtSlrGrqLl3D5oBbuXeOK2e9NKdh9axe2X9gNQBw2p - - -AQAAAHgAAAB4AAAATAAAAA==eNoNw5EShFAAAMAHQRAEQRAEQRAEwUEQBEEQBEEQBEEQBH3+7c5sFEKITUzNzC0sraxtbO382Ts4Ojm7uLq5e3h6efv4+vkHNocHRQ== - - -AQAAAB4AAAAeAAAACwAAAA==eNrj5MQHABB3AQ8= - - - - -AQAAALABAACwAQAANgAAAA==eNpjYEAGH+wZsPJh9A+YvAN54mB6wapVTCA6ITSUFSrOQSd5GM0FpXmgNB+UFhj06gCiMiHx - -AQAAALABAACwAQAAMwAAAA==eNpjYMAGPtgTR//AQTM4kEEvWLWKCR+dEBrKio8GAg4q0VxE0jxE0nxE0gIEaQDf2iHx - -AQAAALABAACwAQAAFwAAAA==eNpjYCAGfLCnDs3gMLA0x5CnAc+qFbA= - -AQAAALABAACwAQAAFwAAAA==eNpjYCAGfLCnDs3gMLA0x5CnAc+qFbA= - -AQAAALABAACwAQAAUAAAAA==eNpjYEAGH+yhDAcIxeHAQJS8AJQWgdISUFoGSitQ2RwlKK0CpdWgtAaU1oLSOlBab5DYbwClDaG0EZQ2htImUNoUSptBaXMobeEAANfTFck= - - - - -============================== -23.vtu -============================== - - - - - -42 - - - - -AQAAABAFAAAQBQAA0gAAAA==eNqNUVsOgjAQRCNJQ2rT8tLb2EvAIfFyfvJpEAbDtGPsz2Rmt9PdaVH8Oq/HnzweOdAIHTgLzn7MuW8m/RLzdSN8Tcz7WvIBeqEX8Tkt55zwcVhOuetHbmJ+nvQ+OPC09efr1e4H/dM2XJM5pq2f3xu3/iMvKYfv+6t/EPt4ygf3QpLHOk9N94Gt0IGV4JZ0cEe6S/bLc/atCJ2oe6pDD1SHXou5vZgjELfkw3M15GdFzo58eM9G5NoSB3Yij17k3oocO5FLL/7zRhx4j28uS4pw - - - - - -AQAAAOABAADgAQAAogAAAA==eNpNi8cSgkAQBdecAyJiDggiiGD8/1/zTVUfPHRtV+8b55yriYaoi6Zoia7o4G3R+2v2DkQft78hbSTGYiY8fCJ8mvlUzGkefSEC3HpI89kuaQF9LVa49Q0tZLul7cRenEWEH0RMMz+KhGZ+EhdaxO4qUtx2GS1ml9MSbm+0lN1dFLjtSlrGrqLl3D5oBbuXeOK2e9NKdh9axe2X9gNQBw2p - - -AQAAAHgAAAB4AAAATAAAAA==eNoNw5EShFAAAMAHQRAEQRAEQRAEwUEQBEEQBEEQBEEQBH3+7c5sFEKITUzNzC0sraxtbO382Ts4Ojm7uLq5e3h6efv4+vkHNocHRQ== - - -AQAAAB4AAAAeAAAACwAAAA==eNrj5MQHABB3AQ8= - - - - -AQAAALABAACwAQAANgAAAA==eNpjYEAGH+wZsPJh9A+YvAN54mB6wapVTCA6ITSUFSrOQSd5GM0FpXmgNB+UFhj06gCiMiHx - -AQAAALABAACwAQAAMwAAAA==eNpjYMAGPtgTR//AQTM4kEEvWLWKCR+dEBrKio8GAg4q0VxE0jxE0nxE0gIEaQDf2iHx - -AQAAALABAACwAQAAFwAAAA==eNpjYCAGfLCnDs3gMLA0x5CnAc+qFbA= - -AQAAALABAACwAQAAFwAAAA==eNpjYCAGfLCnDs3gMLA0x5CnAc+qFbA= - -AQAAALABAACwAQAAUAAAAA==eNpjYEAGH+yhDAcIxeHAQJS8AJQWgdISUFoGSitQ2RwlKK0CpdWgtAaU1oLSOlBab5DYbwClDaG0EZQ2htImUNoUSptBaXMobeEAANfTFck= - - - - -============================== -33.vtu -============================== - - - - - -42 - - - - -AQAAAAAVAAAAFQAAtwEAAA==eNqdljtuxDAMRIUAAQxCIOZGySWSQyaX29LlYgsV0e4zh3FDaGz+hh95jKvn9jFa79fZ1SN9+q4rT8DHZ0/vBHzZcf2cgK+zGxfFR/5In+SeV5U36e15VTyRH+LrZsZNcVR1IH1f/v48nrcn/Pvr8byD3mHbW+cdX/Zf+z/suNZ3O77Or/M47Pz+xnFAHAfo1zwRX5TndXzPdknu/O/23bqRvZ3/3b5bf4pr5/81P3UfUX7UT9d9MEp+iRfKp+prskty57+aD6ob2dv5r+aM6k9xXc/bMPuY87vup2HWiXm65muYcTDf/5MB+AQ8AVfTTwA+AU/A1cwjAJ+AJ+Bq8hSAT8ATcDXrEIBPwBNwNescJu9R8KVmH5GcgCfgavYp+ZmAJ+BqzgHlMQFPwNWcM+JpAp6AqznHYc7tLOZNzT0RZl1nUQ819xD5I5mAq7nnorCXcE7w6+7RKOIV+BV85+7pMPd+FvtazXsgzL2QxTyrec+E2TdZ1FvNeyxMu5VU856Moh9l+lHzHg7zv0FFHmre82HeKxVPav5HhLl3qjqo+Z8SZl9WdVbzPyjMuKs+epZ3Ou4XOQ== - - - - - -AQAAAIAMAACADAAAVwMAAA==eNptkVVTEFAQRrG7u7ADu7tbwQ7s7u7uRrEbDMTuQsXu7hbzr/jtzHnauQ/n5e7Zb2fuFxEREZFOZBDpRUaRSWQRmUVWkU3kFDlEPpFfFBIFmWUXuXBsVkAUxsnBex6Rmx17LyqKMLPdvDiF2C2G4+8VFyVEpCgVuGezkqI0jr9XiveyokzgXiS75XDKiwqiiqgs6on6orFoxKyiiMKxWQPRBMdmlURVHJs1FE1xKrNXXVQj0/aai2bMbK8GTmP2WuBEkV0TpwnZLXGqsVdb1CLT9lqLVsxsrw5Oc/ba4NQguy5OC7Lb4vj/aCfai86iU+A/bNZBdMHx/2GzjqIrjv+PTuzFiOjAf3RmrxuO/48uZHfH8f8RzV5P0SPwHzHs9cLx/9GN7N44/j/6iL5igIgN/IfN+omBOP4/bNZfDMLx/xHL3hAxOPAfA9gbiuP/YyDZw3D8fwxmb4QYHviPIeyNxPH/MZTsUTijxRgxUUwQS8RSsUqsZDZWTMKx2TKxGsdm48RkHJstF2twbDZeTMGx2QqxFmcCudPEVG5a7nqxjpnlTsdZRe4GnEnkzsBZTW4czmRuz8RZw+2NOFPJnS1mcdNy48UmZpY7B2c9uZtxppM7F2cDuVtwZnB7Hk4ct7fizCJ3gZjPTcvdLrYxs9yFOPHk7sCZQ+4inM3k7sSZy+3FOFu4vQvH971b7BGJIiHQt832igM4vm+b7RMHcXzfNtsvDuH4vhPITRKHA30nknsEx/d9gNxkHN/3QW4fxfF9Hyb3uDgW6DuJ3BM4vu8j5J7E8X0nc/sUju/7GLlnxOlA38fJPYvj+z5B7jkc3/dJbp/H8X1fEBdFirga6Ntml8Q1HN+3zS6L6zi+b5tdETdwfN9Xyb0pUgN9p5B7C8f3fY3c2zi+7+vcvoPj+04l9564G+j7Jrn3cXzft8h9gOP7vs3thzi+77vkPhaPAn3fI/cJju/7PrlPcXzfD7j9DMf3/Vy8EG/Fm0DfNnsp3uH4vm32SrzH8X3b7LX4gOP7fkPuJ/Ex0Pdbcj/j+L7fkfsFx/f9nttfcXzfH8n9Lr4F+v5E7g8c3/dnctNwfN9fuP0Tx/f9jdzf4leg7+/k/sHxff8g9y+O7zuN2/9w/gOh1n+I - - -AQAAAJABAACQAQAAmAAAAA==eNoNzRGAhEAAAMD9fzkMwzA8DMMwDMMwDMPDMAzDMAzDMAzDw/AHhucVQoiISUh5k5FTUFJR09DS0fNhYGRiZmFlY+fg5OLmy0P4CeFFRExCypuMnIKSipqGlo6eDwMjEzMLKxs7BycXN18ewq+fiJiElDcZOQUlFTUNLR09HwZGJmYWVjZ2Dk4ubr48hD8/ETEJ/xaiL0A= - - -AQAAAGQAAABkAAAADAAAAA==eNrj4aE9AADtHASx - - - - -AQAAAAAHAAAABwAAQAAAAA==eNpjYEAGH+wZyOLD6B8weYfhIQ6mF6xaxQSiE0JDWaHiHKPyI0IeRnNBaR4ozQelBUbVjaobVTeE1QEAes2Cfw== - -AQAAAAAHAAAABwAASwAAAA==eNpjYMAGPtij0oTkcdE/cNAMDtjpwWYOXnrBqlVM+OiE0FBWfDQQcBCgR+0fWPuJpbmIpHmIpPmIpAWIpEf9MeqPUX9gowFLHIJ/ - -AQAAAAAHAAAABwAAOAAAAA==eNpjYCAGfLCnD/2DSjSDwzCgF6xaxTSQdEJoKOtA0kDAMUpTheYaJjTPMKH5hgktMORpAO0qgn8= - -AQAAAAAHAAAABwAAHwAAAA==eNpjYKAG+GA/PGkGh1F6JNMco/QoPUoPYxoAo8lTHg== - -AQAAAAAHAAAABwAA4wAAAA==eNrt0TlKZVEYhdEdGhoYGFQgIiIiopZ9e+3K3mevZTuVf2hnSA5B4a3AARiJJ1n3Y3OCy0m+nvctH12fAQ5yiMP80+Vb7o9wlGMc5wQnOcVpznCWc/zLeS5wkUtc5gpXf/h/rXGdG9zkFru+xWxrZkczu5rZ08y+Zv5p5kAzh5o50syxZk40c6qZM82ca6ane7/v//v+n+eib8diYy7tLDbmys5iY67tLDbmxs5iY27tLDbmzs5iY+7tLDbmwc5iY/7bWWzMo53FxjzZWWzMs53FxrzYWWzMq53Fxrx1H/t9lj8= - - - - diff --git a/tests/base/data_out_base_vtu_time.cc b/tests/base/data_out_base_vtu_time.cc index 5de2535bd6..47a797f3a6 100644 --- a/tests/base/data_out_base_vtu_time.cc +++ b/tests/base/data_out_base_vtu_time.cc @@ -62,10 +62,13 @@ void check_all(std::ostream &log) int main() { + std::stringstream ss; + check_all<1,1>(ss); + check_all<1,2>(ss); + check_all<2,2>(ss); + check_all<2,3>(ss); + check_all<3,3>(ss); + std::ofstream logfile("output"); - check_all<1,1>(logfile); - check_all<1,2>(logfile); - check_all<2,2>(logfile); - check_all<2,3>(logfile); - check_all<3,3>(logfile); + filter_out_xml_key(ss, "DataArray",logfile); } diff --git a/tests/base/data_out_base_vtu_time.with_zlib=true.output b/tests/base/data_out_base_vtu_time.with_zlib=true.output index a17622db32..9efd303d63 100644 --- a/tests/base/data_out_base_vtu_time.with_zlib=true.output +++ b/tests/base/data_out_base_vtu_time.with_zlib=true.output @@ -14,32 +14,28 @@ -AQAAAFABAABQAQAANQAAAA==eNpjYMAHPtiTJv4DhziDA7Hiq1eBABOGeFgoCLDiMIeDRHEuHOI8OMT5cIgLYIgDAH+pDF0= - + -AQAAAFAAAABQAAAAKQAAAA==eNotw8cNACAQA0HDkY7Qf7vswyONJBVWhjd2Dp++mNx+/PrjBxBcAI0= - + -AQAAACgAAAAoAAAAIgAAAA==eNpjYmBgYAFiNiDmAGIuIOYBYj4gFgBiISAWAWIABwgAbw== - + -AQAAAAoAAAAKAAAACwAAAA==eNpjZoYBAACvAB8= - + -AQAAAHAAAABwAAAALgAAAA==eNpjYEAGH+xR6R9QmsEBiV6wahUTiE4IDWWFinOg0VxQmgdK80FpAQcAUAIJXw== + -AQAAAHAAAABwAAAAFgAAAA==eNpjYMAGPthjpxkc8NMcBGkAb/wF9g== + -AQAAAHAAAABwAAAAFgAAAA==eNpjYMAGPthjpxkc8NMcBGkAb/wF9g== + -AQAAAHAAAABwAAAAFgAAAA==eNpjYMAGPthjpxkc8NMcBGkAb/wF9g== + -AQAAAHAAAABwAAAAGQAAAA==eNpjYEAGH+wZsPMd8ItzECkv4AAAaTsGXQ== + @@ -60,32 +56,28 @@ AQAAAHAAAABwAAAAGQAAAA==eNpjYEAGH+wZsPMd8ItzECkv4AAAaTsGXQ== -AQAAAFABAABQAQAASgAAAA==eNpjYMAHPtij0oTEf9ij0nDggEbjFF+9CgSYHGA0TDwsFARYHWA0qjEcDqg0IXEuB1QaBngcUGkY4HNApWFAwAGVZmAAAJsiGLk= - + -AQAAAFAAAABQAAAAKQAAAA==eNotw8cNACAQA0HDkY7Qf7vswyONJBVWhjd2Dp++mNx+/PrjBxBcAI0= - + -AQAAACgAAAAoAAAAIgAAAA==eNpjYmBgYAFiNiDmAGIuIOYBYj4gFgBiISAWAWIABwgAbw== - + -AQAAAAoAAAAKAAAACwAAAA==eNpjZoYBAACvAB8= - + -AQAAAHAAAABwAAAALgAAAA==eNpjYEAGH+xR6R9QmsEBiV6wahUTiE4IDWWFinOg0VxQmgdK80FpAQcAUAIJXw== + -AQAAAHAAAABwAAAAFgAAAA==eNpjYMAGPthjpxkc8NMcBGkAb/wF9g== + -AQAAAHAAAABwAAAAFgAAAA==eNpjYMAGPthjpxkc8NMcBGkAb/wF9g== + -AQAAAHAAAABwAAAAFgAAAA==eNpjYMAGPthjpxkc8NMcBGkAb/wF9g== + -AQAAAHAAAABwAAAAGQAAAA==eNpjYEAGH+wZsPMd8ItzECkv4AAAaTsGXQ== + @@ -106,32 +98,28 @@ AQAAAHAAAABwAAAAGQAAAA==eNpjYEAGH+wZsPMd8ItzECkv4AAAaTsGXQ== -AQAAABAFAAAQBQAAoAAAAA==eNqVkMsKw0AIAKVQWETEP2p+ovnI5Od63GPJwS3YTB7enIWZRJGj+bzk1nvuV3kHLtOxp4Ong6eDJ9+rp/Kxn/J12ebxx+f3Nk/wNPQX3/BXnv7K07/PZSrfNfyV5155+vd5/k+D+zS4T4P7XOUK3IA78DjpKnQVugpdha5C16Br0DXoGnQNug5dh65D16Hr0A3oBnQDugHdH/8CMeJb0Q== - + -AQAAAOABAADgAQAAogAAAA==eNpNi8cSgkAQBdecAyJiDggiiGD8/1/zTVUfPHRtV+8b55yriYaoi6Zoia7o4G3R+2v2DkQft78hbSTGYiY8fCJ8mvlUzGkefSEC3HpI89kuaQF9LVa49Q0tZLul7cRenEWEH0RMMz+KhGZ+EhdaxO4qUtx2GS1ml9MSbm+0lN1dFLjtSlrGrqLl3D5oBbuXeOK2e9NKdh9axe2X9gNQBw2p - + -AQAAAHgAAAB4AAAATAAAAA==eNoNw5EShFAAAMAHQRAEQRAEQRAEwUEQBEEQBEEQBEEQBH3+7c5sFEKITUzNzC0sraxtbO382Ts4Ojm7uLq5e3h6efv4+vkHNocHRQ== - + -AQAAAB4AAAAeAAAACwAAAA==eNrj5MQHABB3AQ8= - + -AQAAALABAACwAQAANgAAAA==eNpjYEAGH+wZsPJh9A+YvAN54mB6wapVTCA6ITSUFSrOQSd5GM0FpXmgNB+UFhj06gCiMiHx + -AQAAALABAACwAQAAMwAAAA==eNpjYMAGPtgTR//AQTM4kEEvWLWKCR+dEBrKio8GAg4q0VxE0jxE0nxE0gIEaQDf2iHx + -AQAAALABAACwAQAAFwAAAA==eNpjYCAGfLCnDs3gMLA0x5CnAc+qFbA= + -AQAAALABAACwAQAAFwAAAA==eNpjYCAGfLCnDs3gMLA0x5CnAc+qFbA= + -AQAAALABAACwAQAAUAAAAA==eNpjYEAGH+yhDAcIxeHAQJS8AJQWgdISUFoGSitQ2RwlKK0CpdWgtAaU1oLSOlBab5DYbwClDaG0EZQ2htImUNoUSptBaXMobeEAANfTFck= + @@ -152,32 +140,28 @@ AQAAALABAACwAQAAUAAAAA==eNpjYEAGH+yhDAcIxeHAQJS8AJQWgdISUFoGSitQ2RwlKK0CpdWgtAaU -AQAAABAFAAAQBQAA0gAAAA==eNqNUVsOgjAQRCNJQ2rT8tLb2EvAIfFyfvJpEAbDtGPsz2Rmt9PdaVH8Oq/HnzweOdAIHTgLzn7MuW8m/RLzdSN8Tcz7WvIBeqEX8Tkt55zwcVhOuetHbmJ+nvQ+OPC09efr1e4H/dM2XJM5pq2f3xu3/iMvKYfv+6t/EPt4ygf3QpLHOk9N94Gt0IGV4JZ0cEe6S/bLc/atCJ2oe6pDD1SHXou5vZgjELfkw3M15GdFzo58eM9G5NoSB3Yij17k3oocO5FLL/7zRhx4j28uS4pw - + -AQAAAOABAADgAQAAogAAAA==eNpNi8cSgkAQBdecAyJiDggiiGD8/1/zTVUfPHRtV+8b55yriYaoi6Zoia7o4G3R+2v2DkQft78hbSTGYiY8fCJ8mvlUzGkefSEC3HpI89kuaQF9LVa49Q0tZLul7cRenEWEH0RMMz+KhGZ+EhdaxO4qUtx2GS1ml9MSbm+0lN1dFLjtSlrGrqLl3D5oBbuXeOK2e9NKdh9axe2X9gNQBw2p - + -AQAAAHgAAAB4AAAATAAAAA==eNoNw5EShFAAAMAHQRAEQRAEQRAEwUEQBEEQBEEQBEEQBH3+7c5sFEKITUzNzC0sraxtbO382Ts4Ojm7uLq5e3h6efv4+vkHNocHRQ== - + -AQAAAB4AAAAeAAAACwAAAA==eNrj5MQHABB3AQ8= - + -AQAAALABAACwAQAANgAAAA==eNpjYEAGH+wZsPJh9A+YvAN54mB6wapVTCA6ITSUFSrOQSd5GM0FpXmgNB+UFhj06gCiMiHx + -AQAAALABAACwAQAAMwAAAA==eNpjYMAGPtgTR//AQTM4kEEvWLWKCR+dEBrKio8GAg4q0VxE0jxE0nxE0gIEaQDf2iHx + -AQAAALABAACwAQAAFwAAAA==eNpjYCAGfLCnDs3gMLA0x5CnAc+qFbA= + -AQAAALABAACwAQAAFwAAAA==eNpjYCAGfLCnDs3gMLA0x5CnAc+qFbA= + -AQAAALABAACwAQAAUAAAAA==eNpjYEAGH+yhDAcIxeHAQJS8AJQWgdISUFoGSitQ2RwlKK0CpdWgtAaU1oLSOlBab5DYbwClDaG0EZQ2htImUNoUSptBaXMobeEAANfTFck= + @@ -198,32 +182,28 @@ AQAAALABAACwAQAAUAAAAA==eNpjYEAGH+yhDAcIxeHAQJS8AJQWgdISUFoGSitQ2RwlKK0CpdWgtAaU -AQAAAAAVAAAAFQAAtwEAAA==eNqdljtuxDAMRIUAAQxCIOZGySWSQyaX29LlYgsV0e4zh3FDaGz+hh95jKvn9jFa79fZ1SN9+q4rT8DHZ0/vBHzZcf2cgK+zGxfFR/5In+SeV5U36e15VTyRH+LrZsZNcVR1IH1f/v48nrcn/Pvr8byD3mHbW+cdX/Zf+z/suNZ3O77Or/M47Pz+xnFAHAfo1zwRX5TndXzPdknu/O/23bqRvZ3/3b5bf4pr5/81P3UfUX7UT9d9MEp+iRfKp+prskty57+aD6ob2dv5r+aM6k9xXc/bMPuY87vup2HWiXm65muYcTDf/5MB+AQ8AVfTTwA+AU/A1cwjAJ+AJ+Bq8hSAT8ATcDXrEIBPwBNwNescJu9R8KVmH5GcgCfgavYp+ZmAJ+BqzgHlMQFPwNWcM+JpAp6AqznHYc7tLOZNzT0RZl1nUQ819xD5I5mAq7nnorCXcE7w6+7RKOIV+BV85+7pMPd+FvtazXsgzL2QxTyrec+E2TdZ1FvNeyxMu5VU856Moh9l+lHzHg7zv0FFHmre82HeKxVPav5HhLl3qjqo+Z8SZl9WdVbzPyjMuKs+epZ3Ou4XOQ== - + -AQAAAIAMAACADAAAVwMAAA==eNptkVVTEFAQRrG7u7ADu7tbwQ7s7u7uRrEbDMTuQsXu7hbzr/jtzHnauQ/n5e7Zb2fuFxEREZFOZBDpRUaRSWQRmUVWkU3kFDlEPpFfFBIFmWUXuXBsVkAUxsnBex6Rmx17LyqKMLPdvDiF2C2G4+8VFyVEpCgVuGezkqI0jr9XiveyokzgXiS75XDKiwqiiqgs6on6orFoxKyiiMKxWQPRBMdmlURVHJs1FE1xKrNXXVQj0/aai2bMbK8GTmP2WuBEkV0TpwnZLXGqsVdb1CLT9lqLVsxsrw5Oc/ba4NQguy5OC7Lb4vj/aCfai86iU+A/bNZBdMHx/2GzjqIrjv+PTuzFiOjAf3RmrxuO/48uZHfH8f8RzV5P0SPwHzHs9cLx/9GN7N44/j/6iL5igIgN/IfN+omBOP4/bNZfDMLx/xHL3hAxOPAfA9gbiuP/YyDZw3D8fwxmb4QYHviPIeyNxPH/MZTsUTijxRgxUUwQS8RSsUqsZDZWTMKx2TKxGsdm48RkHJstF2twbDZeTMGx2QqxFmcCudPEVG5a7nqxjpnlTsdZRe4GnEnkzsBZTW4czmRuz8RZw+2NOFPJnS1mcdNy48UmZpY7B2c9uZtxppM7F2cDuVtwZnB7Hk4ct7fizCJ3gZjPTcvdLrYxs9yFOPHk7sCZQ+4inM3k7sSZy+3FOFu4vQvH971b7BGJIiHQt832igM4vm+b7RMHcXzfNtsvDuH4vhPITRKHA30nknsEx/d9gNxkHN/3QW4fxfF9Hyb3uDgW6DuJ3BM4vu8j5J7E8X0nc/sUju/7GLlnxOlA38fJPYvj+z5B7jkc3/dJbp/H8X1fEBdFirga6Ntml8Q1HN+3zS6L6zi+b5tdETdwfN9Xyb0pUgN9p5B7C8f3fY3c2zi+7+vcvoPj+04l9564G+j7Jrn3cXzft8h9gOP7vs3thzi+77vkPhaPAn3fI/cJju/7PrlPcXzfD7j9DMf3/Vy8EG/Fm0DfNnsp3uH4vm32SrzH8X3b7LX4gOP7fkPuJ/Ex0Pdbcj/j+L7fkfsFx/f9nttfcXzfH8n9Lr4F+v5E7g8c3/dnctNwfN9fuP0Tx/f9jdzf4leg7+/k/sHxff8g9y+O7zuN2/9w/gOh1n+I - + -AQAAAJABAACQAQAAmAAAAA==eNoNzRGAhEAAAMD9fzkMwzA8DMMwDMMwDMPDMAzDMAzDMAzDw/AHhucVQoiISUh5k5FTUFJR09DS0fNhYGRiZmFlY+fg5OLmy0P4CeFFRExCypuMnIKSipqGlo6eDwMjEzMLKxs7BycXN18ewq+fiJiElDcZOQUlFTUNLR09HwZGJmYWVjZ2Dk4ubr48hD8/ETEJ/xaiL0A= - + -AQAAAGQAAABkAAAADAAAAA==eNrj4aE9AADtHASx - + -AQAAAAAHAAAABwAAQAAAAA==eNpjYEAGH+wZyOLD6B8weYfhIQ6mF6xaxQSiE0JDWaHiHKPyI0IeRnNBaR4ozQelBUbVjaobVTeE1QEAes2Cfw== + -AQAAAAAHAAAABwAASwAAAA==eNpjYMAGPtij0oTkcdE/cNAMDtjpwWYOXnrBqlVM+OiE0FBWfDQQcBCgR+0fWPuJpbmIpHmIpPmIpAWIpEf9MeqPUX9gowFLHIJ/ + -AQAAAAAHAAAABwAAOAAAAA==eNpjYCAGfLCnD/2DSjSDwzCgF6xaxTSQdEJoKOtA0kDAMUpTheYaJjTPMKH5hgktMORpAO0qgn8= + -AQAAAAAHAAAABwAAHwAAAA==eNpjYKAG+GA/PGkGh1F6JNMco/QoPUoPYxoAo8lTHg== + -AQAAAAAHAAAABwAA4wAAAA==eNrt0TlKZVEYhdEdGhoYGFQgIiIiopZ9e+3K3mevZTuVf2hnSA5B4a3AARiJJ1n3Y3OCy0m+nvctH12fAQ5yiMP80+Vb7o9wlGMc5wQnOcVpznCWc/zLeS5wkUtc5gpXf/h/rXGdG9zkFru+xWxrZkczu5rZ08y+Zv5p5kAzh5o50syxZk40c6qZM82ca6ane7/v//v+n+eib8diYy7tLDbmys5iY67tLDbmxs5iY27tLDbmzs5iY+7tLDbmwc5iY/7bWWzMo53FxjzZWWzMs53FxrzYWWzMq53Fxrx1H/t9lj8= + diff --git a/tests/base/data_out_base_vtu_time.with_zlib=true.output.2 b/tests/base/data_out_base_vtu_time.with_zlib=true.output.2 deleted file mode 100644 index 78a9ec8074..0000000000 --- a/tests/base/data_out_base_vtu_time.with_zlib=true.output.2 +++ /dev/null @@ -1,230 +0,0 @@ -============================== -11.vtu -============================== - - - - - -3.14159 - - - - -AQAAAFABAABQAQAANQAAAA==eNpjYMAHPtiTJv4DhziDA7Hiq1eBABOGeFgoCLDiMIeDRHEuHOI8OMT5cIgLYIgDAH+pDF0= - - - - - -AQAAAFAAAABQAAAAKQAAAA==eNotw8cNACAQA0HDkY7Qf7vswyONJBVWhjd2Dp++mNx+/PrjBxBcAI0= - - -AQAAACgAAAAoAAAAIgAAAA==eNpjYmBgYAFiNiDmAGIuIOYBYj4gFgBiISAWAWIABwgAbw== - - -AQAAAAoAAAAKAAAACwAAAA==eNpjZoYBAACvAB8= - - - - -AQAAAHAAAABwAAAALgAAAA==eNpjYEAGH+xR6R9QmsEBiV6wahUTiE4IDWWFinOg0VxQmgdK80FpAQcAUAIJXw== - -AQAAAHAAAABwAAAAFgAAAA==eNpjYMAGPthjpxkc8NMcBGkAb/wF9g== - -AQAAAHAAAABwAAAAFgAAAA==eNpjYMAGPthjpxkc8NMcBGkAb/wF9g== - -AQAAAHAAAABwAAAAFgAAAA==eNpjYMAGPthjpxkc8NMcBGkAb/wF9g== - -AQAAAHAAAABwAAAAGQAAAA==eNpjYEAGH+wZsPMd8ItzECkv4AAAaTsGXQ== - - - - -============================== -12.vtu -============================== - - - - - -3.14159 - - - - -AQAAAFABAABQAQAASgAAAA==eNpjYMAHPtij0oTEf9ij0nDggEbjFF+9CgSYHGA0TDwsFARYHWA0qjEcDqg0IXEuB1QaBngcUGkY4HNApWFAwAGVZmAAAJsiGLk= - - - - - -AQAAAFAAAABQAAAAKQAAAA==eNotw8cNACAQA0HDkY7Qf7vswyONJBVWhjd2Dp++mNx+/PrjBxBcAI0= - - -AQAAACgAAAAoAAAAIgAAAA==eNpjYmBgYAFiNiDmAGIuIOYBYj4gFgBiISAWAWIABwgAbw== - - -AQAAAAoAAAAKAAAACwAAAA==eNpjZoYBAACvAB8= - - - - -AQAAAHAAAABwAAAALgAAAA==eNpjYEAGH+xR6R9QmsEBiV6wahUTiE4IDWWFinOg0VxQmgdK80FpAQcAUAIJXw== - -AQAAAHAAAABwAAAAFgAAAA==eNpjYMAGPthjpxkc8NMcBGkAb/wF9g== - -AQAAAHAAAABwAAAAFgAAAA==eNpjYMAGPthjpxkc8NMcBGkAb/wF9g== - -AQAAAHAAAABwAAAAFgAAAA==eNpjYMAGPthjpxkc8NMcBGkAb/wF9g== - -AQAAAHAAAABwAAAAGQAAAA==eNpjYEAGH+wZsPMd8ItzECkv4AAAaTsGXQ== - - - - -============================== -22.vtu -============================== - - - - - -3.14159 - - - - -AQAAABAFAAAQBQAAoQAAAA==eNqVkMEJwzAMAEWhYIQQ2qhZIh2yXa5PP0secoiaS1L9fIY7WyJH83nIX/d5vso7cJmOPR08HTwdPHlfPZWP8yl/v5a5/fDnvMwdPA39xTf8lae/8vTvc5nm7buGv/L0V57+fZ7/abCfBvtpsJ+rXIEbcAceJ12FrkJXoavQVegadA26Bl2DrkHXoevQdeg6dB26Ad2AbkA3oLvyLyYyW80= - - - - - -AQAAAOABAADgAQAAogAAAA==eNpNi8cSgkAQBdecAyJiDggiiGD8/1/zTVUfPHRtV+8b55yriYaoi6Zoia7o4G3R+2v2DkQft78hbSTGYiY8fCJ8mvlUzGkefSEC3HpI89kuaQF9LVa49Q0tZLul7cRenEWEH0RMMz+KhGZ+EhdaxO4qUtx2GS1ml9MSbm+0lN1dFLjtSlrGrqLl3D5oBbuXeOK2e9NKdh9axe2X9gNQBw2p - - -AQAAAHgAAAB4AAAATAAAAA==eNoNw5EShFAAAMAHQRAEQRAEQRAEwUEQBEEQBEEQBEEQBH3+7c5sFEKITUzNzC0sraxtbO382Ts4Ojm7uLq5e3h6efv4+vkHNocHRQ== - - -AQAAAB4AAAAeAAAACwAAAA==eNrj5MQHABB3AQ8= - - - - -AQAAALABAACwAQAANgAAAA==eNpjYEAGH+wZsPJh9A+YvAN54mB6wapVTCA6ITSUFSrOQSd5GM0FpXmgNB+UFhj06gCiMiHx - -AQAAALABAACwAQAAMwAAAA==eNpjYMAGPtgTR//AQTM4kEEvWLWKCR+dEBrKio8GAg4q0VxE0jxE0nxE0gIEaQDf2iHx - -AQAAALABAACwAQAAFwAAAA==eNpjYCAGfLCnDs3gMLA0x5CnAc+qFbA= - -AQAAALABAACwAQAAFwAAAA==eNpjYCAGfLCnDs3gMLA0x5CnAc+qFbA= - -AQAAALABAACwAQAAUAAAAA==eNpjYEAGH+yhDAcIxeHAQJS8AJQWgdISUFoGSitQ2RwlKK0CpdWgtAaU1oLSOlBab5DYbwClDaG0EZQ2htImUNoUSptBaXMobeEAANfTFck= - - - - -============================== -23.vtu -============================== - - - - - -3.14159 - - - - -AQAAABAFAAAQBQAA0gAAAA==eNqNUVsOgjAQRCNJQ2rT8tLb2EvAIfFyfvJpEAbDtGPsz2Rmt9PdaVH8Oq/HnzweOdAIHTgLzn7MuW8m/RLzdSN8Tcz7WvIBeqEX8Tkt55zwcVhOuetHbmJ+nvQ+OPC09efr1e4H/dM2XJM5pq2f3xu3/iMvKYfv+6t/EPt4ygf3QpLHOk9N94Gt0IGV4JZ0cEe6S/bLc/atCJ2oe6pDD1SHXou5vZgjELfkw3M15GdFzo58eM9G5NoSB3Yij17k3oocO5FLL/7zRhx4j28uS4pw - - - - - -AQAAAOABAADgAQAAogAAAA==eNpNi8cSgkAQBdecAyJiDggiiGD8/1/zTVUfPHRtV+8b55yriYaoi6Zoia7o4G3R+2v2DkQft78hbSTGYiY8fCJ8mvlUzGkefSEC3HpI89kuaQF9LVa49Q0tZLul7cRenEWEH0RMMz+KhGZ+EhdaxO4qUtx2GS1ml9MSbm+0lN1dFLjtSlrGrqLl3D5oBbuXeOK2e9NKdh9axe2X9gNQBw2p - - -AQAAAHgAAAB4AAAATAAAAA==eNoNw5EShFAAAMAHQRAEQRAEQRAEwUEQBEEQBEEQBEEQBH3+7c5sFEKITUzNzC0sraxtbO382Ts4Ojm7uLq5e3h6efv4+vkHNocHRQ== - - -AQAAAB4AAAAeAAAACwAAAA==eNrj5MQHABB3AQ8= - - - - -AQAAALABAACwAQAANgAAAA==eNpjYEAGH+wZsPJh9A+YvAN54mB6wapVTCA6ITSUFSrOQSd5GM0FpXmgNB+UFhj06gCiMiHx - -AQAAALABAACwAQAAMwAAAA==eNpjYMAGPtgTR//AQTM4kEEvWLWKCR+dEBrKio8GAg4q0VxE0jxE0nxE0gIEaQDf2iHx - -AQAAALABAACwAQAAFwAAAA==eNpjYCAGfLCnDs3gMLA0x5CnAc+qFbA= - -AQAAALABAACwAQAAFwAAAA==eNpjYCAGfLCnDs3gMLA0x5CnAc+qFbA= - -AQAAALABAACwAQAAUAAAAA==eNpjYEAGH+yhDAcIxeHAQJS8AJQWgdISUFoGSitQ2RwlKK0CpdWgtAaU1oLSOlBab5DYbwClDaG0EZQ2htImUNoUSptBaXMobeEAANfTFck= - - - - -============================== -33.vtu -============================== - - - - - -3.14159 - - - - -AQAAAAAVAAAAFQAAtwEAAA==eNqdljtuxDAMRIUAAQxCIOZGySWSQyaX29LlYgsV0e4zh3FDaGz+hh95jKvn9jFa79fZ1SN9+q4rT8DHZ0/vBHzZcf2cgK+zGxfFR/5In+SeV5U36e15VTyRH+LrZsZNcVR1IH1f/v48nrcn/Pvr8byD3mHbW+cdX/Zf+z/suNZ3O77Or/M47Pz+xnFAHAfo1zwRX5TndXzPdknu/O/23bqRvZ3/3b5bf4pr5/81P3UfUX7UT9d9MEp+iRfKp+prskty57+aD6ob2dv5r+aM6k9xXc/bMPuY87vup2HWiXm65muYcTDf/5MB+AQ8AVfTTwA+AU/A1cwjAJ+AJ+Bq8hSAT8ATcDXrEIBPwBNwNescJu9R8KVmH5GcgCfgavYp+ZmAJ+BqzgHlMQFPwNWcM+JpAp6AqznHYc7tLOZNzT0RZl1nUQ819xD5I5mAq7nnorCXcE7w6+7RKOIV+BV85+7pMPd+FvtazXsgzL2QxTyrec+E2TdZ1FvNeyxMu5VU856Moh9l+lHzHg7zv0FFHmre82HeKxVPav5HhLl3qjqo+Z8SZl9WdVbzPyjMuKs+epZ3Ou4XOQ== - - - - - -AQAAAIAMAACADAAAVwMAAA==eNptkVVTEFAQRrG7u7ADu7tbwQ7s7u7uRrEbDMTuQsXu7hbzr/jtzHnauQ/n5e7Zb2fuFxEREZFOZBDpRUaRSWQRmUVWkU3kFDlEPpFfFBIFmWUXuXBsVkAUxsnBex6Rmx17LyqKMLPdvDiF2C2G4+8VFyVEpCgVuGezkqI0jr9XiveyokzgXiS75XDKiwqiiqgs6on6orFoxKyiiMKxWQPRBMdmlURVHJs1FE1xKrNXXVQj0/aai2bMbK8GTmP2WuBEkV0TpwnZLXGqsVdb1CLT9lqLVsxsrw5Oc/ba4NQguy5OC7Lb4vj/aCfai86iU+A/bNZBdMHx/2GzjqIrjv+PTuzFiOjAf3RmrxuO/48uZHfH8f8RzV5P0SPwHzHs9cLx/9GN7N44/j/6iL5igIgN/IfN+omBOP4/bNZfDMLx/xHL3hAxOPAfA9gbiuP/YyDZw3D8fwxmb4QYHviPIeyNxPH/MZTsUTijxRgxUUwQS8RSsUqsZDZWTMKx2TKxGsdm48RkHJstF2twbDZeTMGx2QqxFmcCudPEVG5a7nqxjpnlTsdZRe4GnEnkzsBZTW4czmRuz8RZw+2NOFPJnS1mcdNy48UmZpY7B2c9uZtxppM7F2cDuVtwZnB7Hk4ct7fizCJ3gZjPTcvdLrYxs9yFOPHk7sCZQ+4inM3k7sSZy+3FOFu4vQvH971b7BGJIiHQt832igM4vm+b7RMHcXzfNtsvDuH4vhPITRKHA30nknsEx/d9gNxkHN/3QW4fxfF9Hyb3uDgW6DuJ3BM4vu8j5J7E8X0nc/sUju/7GLlnxOlA38fJPYvj+z5B7jkc3/dJbp/H8X1fEBdFirga6Ntml8Q1HN+3zS6L6zi+b5tdETdwfN9Xyb0pUgN9p5B7C8f3fY3c2zi+7+vcvoPj+04l9564G+j7Jrn3cXzft8h9gOP7vs3thzi+77vkPhaPAn3fI/cJju/7PrlPcXzfD7j9DMf3/Vy8EG/Fm0DfNnsp3uH4vm32SrzH8X3b7LX4gOP7fkPuJ/Ex0Pdbcj/j+L7fkfsFx/f9nttfcXzfH8n9Lr4F+v5E7g8c3/dnctNwfN9fuP0Tx/f9jdzf4leg7+/k/sHxff8g9y+O7zuN2/9w/gOh1n+I - - -AQAAAJABAACQAQAAmAAAAA==eNoNzRGAhEAAAMD9fzkMwzA8DMMwDMMwDMPDMAzDMAzDMAzDw/AHhucVQoiISUh5k5FTUFJR09DS0fNhYGRiZmFlY+fg5OLmy0P4CeFFRExCypuMnIKSipqGlo6eDwMjEzMLKxs7BycXN18ewq+fiJiElDcZOQUlFTUNLR09HwZGJmYWVjZ2Dk4ubr48hD8/ETEJ/xaiL0A= - - -AQAAAGQAAABkAAAADAAAAA==eNrj4aE9AADtHASx - - - - -AQAAAAAHAAAABwAAQAAAAA==eNpjYEAGH+wZyOLD6B8weYfhIQ6mF6xaxQSiE0JDWaHiHKPyI0IeRnNBaR4ozQelBUbVjaobVTeE1QEAes2Cfw== - -AQAAAAAHAAAABwAASwAAAA==eNpjYMAGPtij0oTkcdE/cNAMDtjpwWYOXnrBqlVM+OiE0FBWfDQQcBCgR+0fWPuJpbmIpHmIpPmIpAWIpEf9MeqPUX9gowFLHIJ/ - -AQAAAAAHAAAABwAAOAAAAA==eNpjYCAGfLCnD/2DSjSDwzCgF6xaxTSQdEJoKOtA0kDAMUpTheYaJjTPMKH5hgktMORpAO0qgn8= - -AQAAAAAHAAAABwAAHwAAAA==eNpjYKAG+GA/PGkGh1F6JNMco/QoPUoPYxoAo8lTHg== - -AQAAAAAHAAAABwAA4wAAAA==eNrt0TlKZVEYhdEdGhoYGFQgIiIiopZ9e+3K3mevZTuVf2hnSA5B4a3AARiJJ1n3Y3OCy0m+nvctH12fAQ5yiMP80+Vb7o9wlGMc5wQnOcVpznCWc/zLeS5wkUtc5gpXf/h/rXGdG9zkFru+xWxrZkczu5rZ08y+Zv5p5kAzh5o50syxZk40c6qZM82ca6ane7/v//v+n+eib8diYy7tLDbmys5iY67tLDbmxs5iY27tLDbmzs5iY+7tLDbmwc5iY/7bWWzMo53FxjzZWWzMs53FxrzYWWzMq53Fxrx1H/t9lj8= - - - - diff --git a/tests/base/data_out_base_vtu_time_and_cycle.cc b/tests/base/data_out_base_vtu_time_and_cycle.cc index b3620c5d74..6df457d333 100644 --- a/tests/base/data_out_base_vtu_time_and_cycle.cc +++ b/tests/base/data_out_base_vtu_time_and_cycle.cc @@ -64,10 +64,13 @@ void check_all(std::ostream &log) int main() { + std::stringstream ss; + check_all<1,1>(ss); + check_all<1,2>(ss); + check_all<2,2>(ss); + check_all<2,3>(ss); + check_all<3,3>(ss); + std::ofstream logfile("output"); - check_all<1,1>(logfile); - check_all<1,2>(logfile); - check_all<2,2>(logfile); - check_all<2,3>(logfile); - check_all<3,3>(logfile); + filter_out_xml_key(ss, "DataArray",logfile); } diff --git a/tests/base/data_out_base_vtu_time_and_cycle.with_zlib=true.output b/tests/base/data_out_base_vtu_time_and_cycle.with_zlib=true.output index b411bccd29..1b20754a1a 100644 --- a/tests/base/data_out_base_vtu_time_and_cycle.with_zlib=true.output +++ b/tests/base/data_out_base_vtu_time_and_cycle.with_zlib=true.output @@ -15,32 +15,28 @@ -AQAAAFABAABQAQAANQAAAA==eNpjYMAHPtiTJv4DhziDA7Hiq1eBABOGeFgoCLDiMIeDRHEuHOI8OMT5cIgLYIgDAH+pDF0= - + -AQAAAFAAAABQAAAAKQAAAA==eNotw8cNACAQA0HDkY7Qf7vswyONJBVWhjd2Dp++mNx+/PrjBxBcAI0= - + -AQAAACgAAAAoAAAAIgAAAA==eNpjYmBgYAFiNiDmAGIuIOYBYj4gFgBiISAWAWIABwgAbw== - + -AQAAAAoAAAAKAAAACwAAAA==eNpjZoYBAACvAB8= - + -AQAAAHAAAABwAAAALgAAAA==eNpjYEAGH+xR6R9QmsEBiV6wahUTiE4IDWWFinOg0VxQmgdK80FpAQcAUAIJXw== + -AQAAAHAAAABwAAAAFgAAAA==eNpjYMAGPthjpxkc8NMcBGkAb/wF9g== + -AQAAAHAAAABwAAAAFgAAAA==eNpjYMAGPthjpxkc8NMcBGkAb/wF9g== + -AQAAAHAAAABwAAAAFgAAAA==eNpjYMAGPthjpxkc8NMcBGkAb/wF9g== + -AQAAAHAAAABwAAAAGQAAAA==eNpjYEAGH+wZsPMd8ItzECkv4AAAaTsGXQ== + @@ -62,32 +58,28 @@ AQAAAHAAAABwAAAAGQAAAA==eNpjYEAGH+wZsPMd8ItzECkv4AAAaTsGXQ== -AQAAAFABAABQAQAASgAAAA==eNpjYMAHPtij0oTEf9ij0nDggEbjFF+9CgSYHGA0TDwsFARYHWA0qjEcDqg0IXEuB1QaBngcUGkY4HNApWFAwAGVZmAAAJsiGLk= - + -AQAAAFAAAABQAAAAKQAAAA==eNotw8cNACAQA0HDkY7Qf7vswyONJBVWhjd2Dp++mNx+/PrjBxBcAI0= - + -AQAAACgAAAAoAAAAIgAAAA==eNpjYmBgYAFiNiDmAGIuIOYBYj4gFgBiISAWAWIABwgAbw== - + -AQAAAAoAAAAKAAAACwAAAA==eNpjZoYBAACvAB8= - + -AQAAAHAAAABwAAAALgAAAA==eNpjYEAGH+xR6R9QmsEBiV6wahUTiE4IDWWFinOg0VxQmgdK80FpAQcAUAIJXw== + -AQAAAHAAAABwAAAAFgAAAA==eNpjYMAGPthjpxkc8NMcBGkAb/wF9g== + -AQAAAHAAAABwAAAAFgAAAA==eNpjYMAGPthjpxkc8NMcBGkAb/wF9g== + -AQAAAHAAAABwAAAAFgAAAA==eNpjYMAGPthjpxkc8NMcBGkAb/wF9g== + -AQAAAHAAAABwAAAAGQAAAA==eNpjYEAGH+wZsPMd8ItzECkv4AAAaTsGXQ== + @@ -109,32 +101,28 @@ AQAAAHAAAABwAAAAGQAAAA==eNpjYEAGH+wZsPMd8ItzECkv4AAAaTsGXQ== -AQAAABAFAAAQBQAAoAAAAA==eNqVkMsKw0AIAKVQWETEP2p+ovnI5Od63GPJwS3YTB7enIWZRJGj+bzk1nvuV3kHLtOxp4Ong6eDJ9+rp/Kxn/J12ebxx+f3Nk/wNPQX3/BXnv7K07/PZSrfNfyV5155+vd5/k+D+zS4T4P7XOUK3IA78DjpKnQVugpdha5C16Br0DXoGnQNug5dh65D16Hr0A3oBnQDugHdH/8CMeJb0Q== - + -AQAAAOABAADgAQAAogAAAA==eNpNi8cSgkAQBdecAyJiDggiiGD8/1/zTVUfPHRtV+8b55yriYaoi6Zoia7o4G3R+2v2DkQft78hbSTGYiY8fCJ8mvlUzGkefSEC3HpI89kuaQF9LVa49Q0tZLul7cRenEWEH0RMMz+KhGZ+EhdaxO4qUtx2GS1ml9MSbm+0lN1dFLjtSlrGrqLl3D5oBbuXeOK2e9NKdh9axe2X9gNQBw2p - + -AQAAAHgAAAB4AAAATAAAAA==eNoNw5EShFAAAMAHQRAEQRAEQRAEwUEQBEEQBEEQBEEQBH3+7c5sFEKITUzNzC0sraxtbO382Ts4Ojm7uLq5e3h6efv4+vkHNocHRQ== - + -AQAAAB4AAAAeAAAACwAAAA==eNrj5MQHABB3AQ8= - + -AQAAALABAACwAQAANgAAAA==eNpjYEAGH+wZsPJh9A+YvAN54mB6wapVTCA6ITSUFSrOQSd5GM0FpXmgNB+UFhj06gCiMiHx + -AQAAALABAACwAQAAMwAAAA==eNpjYMAGPtgTR//AQTM4kEEvWLWKCR+dEBrKio8GAg4q0VxE0jxE0nxE0gIEaQDf2iHx + -AQAAALABAACwAQAAFwAAAA==eNpjYCAGfLCnDs3gMLA0x5CnAc+qFbA= + -AQAAALABAACwAQAAFwAAAA==eNpjYCAGfLCnDs3gMLA0x5CnAc+qFbA= + -AQAAALABAACwAQAAUAAAAA==eNpjYEAGH+yhDAcIxeHAQJS8AJQWgdISUFoGSitQ2RwlKK0CpdWgtAaU1oLSOlBab5DYbwClDaG0EZQ2htImUNoUSptBaXMobeEAANfTFck= + @@ -156,32 +144,28 @@ AQAAALABAACwAQAAUAAAAA==eNpjYEAGH+yhDAcIxeHAQJS8AJQWgdISUFoGSitQ2RwlKK0CpdWgtAaU -AQAAABAFAAAQBQAA0gAAAA==eNqNUVsOgjAQRCNJQ2rT8tLb2EvAIfFyfvJpEAbDtGPsz2Rmt9PdaVH8Oq/HnzweOdAIHTgLzn7MuW8m/RLzdSN8Tcz7WvIBeqEX8Tkt55zwcVhOuetHbmJ+nvQ+OPC09efr1e4H/dM2XJM5pq2f3xu3/iMvKYfv+6t/EPt4ygf3QpLHOk9N94Gt0IGV4JZ0cEe6S/bLc/atCJ2oe6pDD1SHXou5vZgjELfkw3M15GdFzo58eM9G5NoSB3Yij17k3oocO5FLL/7zRhx4j28uS4pw - + -AQAAAOABAADgAQAAogAAAA==eNpNi8cSgkAQBdecAyJiDggiiGD8/1/zTVUfPHRtV+8b55yriYaoi6Zoia7o4G3R+2v2DkQft78hbSTGYiY8fCJ8mvlUzGkefSEC3HpI89kuaQF9LVa49Q0tZLul7cRenEWEH0RMMz+KhGZ+EhdaxO4qUtx2GS1ml9MSbm+0lN1dFLjtSlrGrqLl3D5oBbuXeOK2e9NKdh9axe2X9gNQBw2p - + -AQAAAHgAAAB4AAAATAAAAA==eNoNw5EShFAAAMAHQRAEQRAEQRAEwUEQBEEQBEEQBEEQBH3+7c5sFEKITUzNzC0sraxtbO382Ts4Ojm7uLq5e3h6efv4+vkHNocHRQ== - + -AQAAAB4AAAAeAAAACwAAAA==eNrj5MQHABB3AQ8= - + -AQAAALABAACwAQAANgAAAA==eNpjYEAGH+wZsPJh9A+YvAN54mB6wapVTCA6ITSUFSrOQSd5GM0FpXmgNB+UFhj06gCiMiHx + -AQAAALABAACwAQAAMwAAAA==eNpjYMAGPtgTR//AQTM4kEEvWLWKCR+dEBrKio8GAg4q0VxE0jxE0nxE0gIEaQDf2iHx + -AQAAALABAACwAQAAFwAAAA==eNpjYCAGfLCnDs3gMLA0x5CnAc+qFbA= + -AQAAALABAACwAQAAFwAAAA==eNpjYCAGfLCnDs3gMLA0x5CnAc+qFbA= + -AQAAALABAACwAQAAUAAAAA==eNpjYEAGH+yhDAcIxeHAQJS8AJQWgdISUFoGSitQ2RwlKK0CpdWgtAaU1oLSOlBab5DYbwClDaG0EZQ2htImUNoUSptBaXMobeEAANfTFck= + @@ -203,32 +187,28 @@ AQAAALABAACwAQAAUAAAAA==eNpjYEAGH+yhDAcIxeHAQJS8AJQWgdISUFoGSitQ2RwlKK0CpdWgtAaU -AQAAAAAVAAAAFQAAtwEAAA==eNqdljtuxDAMRIUAAQxCIOZGySWSQyaX29LlYgsV0e4zh3FDaGz+hh95jKvn9jFa79fZ1SN9+q4rT8DHZ0/vBHzZcf2cgK+zGxfFR/5In+SeV5U36e15VTyRH+LrZsZNcVR1IH1f/v48nrcn/Pvr8byD3mHbW+cdX/Zf+z/suNZ3O77Or/M47Pz+xnFAHAfo1zwRX5TndXzPdknu/O/23bqRvZ3/3b5bf4pr5/81P3UfUX7UT9d9MEp+iRfKp+prskty57+aD6ob2dv5r+aM6k9xXc/bMPuY87vup2HWiXm65muYcTDf/5MB+AQ8AVfTTwA+AU/A1cwjAJ+AJ+Bq8hSAT8ATcDXrEIBPwBNwNescJu9R8KVmH5GcgCfgavYp+ZmAJ+BqzgHlMQFPwNWcM+JpAp6AqznHYc7tLOZNzT0RZl1nUQ819xD5I5mAq7nnorCXcE7w6+7RKOIV+BV85+7pMPd+FvtazXsgzL2QxTyrec+E2TdZ1FvNeyxMu5VU856Moh9l+lHzHg7zv0FFHmre82HeKxVPav5HhLl3qjqo+Z8SZl9WdVbzPyjMuKs+epZ3Ou4XOQ== - + -AQAAAIAMAACADAAAVwMAAA==eNptkVVTEFAQRrG7u7ADu7tbwQ7s7u7uRrEbDMTuQsXu7hbzr/jtzHnauQ/n5e7Zb2fuFxEREZFOZBDpRUaRSWQRmUVWkU3kFDlEPpFfFBIFmWUXuXBsVkAUxsnBex6Rmx17LyqKMLPdvDiF2C2G4+8VFyVEpCgVuGezkqI0jr9XiveyokzgXiS75XDKiwqiiqgs6on6orFoxKyiiMKxWQPRBMdmlURVHJs1FE1xKrNXXVQj0/aai2bMbK8GTmP2WuBEkV0TpwnZLXGqsVdb1CLT9lqLVsxsrw5Oc/ba4NQguy5OC7Lb4vj/aCfai86iU+A/bNZBdMHx/2GzjqIrjv+PTuzFiOjAf3RmrxuO/48uZHfH8f8RzV5P0SPwHzHs9cLx/9GN7N44/j/6iL5igIgN/IfN+omBOP4/bNZfDMLx/xHL3hAxOPAfA9gbiuP/YyDZw3D8fwxmb4QYHviPIeyNxPH/MZTsUTijxRgxUUwQS8RSsUqsZDZWTMKx2TKxGsdm48RkHJstF2twbDZeTMGx2QqxFmcCudPEVG5a7nqxjpnlTsdZRe4GnEnkzsBZTW4czmRuz8RZw+2NOFPJnS1mcdNy48UmZpY7B2c9uZtxppM7F2cDuVtwZnB7Hk4ct7fizCJ3gZjPTcvdLrYxs9yFOPHk7sCZQ+4inM3k7sSZy+3FOFu4vQvH971b7BGJIiHQt832igM4vm+b7RMHcXzfNtsvDuH4vhPITRKHA30nknsEx/d9gNxkHN/3QW4fxfF9Hyb3uDgW6DuJ3BM4vu8j5J7E8X0nc/sUju/7GLlnxOlA38fJPYvj+z5B7jkc3/dJbp/H8X1fEBdFirga6Ntml8Q1HN+3zS6L6zi+b5tdETdwfN9Xyb0pUgN9p5B7C8f3fY3c2zi+7+vcvoPj+04l9564G+j7Jrn3cXzft8h9gOP7vs3thzi+77vkPhaPAn3fI/cJju/7PrlPcXzfD7j9DMf3/Vy8EG/Fm0DfNnsp3uH4vm32SrzH8X3b7LX4gOP7fkPuJ/Ex0Pdbcj/j+L7fkfsFx/f9nttfcXzfH8n9Lr4F+v5E7g8c3/dnctNwfN9fuP0Tx/f9jdzf4leg7+/k/sHxff8g9y+O7zuN2/9w/gOh1n+I - + -AQAAAJABAACQAQAAmAAAAA==eNoNzRGAhEAAAMD9fzkMwzA8DMMwDMMwDMPDMAzDMAzDMAzDw/AHhucVQoiISUh5k5FTUFJR09DS0fNhYGRiZmFlY+fg5OLmy0P4CeFFRExCypuMnIKSipqGlo6eDwMjEzMLKxs7BycXN18ewq+fiJiElDcZOQUlFTUNLR09HwZGJmYWVjZ2Dk4ubr48hD8/ETEJ/xaiL0A= - + -AQAAAGQAAABkAAAADAAAAA==eNrj4aE9AADtHASx - + -AQAAAAAHAAAABwAAQAAAAA==eNpjYEAGH+wZyOLD6B8weYfhIQ6mF6xaxQSiE0JDWaHiHKPyI0IeRnNBaR4ozQelBUbVjaobVTeE1QEAes2Cfw== + -AQAAAAAHAAAABwAASwAAAA==eNpjYMAGPtij0oTkcdE/cNAMDtjpwWYOXnrBqlVM+OiE0FBWfDQQcBCgR+0fWPuJpbmIpHmIpPmIpAWIpEf9MeqPUX9gowFLHIJ/ + -AQAAAAAHAAAABwAAOAAAAA==eNpjYCAGfLCnD/2DSjSDwzCgF6xaxTSQdEJoKOtA0kDAMUpTheYaJjTPMKH5hgktMORpAO0qgn8= + -AQAAAAAHAAAABwAAHwAAAA==eNpjYKAG+GA/PGkGh1F6JNMco/QoPUoPYxoAo8lTHg== + -AQAAAAAHAAAABwAA4wAAAA==eNrt0TlKZVEYhdEdGhoYGFQgIiIiopZ9e+3K3mevZTuVf2hnSA5B4a3AARiJJ1n3Y3OCy0m+nvctH12fAQ5yiMP80+Vb7o9wlGMc5wQnOcVpznCWc/zLeS5wkUtc5gpXf/h/rXGdG9zkFru+xWxrZkczu5rZ08y+Zv5p5kAzh5o50syxZk40c6qZM82ca6ane7/v//v+n+eib8diYy7tLDbmys5iY67tLDbmxs5iY27tLDbmzs5iY+7tLDbmwc5iY/7bWWzMo53FxjzZWWzMs53FxrzYWWzMq53Fxrx1H/t9lj8= + diff --git a/tests/base/data_out_base_vtu_time_and_cycle.with_zlib=true.output.2 b/tests/base/data_out_base_vtu_time_and_cycle.with_zlib=true.output.2 deleted file mode 100644 index e3acdce239..0000000000 --- a/tests/base/data_out_base_vtu_time_and_cycle.with_zlib=true.output.2 +++ /dev/null @@ -1,235 +0,0 @@ -============================== -11.vtu -============================== - - - - - -42 -3.14159 - - - - -AQAAAFABAABQAQAANQAAAA==eNpjYMAHPtiTJv4DhziDA7Hiq1eBABOGeFgoCLDiMIeDRHEuHOI8OMT5cIgLYIgDAH+pDF0= - - - - - -AQAAAFAAAABQAAAAKQAAAA==eNotw8cNACAQA0HDkY7Qf7vswyONJBVWhjd2Dp++mNx+/PrjBxBcAI0= - - -AQAAACgAAAAoAAAAIgAAAA==eNpjYmBgYAFiNiDmAGIuIOYBYj4gFgBiISAWAWIABwgAbw== - - -AQAAAAoAAAAKAAAACwAAAA==eNpjZoYBAACvAB8= - - - - -AQAAAHAAAABwAAAALgAAAA==eNpjYEAGH+xR6R9QmsEBiV6wahUTiE4IDWWFinOg0VxQmgdK80FpAQcAUAIJXw== - -AQAAAHAAAABwAAAAFgAAAA==eNpjYMAGPthjpxkc8NMcBGkAb/wF9g== - -AQAAAHAAAABwAAAAFgAAAA==eNpjYMAGPthjpxkc8NMcBGkAb/wF9g== - -AQAAAHAAAABwAAAAFgAAAA==eNpjYMAGPthjpxkc8NMcBGkAb/wF9g== - -AQAAAHAAAABwAAAAGQAAAA==eNpjYEAGH+wZsPMd8ItzECkv4AAAaTsGXQ== - - - - -============================== -12.vtu -============================== - - - - - -42 -3.14159 - - - - -AQAAAFABAABQAQAASgAAAA==eNpjYMAHPtij0oTEf9ij0nDggEbjFF+9CgSYHGA0TDwsFARYHWA0qjEcDqg0IXEuB1QaBngcUGkY4HNApWFAwAGVZmAAAJsiGLk= - - - - - -AQAAAFAAAABQAAAAKQAAAA==eNotw8cNACAQA0HDkY7Qf7vswyONJBVWhjd2Dp++mNx+/PrjBxBcAI0= - - -AQAAACgAAAAoAAAAIgAAAA==eNpjYmBgYAFiNiDmAGIuIOYBYj4gFgBiISAWAWIABwgAbw== - - -AQAAAAoAAAAKAAAACwAAAA==eNpjZoYBAACvAB8= - - - - -AQAAAHAAAABwAAAALgAAAA==eNpjYEAGH+xR6R9QmsEBiV6wahUTiE4IDWWFinOg0VxQmgdK80FpAQcAUAIJXw== - -AQAAAHAAAABwAAAAFgAAAA==eNpjYMAGPthjpxkc8NMcBGkAb/wF9g== - -AQAAAHAAAABwAAAAFgAAAA==eNpjYMAGPthjpxkc8NMcBGkAb/wF9g== - -AQAAAHAAAABwAAAAFgAAAA==eNpjYMAGPthjpxkc8NMcBGkAb/wF9g== - -AQAAAHAAAABwAAAAGQAAAA==eNpjYEAGH+wZsPMd8ItzECkv4AAAaTsGXQ== - - - - -============================== -22.vtu -============================== - - - - - -42 -3.14159 - - - - -AQAAABAFAAAQBQAAoQAAAA==eNqVkMEJwzAMAEWhYIQQ2qhZIh2yXa5PP0secoiaS1L9fIY7WyJH83nIX/d5vso7cJmOPR08HTwdPHlfPZWP8yl/v5a5/fDnvMwdPA39xTf8lae/8vTvc5nm7buGv/L0V57+fZ7/abCfBvtpsJ+rXIEbcAceJ12FrkJXoavQVegadA26Bl2DrkHXoevQdeg6dB26Ad2AbkA3oLvyLyYyW80= - - - - - -AQAAAOABAADgAQAAogAAAA==eNpNi8cSgkAQBdecAyJiDggiiGD8/1/zTVUfPHRtV+8b55yriYaoi6Zoia7o4G3R+2v2DkQft78hbSTGYiY8fCJ8mvlUzGkefSEC3HpI89kuaQF9LVa49Q0tZLul7cRenEWEH0RMMz+KhGZ+EhdaxO4qUtx2GS1ml9MSbm+0lN1dFLjtSlrGrqLl3D5oBbuXeOK2e9NKdh9axe2X9gNQBw2p - - -AQAAAHgAAAB4AAAATAAAAA==eNoNw5EShFAAAMAHQRAEQRAEQRAEwUEQBEEQBEEQBEEQBH3+7c5sFEKITUzNzC0sraxtbO382Ts4Ojm7uLq5e3h6efv4+vkHNocHRQ== - - -AQAAAB4AAAAeAAAACwAAAA==eNrj5MQHABB3AQ8= - - - - -AQAAALABAACwAQAANgAAAA==eNpjYEAGH+wZsPJh9A+YvAN54mB6wapVTCA6ITSUFSrOQSd5GM0FpXmgNB+UFhj06gCiMiHx - -AQAAALABAACwAQAAMwAAAA==eNpjYMAGPtgTR//AQTM4kEEvWLWKCR+dEBrKio8GAg4q0VxE0jxE0nxE0gIEaQDf2iHx - -AQAAALABAACwAQAAFwAAAA==eNpjYCAGfLCnDs3gMLA0x5CnAc+qFbA= - -AQAAALABAACwAQAAFwAAAA==eNpjYCAGfLCnDs3gMLA0x5CnAc+qFbA= - -AQAAALABAACwAQAAUAAAAA==eNpjYEAGH+yhDAcIxeHAQJS8AJQWgdISUFoGSitQ2RwlKK0CpdWgtAaU1oLSOlBab5DYbwClDaG0EZQ2htImUNoUSptBaXMobeEAANfTFck= - - - - -============================== -23.vtu -============================== - - - - - -42 -3.14159 - - - - -AQAAABAFAAAQBQAA0gAAAA==eNqNUVsOgjAQRCNJQ2rT8tLb2EvAIfFyfvJpEAbDtGPsz2Rmt9PdaVH8Oq/HnzweOdAIHTgLzn7MuW8m/RLzdSN8Tcz7WvIBeqEX8Tkt55zwcVhOuetHbmJ+nvQ+OPC09efr1e4H/dM2XJM5pq2f3xu3/iMvKYfv+6t/EPt4ygf3QpLHOk9N94Gt0IGV4JZ0cEe6S/bLc/atCJ2oe6pDD1SHXou5vZgjELfkw3M15GdFzo58eM9G5NoSB3Yij17k3oocO5FLL/7zRhx4j28uS4pw - - - - - -AQAAAOABAADgAQAAogAAAA==eNpNi8cSgkAQBdecAyJiDggiiGD8/1/zTVUfPHRtV+8b55yriYaoi6Zoia7o4G3R+2v2DkQft78hbSTGYiY8fCJ8mvlUzGkefSEC3HpI89kuaQF9LVa49Q0tZLul7cRenEWEH0RMMz+KhGZ+EhdaxO4qUtx2GS1ml9MSbm+0lN1dFLjtSlrGrqLl3D5oBbuXeOK2e9NKdh9axe2X9gNQBw2p - - -AQAAAHgAAAB4AAAATAAAAA==eNoNw5EShFAAAMAHQRAEQRAEQRAEwUEQBEEQBEEQBEEQBH3+7c5sFEKITUzNzC0sraxtbO382Ts4Ojm7uLq5e3h6efv4+vkHNocHRQ== - - -AQAAAB4AAAAeAAAACwAAAA==eNrj5MQHABB3AQ8= - - - - -AQAAALABAACwAQAANgAAAA==eNpjYEAGH+wZsPJh9A+YvAN54mB6wapVTCA6ITSUFSrOQSd5GM0FpXmgNB+UFhj06gCiMiHx - -AQAAALABAACwAQAAMwAAAA==eNpjYMAGPtgTR//AQTM4kEEvWLWKCR+dEBrKio8GAg4q0VxE0jxE0nxE0gIEaQDf2iHx - -AQAAALABAACwAQAAFwAAAA==eNpjYCAGfLCnDs3gMLA0x5CnAc+qFbA= - -AQAAALABAACwAQAAFwAAAA==eNpjYCAGfLCnDs3gMLA0x5CnAc+qFbA= - -AQAAALABAACwAQAAUAAAAA==eNpjYEAGH+yhDAcIxeHAQJS8AJQWgdISUFoGSitQ2RwlKK0CpdWgtAaU1oLSOlBab5DYbwClDaG0EZQ2htImUNoUSptBaXMobeEAANfTFck= - - - - -============================== -33.vtu -============================== - - - - - -42 -3.14159 - - - - -AQAAAAAVAAAAFQAAtwEAAA==eNqdljtuxDAMRIUAAQxCIOZGySWSQyaX29LlYgsV0e4zh3FDaGz+hh95jKvn9jFa79fZ1SN9+q4rT8DHZ0/vBHzZcf2cgK+zGxfFR/5In+SeV5U36e15VTyRH+LrZsZNcVR1IH1f/v48nrcn/Pvr8byD3mHbW+cdX/Zf+z/suNZ3O77Or/M47Pz+xnFAHAfo1zwRX5TndXzPdknu/O/23bqRvZ3/3b5bf4pr5/81P3UfUX7UT9d9MEp+iRfKp+prskty57+aD6ob2dv5r+aM6k9xXc/bMPuY87vup2HWiXm65muYcTDf/5MB+AQ8AVfTTwA+AU/A1cwjAJ+AJ+Bq8hSAT8ATcDXrEIBPwBNwNescJu9R8KVmH5GcgCfgavYp+ZmAJ+BqzgHlMQFPwNWcM+JpAp6AqznHYc7tLOZNzT0RZl1nUQ819xD5I5mAq7nnorCXcE7w6+7RKOIV+BV85+7pMPd+FvtazXsgzL2QxTyrec+E2TdZ1FvNeyxMu5VU856Moh9l+lHzHg7zv0FFHmre82HeKxVPav5HhLl3qjqo+Z8SZl9WdVbzPyjMuKs+epZ3Ou4XOQ== - - - - - -AQAAAIAMAACADAAAVwMAAA==eNptkVVTEFAQRrG7u7ADu7tbwQ7s7u7uRrEbDMTuQsXu7hbzr/jtzHnauQ/n5e7Zb2fuFxEREZFOZBDpRUaRSWQRmUVWkU3kFDlEPpFfFBIFmWUXuXBsVkAUxsnBex6Rmx17LyqKMLPdvDiF2C2G4+8VFyVEpCgVuGezkqI0jr9XiveyokzgXiS75XDKiwqiiqgs6on6orFoxKyiiMKxWQPRBMdmlURVHJs1FE1xKrNXXVQj0/aai2bMbK8GTmP2WuBEkV0TpwnZLXGqsVdb1CLT9lqLVsxsrw5Oc/ba4NQguy5OC7Lb4vj/aCfai86iU+A/bNZBdMHx/2GzjqIrjv+PTuzFiOjAf3RmrxuO/48uZHfH8f8RzV5P0SPwHzHs9cLx/9GN7N44/j/6iL5igIgN/IfN+omBOP4/bNZfDMLx/xHL3hAxOPAfA9gbiuP/YyDZw3D8fwxmb4QYHviPIeyNxPH/MZTsUTijxRgxUUwQS8RSsUqsZDZWTMKx2TKxGsdm48RkHJstF2twbDZeTMGx2QqxFmcCudPEVG5a7nqxjpnlTsdZRe4GnEnkzsBZTW4czmRuz8RZw+2NOFPJnS1mcdNy48UmZpY7B2c9uZtxppM7F2cDuVtwZnB7Hk4ct7fizCJ3gZjPTcvdLrYxs9yFOPHk7sCZQ+4inM3k7sSZy+3FOFu4vQvH971b7BGJIiHQt832igM4vm+b7RMHcXzfNtsvDuH4vhPITRKHA30nknsEx/d9gNxkHN/3QW4fxfF9Hyb3uDgW6DuJ3BM4vu8j5J7E8X0nc/sUju/7GLlnxOlA38fJPYvj+z5B7jkc3/dJbp/H8X1fEBdFirga6Ntml8Q1HN+3zS6L6zi+b5tdETdwfN9Xyb0pUgN9p5B7C8f3fY3c2zi+7+vcvoPj+04l9564G+j7Jrn3cXzft8h9gOP7vs3thzi+77vkPhaPAn3fI/cJju/7PrlPcXzfD7j9DMf3/Vy8EG/Fm0DfNnsp3uH4vm32SrzH8X3b7LX4gOP7fkPuJ/Ex0Pdbcj/j+L7fkfsFx/f9nttfcXzfH8n9Lr4F+v5E7g8c3/dnctNwfN9fuP0Tx/f9jdzf4leg7+/k/sHxff8g9y+O7zuN2/9w/gOh1n+I - - -AQAAAJABAACQAQAAmAAAAA==eNoNzRGAhEAAAMD9fzkMwzA8DMMwDMMwDMPDMAzDMAzDMAzDw/AHhucVQoiISUh5k5FTUFJR09DS0fNhYGRiZmFlY+fg5OLmy0P4CeFFRExCypuMnIKSipqGlo6eDwMjEzMLKxs7BycXN18ewq+fiJiElDcZOQUlFTUNLR09HwZGJmYWVjZ2Dk4ubr48hD8/ETEJ/xaiL0A= - - -AQAAAGQAAABkAAAADAAAAA==eNrj4aE9AADtHASx - - - - -AQAAAAAHAAAABwAAQAAAAA==eNpjYEAGH+wZyOLD6B8weYfhIQ6mF6xaxQSiE0JDWaHiHKPyI0IeRnNBaR4ozQelBUbVjaobVTeE1QEAes2Cfw== - -AQAAAAAHAAAABwAASwAAAA==eNpjYMAGPtij0oTkcdE/cNAMDtjpwWYOXnrBqlVM+OiE0FBWfDQQcBCgR+0fWPuJpbmIpHmIpPmIpAWIpEf9MeqPUX9gowFLHIJ/ - -AQAAAAAHAAAABwAAOAAAAA==eNpjYCAGfLCnD/2DSjSDwzCgF6xaxTSQdEJoKOtA0kDAMUpTheYaJjTPMKH5hgktMORpAO0qgn8= - -AQAAAAAHAAAABwAAHwAAAA==eNpjYKAG+GA/PGkGh1F6JNMco/QoPUoPYxoAo8lTHg== - -AQAAAAAHAAAABwAA4wAAAA==eNrt0TlKZVEYhdEdGhoYGFQgIiIiopZ9e+3K3mevZTuVf2hnSA5B4a3AARiJJ1n3Y3OCy0m+nvctH12fAQ5yiMP80+Vb7o9wlGMc5wQnOcVpznCWc/zLeS5wkUtc5gpXf/h/rXGdG9zkFru+xWxrZkczu5rZ08y+Zv5p5kAzh5o50syxZk40c6qZM82ca6ane7/v//v+n+eib8diYy7tLDbmys5iY67tLDbmxs5iY27tLDbmzs5iY+7tLDbmwc5iY/7bWWzMo53FxjzZWWzMs53FxrzYWWzMq53Fxrx1H/t9lj8= - - - - diff --git a/tests/tests.h b/tests/tests.h index 42eb4a332b..304e74a653 100644 --- a/tests/tests.h +++ b/tests/tests.h @@ -66,6 +66,45 @@ using namespace dealii; // ------------------------------ Utility functions used in tests ----------------------- +/** + * Go through the input stream @p in and filter out binary data for the key @p key . + * The filtered stream is returned in @p out. + */ +void filter_out_xml_key(std::istream &in, const std::string &key, std::ostream &out) +{ + std::string line; + bool found = false; + const std::string opening = "<" + key; + const std::string closing = "" but keep things after "", 0)+1) + line.substr(pos); + found = false; + } + else + line = line.substr(0, line.find(">", 0)+1); + out << line << std::endl; + } + else if (line.find(closing) != std::string::npos) + { + found = false; + // remove everything before "<" + line = line.substr(line.find("<",0)); + out << line << std::endl; + } + else if (!found) + out << line << std::endl; + } +} + /** * A function to return real part of the number and check that * its imaginary part is zero. -- 2.39.5