]> https://gitweb.dealii.org/ - dealii.git/commitdiff
projects / dealii.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 5341761)
filter out binary data from XML output for some data_out tests 5443/head
authorDenis Davydov <davydden@gmail.com>
Sun, 12 Nov 2017 19:47:02 +0000 (20:47 +0100)
committerDenis Davydov <davydden@gmail.com>
Mon, 13 Nov 2017 17:19:14 +0000 (18:19 +0100)
13 files changed:
tests/base/data_out_base_vtu.cc patch | blob | history
tests/base/data_out_base_vtu.with_zlib=true.output patch | blob | history
tests/base/data_out_base_vtu.with_zlib=true.output.2 [deleted file] patch | blob | history
tests/base/data_out_base_vtu_cycle.cc patch | blob | history
tests/base/data_out_base_vtu_cycle.with_zlib=true.output patch | blob | history
tests/base/data_out_base_vtu_cycle.with_zlib=true.output.2 [deleted file] patch | blob | history
tests/base/data_out_base_vtu_time.cc patch | blob | history
tests/base/data_out_base_vtu_time.with_zlib=true.output patch | blob | history
tests/base/data_out_base_vtu_time.with_zlib=true.output.2 [deleted file] patch | blob | history
tests/base/data_out_base_vtu_time_and_cycle.cc patch | blob | history
tests/base/data_out_base_vtu_time_and_cycle.with_zlib=true.output patch | blob | history
tests/base/data_out_base_vtu_time_and_cycle.with_zlib=true.output.2 [deleted file] patch | blob | history
tests/tests.h patch | blob | history

diff --git a/tests/base/data_out_base_vtu.cc b/tests/base/data_out_base_vtu.cc
index 510ac6ab230b83543c07591c19d62ac6fc72e205..02ec04a1ad4ed90d2ae820c77f083e2fd50b2d25 100644 (file)
--- 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 969ad95726ff25bfb27e1f4192450b1bb760668c..15647ecca257087d74828dd8a9c516d98bef7bc9 100644 (file)
--- 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 @@
 <Piece NumberOfPoints="14" NumberOfCells="10" >
   <Points>
     <DataArray type="Float64" NumberOfComponents="3" format="binary">
-AQAAAFABAABQAQAANQAAAA==eNpjYMAHPtiTJv4DhziDA7Hiq1eBABOGeFgoCLDiMIeDRHEuHOI8OMT5cIgLYIgDAH+pDF0=
-    </DataArray>
+</DataArray>
   </Points>
 
   <Cells>
     <DataArray type="Int32" Name="connectivity" format="binary">
-AQAAAFAAAABQAAAAKQAAAA==eNotw8cNACAQA0HDkY7Qf7vswyONJBVWhjd2Dp++mNx+/PrjBxBcAI0=
-    </DataArray>
+</DataArray>
     <DataArray type="Int32" Name="offsets" format="binary">
-AQAAACgAAAAoAAAAIgAAAA==eNpjYmBgYAFiNiDmAGIuIOYBYj4gFgBiISAWAWIABwgAbw==
-    </DataArray>
+</DataArray>
     <DataArray type="UInt8" Name="types" format="binary">
-AQAAAAoAAAAKAAAACwAAAA==eNpjZoYBAACvAB8=
-    </DataArray>
+</DataArray>
   </Cells>
   <PointData Scalars="scalars">
     <DataArray type="Float64" Name="x1" format="binary">
-AQAAAHAAAABwAAAALgAAAA==eNpjYEAGH+xR6R9QmsEBiV6wahUTiE4IDWWFinOg0VxQmgdK80FpAQcAUAIJXw==    </DataArray>
+</DataArray>
     <DataArray type="Float64" Name="x2" format="binary">
-AQAAAHAAAABwAAAAFgAAAA==eNpjYMAGPthjpxkc8NMcBGkAb/wF9g==    </DataArray>
+</DataArray>
     <DataArray type="Float64" Name="x3" format="binary">
-AQAAAHAAAABwAAAAFgAAAA==eNpjYMAGPthjpxkc8NMcBGkAb/wF9g==    </DataArray>
+</DataArray>
     <DataArray type="Float64" Name="x4" format="binary">
-AQAAAHAAAABwAAAAFgAAAA==eNpjYMAGPthjpxkc8NMcBGkAb/wF9g==    </DataArray>
+</DataArray>
     <DataArray type="Float64" Name="i" format="binary">
-AQAAAHAAAABwAAAAGQAAAA==eNpjYEAGH+wZsPMd8ItzECkv4AAAaTsGXQ==    </DataArray>
+</DataArray>
   </PointData>
  </Piece>
  </UnstructuredGrid>
@@ -54,32 +50,28 @@ AQAAAHAAAABwAAAAGQAAAA==eNpjYEAGH+wZsPMd8ItzECkv4AAAaTsGXQ==    </DataArray>
 <Piece NumberOfPoints="14" NumberOfCells="10" >
   <Points>
     <DataArray type="Float64" NumberOfComponents="3" format="binary">
-AQAAAFABAABQAQAASgAAAA==eNpjYMAHPtij0oTEf9ij0nDggEbjFF+9CgSYHGA0TDwsFARYHWA0qjEcDqg0IXEuB1QaBngcUGkY4HNApWFAwAGVZmAAAJsiGLk=
-    </DataArray>
+</DataArray>
   </Points>
 
   <Cells>
     <DataArray type="Int32" Name="connectivity" format="binary">
-AQAAAFAAAABQAAAAKQAAAA==eNotw8cNACAQA0HDkY7Qf7vswyONJBVWhjd2Dp++mNx+/PrjBxBcAI0=
-    </DataArray>
+</DataArray>
     <DataArray type="Int32" Name="offsets" format="binary">
-AQAAACgAAAAoAAAAIgAAAA==eNpjYmBgYAFiNiDmAGIuIOYBYj4gFgBiISAWAWIABwgAbw==
-    </DataArray>
+</DataArray>
     <DataArray type="UInt8" Name="types" format="binary">
-AQAAAAoAAAAKAAAACwAAAA==eNpjZoYBAACvAB8=
-    </DataArray>
+</DataArray>
   </Cells>
   <PointData Scalars="scalars">
     <DataArray type="Float64" Name="x1" format="binary">
-AQAAAHAAAABwAAAALgAAAA==eNpjYEAGH+xR6R9QmsEBiV6wahUTiE4IDWWFinOg0VxQmgdK80FpAQcAUAIJXw==    </DataArray>
+</DataArray>
     <DataArray type="Float64" Name="x2" format="binary">
-AQAAAHAAAABwAAAAFgAAAA==eNpjYMAGPthjpxkc8NMcBGkAb/wF9g==    </DataArray>
+</DataArray>
     <DataArray type="Float64" Name="x3" format="binary">
-AQAAAHAAAABwAAAAFgAAAA==eNpjYMAGPthjpxkc8NMcBGkAb/wF9g==    </DataArray>
+</DataArray>
     <DataArray type="Float64" Name="x4" format="binary">
-AQAAAHAAAABwAAAAFgAAAA==eNpjYMAGPthjpxkc8NMcBGkAb/wF9g==    </DataArray>
+</DataArray>
     <DataArray type="Float64" Name="i" format="binary">
-AQAAAHAAAABwAAAAGQAAAA==eNpjYEAGH+wZsPMd8ItzECkv4AAAaTsGXQ==    </DataArray>
+</DataArray>
   </PointData>
  </Piece>
  </UnstructuredGrid>
@@ -97,32 +89,28 @@ AQAAAHAAAABwAAAAGQAAAA==eNpjYEAGH+wZsPMd8ItzECkv4AAAaTsGXQ==    </DataArray>
 <Piece NumberOfPoints="54" NumberOfCells="30" >
   <Points>
     <DataArray type="Float64" NumberOfComponents="3" format="binary">
-AQAAABAFAAAQBQAAoAAAAA==eNqVkMsKw0AIAKVQWETEP2p+ovnI5Od63GPJwS3YTB7enIWZRJGj+bzk1nvuV3kHLtOxp4Ong6eDJ9+rp/Kxn/J12ebxx+f3Nk/wNPQX3/BXnv7K07/PZSrfNfyV5155+vd5/k+D+zS4T4P7XOUK3IA78DjpKnQVugpdha5C16Br0DXoGnQNug5dh65D16Hr0A3oBnQDugHdH/8CMeJb0Q==
-    </DataArray>
+</DataArray>
   </Points>
 
   <Cells>
     <DataArray type="Int32" Name="connectivity" format="binary">
-AQAAAOABAADgAQAAogAAAA==eNpNi8cSgkAQBdecAyJiDggiiGD8/1/zTVUfPHRtV+8b55yriYaoi6Zoia7o4G3R+2v2DkQft78hbSTGYiY8fCJ8mvlUzGkefSEC3HpI89kuaQF9LVa49Q0tZLul7cRenEWEH0RMMz+KhGZ+EhdaxO4qUtx2GS1ml9MSbm+0lN1dFLjtSlrGrqLl3D5oBbuXeOK2e9NKdh9axe2X9gNQBw2p
-    </DataArray>
+</DataArray>
     <DataArray type="Int32" Name="offsets" format="binary">
-AQAAAHgAAAB4AAAATAAAAA==eNoNw5EShFAAAMAHQRAEQRAEQRAEwUEQBEEQBEEQBEEQBH3+7c5sFEKITUzNzC0sraxtbO382Ts4Ojm7uLq5e3h6efv4+vkHNocHRQ==
-    </DataArray>
+</DataArray>
     <DataArray type="UInt8" Name="types" format="binary">
-AQAAAB4AAAAeAAAACwAAAA==eNrj5MQHABB3AQ8=
-    </DataArray>
+</DataArray>
   </Cells>
   <PointData Scalars="scalars">
     <DataArray type="Float64" Name="x1" format="binary">
-AQAAALABAACwAQAANgAAAA==eNpjYEAGH+wZsPJh9A+YvAN54mB6wapVTCA6ITSUFSrOQSd5GM0FpXmgNB+UFhj06gCiMiHx    </DataArray>
+</DataArray>
     <DataArray type="Float64" Name="x2" format="binary">
-AQAAALABAACwAQAAMwAAAA==eNpjYMAGPtgTR//AQTM4kEEvWLWKCR+dEBrKio8GAg4q0VxE0jxE0nxE0gIEaQDf2iHx    </DataArray>
+</DataArray>
     <DataArray type="Float64" Name="x3" format="binary">
-AQAAALABAACwAQAAFwAAAA==eNpjYCAGfLCnDs3gMLA0x5CnAc+qFbA=    </DataArray>
+</DataArray>
     <DataArray type="Float64" Name="x4" format="binary">
-AQAAALABAACwAQAAFwAAAA==eNpjYCAGfLCnDs3gMLA0x5CnAc+qFbA=    </DataArray>
+</DataArray>
     <DataArray type="Float64" Name="i" format="binary">
-AQAAALABAACwAQAAUAAAAA==eNpjYEAGH+yhDAcIxeHAQJS8AJQWgdISUFoGSitQ2RwlKK0CpdWgtAaU1oLSOlBab5DYbwClDaG0EZQ2htImUNoUSptBaXMobeEAANfTFck=    </DataArray>
+</DataArray>
   </PointData>
  </Piece>
  </UnstructuredGrid>
@@ -140,32 +128,28 @@ AQAAALABAACwAQAAUAAAAA==eNpjYEAGH+yhDAcIxeHAQJS8AJQWgdISUFoGSitQ2RwlKK0CpdWgtAaU
 <Piece NumberOfPoints="54" NumberOfCells="30" >
   <Points>
     <DataArray type="Float64" NumberOfComponents="3" format="binary">
-AQAAABAFAAAQBQAA0gAAAA==eNqNUVsOgjAQRCNJQ2rT8tLb2EvAIfFyfvJpEAbDtGPsz2Rmt9PdaVH8Oq/HnzweOdAIHTgLzn7MuW8m/RLzdSN8Tcz7WvIBeqEX8Tkt55zwcVhOuetHbmJ+nvQ+OPC09efr1e4H/dM2XJM5pq2f3xu3/iMvKYfv+6t/EPt4ygf3QpLHOk9N94Gt0IGV4JZ0cEe6S/bLc/atCJ2oe6pDD1SHXou5vZgjELfkw3M15GdFzo58eM9G5NoSB3Yij17k3oocO5FLL/7zRhx4j28uS4pw
-    </DataArray>
+</DataArray>
   </Points>
 
   <Cells>
     <DataArray type="Int32" Name="connectivity" format="binary">
-AQAAAOABAADgAQAAogAAAA==eNpNi8cSgkAQBdecAyJiDggiiGD8/1/zTVUfPHRtV+8b55yriYaoi6Zoia7o4G3R+2v2DkQft78hbSTGYiY8fCJ8mvlUzGkefSEC3HpI89kuaQF9LVa49Q0tZLul7cRenEWEH0RMMz+KhGZ+EhdaxO4qUtx2GS1ml9MSbm+0lN1dFLjtSlrGrqLl3D5oBbuXeOK2e9NKdh9axe2X9gNQBw2p
-    </DataArray>
+</DataArray>
     <DataArray type="Int32" Name="offsets" format="binary">
-AQAAAHgAAAB4AAAATAAAAA==eNoNw5EShFAAAMAHQRAEQRAEQRAEwUEQBEEQBEEQBEEQBH3+7c5sFEKITUzNzC0sraxtbO382Ts4Ojm7uLq5e3h6efv4+vkHNocHRQ==
-    </DataArray>
+</DataArray>
     <DataArray type="UInt8" Name="types" format="binary">
-AQAAAB4AAAAeAAAACwAAAA==eNrj5MQHABB3AQ8=
-    </DataArray>
+</DataArray>
   </Cells>
   <PointData Scalars="scalars">
     <DataArray type="Float64" Name="x1" format="binary">
-AQAAALABAACwAQAANgAAAA==eNpjYEAGH+wZsPJh9A+YvAN54mB6wapVTCA6ITSUFSrOQSd5GM0FpXmgNB+UFhj06gCiMiHx    </DataArray>
+</DataArray>
     <DataArray type="Float64" Name="x2" format="binary">
-AQAAALABAACwAQAAMwAAAA==eNpjYMAGPtgTR//AQTM4kEEvWLWKCR+dEBrKio8GAg4q0VxE0jxE0nxE0gIEaQDf2iHx    </DataArray>
+</DataArray>
     <DataArray type="Float64" Name="x3" format="binary">
-AQAAALABAACwAQAAFwAAAA==eNpjYCAGfLCnDs3gMLA0x5CnAc+qFbA=    </DataArray>
+</DataArray>
     <DataArray type="Float64" Name="x4" format="binary">
-AQAAALABAACwAQAAFwAAAA==eNpjYCAGfLCnDs3gMLA0x5CnAc+qFbA=    </DataArray>
+</DataArray>
     <DataArray type="Float64" Name="i" format="binary">
-AQAAALABAACwAQAAUAAAAA==eNpjYEAGH+yhDAcIxeHAQJS8AJQWgdISUFoGSitQ2RwlKK0CpdWgtAaU1oLSOlBab5DYbwClDaG0EZQ2htImUNoUSptBaXMobeEAANfTFck=    </DataArray>
+</DataArray>
   </PointData>
  </Piece>
  </UnstructuredGrid>
@@ -183,32 +167,28 @@ AQAAALABAACwAQAAUAAAAA==eNpjYEAGH+yhDAcIxeHAQJS8AJQWgdISUFoGSitQ2RwlKK0CpdWgtAaU
 <Piece NumberOfPoints="224" NumberOfCells="100" >
   <Points>
     <DataArray type="Float64" NumberOfComponents="3" format="binary">
-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==
-    </DataArray>
+</DataArray>
   </Points>
 
   <Cells>
     <DataArray type="Int32" Name="connectivity" format="binary">
-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
-    </DataArray>
+</DataArray>
     <DataArray type="Int32" Name="offsets" format="binary">
-AQAAAJABAACQAQAAmAAAAA==eNoNzRGAhEAAAMD9fzkMwzA8DMMwDMMwDMPDMAzDMAzDMAzDw/AHhucVQoiISUh5k5FTUFJR09DS0fNhYGRiZmFlY+fg5OLmy0P4CeFFRExCypuMnIKSipqGlo6eDwMjEzMLKxs7BycXN18ewq+fiJiElDcZOQUlFTUNLR09HwZGJmYWVjZ2Dk4ubr48hD8/ETEJ/xaiL0A=
-    </DataArray>
+</DataArray>
     <DataArray type="UInt8" Name="types" format="binary">
-AQAAAGQAAABkAAAADAAAAA==eNrj4aE9AADtHASx
-    </DataArray>
+</DataArray>
   </Cells>
   <PointData Scalars="scalars">
     <DataArray type="Float64" Name="x1" format="binary">
-AQAAAAAHAAAABwAAQAAAAA==eNpjYEAGH+wZyOLD6B8weYfhIQ6mF6xaxQSiE0JDWaHiHKPyI0IeRnNBaR4ozQelBUbVjaobVTeE1QEAes2Cfw==    </DataArray>
+</DataArray>
     <DataArray type="Float64" Name="x2" format="binary">
-AQAAAAAHAAAABwAASwAAAA==eNpjYMAGPtij0oTkcdE/cNAMDtjpwWYOXnrBqlVM+OiE0FBWfDQQcBCgR+0fWPuJpbmIpHmIpPmIpAWIpEf9MeqPUX9gowFLHIJ/    </DataArray>
+</DataArray>
     <DataArray type="Float64" Name="x3" format="binary">
-AQAAAAAHAAAABwAAOAAAAA==eNpjYCAGfLCnD/2DSjSDwzCgF6xaxTSQdEJoKOtA0kDAMUpTheYaJjTPMKH5hgktMORpAO0qgn8=    </DataArray>
+</DataArray>
     <DataArray type="Float64" Name="x4" format="binary">
-AQAAAAAHAAAABwAAHwAAAA==eNpjYKAG+GA/PGkGh1F6JNMco/QoPUoPYxoAo8lTHg==    </DataArray>
+</DataArray>
     <DataArray type="Float64" Name="i" format="binary">
-AQAAAAAHAAAABwAA4wAAAA==eNrt0TlKZVEYhdEdGhoYGFQgIiIiopZ9e+3K3mevZTuVf2hnSA5B4a3AARiJJ1n3Y3OCy0m+nvctH12fAQ5yiMP80+Vb7o9wlGMc5wQnOcVpznCWc/zLeS5wkUtc5gpXf/h/rXGdG9zkFru+xWxrZkczu5rZ08y+Zv5p5kAzh5o50syxZk40c6qZM82ca6ane7/v//v+n+eib8diYy7tLDbmys5iY67tLDbmxs5iY27tLDbmzs5iY+7tLDbmwc5iY/7bWWzMo53FxjzZWWzMs53FxrzYWWzMq53Fxrx1H/t9lj8=    </DataArray>
+</DataArray>
   </PointData>
  </Piece>
  </UnstructuredGrid>
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 (file)
index 04dae23..0000000
--- a/tests/base/data_out_base_vtu.with_zlib=true.output.2
+++ /dev/null
@@ -1,215 +0,0 @@
-==============================
-11.vtu
-==============================
-<?xml version="1.0" ?> 
-<!-- 
-# vtk DataFile Version 3.0
-#This file was generated 
--->
-<VTKFile type="UnstructuredGrid" version="0.1" compressor="vtkZLibDataCompressor" byte_order="LittleEndian">
-<UnstructuredGrid>
-<Piece NumberOfPoints="14" NumberOfCells="10" >
-  <Points>
-    <DataArray type="Float64" NumberOfComponents="3" format="binary">
-AQAAAFABAABQAQAANQAAAA==eNpjYMAHPtiTJv4DhziDA7Hiq1eBABOGeFgoCLDiMIeDRHEuHOI8OMT5cIgLYIgDAH+pDF0=
-    </DataArray>
-  </Points>
-
-  <Cells>
-    <DataArray type="Int32" Name="connectivity" format="binary">
-AQAAAFAAAABQAAAAKQAAAA==eNotw8cNACAQA0HDkY7Qf7vswyONJBVWhjd2Dp++mNx+/PrjBxBcAI0=
-    </DataArray>
-    <DataArray type="Int32" Name="offsets" format="binary">
-AQAAACgAAAAoAAAAIgAAAA==eNpjYmBgYAFiNiDmAGIuIOYBYj4gFgBiISAWAWIABwgAbw==
-    </DataArray>
-    <DataArray type="UInt8" Name="types" format="binary">
-AQAAAAoAAAAKAAAACwAAAA==eNpjZoYBAACvAB8=
-    </DataArray>
-  </Cells>
-  <PointData Scalars="scalars">
-    <DataArray type="Float64" Name="x1" format="binary">
-AQAAAHAAAABwAAAALgAAAA==eNpjYEAGH+xR6R9QmsEBiV6wahUTiE4IDWWFinOg0VxQmgdK80FpAQcAUAIJXw==    </DataArray>
-    <DataArray type="Float64" Name="x2" format="binary">
-AQAAAHAAAABwAAAAFgAAAA==eNpjYMAGPthjpxkc8NMcBGkAb/wF9g==    </DataArray>
-    <DataArray type="Float64" Name="x3" format="binary">
-AQAAAHAAAABwAAAAFgAAAA==eNpjYMAGPthjpxkc8NMcBGkAb/wF9g==    </DataArray>
-    <DataArray type="Float64" Name="x4" format="binary">
-AQAAAHAAAABwAAAAFgAAAA==eNpjYMAGPthjpxkc8NMcBGkAb/wF9g==    </DataArray>
-    <DataArray type="Float64" Name="i" format="binary">
-AQAAAHAAAABwAAAAGQAAAA==eNpjYEAGH+wZsPMd8ItzECkv4AAAaTsGXQ==    </DataArray>
-  </PointData>
- </Piece>
- </UnstructuredGrid>
-</VTKFile>
-==============================
-12.vtu
-==============================
-<?xml version="1.0" ?> 
-<!-- 
-# vtk DataFile Version 3.0
-#This file was generated 
--->
-<VTKFile type="UnstructuredGrid" version="0.1" compressor="vtkZLibDataCompressor" byte_order="LittleEndian">
-<UnstructuredGrid>
-<Piece NumberOfPoints="14" NumberOfCells="10" >
-  <Points>
-    <DataArray type="Float64" NumberOfComponents="3" format="binary">
-AQAAAFABAABQAQAASgAAAA==eNpjYMAHPtij0oTEf9ij0nDggEbjFF+9CgSYHGA0TDwsFARYHWA0qjEcDqg0IXEuB1QaBngcUGkY4HNApWFAwAGVZmAAAJsiGLk=
-    </DataArray>
-  </Points>
-
-  <Cells>
-    <DataArray type="Int32" Name="connectivity" format="binary">
-AQAAAFAAAABQAAAAKQAAAA==eNotw8cNACAQA0HDkY7Qf7vswyONJBVWhjd2Dp++mNx+/PrjBxBcAI0=
-    </DataArray>
-    <DataArray type="Int32" Name="offsets" format="binary">
-AQAAACgAAAAoAAAAIgAAAA==eNpjYmBgYAFiNiDmAGIuIOYBYj4gFgBiISAWAWIABwgAbw==
-    </DataArray>
-    <DataArray type="UInt8" Name="types" format="binary">
-AQAAAAoAAAAKAAAACwAAAA==eNpjZoYBAACvAB8=
-    </DataArray>
-  </Cells>
-  <PointData Scalars="scalars">
-    <DataArray type="Float64" Name="x1" format="binary">
-AQAAAHAAAABwAAAALgAAAA==eNpjYEAGH+xR6R9QmsEBiV6wahUTiE4IDWWFinOg0VxQmgdK80FpAQcAUAIJXw==    </DataArray>
-    <DataArray type="Float64" Name="x2" format="binary">
-AQAAAHAAAABwAAAAFgAAAA==eNpjYMAGPthjpxkc8NMcBGkAb/wF9g==    </DataArray>
-    <DataArray type="Float64" Name="x3" format="binary">
-AQAAAHAAAABwAAAAFgAAAA==eNpjYMAGPthjpxkc8NMcBGkAb/wF9g==    </DataArray>
-    <DataArray type="Float64" Name="x4" format="binary">
-AQAAAHAAAABwAAAAFgAAAA==eNpjYMAGPthjpxkc8NMcBGkAb/wF9g==    </DataArray>
-    <DataArray type="Float64" Name="i" format="binary">
-AQAAAHAAAABwAAAAGQAAAA==eNpjYEAGH+wZsPMd8ItzECkv4AAAaTsGXQ==    </DataArray>
-  </PointData>
- </Piece>
- </UnstructuredGrid>
-</VTKFile>
-==============================
-22.vtu
-==============================
-<?xml version="1.0" ?> 
-<!-- 
-# vtk DataFile Version 3.0
-#This file was generated 
--->
-<VTKFile type="UnstructuredGrid" version="0.1" compressor="vtkZLibDataCompressor" byte_order="LittleEndian">
-<UnstructuredGrid>
-<Piece NumberOfPoints="54" NumberOfCells="30" >
-  <Points>
-    <DataArray type="Float64" NumberOfComponents="3" format="binary">
-AQAAABAFAAAQBQAAoQAAAA==eNqVkMEJwzAMAEWhYIQQ2qhZIh2yXa5PP0secoiaS1L9fIY7WyJH83nIX/d5vso7cJmOPR08HTwdPHlfPZWP8yl/v5a5/fDnvMwdPA39xTf8lae/8vTvc5nm7buGv/L0V57+fZ7/abCfBvtpsJ+rXIEbcAceJ12FrkJXoavQVegadA26Bl2DrkHXoevQdeg6dB26Ad2AbkA3oLvyLyYyW80=
-    </DataArray>
-  </Points>
-
-  <Cells>
-    <DataArray type="Int32" Name="connectivity" format="binary">
-AQAAAOABAADgAQAAogAAAA==eNpNi8cSgkAQBdecAyJiDggiiGD8/1/zTVUfPHRtV+8b55yriYaoi6Zoia7o4G3R+2v2DkQft78hbSTGYiY8fCJ8mvlUzGkefSEC3HpI89kuaQF9LVa49Q0tZLul7cRenEWEH0RMMz+KhGZ+EhdaxO4qUtx2GS1ml9MSbm+0lN1dFLjtSlrGrqLl3D5oBbuXeOK2e9NKdh9axe2X9gNQBw2p
-    </DataArray>
-    <DataArray type="Int32" Name="offsets" format="binary">
-AQAAAHgAAAB4AAAATAAAAA==eNoNw5EShFAAAMAHQRAEQRAEQRAEwUEQBEEQBEEQBEEQBH3+7c5sFEKITUzNzC0sraxtbO382Ts4Ojm7uLq5e3h6efv4+vkHNocHRQ==
-    </DataArray>
-    <DataArray type="UInt8" Name="types" format="binary">
-AQAAAB4AAAAeAAAACwAAAA==eNrj5MQHABB3AQ8=
-    </DataArray>
-  </Cells>
-  <PointData Scalars="scalars">
-    <DataArray type="Float64" Name="x1" format="binary">
-AQAAALABAACwAQAANgAAAA==eNpjYEAGH+wZsPJh9A+YvAN54mB6wapVTCA6ITSUFSrOQSd5GM0FpXmgNB+UFhj06gCiMiHx    </DataArray>
-    <DataArray type="Float64" Name="x2" format="binary">
-AQAAALABAACwAQAAMwAAAA==eNpjYMAGPtgTR//AQTM4kEEvWLWKCR+dEBrKio8GAg4q0VxE0jxE0nxE0gIEaQDf2iHx    </DataArray>
-    <DataArray type="Float64" Name="x3" format="binary">
-AQAAALABAACwAQAAFwAAAA==eNpjYCAGfLCnDs3gMLA0x5CnAc+qFbA=    </DataArray>
-    <DataArray type="Float64" Name="x4" format="binary">
-AQAAALABAACwAQAAFwAAAA==eNpjYCAGfLCnDs3gMLA0x5CnAc+qFbA=    </DataArray>
-    <DataArray type="Float64" Name="i" format="binary">
-AQAAALABAACwAQAAUAAAAA==eNpjYEAGH+yhDAcIxeHAQJS8AJQWgdISUFoGSitQ2RwlKK0CpdWgtAaU1oLSOlBab5DYbwClDaG0EZQ2htImUNoUSptBaXMobeEAANfTFck=    </DataArray>
-  </PointData>
- </Piece>
- </UnstructuredGrid>
-</VTKFile>
-==============================
-23.vtu
-==============================
-<?xml version="1.0" ?> 
-<!-- 
-# vtk DataFile Version 3.0
-#This file was generated 
--->
-<VTKFile type="UnstructuredGrid" version="0.1" compressor="vtkZLibDataCompressor" byte_order="LittleEndian">
-<UnstructuredGrid>
-<Piece NumberOfPoints="54" NumberOfCells="30" >
-  <Points>
-    <DataArray type="Float64" NumberOfComponents="3" format="binary">
-AQAAABAFAAAQBQAA0gAAAA==eNqNUVsOgjAQRCNJQ2rT8tLb2EvAIfFyfvJpEAbDtGPsz2Rmt9PdaVH8Oq/HnzweOdAIHTgLzn7MuW8m/RLzdSN8Tcz7WvIBeqEX8Tkt55zwcVhOuetHbmJ+nvQ+OPC09efr1e4H/dM2XJM5pq2f3xu3/iMvKYfv+6t/EPt4ygf3QpLHOk9N94Gt0IGV4JZ0cEe6S/bLc/atCJ2oe6pDD1SHXou5vZgjELfkw3M15GdFzo58eM9G5NoSB3Yij17k3oocO5FLL/7zRhx4j28uS4pw
-    </DataArray>
-  </Points>
-
-  <Cells>
-    <DataArray type="Int32" Name="connectivity" format="binary">
-AQAAAOABAADgAQAAogAAAA==eNpNi8cSgkAQBdecAyJiDggiiGD8/1/zTVUfPHRtV+8b55yriYaoi6Zoia7o4G3R+2v2DkQft78hbSTGYiY8fCJ8mvlUzGkefSEC3HpI89kuaQF9LVa49Q0tZLul7cRenEWEH0RMMz+KhGZ+EhdaxO4qUtx2GS1ml9MSbm+0lN1dFLjtSlrGrqLl3D5oBbuXeOK2e9NKdh9axe2X9gNQBw2p
-    </DataArray>
-    <DataArray type="Int32" Name="offsets" format="binary">
-AQAAAHgAAAB4AAAATAAAAA==eNoNw5EShFAAAMAHQRAEQRAEQRAEwUEQBEEQBEEQBEEQBH3+7c5sFEKITUzNzC0sraxtbO382Ts4Ojm7uLq5e3h6efv4+vkHNocHRQ==
-    </DataArray>
-    <DataArray type="UInt8" Name="types" format="binary">
-AQAAAB4AAAAeAAAACwAAAA==eNrj5MQHABB3AQ8=
-    </DataArray>
-  </Cells>
-  <PointData Scalars="scalars">
-    <DataArray type="Float64" Name="x1" format="binary">
-AQAAALABAACwAQAANgAAAA==eNpjYEAGH+wZsPJh9A+YvAN54mB6wapVTCA6ITSUFSrOQSd5GM0FpXmgNB+UFhj06gCiMiHx    </DataArray>
-    <DataArray type="Float64" Name="x2" format="binary">
-AQAAALABAACwAQAAMwAAAA==eNpjYMAGPtgTR//AQTM4kEEvWLWKCR+dEBrKio8GAg4q0VxE0jxE0nxE0gIEaQDf2iHx    </DataArray>
-    <DataArray type="Float64" Name="x3" format="binary">
-AQAAALABAACwAQAAFwAAAA==eNpjYCAGfLCnDs3gMLA0x5CnAc+qFbA=    </DataArray>
-    <DataArray type="Float64" Name="x4" format="binary">
-AQAAALABAACwAQAAFwAAAA==eNpjYCAGfLCnDs3gMLA0x5CnAc+qFbA=    </DataArray>
-    <DataArray type="Float64" Name="i" format="binary">
-AQAAALABAACwAQAAUAAAAA==eNpjYEAGH+yhDAcIxeHAQJS8AJQWgdISUFoGSitQ2RwlKK0CpdWgtAaU1oLSOlBab5DYbwClDaG0EZQ2htImUNoUSptBaXMobeEAANfTFck=    </DataArray>
-  </PointData>
- </Piece>
- </UnstructuredGrid>
-</VTKFile>
-==============================
-33.vtu
-==============================
-<?xml version="1.0" ?> 
-<!-- 
-# vtk DataFile Version 3.0
-#This file was generated 
--->
-<VTKFile type="UnstructuredGrid" version="0.1" compressor="vtkZLibDataCompressor" byte_order="LittleEndian">
-<UnstructuredGrid>
-<Piece NumberOfPoints="224" NumberOfCells="100" >
-  <Points>
-    <DataArray type="Float64" NumberOfComponents="3" format="binary">
-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==
-    </DataArray>
-  </Points>
-
-  <Cells>
-    <DataArray type="Int32" Name="connectivity" format="binary">
-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
-    </DataArray>
-    <DataArray type="Int32" Name="offsets" format="binary">
-AQAAAJABAACQAQAAmAAAAA==eNoNzRGAhEAAAMD9fzkMwzA8DMMwDMMwDMPDMAzDMAzDMAzDw/AHhucVQoiISUh5k5FTUFJR09DS0fNhYGRiZmFlY+fg5OLmy0P4CeFFRExCypuMnIKSipqGlo6eDwMjEzMLKxs7BycXN18ewq+fiJiElDcZOQUlFTUNLR09HwZGJmYWVjZ2Dk4ubr48hD8/ETEJ/xaiL0A=
-    </DataArray>
-    <DataArray type="UInt8" Name="types" format="binary">
-AQAAAGQAAABkAAAADAAAAA==eNrj4aE9AADtHASx
-    </DataArray>
-  </Cells>
-  <PointData Scalars="scalars">
-    <DataArray type="Float64" Name="x1" format="binary">
-AQAAAAAHAAAABwAAQAAAAA==eNpjYEAGH+wZyOLD6B8weYfhIQ6mF6xaxQSiE0JDWaHiHKPyI0IeRnNBaR4ozQelBUbVjaobVTeE1QEAes2Cfw==    </DataArray>
-    <DataArray type="Float64" Name="x2" format="binary">
-AQAAAAAHAAAABwAASwAAAA==eNpjYMAGPtij0oTkcdE/cNAMDtjpwWYOXnrBqlVM+OiE0FBWfDQQcBCgR+0fWPuJpbmIpHmIpPmIpAWIpEf9MeqPUX9gowFLHIJ/    </DataArray>
-    <DataArray type="Float64" Name="x3" format="binary">
-AQAAAAAHAAAABwAAOAAAAA==eNpjYCAGfLCnD/2DSjSDwzCgF6xaxTSQdEJoKOtA0kDAMUpTheYaJjTPMKH5hgktMORpAO0qgn8=    </DataArray>
-    <DataArray type="Float64" Name="x4" format="binary">
-AQAAAAAHAAAABwAAHwAAAA==eNpjYKAG+GA/PGkGh1F6JNMco/QoPUoPYxoAo8lTHg==    </DataArray>
-    <DataArray type="Float64" Name="i" format="binary">
-AQAAAAAHAAAABwAA4wAAAA==eNrt0TlKZVEYhdEdGhoYGFQgIiIiopZ9e+3K3mevZTuVf2hnSA5B4a3AARiJJ1n3Y3OCy0m+nvctH12fAQ5yiMP80+Vb7o9wlGMc5wQnOcVpznCWc/zLeS5wkUtc5gpXf/h/rXGdG9zkFru+xWxrZkczu5rZ08y+Zv5p5kAzh5o50syxZk40c6qZM82ca6ane7/v//v+n+eib8diYy7tLDbmys5iY67tLDbmxs5iY27tLDbmzs5iY+7tLDbmwc5iY/7bWWzMo53FxjzZWWzMs53FxrzYWWzMq53Fxrx1H/t9lj8=    </DataArray>
-  </PointData>
- </Piece>
- </UnstructuredGrid>
-</VTKFile>
diff --git a/tests/base/data_out_base_vtu_cycle.cc b/tests/base/data_out_base_vtu_cycle.cc
index 8751403558772ef2f3e0bbc293efe6582fdae138..8ded009af6b31d8be27cb9e5dd5934f05b0bf3b0 100644 (file)
--- 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 9a38513525cda173f18f50d779f36b7316434fb8..56fe23cc69db80b2315059856f4c83162f874244 100644 (file)
--- 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 @@
 <Piece NumberOfPoints="14" NumberOfCells="10" >
   <Points>
     <DataArray type="Float64" NumberOfComponents="3" format="binary">
-AQAAAFABAABQAQAANQAAAA==eNpjYMAHPtiTJv4DhziDA7Hiq1eBABOGeFgoCLDiMIeDRHEuHOI8OMT5cIgLYIgDAH+pDF0=
-    </DataArray>
+</DataArray>
   </Points>
 
   <Cells>
     <DataArray type="Int32" Name="connectivity" format="binary">
-AQAAAFAAAABQAAAAKQAAAA==eNotw8cNACAQA0HDkY7Qf7vswyONJBVWhjd2Dp++mNx+/PrjBxBcAI0=
-    </DataArray>
+</DataArray>
     <DataArray type="Int32" Name="offsets" format="binary">
-AQAAACgAAAAoAAAAIgAAAA==eNpjYmBgYAFiNiDmAGIuIOYBYj4gFgBiISAWAWIABwgAbw==
-    </DataArray>
+</DataArray>
     <DataArray type="UInt8" Name="types" format="binary">
-AQAAAAoAAAAKAAAACwAAAA==eNpjZoYBAACvAB8=
-    </DataArray>
+</DataArray>
   </Cells>
   <PointData Scalars="scalars">
     <DataArray type="Float64" Name="x1" format="binary">
-AQAAAHAAAABwAAAALgAAAA==eNpjYEAGH+xR6R9QmsEBiV6wahUTiE4IDWWFinOg0VxQmgdK80FpAQcAUAIJXw==    </DataArray>
+</DataArray>
     <DataArray type="Float64" Name="x2" format="binary">
-AQAAAHAAAABwAAAAFgAAAA==eNpjYMAGPthjpxkc8NMcBGkAb/wF9g==    </DataArray>
+</DataArray>
     <DataArray type="Float64" Name="x3" format="binary">
-AQAAAHAAAABwAAAAFgAAAA==eNpjYMAGPthjpxkc8NMcBGkAb/wF9g==    </DataArray>
+</DataArray>
     <DataArray type="Float64" Name="x4" format="binary">
-AQAAAHAAAABwAAAAFgAAAA==eNpjYMAGPthjpxkc8NMcBGkAb/wF9g==    </DataArray>
+</DataArray>
     <DataArray type="Float64" Name="i" format="binary">
-AQAAAHAAAABwAAAAGQAAAA==eNpjYEAGH+wZsPMd8ItzECkv4AAAaTsGXQ==    </DataArray>
+</DataArray>
   </PointData>
  </Piece>
  </UnstructuredGrid>
@@ -60,32 +56,28 @@ AQAAAHAAAABwAAAAGQAAAA==eNpjYEAGH+wZsPMd8ItzECkv4AAAaTsGXQ==    </DataArray>
 <Piece NumberOfPoints="14" NumberOfCells="10" >
   <Points>
     <DataArray type="Float64" NumberOfComponents="3" format="binary">
-AQAAAFABAABQAQAASgAAAA==eNpjYMAHPtij0oTEf9ij0nDggEbjFF+9CgSYHGA0TDwsFARYHWA0qjEcDqg0IXEuB1QaBngcUGkY4HNApWFAwAGVZmAAAJsiGLk=
-    </DataArray>
+</DataArray>
   </Points>
 
   <Cells>
     <DataArray type="Int32" Name="connectivity" format="binary">
-AQAAAFAAAABQAAAAKQAAAA==eNotw8cNACAQA0HDkY7Qf7vswyONJBVWhjd2Dp++mNx+/PrjBxBcAI0=
-    </DataArray>
+</DataArray>
     <DataArray type="Int32" Name="offsets" format="binary">
-AQAAACgAAAAoAAAAIgAAAA==eNpjYmBgYAFiNiDmAGIuIOYBYj4gFgBiISAWAWIABwgAbw==
-    </DataArray>
+</DataArray>
     <DataArray type="UInt8" Name="types" format="binary">
-AQAAAAoAAAAKAAAACwAAAA==eNpjZoYBAACvAB8=
-    </DataArray>
+</DataArray>
   </Cells>
   <PointData Scalars="scalars">
     <DataArray type="Float64" Name="x1" format="binary">
-AQAAAHAAAABwAAAALgAAAA==eNpjYEAGH+xR6R9QmsEBiV6wahUTiE4IDWWFinOg0VxQmgdK80FpAQcAUAIJXw==    </DataArray>
+</DataArray>
     <DataArray type="Float64" Name="x2" format="binary">
-AQAAAHAAAABwAAAAFgAAAA==eNpjYMAGPthjpxkc8NMcBGkAb/wF9g==    </DataArray>
+</DataArray>
     <DataArray type="Float64" Name="x3" format="binary">
-AQAAAHAAAABwAAAAFgAAAA==eNpjYMAGPthjpxkc8NMcBGkAb/wF9g==    </DataArray>
+</DataArray>
     <DataArray type="Float64" Name="x4" format="binary">
-AQAAAHAAAABwAAAAFgAAAA==eNpjYMAGPthjpxkc8NMcBGkAb/wF9g==    </DataArray>
+</DataArray>
     <DataArray type="Float64" Name="i" format="binary">
-AQAAAHAAAABwAAAAGQAAAA==eNpjYEAGH+wZsPMd8ItzECkv4AAAaTsGXQ==    </DataArray>
+</DataArray>
   </PointData>
  </Piece>
  </UnstructuredGrid>
@@ -106,32 +98,28 @@ AQAAAHAAAABwAAAAGQAAAA==eNpjYEAGH+wZsPMd8ItzECkv4AAAaTsGXQ==    </DataArray>
 <Piece NumberOfPoints="54" NumberOfCells="30" >
   <Points>
     <DataArray type="Float64" NumberOfComponents="3" format="binary">
-AQAAABAFAAAQBQAAoAAAAA==eNqVkMsKw0AIAKVQWETEP2p+ovnI5Od63GPJwS3YTB7enIWZRJGj+bzk1nvuV3kHLtOxp4Ong6eDJ9+rp/Kxn/J12ebxx+f3Nk/wNPQX3/BXnv7K07/PZSrfNfyV5155+vd5/k+D+zS4T4P7XOUK3IA78DjpKnQVugpdha5C16Br0DXoGnQNug5dh65D16Hr0A3oBnQDugHdH/8CMeJb0Q==
-    </DataArray>
+</DataArray>
   </Points>
 
   <Cells>
     <DataArray type="Int32" Name="connectivity" format="binary">
-AQAAAOABAADgAQAAogAAAA==eNpNi8cSgkAQBdecAyJiDggiiGD8/1/zTVUfPHRtV+8b55yriYaoi6Zoia7o4G3R+2v2DkQft78hbSTGYiY8fCJ8mvlUzGkefSEC3HpI89kuaQF9LVa49Q0tZLul7cRenEWEH0RMMz+KhGZ+EhdaxO4qUtx2GS1ml9MSbm+0lN1dFLjtSlrGrqLl3D5oBbuXeOK2e9NKdh9axe2X9gNQBw2p
-    </DataArray>
+</DataArray>
     <DataArray type="Int32" Name="offsets" format="binary">
-AQAAAHgAAAB4AAAATAAAAA==eNoNw5EShFAAAMAHQRAEQRAEQRAEwUEQBEEQBEEQBEEQBH3+7c5sFEKITUzNzC0sraxtbO382Ts4Ojm7uLq5e3h6efv4+vkHNocHRQ==
-    </DataArray>
+</DataArray>
     <DataArray type="UInt8" Name="types" format="binary">
-AQAAAB4AAAAeAAAACwAAAA==eNrj5MQHABB3AQ8=
-    </DataArray>
+</DataArray>
   </Cells>
   <PointData Scalars="scalars">
     <DataArray type="Float64" Name="x1" format="binary">
-AQAAALABAACwAQAANgAAAA==eNpjYEAGH+wZsPJh9A+YvAN54mB6wapVTCA6ITSUFSrOQSd5GM0FpXmgNB+UFhj06gCiMiHx    </DataArray>
+</DataArray>
     <DataArray type="Float64" Name="x2" format="binary">
-AQAAALABAACwAQAAMwAAAA==eNpjYMAGPtgTR//AQTM4kEEvWLWKCR+dEBrKio8GAg4q0VxE0jxE0nxE0gIEaQDf2iHx    </DataArray>
+</DataArray>
     <DataArray type="Float64" Name="x3" format="binary">
-AQAAALABAACwAQAAFwAAAA==eNpjYCAGfLCnDs3gMLA0x5CnAc+qFbA=    </DataArray>
+</DataArray>
     <DataArray type="Float64" Name="x4" format="binary">
-AQAAALABAACwAQAAFwAAAA==eNpjYCAGfLCnDs3gMLA0x5CnAc+qFbA=    </DataArray>
+</DataArray>
     <DataArray type="Float64" Name="i" format="binary">
-AQAAALABAACwAQAAUAAAAA==eNpjYEAGH+yhDAcIxeHAQJS8AJQWgdISUFoGSitQ2RwlKK0CpdWgtAaU1oLSOlBab5DYbwClDaG0EZQ2htImUNoUSptBaXMobeEAANfTFck=    </DataArray>
+</DataArray>
   </PointData>
  </Piece>
  </UnstructuredGrid>
@@ -152,32 +140,28 @@ AQAAALABAACwAQAAUAAAAA==eNpjYEAGH+yhDAcIxeHAQJS8AJQWgdISUFoGSitQ2RwlKK0CpdWgtAaU
 <Piece NumberOfPoints="54" NumberOfCells="30" >
   <Points>
     <DataArray type="Float64" NumberOfComponents="3" format="binary">
-AQAAABAFAAAQBQAA0gAAAA==eNqNUVsOgjAQRCNJQ2rT8tLb2EvAIfFyfvJpEAbDtGPsz2Rmt9PdaVH8Oq/HnzweOdAIHTgLzn7MuW8m/RLzdSN8Tcz7WvIBeqEX8Tkt55zwcVhOuetHbmJ+nvQ+OPC09efr1e4H/dM2XJM5pq2f3xu3/iMvKYfv+6t/EPt4ygf3QpLHOk9N94Gt0IGV4JZ0cEe6S/bLc/atCJ2oe6pDD1SHXou5vZgjELfkw3M15GdFzo58eM9G5NoSB3Yij17k3oocO5FLL/7zRhx4j28uS4pw
-    </DataArray>
+</DataArray>
   </Points>
 
   <Cells>
     <DataArray type="Int32" Name="connectivity" format="binary">
-AQAAAOABAADgAQAAogAAAA==eNpNi8cSgkAQBdecAyJiDggiiGD8/1/zTVUfPHRtV+8b55yriYaoi6Zoia7o4G3R+2v2DkQft78hbSTGYiY8fCJ8mvlUzGkefSEC3HpI89kuaQF9LVa49Q0tZLul7cRenEWEH0RMMz+KhGZ+EhdaxO4qUtx2GS1ml9MSbm+0lN1dFLjtSlrGrqLl3D5oBbuXeOK2e9NKdh9axe2X9gNQBw2p
-    </DataArray>
+</DataArray>
     <DataArray type="Int32" Name="offsets" format="binary">
-AQAAAHgAAAB4AAAATAAAAA==eNoNw5EShFAAAMAHQRAEQRAEQRAEwUEQBEEQBEEQBEEQBH3+7c5sFEKITUzNzC0sraxtbO382Ts4Ojm7uLq5e3h6efv4+vkHNocHRQ==
-    </DataArray>
+</DataArray>
     <DataArray type="UInt8" Name="types" format="binary">
-AQAAAB4AAAAeAAAACwAAAA==eNrj5MQHABB3AQ8=
-    </DataArray>
+</DataArray>
   </Cells>
   <PointData Scalars="scalars">
     <DataArray type="Float64" Name="x1" format="binary">
-AQAAALABAACwAQAANgAAAA==eNpjYEAGH+wZsPJh9A+YvAN54mB6wapVTCA6ITSUFSrOQSd5GM0FpXmgNB+UFhj06gCiMiHx    </DataArray>
+</DataArray>
     <DataArray type="Float64" Name="x2" format="binary">
-AQAAALABAACwAQAAMwAAAA==eNpjYMAGPtgTR//AQTM4kEEvWLWKCR+dEBrKio8GAg4q0VxE0jxE0nxE0gIEaQDf2iHx    </DataArray>
+</DataArray>
     <DataArray type="Float64" Name="x3" format="binary">
-AQAAALABAACwAQAAFwAAAA==eNpjYCAGfLCnDs3gMLA0x5CnAc+qFbA=    </DataArray>
+</DataArray>
     <DataArray type="Float64" Name="x4" format="binary">
-AQAAALABAACwAQAAFwAAAA==eNpjYCAGfLCnDs3gMLA0x5CnAc+qFbA=    </DataArray>
+</DataArray>
     <DataArray type="Float64" Name="i" format="binary">
-AQAAALABAACwAQAAUAAAAA==eNpjYEAGH+yhDAcIxeHAQJS8AJQWgdISUFoGSitQ2RwlKK0CpdWgtAaU1oLSOlBab5DYbwClDaG0EZQ2htImUNoUSptBaXMobeEAANfTFck=    </DataArray>
+</DataArray>
   </PointData>
  </Piece>
  </UnstructuredGrid>
@@ -198,32 +182,28 @@ AQAAALABAACwAQAAUAAAAA==eNpjYEAGH+yhDAcIxeHAQJS8AJQWgdISUFoGSitQ2RwlKK0CpdWgtAaU
 <Piece NumberOfPoints="224" NumberOfCells="100" >
   <Points>
     <DataArray type="Float64" NumberOfComponents="3" format="binary">
-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==
-    </DataArray>
+</DataArray>
   </Points>
 
   <Cells>
     <DataArray type="Int32" Name="connectivity" format="binary">
-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
-    </DataArray>
+</DataArray>
     <DataArray type="Int32" Name="offsets" format="binary">
-AQAAAJABAACQAQAAmAAAAA==eNoNzRGAhEAAAMD9fzkMwzA8DMMwDMMwDMPDMAzDMAzDMAzDw/AHhucVQoiISUh5k5FTUFJR09DS0fNhYGRiZmFlY+fg5OLmy0P4CeFFRExCypuMnIKSipqGlo6eDwMjEzMLKxs7BycXN18ewq+fiJiElDcZOQUlFTUNLR09HwZGJmYWVjZ2Dk4ubr48hD8/ETEJ/xaiL0A=
-    </DataArray>
+</DataArray>
     <DataArray type="UInt8" Name="types" format="binary">
-AQAAAGQAAABkAAAADAAAAA==eNrj4aE9AADtHASx
-    </DataArray>
+</DataArray>
   </Cells>
   <PointData Scalars="scalars">
     <DataArray type="Float64" Name="x1" format="binary">
-AQAAAAAHAAAABwAAQAAAAA==eNpjYEAGH+wZyOLD6B8weYfhIQ6mF6xaxQSiE0JDWaHiHKPyI0IeRnNBaR4ozQelBUbVjaobVTeE1QEAes2Cfw==    </DataArray>
+</DataArray>
     <DataArray type="Float64" Name="x2" format="binary">
-AQAAAAAHAAAABwAASwAAAA==eNpjYMAGPtij0oTkcdE/cNAMDtjpwWYOXnrBqlVM+OiE0FBWfDQQcBCgR+0fWPuJpbmIpHmIpPmIpAWIpEf9MeqPUX9gowFLHIJ/    </DataArray>
+</DataArray>
     <DataArray type="Float64" Name="x3" format="binary">
-AQAAAAAHAAAABwAAOAAAAA==eNpjYCAGfLCnD/2DSjSDwzCgF6xaxTSQdEJoKOtA0kDAMUpTheYaJjTPMKH5hgktMORpAO0qgn8=    </DataArray>
+</DataArray>
     <DataArray type="Float64" Name="x4" format="binary">
-AQAAAAAHAAAABwAAHwAAAA==eNpjYKAG+GA/PGkGh1F6JNMco/QoPUoPYxoAo8lTHg==    </DataArray>
+</DataArray>
     <DataArray type="Float64" Name="i" format="binary">
-AQAAAAAHAAAABwAA4wAAAA==eNrt0TlKZVEYhdEdGhoYGFQgIiIiopZ9e+3K3mevZTuVf2hnSA5B4a3AARiJJ1n3Y3OCy0m+nvctH12fAQ5yiMP80+Vb7o9wlGMc5wQnOcVpznCWc/zLeS5wkUtc5gpXf/h/rXGdG9zkFru+xWxrZkczu5rZ08y+Zv5p5kAzh5o50syxZk40c6qZM82ca6ane7/v//v+n+eib8diYy7tLDbmys5iY67tLDbmxs5iY27tLDbmzs5iY+7tLDbmwc5iY/7bWWzMo53FxjzZWWzMs53FxrzYWWzMq53Fxrx1H/t9lj8=    </DataArray>
+</DataArray>
   </PointData>
  </Piece>
  </UnstructuredGrid>
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 (file)
index f767e89..0000000
--- a/tests/base/data_out_base_vtu_cycle.with_zlib=true.output.2
+++ /dev/null
@@ -1,230 +0,0 @@
-==============================
-11.vtu
-==============================
-<?xml version="1.0" ?> 
-<!-- 
-# vtk DataFile Version 3.0
-#This file was generated 
--->
-<VTKFile type="UnstructuredGrid" version="0.1" compressor="vtkZLibDataCompressor" byte_order="LittleEndian">
-<UnstructuredGrid>
-<FieldData>
-<DataArray type="Float32" Name="CYCLE" NumberOfTuples="1" format="ascii">42</DataArray>
-</FieldData>
-<Piece NumberOfPoints="14" NumberOfCells="10" >
-  <Points>
-    <DataArray type="Float64" NumberOfComponents="3" format="binary">
-AQAAAFABAABQAQAANQAAAA==eNpjYMAHPtiTJv4DhziDA7Hiq1eBABOGeFgoCLDiMIeDRHEuHOI8OMT5cIgLYIgDAH+pDF0=
-    </DataArray>
-  </Points>
-
-  <Cells>
-    <DataArray type="Int32" Name="connectivity" format="binary">
-AQAAAFAAAABQAAAAKQAAAA==eNotw8cNACAQA0HDkY7Qf7vswyONJBVWhjd2Dp++mNx+/PrjBxBcAI0=
-    </DataArray>
-    <DataArray type="Int32" Name="offsets" format="binary">
-AQAAACgAAAAoAAAAIgAAAA==eNpjYmBgYAFiNiDmAGIuIOYBYj4gFgBiISAWAWIABwgAbw==
-    </DataArray>
-    <DataArray type="UInt8" Name="types" format="binary">
-AQAAAAoAAAAKAAAACwAAAA==eNpjZoYBAACvAB8=
-    </DataArray>
-  </Cells>
-  <PointData Scalars="scalars">
-    <DataArray type="Float64" Name="x1" format="binary">
-AQAAAHAAAABwAAAALgAAAA==eNpjYEAGH+xR6R9QmsEBiV6wahUTiE4IDWWFinOg0VxQmgdK80FpAQcAUAIJXw==    </DataArray>
-    <DataArray type="Float64" Name="x2" format="binary">
-AQAAAHAAAABwAAAAFgAAAA==eNpjYMAGPthjpxkc8NMcBGkAb/wF9g==    </DataArray>
-    <DataArray type="Float64" Name="x3" format="binary">
-AQAAAHAAAABwAAAAFgAAAA==eNpjYMAGPthjpxkc8NMcBGkAb/wF9g==    </DataArray>
-    <DataArray type="Float64" Name="x4" format="binary">
-AQAAAHAAAABwAAAAFgAAAA==eNpjYMAGPthjpxkc8NMcBGkAb/wF9g==    </DataArray>
-    <DataArray type="Float64" Name="i" format="binary">
-AQAAAHAAAABwAAAAGQAAAA==eNpjYEAGH+wZsPMd8ItzECkv4AAAaTsGXQ==    </DataArray>
-  </PointData>
- </Piece>
- </UnstructuredGrid>
-</VTKFile>
-==============================
-12.vtu
-==============================
-<?xml version="1.0" ?> 
-<!-- 
-# vtk DataFile Version 3.0
-#This file was generated 
--->
-<VTKFile type="UnstructuredGrid" version="0.1" compressor="vtkZLibDataCompressor" byte_order="LittleEndian">
-<UnstructuredGrid>
-<FieldData>
-<DataArray type="Float32" Name="CYCLE" NumberOfTuples="1" format="ascii">42</DataArray>
-</FieldData>
-<Piece NumberOfPoints="14" NumberOfCells="10" >
-  <Points>
-    <DataArray type="Float64" NumberOfComponents="3" format="binary">
-AQAAAFABAABQAQAASgAAAA==eNpjYMAHPtij0oTEf9ij0nDggEbjFF+9CgSYHGA0TDwsFARYHWA0qjEcDqg0IXEuB1QaBngcUGkY4HNApWFAwAGVZmAAAJsiGLk=
-    </DataArray>
-  </Points>
-
-  <Cells>
-    <DataArray type="Int32" Name="connectivity" format="binary">
-AQAAAFAAAABQAAAAKQAAAA==eNotw8cNACAQA0HDkY7Qf7vswyONJBVWhjd2Dp++mNx+/PrjBxBcAI0=
-    </DataArray>
-    <DataArray type="Int32" Name="offsets" format="binary">
-AQAAACgAAAAoAAAAIgAAAA==eNpjYmBgYAFiNiDmAGIuIOYBYj4gFgBiISAWAWIABwgAbw==
-    </DataArray>
-    <DataArray type="UInt8" Name="types" format="binary">
-AQAAAAoAAAAKAAAACwAAAA==eNpjZoYBAACvAB8=
-    </DataArray>
-  </Cells>
-  <PointData Scalars="scalars">
-    <DataArray type="Float64" Name="x1" format="binary">
-AQAAAHAAAABwAAAALgAAAA==eNpjYEAGH+xR6R9QmsEBiV6wahUTiE4IDWWFinOg0VxQmgdK80FpAQcAUAIJXw==    </DataArray>
-    <DataArray type="Float64" Name="x2" format="binary">
-AQAAAHAAAABwAAAAFgAAAA==eNpjYMAGPthjpxkc8NMcBGkAb/wF9g==    </DataArray>
-    <DataArray type="Float64" Name="x3" format="binary">
-AQAAAHAAAABwAAAAFgAAAA==eNpjYMAGPthjpxkc8NMcBGkAb/wF9g==    </DataArray>
-    <DataArray type="Float64" Name="x4" format="binary">
-AQAAAHAAAABwAAAAFgAAAA==eNpjYMAGPthjpxkc8NMcBGkAb/wF9g==    </DataArray>
-    <DataArray type="Float64" Name="i" format="binary">
-AQAAAHAAAABwAAAAGQAAAA==eNpjYEAGH+wZsPMd8ItzECkv4AAAaTsGXQ==    </DataArray>
-  </PointData>
- </Piece>
- </UnstructuredGrid>
-</VTKFile>
-==============================
-22.vtu
-==============================
-<?xml version="1.0" ?> 
-<!-- 
-# vtk DataFile Version 3.0
-#This file was generated 
--->
-<VTKFile type="UnstructuredGrid" version="0.1" compressor="vtkZLibDataCompressor" byte_order="LittleEndian">
-<UnstructuredGrid>
-<FieldData>
-<DataArray type="Float32" Name="CYCLE" NumberOfTuples="1" format="ascii">42</DataArray>
-</FieldData>
-<Piece NumberOfPoints="54" NumberOfCells="30" >
-  <Points>
-    <DataArray type="Float64" NumberOfComponents="3" format="binary">
-AQAAABAFAAAQBQAAoQAAAA==eNqVkMEJwzAMAEWhYIQQ2qhZIh2yXa5PP0secoiaS1L9fIY7WyJH83nIX/d5vso7cJmOPR08HTwdPHlfPZWP8yl/v5a5/fDnvMwdPA39xTf8lae/8vTvc5nm7buGv/L0V57+fZ7/abCfBvtpsJ+rXIEbcAceJ12FrkJXoavQVegadA26Bl2DrkHXoevQdeg6dB26Ad2AbkA3oLvyLyYyW80=
-    </DataArray>
-  </Points>
-
-  <Cells>
-    <DataArray type="Int32" Name="connectivity" format="binary">
-AQAAAOABAADgAQAAogAAAA==eNpNi8cSgkAQBdecAyJiDggiiGD8/1/zTVUfPHRtV+8b55yriYaoi6Zoia7o4G3R+2v2DkQft78hbSTGYiY8fCJ8mvlUzGkefSEC3HpI89kuaQF9LVa49Q0tZLul7cRenEWEH0RMMz+KhGZ+EhdaxO4qUtx2GS1ml9MSbm+0lN1dFLjtSlrGrqLl3D5oBbuXeOK2e9NKdh9axe2X9gNQBw2p
-    </DataArray>
-    <DataArray type="Int32" Name="offsets" format="binary">
-AQAAAHgAAAB4AAAATAAAAA==eNoNw5EShFAAAMAHQRAEQRAEQRAEwUEQBEEQBEEQBEEQBH3+7c5sFEKITUzNzC0sraxtbO382Ts4Ojm7uLq5e3h6efv4+vkHNocHRQ==
-    </DataArray>
-    <DataArray type="UInt8" Name="types" format="binary">
-AQAAAB4AAAAeAAAACwAAAA==eNrj5MQHABB3AQ8=
-    </DataArray>
-  </Cells>
-  <PointData Scalars="scalars">
-    <DataArray type="Float64" Name="x1" format="binary">
-AQAAALABAACwAQAANgAAAA==eNpjYEAGH+wZsPJh9A+YvAN54mB6wapVTCA6ITSUFSrOQSd5GM0FpXmgNB+UFhj06gCiMiHx    </DataArray>
-    <DataArray type="Float64" Name="x2" format="binary">
-AQAAALABAACwAQAAMwAAAA==eNpjYMAGPtgTR//AQTM4kEEvWLWKCR+dEBrKio8GAg4q0VxE0jxE0nxE0gIEaQDf2iHx    </DataArray>
-    <DataArray type="Float64" Name="x3" format="binary">
-AQAAALABAACwAQAAFwAAAA==eNpjYCAGfLCnDs3gMLA0x5CnAc+qFbA=    </DataArray>
-    <DataArray type="Float64" Name="x4" format="binary">
-AQAAALABAACwAQAAFwAAAA==eNpjYCAGfLCnDs3gMLA0x5CnAc+qFbA=    </DataArray>
-    <DataArray type="Float64" Name="i" format="binary">
-AQAAALABAACwAQAAUAAAAA==eNpjYEAGH+yhDAcIxeHAQJS8AJQWgdISUFoGSitQ2RwlKK0CpdWgtAaU1oLSOlBab5DYbwClDaG0EZQ2htImUNoUSptBaXMobeEAANfTFck=    </DataArray>
-  </PointData>
- </Piece>
- </UnstructuredGrid>
-</VTKFile>
-==============================
-23.vtu
-==============================
-<?xml version="1.0" ?> 
-<!-- 
-# vtk DataFile Version 3.0
-#This file was generated 
--->
-<VTKFile type="UnstructuredGrid" version="0.1" compressor="vtkZLibDataCompressor" byte_order="LittleEndian">
-<UnstructuredGrid>
-<FieldData>
-<DataArray type="Float32" Name="CYCLE" NumberOfTuples="1" format="ascii">42</DataArray>
-</FieldData>
-<Piece NumberOfPoints="54" NumberOfCells="30" >
-  <Points>
-    <DataArray type="Float64" NumberOfComponents="3" format="binary">
-AQAAABAFAAAQBQAA0gAAAA==eNqNUVsOgjAQRCNJQ2rT8tLb2EvAIfFyfvJpEAbDtGPsz2Rmt9PdaVH8Oq/HnzweOdAIHTgLzn7MuW8m/RLzdSN8Tcz7WvIBeqEX8Tkt55zwcVhOuetHbmJ+nvQ+OPC09efr1e4H/dM2XJM5pq2f3xu3/iMvKYfv+6t/EPt4ygf3QpLHOk9N94Gt0IGV4JZ0cEe6S/bLc/atCJ2oe6pDD1SHXou5vZgjELfkw3M15GdFzo58eM9G5NoSB3Yij17k3oocO5FLL/7zRhx4j28uS4pw
-    </DataArray>
-  </Points>
-
-  <Cells>
-    <DataArray type="Int32" Name="connectivity" format="binary">
-AQAAAOABAADgAQAAogAAAA==eNpNi8cSgkAQBdecAyJiDggiiGD8/1/zTVUfPHRtV+8b55yriYaoi6Zoia7o4G3R+2v2DkQft78hbSTGYiY8fCJ8mvlUzGkefSEC3HpI89kuaQF9LVa49Q0tZLul7cRenEWEH0RMMz+KhGZ+EhdaxO4qUtx2GS1ml9MSbm+0lN1dFLjtSlrGrqLl3D5oBbuXeOK2e9NKdh9axe2X9gNQBw2p
-    </DataArray>
-    <DataArray type="Int32" Name="offsets" format="binary">
-AQAAAHgAAAB4AAAATAAAAA==eNoNw5EShFAAAMAHQRAEQRAEQRAEwUEQBEEQBEEQBEEQBH3+7c5sFEKITUzNzC0sraxtbO382Ts4Ojm7uLq5e3h6efv4+vkHNocHRQ==
-    </DataArray>
-    <DataArray type="UInt8" Name="types" format="binary">
-AQAAAB4AAAAeAAAACwAAAA==eNrj5MQHABB3AQ8=
-    </DataArray>
-  </Cells>
-  <PointData Scalars="scalars">
-    <DataArray type="Float64" Name="x1" format="binary">
-AQAAALABAACwAQAANgAAAA==eNpjYEAGH+wZsPJh9A+YvAN54mB6wapVTCA6ITSUFSrOQSd5GM0FpXmgNB+UFhj06gCiMiHx    </DataArray>
-    <DataArray type="Float64" Name="x2" format="binary">
-AQAAALABAACwAQAAMwAAAA==eNpjYMAGPtgTR//AQTM4kEEvWLWKCR+dEBrKio8GAg4q0VxE0jxE0nxE0gIEaQDf2iHx    </DataArray>
-    <DataArray type="Float64" Name="x3" format="binary">
-AQAAALABAACwAQAAFwAAAA==eNpjYCAGfLCnDs3gMLA0x5CnAc+qFbA=    </DataArray>
-    <DataArray type="Float64" Name="x4" format="binary">
-AQAAALABAACwAQAAFwAAAA==eNpjYCAGfLCnDs3gMLA0x5CnAc+qFbA=    </DataArray>
-    <DataArray type="Float64" Name="i" format="binary">
-AQAAALABAACwAQAAUAAAAA==eNpjYEAGH+yhDAcIxeHAQJS8AJQWgdISUFoGSitQ2RwlKK0CpdWgtAaU1oLSOlBab5DYbwClDaG0EZQ2htImUNoUSptBaXMobeEAANfTFck=    </DataArray>
-  </PointData>
- </Piece>
- </UnstructuredGrid>
-</VTKFile>
-==============================
-33.vtu
-==============================
-<?xml version="1.0" ?> 
-<!-- 
-# vtk DataFile Version 3.0
-#This file was generated 
--->
-<VTKFile type="UnstructuredGrid" version="0.1" compressor="vtkZLibDataCompressor" byte_order="LittleEndian">
-<UnstructuredGrid>
-<FieldData>
-<DataArray type="Float32" Name="CYCLE" NumberOfTuples="1" format="ascii">42</DataArray>
-</FieldData>
-<Piece NumberOfPoints="224" NumberOfCells="100" >
-  <Points>
-    <DataArray type="Float64" NumberOfComponents="3" format="binary">
-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==
-    </DataArray>
-  </Points>
-
-  <Cells>
-    <DataArray type="Int32" Name="connectivity" format="binary">
-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
-    </DataArray>
-    <DataArray type="Int32" Name="offsets" format="binary">
-AQAAAJABAACQAQAAmAAAAA==eNoNzRGAhEAAAMD9fzkMwzA8DMMwDMMwDMPDMAzDMAzDMAzDw/AHhucVQoiISUh5k5FTUFJR09DS0fNhYGRiZmFlY+fg5OLmy0P4CeFFRExCypuMnIKSipqGlo6eDwMjEzMLKxs7BycXN18ewq+fiJiElDcZOQUlFTUNLR09HwZGJmYWVjZ2Dk4ubr48hD8/ETEJ/xaiL0A=
-    </DataArray>
-    <DataArray type="UInt8" Name="types" format="binary">
-AQAAAGQAAABkAAAADAAAAA==eNrj4aE9AADtHASx
-    </DataArray>
-  </Cells>
-  <PointData Scalars="scalars">
-    <DataArray type="Float64" Name="x1" format="binary">
-AQAAAAAHAAAABwAAQAAAAA==eNpjYEAGH+wZyOLD6B8weYfhIQ6mF6xaxQSiE0JDWaHiHKPyI0IeRnNBaR4ozQelBUbVjaobVTeE1QEAes2Cfw==    </DataArray>
-    <DataArray type="Float64" Name="x2" format="binary">
-AQAAAAAHAAAABwAASwAAAA==eNpjYMAGPtij0oTkcdE/cNAMDtjpwWYOXnrBqlVM+OiE0FBWfDQQcBCgR+0fWPuJpbmIpHmIpPmIpAWIpEf9MeqPUX9gowFLHIJ/    </DataArray>
-    <DataArray type="Float64" Name="x3" format="binary">
-AQAAAAAHAAAABwAAOAAAAA==eNpjYCAGfLCnD/2DSjSDwzCgF6xaxTSQdEJoKOtA0kDAMUpTheYaJjTPMKH5hgktMORpAO0qgn8=    </DataArray>
-    <DataArray type="Float64" Name="x4" format="binary">
-AQAAAAAHAAAABwAAHwAAAA==eNpjYKAG+GA/PGkGh1F6JNMco/QoPUoPYxoAo8lTHg==    </DataArray>
-    <DataArray type="Float64" Name="i" format="binary">
-AQAAAAAHAAAABwAA4wAAAA==eNrt0TlKZVEYhdEdGhoYGFQgIiIiopZ9e+3K3mevZTuVf2hnSA5B4a3AARiJJ1n3Y3OCy0m+nvctH12fAQ5yiMP80+Vb7o9wlGMc5wQnOcVpznCWc/zLeS5wkUtc5gpXf/h/rXGdG9zkFru+xWxrZkczu5rZ08y+Zv5p5kAzh5o50syxZk40c6qZM82ca6ane7/v//v+n+eib8diYy7tLDbmys5iY67tLDbmxs5iY27tLDbmzs5iY+7tLDbmwc5iY/7bWWzMo53FxjzZWWzMs53FxrzYWWzMq53Fxrx1H/t9lj8=    </DataArray>
-  </PointData>
- </Piece>
- </UnstructuredGrid>
-</VTKFile>
diff --git a/tests/base/data_out_base_vtu_time.cc b/tests/base/data_out_base_vtu_time.cc
index 5de2535bd6f7a0fb58f8aee1ab64e668586302aa..47a797f3a68da123466b0fc445abf8a4efd9ab9c 100644 (file)
--- 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 a17622db32f73cad710ca26ec90bc1ebcff1bce2..9efd303d63f4b868dfb4deeb6135e01b2b487d74 100644 (file)
--- 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 @@
 <Piece NumberOfPoints="14" NumberOfCells="10" >
   <Points>
     <DataArray type="Float64" NumberOfComponents="3" format="binary">
-AQAAAFABAABQAQAANQAAAA==eNpjYMAHPtiTJv4DhziDA7Hiq1eBABOGeFgoCLDiMIeDRHEuHOI8OMT5cIgLYIgDAH+pDF0=
-    </DataArray>
+</DataArray>
   </Points>
 
   <Cells>
     <DataArray type="Int32" Name="connectivity" format="binary">
-AQAAAFAAAABQAAAAKQAAAA==eNotw8cNACAQA0HDkY7Qf7vswyONJBVWhjd2Dp++mNx+/PrjBxBcAI0=
-    </DataArray>
+</DataArray>
     <DataArray type="Int32" Name="offsets" format="binary">
-AQAAACgAAAAoAAAAIgAAAA==eNpjYmBgYAFiNiDmAGIuIOYBYj4gFgBiISAWAWIABwgAbw==
-    </DataArray>
+</DataArray>
     <DataArray type="UInt8" Name="types" format="binary">
-AQAAAAoAAAAKAAAACwAAAA==eNpjZoYBAACvAB8=
-    </DataArray>
+</DataArray>
   </Cells>
   <PointData Scalars="scalars">
     <DataArray type="Float64" Name="x1" format="binary">
-AQAAAHAAAABwAAAALgAAAA==eNpjYEAGH+xR6R9QmsEBiV6wahUTiE4IDWWFinOg0VxQmgdK80FpAQcAUAIJXw==    </DataArray>
+</DataArray>
     <DataArray type="Float64" Name="x2" format="binary">
-AQAAAHAAAABwAAAAFgAAAA==eNpjYMAGPthjpxkc8NMcBGkAb/wF9g==    </DataArray>
+</DataArray>
     <DataArray type="Float64" Name="x3" format="binary">
-AQAAAHAAAABwAAAAFgAAAA==eNpjYMAGPthjpxkc8NMcBGkAb/wF9g==    </DataArray>
+</DataArray>
     <DataArray type="Float64" Name="x4" format="binary">
-AQAAAHAAAABwAAAAFgAAAA==eNpjYMAGPthjpxkc8NMcBGkAb/wF9g==    </DataArray>
+</DataArray>
     <DataArray type="Float64" Name="i" format="binary">
-AQAAAHAAAABwAAAAGQAAAA==eNpjYEAGH+wZsPMd8ItzECkv4AAAaTsGXQ==    </DataArray>
+</DataArray>
   </PointData>
  </Piece>
  </UnstructuredGrid>
@@ -60,32 +56,28 @@ AQAAAHAAAABwAAAAGQAAAA==eNpjYEAGH+wZsPMd8ItzECkv4AAAaTsGXQ==    </DataArray>
 <Piece NumberOfPoints="14" NumberOfCells="10" >
   <Points>
     <DataArray type="Float64" NumberOfComponents="3" format="binary">
-AQAAAFABAABQAQAASgAAAA==eNpjYMAHPtij0oTEf9ij0nDggEbjFF+9CgSYHGA0TDwsFARYHWA0qjEcDqg0IXEuB1QaBngcUGkY4HNApWFAwAGVZmAAAJsiGLk=
-    </DataArray>
+</DataArray>
   </Points>
 
   <Cells>
     <DataArray type="Int32" Name="connectivity" format="binary">
-AQAAAFAAAABQAAAAKQAAAA==eNotw8cNACAQA0HDkY7Qf7vswyONJBVWhjd2Dp++mNx+/PrjBxBcAI0=
-    </DataArray>
+</DataArray>
     <DataArray type="Int32" Name="offsets" format="binary">
-AQAAACgAAAAoAAAAIgAAAA==eNpjYmBgYAFiNiDmAGIuIOYBYj4gFgBiISAWAWIABwgAbw==
-    </DataArray>
+</DataArray>
     <DataArray type="UInt8" Name="types" format="binary">
-AQAAAAoAAAAKAAAACwAAAA==eNpjZoYBAACvAB8=
-    </DataArray>
+</DataArray>
   </Cells>
   <PointData Scalars="scalars">
     <DataArray type="Float64" Name="x1" format="binary">
-AQAAAHAAAABwAAAALgAAAA==eNpjYEAGH+xR6R9QmsEBiV6wahUTiE4IDWWFinOg0VxQmgdK80FpAQcAUAIJXw==    </DataArray>
+</DataArray>
     <DataArray type="Float64" Name="x2" format="binary">
-AQAAAHAAAABwAAAAFgAAAA==eNpjYMAGPthjpxkc8NMcBGkAb/wF9g==    </DataArray>
+</DataArray>
     <DataArray type="Float64" Name="x3" format="binary">
-AQAAAHAAAABwAAAAFgAAAA==eNpjYMAGPthjpxkc8NMcBGkAb/wF9g==    </DataArray>
+</DataArray>
     <DataArray type="Float64" Name="x4" format="binary">
-AQAAAHAAAABwAAAAFgAAAA==eNpjYMAGPthjpxkc8NMcBGkAb/wF9g==    </DataArray>
+</DataArray>
     <DataArray type="Float64" Name="i" format="binary">
-AQAAAHAAAABwAAAAGQAAAA==eNpjYEAGH+wZsPMd8ItzECkv4AAAaTsGXQ==    </DataArray>
+</DataArray>
   </PointData>
  </Piece>
  </UnstructuredGrid>
@@ -106,32 +98,28 @@ AQAAAHAAAABwAAAAGQAAAA==eNpjYEAGH+wZsPMd8ItzECkv4AAAaTsGXQ==    </DataArray>
 <Piece NumberOfPoints="54" NumberOfCells="30" >
   <Points>
     <DataArray type="Float64" NumberOfComponents="3" format="binary">
-AQAAABAFAAAQBQAAoAAAAA==eNqVkMsKw0AIAKVQWETEP2p+ovnI5Od63GPJwS3YTB7enIWZRJGj+bzk1nvuV3kHLtOxp4Ong6eDJ9+rp/Kxn/J12ebxx+f3Nk/wNPQX3/BXnv7K07/PZSrfNfyV5155+vd5/k+D+zS4T4P7XOUK3IA78DjpKnQVugpdha5C16Br0DXoGnQNug5dh65D16Hr0A3oBnQDugHdH/8CMeJb0Q==
-    </DataArray>
+</DataArray>
   </Points>
 
   <Cells>
     <DataArray type="Int32" Name="connectivity" format="binary">
-AQAAAOABAADgAQAAogAAAA==eNpNi8cSgkAQBdecAyJiDggiiGD8/1/zTVUfPHRtV+8b55yriYaoi6Zoia7o4G3R+2v2DkQft78hbSTGYiY8fCJ8mvlUzGkefSEC3HpI89kuaQF9LVa49Q0tZLul7cRenEWEH0RMMz+KhGZ+EhdaxO4qUtx2GS1ml9MSbm+0lN1dFLjtSlrGrqLl3D5oBbuXeOK2e9NKdh9axe2X9gNQBw2p
-    </DataArray>
+</DataArray>
     <DataArray type="Int32" Name="offsets" format="binary">
-AQAAAHgAAAB4AAAATAAAAA==eNoNw5EShFAAAMAHQRAEQRAEQRAEwUEQBEEQBEEQBEEQBH3+7c5sFEKITUzNzC0sraxtbO382Ts4Ojm7uLq5e3h6efv4+vkHNocHRQ==
-    </DataArray>
+</DataArray>
     <DataArray type="UInt8" Name="types" format="binary">
-AQAAAB4AAAAeAAAACwAAAA==eNrj5MQHABB3AQ8=
-    </DataArray>
+</DataArray>
   </Cells>
   <PointData Scalars="scalars">
     <DataArray type="Float64" Name="x1" format="binary">
-AQAAALABAACwAQAANgAAAA==eNpjYEAGH+wZsPJh9A+YvAN54mB6wapVTCA6ITSUFSrOQSd5GM0FpXmgNB+UFhj06gCiMiHx    </DataArray>
+</DataArray>
     <DataArray type="Float64" Name="x2" format="binary">
-AQAAALABAACwAQAAMwAAAA==eNpjYMAGPtgTR//AQTM4kEEvWLWKCR+dEBrKio8GAg4q0VxE0jxE0nxE0gIEaQDf2iHx    </DataArray>
+</DataArray>
     <DataArray type="Float64" Name="x3" format="binary">
-AQAAALABAACwAQAAFwAAAA==eNpjYCAGfLCnDs3gMLA0x5CnAc+qFbA=    </DataArray>
+</DataArray>
     <DataArray type="Float64" Name="x4" format="binary">
-AQAAALABAACwAQAAFwAAAA==eNpjYCAGfLCnDs3gMLA0x5CnAc+qFbA=    </DataArray>
+</DataArray>
     <DataArray type="Float64" Name="i" format="binary">
-AQAAALABAACwAQAAUAAAAA==eNpjYEAGH+yhDAcIxeHAQJS8AJQWgdISUFoGSitQ2RwlKK0CpdWgtAaU1oLSOlBab5DYbwClDaG0EZQ2htImUNoUSptBaXMobeEAANfTFck=    </DataArray>
+</DataArray>
   </PointData>
  </Piece>
  </UnstructuredGrid>
@@ -152,32 +140,28 @@ AQAAALABAACwAQAAUAAAAA==eNpjYEAGH+yhDAcIxeHAQJS8AJQWgdISUFoGSitQ2RwlKK0CpdWgtAaU
 <Piece NumberOfPoints="54" NumberOfCells="30" >
   <Points>
     <DataArray type="Float64" NumberOfComponents="3" format="binary">
-AQAAABAFAAAQBQAA0gAAAA==eNqNUVsOgjAQRCNJQ2rT8tLb2EvAIfFyfvJpEAbDtGPsz2Rmt9PdaVH8Oq/HnzweOdAIHTgLzn7MuW8m/RLzdSN8Tcz7WvIBeqEX8Tkt55zwcVhOuetHbmJ+nvQ+OPC09efr1e4H/dM2XJM5pq2f3xu3/iMvKYfv+6t/EPt4ygf3QpLHOk9N94Gt0IGV4JZ0cEe6S/bLc/atCJ2oe6pDD1SHXou5vZgjELfkw3M15GdFzo58eM9G5NoSB3Yij17k3oocO5FLL/7zRhx4j28uS4pw
-    </DataArray>
+</DataArray>
   </Points>
 
   <Cells>
     <DataArray type="Int32" Name="connectivity" format="binary">
-AQAAAOABAADgAQAAogAAAA==eNpNi8cSgkAQBdecAyJiDggiiGD8/1/zTVUfPHRtV+8b55yriYaoi6Zoia7o4G3R+2v2DkQft78hbSTGYiY8fCJ8mvlUzGkefSEC3HpI89kuaQF9LVa49Q0tZLul7cRenEWEH0RMMz+KhGZ+EhdaxO4qUtx2GS1ml9MSbm+0lN1dFLjtSlrGrqLl3D5oBbuXeOK2e9NKdh9axe2X9gNQBw2p
-    </DataArray>
+</DataArray>
     <DataArray type="Int32" Name="offsets" format="binary">
-AQAAAHgAAAB4AAAATAAAAA==eNoNw5EShFAAAMAHQRAEQRAEQRAEwUEQBEEQBEEQBEEQBH3+7c5sFEKITUzNzC0sraxtbO382Ts4Ojm7uLq5e3h6efv4+vkHNocHRQ==
-    </DataArray>
+</DataArray>
     <DataArray type="UInt8" Name="types" format="binary">
-AQAAAB4AAAAeAAAACwAAAA==eNrj5MQHABB3AQ8=
-    </DataArray>
+</DataArray>
   </Cells>
   <PointData Scalars="scalars">
     <DataArray type="Float64" Name="x1" format="binary">
-AQAAALABAACwAQAANgAAAA==eNpjYEAGH+wZsPJh9A+YvAN54mB6wapVTCA6ITSUFSrOQSd5GM0FpXmgNB+UFhj06gCiMiHx    </DataArray>
+</DataArray>
     <DataArray type="Float64" Name="x2" format="binary">
-AQAAALABAACwAQAAMwAAAA==eNpjYMAGPtgTR//AQTM4kEEvWLWKCR+dEBrKio8GAg4q0VxE0jxE0nxE0gIEaQDf2iHx    </DataArray>
+</DataArray>
     <DataArray type="Float64" Name="x3" format="binary">
-AQAAALABAACwAQAAFwAAAA==eNpjYCAGfLCnDs3gMLA0x5CnAc+qFbA=    </DataArray>
+</DataArray>
     <DataArray type="Float64" Name="x4" format="binary">
-AQAAALABAACwAQAAFwAAAA==eNpjYCAGfLCnDs3gMLA0x5CnAc+qFbA=    </DataArray>
+</DataArray>
     <DataArray type="Float64" Name="i" format="binary">
-AQAAALABAACwAQAAUAAAAA==eNpjYEAGH+yhDAcIxeHAQJS8AJQWgdISUFoGSitQ2RwlKK0CpdWgtAaU1oLSOlBab5DYbwClDaG0EZQ2htImUNoUSptBaXMobeEAANfTFck=    </DataArray>
+</DataArray>
   </PointData>
  </Piece>
  </UnstructuredGrid>
@@ -198,32 +182,28 @@ AQAAALABAACwAQAAUAAAAA==eNpjYEAGH+yhDAcIxeHAQJS8AJQWgdISUFoGSitQ2RwlKK0CpdWgtAaU
 <Piece NumberOfPoints="224" NumberOfCells="100" >
   <Points>
     <DataArray type="Float64" NumberOfComponents="3" format="binary">
-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==
-    </DataArray>
+</DataArray>
   </Points>
 
   <Cells>
     <DataArray type="Int32" Name="connectivity" format="binary">
-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
-    </DataArray>
+</DataArray>
     <DataArray type="Int32" Name="offsets" format="binary">
-AQAAAJABAACQAQAAmAAAAA==eNoNzRGAhEAAAMD9fzkMwzA8DMMwDMMwDMPDMAzDMAzDMAzDw/AHhucVQoiISUh5k5FTUFJR09DS0fNhYGRiZmFlY+fg5OLmy0P4CeFFRExCypuMnIKSipqGlo6eDwMjEzMLKxs7BycXN18ewq+fiJiElDcZOQUlFTUNLR09HwZGJmYWVjZ2Dk4ubr48hD8/ETEJ/xaiL0A=
-    </DataArray>
+</DataArray>
     <DataArray type="UInt8" Name="types" format="binary">
-AQAAAGQAAABkAAAADAAAAA==eNrj4aE9AADtHASx
-    </DataArray>
+</DataArray>
   </Cells>
   <PointData Scalars="scalars">
     <DataArray type="Float64" Name="x1" format="binary">
-AQAAAAAHAAAABwAAQAAAAA==eNpjYEAGH+wZyOLD6B8weYfhIQ6mF6xaxQSiE0JDWaHiHKPyI0IeRnNBaR4ozQelBUbVjaobVTeE1QEAes2Cfw==    </DataArray>
+</DataArray>
     <DataArray type="Float64" Name="x2" format="binary">
-AQAAAAAHAAAABwAASwAAAA==eNpjYMAGPtij0oTkcdE/cNAMDtjpwWYOXnrBqlVM+OiE0FBWfDQQcBCgR+0fWPuJpbmIpHmIpPmIpAWIpEf9MeqPUX9gowFLHIJ/    </DataArray>
+</DataArray>
     <DataArray type="Float64" Name="x3" format="binary">
-AQAAAAAHAAAABwAAOAAAAA==eNpjYCAGfLCnD/2DSjSDwzCgF6xaxTSQdEJoKOtA0kDAMUpTheYaJjTPMKH5hgktMORpAO0qgn8=    </DataArray>
+</DataArray>
     <DataArray type="Float64" Name="x4" format="binary">
-AQAAAAAHAAAABwAAHwAAAA==eNpjYKAG+GA/PGkGh1F6JNMco/QoPUoPYxoAo8lTHg==    </DataArray>
+</DataArray>
     <DataArray type="Float64" Name="i" format="binary">
-AQAAAAAHAAAABwAA4wAAAA==eNrt0TlKZVEYhdEdGhoYGFQgIiIiopZ9e+3K3mevZTuVf2hnSA5B4a3AARiJJ1n3Y3OCy0m+nvctH12fAQ5yiMP80+Vb7o9wlGMc5wQnOcVpznCWc/zLeS5wkUtc5gpXf/h/rXGdG9zkFru+xWxrZkczu5rZ08y+Zv5p5kAzh5o50syxZk40c6qZM82ca6ane7/v//v+n+eib8diYy7tLDbmys5iY67tLDbmxs5iY27tLDbmzs5iY+7tLDbmwc5iY/7bWWzMo53FxjzZWWzMs53FxrzYWWzMq53Fxrx1H/t9lj8=    </DataArray>
+</DataArray>
   </PointData>
  </Piece>
  </UnstructuredGrid>
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 (file)
index 78a9ec8..0000000
--- a/tests/base/data_out_base_vtu_time.with_zlib=true.output.2
+++ /dev/null
@@ -1,230 +0,0 @@
-==============================
-11.vtu
-==============================
-<?xml version="1.0" ?> 
-<!-- 
-# vtk DataFile Version 3.0
-#This file was generated 
--->
-<VTKFile type="UnstructuredGrid" version="0.1" compressor="vtkZLibDataCompressor" byte_order="LittleEndian">
-<UnstructuredGrid>
-<FieldData>
-<DataArray type="Float32" Name="TIME" NumberOfTuples="1" format="ascii">3.14159</DataArray>
-</FieldData>
-<Piece NumberOfPoints="14" NumberOfCells="10" >
-  <Points>
-    <DataArray type="Float64" NumberOfComponents="3" format="binary">
-AQAAAFABAABQAQAANQAAAA==eNpjYMAHPtiTJv4DhziDA7Hiq1eBABOGeFgoCLDiMIeDRHEuHOI8OMT5cIgLYIgDAH+pDF0=
-    </DataArray>
-  </Points>
-
-  <Cells>
-    <DataArray type="Int32" Name="connectivity" format="binary">
-AQAAAFAAAABQAAAAKQAAAA==eNotw8cNACAQA0HDkY7Qf7vswyONJBVWhjd2Dp++mNx+/PrjBxBcAI0=
-    </DataArray>
-    <DataArray type="Int32" Name="offsets" format="binary">
-AQAAACgAAAAoAAAAIgAAAA==eNpjYmBgYAFiNiDmAGIuIOYBYj4gFgBiISAWAWIABwgAbw==
-    </DataArray>
-    <DataArray type="UInt8" Name="types" format="binary">
-AQAAAAoAAAAKAAAACwAAAA==eNpjZoYBAACvAB8=
-    </DataArray>
-  </Cells>
-  <PointData Scalars="scalars">
-    <DataArray type="Float64" Name="x1" format="binary">
-AQAAAHAAAABwAAAALgAAAA==eNpjYEAGH+xR6R9QmsEBiV6wahUTiE4IDWWFinOg0VxQmgdK80FpAQcAUAIJXw==    </DataArray>
-    <DataArray type="Float64" Name="x2" format="binary">
-AQAAAHAAAABwAAAAFgAAAA==eNpjYMAGPthjpxkc8NMcBGkAb/wF9g==    </DataArray>
-    <DataArray type="Float64" Name="x3" format="binary">
-AQAAAHAAAABwAAAAFgAAAA==eNpjYMAGPthjpxkc8NMcBGkAb/wF9g==    </DataArray>
-    <DataArray type="Float64" Name="x4" format="binary">
-AQAAAHAAAABwAAAAFgAAAA==eNpjYMAGPthjpxkc8NMcBGkAb/wF9g==    </DataArray>
-    <DataArray type="Float64" Name="i" format="binary">
-AQAAAHAAAABwAAAAGQAAAA==eNpjYEAGH+wZsPMd8ItzECkv4AAAaTsGXQ==    </DataArray>
-  </PointData>
- </Piece>
- </UnstructuredGrid>
-</VTKFile>
-==============================
-12.vtu
-==============================
-<?xml version="1.0" ?> 
-<!-- 
-# vtk DataFile Version 3.0
-#This file was generated 
--->
-<VTKFile type="UnstructuredGrid" version="0.1" compressor="vtkZLibDataCompressor" byte_order="LittleEndian">
-<UnstructuredGrid>
-<FieldData>
-<DataArray type="Float32" Name="TIME" NumberOfTuples="1" format="ascii">3.14159</DataArray>
-</FieldData>
-<Piece NumberOfPoints="14" NumberOfCells="10" >
-  <Points>
-    <DataArray type="Float64" NumberOfComponents="3" format="binary">
-AQAAAFABAABQAQAASgAAAA==eNpjYMAHPtij0oTEf9ij0nDggEbjFF+9CgSYHGA0TDwsFARYHWA0qjEcDqg0IXEuB1QaBngcUGkY4HNApWFAwAGVZmAAAJsiGLk=
-    </DataArray>
-  </Points>
-
-  <Cells>
-    <DataArray type="Int32" Name="connectivity" format="binary">
-AQAAAFAAAABQAAAAKQAAAA==eNotw8cNACAQA0HDkY7Qf7vswyONJBVWhjd2Dp++mNx+/PrjBxBcAI0=
-    </DataArray>
-    <DataArray type="Int32" Name="offsets" format="binary">
-AQAAACgAAAAoAAAAIgAAAA==eNpjYmBgYAFiNiDmAGIuIOYBYj4gFgBiISAWAWIABwgAbw==
-    </DataArray>
-    <DataArray type="UInt8" Name="types" format="binary">
-AQAAAAoAAAAKAAAACwAAAA==eNpjZoYBAACvAB8=
-    </DataArray>
-  </Cells>
-  <PointData Scalars="scalars">
-    <DataArray type="Float64" Name="x1" format="binary">
-AQAAAHAAAABwAAAALgAAAA==eNpjYEAGH+xR6R9QmsEBiV6wahUTiE4IDWWFinOg0VxQmgdK80FpAQcAUAIJXw==    </DataArray>
-    <DataArray type="Float64" Name="x2" format="binary">
-AQAAAHAAAABwAAAAFgAAAA==eNpjYMAGPthjpxkc8NMcBGkAb/wF9g==    </DataArray>
-    <DataArray type="Float64" Name="x3" format="binary">
-AQAAAHAAAABwAAAAFgAAAA==eNpjYMAGPthjpxkc8NMcBGkAb/wF9g==    </DataArray>
-    <DataArray type="Float64" Name="x4" format="binary">
-AQAAAHAAAABwAAAAFgAAAA==eNpjYMAGPthjpxkc8NMcBGkAb/wF9g==    </DataArray>
-    <DataArray type="Float64" Name="i" format="binary">
-AQAAAHAAAABwAAAAGQAAAA==eNpjYEAGH+wZsPMd8ItzECkv4AAAaTsGXQ==    </DataArray>
-  </PointData>
- </Piece>
- </UnstructuredGrid>
-</VTKFile>
-==============================
-22.vtu
-==============================
-<?xml version="1.0" ?> 
-<!-- 
-# vtk DataFile Version 3.0
-#This file was generated 
--->
-<VTKFile type="UnstructuredGrid" version="0.1" compressor="vtkZLibDataCompressor" byte_order="LittleEndian">
-<UnstructuredGrid>
-<FieldData>
-<DataArray type="Float32" Name="TIME" NumberOfTuples="1" format="ascii">3.14159</DataArray>
-</FieldData>
-<Piece NumberOfPoints="54" NumberOfCells="30" >
-  <Points>
-    <DataArray type="Float64" NumberOfComponents="3" format="binary">
-AQAAABAFAAAQBQAAoQAAAA==eNqVkMEJwzAMAEWhYIQQ2qhZIh2yXa5PP0secoiaS1L9fIY7WyJH83nIX/d5vso7cJmOPR08HTwdPHlfPZWP8yl/v5a5/fDnvMwdPA39xTf8lae/8vTvc5nm7buGv/L0V57+fZ7/abCfBvtpsJ+rXIEbcAceJ12FrkJXoavQVegadA26Bl2DrkHXoevQdeg6dB26Ad2AbkA3oLvyLyYyW80=
-    </DataArray>
-  </Points>
-
-  <Cells>
-    <DataArray type="Int32" Name="connectivity" format="binary">
-AQAAAOABAADgAQAAogAAAA==eNpNi8cSgkAQBdecAyJiDggiiGD8/1/zTVUfPHRtV+8b55yriYaoi6Zoia7o4G3R+2v2DkQft78hbSTGYiY8fCJ8mvlUzGkefSEC3HpI89kuaQF9LVa49Q0tZLul7cRenEWEH0RMMz+KhGZ+EhdaxO4qUtx2GS1ml9MSbm+0lN1dFLjtSlrGrqLl3D5oBbuXeOK2e9NKdh9axe2X9gNQBw2p
-    </DataArray>
-    <DataArray type="Int32" Name="offsets" format="binary">
-AQAAAHgAAAB4AAAATAAAAA==eNoNw5EShFAAAMAHQRAEQRAEQRAEwUEQBEEQBEEQBEEQBH3+7c5sFEKITUzNzC0sraxtbO382Ts4Ojm7uLq5e3h6efv4+vkHNocHRQ==
-    </DataArray>
-    <DataArray type="UInt8" Name="types" format="binary">
-AQAAAB4AAAAeAAAACwAAAA==eNrj5MQHABB3AQ8=
-    </DataArray>
-  </Cells>
-  <PointData Scalars="scalars">
-    <DataArray type="Float64" Name="x1" format="binary">
-AQAAALABAACwAQAANgAAAA==eNpjYEAGH+wZsPJh9A+YvAN54mB6wapVTCA6ITSUFSrOQSd5GM0FpXmgNB+UFhj06gCiMiHx    </DataArray>
-    <DataArray type="Float64" Name="x2" format="binary">
-AQAAALABAACwAQAAMwAAAA==eNpjYMAGPtgTR//AQTM4kEEvWLWKCR+dEBrKio8GAg4q0VxE0jxE0nxE0gIEaQDf2iHx    </DataArray>
-    <DataArray type="Float64" Name="x3" format="binary">
-AQAAALABAACwAQAAFwAAAA==eNpjYCAGfLCnDs3gMLA0x5CnAc+qFbA=    </DataArray>
-    <DataArray type="Float64" Name="x4" format="binary">
-AQAAALABAACwAQAAFwAAAA==eNpjYCAGfLCnDs3gMLA0x5CnAc+qFbA=    </DataArray>
-    <DataArray type="Float64" Name="i" format="binary">
-AQAAALABAACwAQAAUAAAAA==eNpjYEAGH+yhDAcIxeHAQJS8AJQWgdISUFoGSitQ2RwlKK0CpdWgtAaU1oLSOlBab5DYbwClDaG0EZQ2htImUNoUSptBaXMobeEAANfTFck=    </DataArray>
-  </PointData>
- </Piece>
- </UnstructuredGrid>
-</VTKFile>
-==============================
-23.vtu
-==============================
-<?xml version="1.0" ?> 
-<!-- 
-# vtk DataFile Version 3.0
-#This file was generated 
--->
-<VTKFile type="UnstructuredGrid" version="0.1" compressor="vtkZLibDataCompressor" byte_order="LittleEndian">
-<UnstructuredGrid>
-<FieldData>
-<DataArray type="Float32" Name="TIME" NumberOfTuples="1" format="ascii">3.14159</DataArray>
-</FieldData>
-<Piece NumberOfPoints="54" NumberOfCells="30" >
-  <Points>
-    <DataArray type="Float64" NumberOfComponents="3" format="binary">
-AQAAABAFAAAQBQAA0gAAAA==eNqNUVsOgjAQRCNJQ2rT8tLb2EvAIfFyfvJpEAbDtGPsz2Rmt9PdaVH8Oq/HnzweOdAIHTgLzn7MuW8m/RLzdSN8Tcz7WvIBeqEX8Tkt55zwcVhOuetHbmJ+nvQ+OPC09efr1e4H/dM2XJM5pq2f3xu3/iMvKYfv+6t/EPt4ygf3QpLHOk9N94Gt0IGV4JZ0cEe6S/bLc/atCJ2oe6pDD1SHXou5vZgjELfkw3M15GdFzo58eM9G5NoSB3Yij17k3oocO5FLL/7zRhx4j28uS4pw
-    </DataArray>
-  </Points>
-
-  <Cells>
-    <DataArray type="Int32" Name="connectivity" format="binary">
-AQAAAOABAADgAQAAogAAAA==eNpNi8cSgkAQBdecAyJiDggiiGD8/1/zTVUfPHRtV+8b55yriYaoi6Zoia7o4G3R+2v2DkQft78hbSTGYiY8fCJ8mvlUzGkefSEC3HpI89kuaQF9LVa49Q0tZLul7cRenEWEH0RMMz+KhGZ+EhdaxO4qUtx2GS1ml9MSbm+0lN1dFLjtSlrGrqLl3D5oBbuXeOK2e9NKdh9axe2X9gNQBw2p
-    </DataArray>
-    <DataArray type="Int32" Name="offsets" format="binary">
-AQAAAHgAAAB4AAAATAAAAA==eNoNw5EShFAAAMAHQRAEQRAEQRAEwUEQBEEQBEEQBEEQBH3+7c5sFEKITUzNzC0sraxtbO382Ts4Ojm7uLq5e3h6efv4+vkHNocHRQ==
-    </DataArray>
-    <DataArray type="UInt8" Name="types" format="binary">
-AQAAAB4AAAAeAAAACwAAAA==eNrj5MQHABB3AQ8=
-    </DataArray>
-  </Cells>
-  <PointData Scalars="scalars">
-    <DataArray type="Float64" Name="x1" format="binary">
-AQAAALABAACwAQAANgAAAA==eNpjYEAGH+wZsPJh9A+YvAN54mB6wapVTCA6ITSUFSrOQSd5GM0FpXmgNB+UFhj06gCiMiHx    </DataArray>
-    <DataArray type="Float64" Name="x2" format="binary">
-AQAAALABAACwAQAAMwAAAA==eNpjYMAGPtgTR//AQTM4kEEvWLWKCR+dEBrKio8GAg4q0VxE0jxE0nxE0gIEaQDf2iHx    </DataArray>
-    <DataArray type="Float64" Name="x3" format="binary">
-AQAAALABAACwAQAAFwAAAA==eNpjYCAGfLCnDs3gMLA0x5CnAc+qFbA=    </DataArray>
-    <DataArray type="Float64" Name="x4" format="binary">
-AQAAALABAACwAQAAFwAAAA==eNpjYCAGfLCnDs3gMLA0x5CnAc+qFbA=    </DataArray>
-    <DataArray type="Float64" Name="i" format="binary">
-AQAAALABAACwAQAAUAAAAA==eNpjYEAGH+yhDAcIxeHAQJS8AJQWgdISUFoGSitQ2RwlKK0CpdWgtAaU1oLSOlBab5DYbwClDaG0EZQ2htImUNoUSptBaXMobeEAANfTFck=    </DataArray>
-  </PointData>
- </Piece>
- </UnstructuredGrid>
-</VTKFile>
-==============================
-33.vtu
-==============================
-<?xml version="1.0" ?> 
-<!-- 
-# vtk DataFile Version 3.0
-#This file was generated 
--->
-<VTKFile type="UnstructuredGrid" version="0.1" compressor="vtkZLibDataCompressor" byte_order="LittleEndian">
-<UnstructuredGrid>
-<FieldData>
-<DataArray type="Float32" Name="TIME" NumberOfTuples="1" format="ascii">3.14159</DataArray>
-</FieldData>
-<Piece NumberOfPoints="224" NumberOfCells="100" >
-  <Points>
-    <DataArray type="Float64" NumberOfComponents="3" format="binary">
-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==
-    </DataArray>
-  </Points>
-
-  <Cells>
-    <DataArray type="Int32" Name="connectivity" format="binary">
-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
-    </DataArray>
-    <DataArray type="Int32" Name="offsets" format="binary">
-AQAAAJABAACQAQAAmAAAAA==eNoNzRGAhEAAAMD9fzkMwzA8DMMwDMMwDMPDMAzDMAzDMAzDw/AHhucVQoiISUh5k5FTUFJR09DS0fNhYGRiZmFlY+fg5OLmy0P4CeFFRExCypuMnIKSipqGlo6eDwMjEzMLKxs7BycXN18ewq+fiJiElDcZOQUlFTUNLR09HwZGJmYWVjZ2Dk4ubr48hD8/ETEJ/xaiL0A=
-    </DataArray>
-    <DataArray type="UInt8" Name="types" format="binary">
-AQAAAGQAAABkAAAADAAAAA==eNrj4aE9AADtHASx
-    </DataArray>
-  </Cells>
-  <PointData Scalars="scalars">
-    <DataArray type="Float64" Name="x1" format="binary">
-AQAAAAAHAAAABwAAQAAAAA==eNpjYEAGH+wZyOLD6B8weYfhIQ6mF6xaxQSiE0JDWaHiHKPyI0IeRnNBaR4ozQelBUbVjaobVTeE1QEAes2Cfw==    </DataArray>
-    <DataArray type="Float64" Name="x2" format="binary">
-AQAAAAAHAAAABwAASwAAAA==eNpjYMAGPtij0oTkcdE/cNAMDtjpwWYOXnrBqlVM+OiE0FBWfDQQcBCgR+0fWPuJpbmIpHmIpPmIpAWIpEf9MeqPUX9gowFLHIJ/    </DataArray>
-    <DataArray type="Float64" Name="x3" format="binary">
-AQAAAAAHAAAABwAAOAAAAA==eNpjYCAGfLCnD/2DSjSDwzCgF6xaxTSQdEJoKOtA0kDAMUpTheYaJjTPMKH5hgktMORpAO0qgn8=    </DataArray>
-    <DataArray type="Float64" Name="x4" format="binary">
-AQAAAAAHAAAABwAAHwAAAA==eNpjYKAG+GA/PGkGh1F6JNMco/QoPUoPYxoAo8lTHg==    </DataArray>
-    <DataArray type="Float64" Name="i" format="binary">
-AQAAAAAHAAAABwAA4wAAAA==eNrt0TlKZVEYhdEdGhoYGFQgIiIiopZ9e+3K3mevZTuVf2hnSA5B4a3AARiJJ1n3Y3OCy0m+nvctH12fAQ5yiMP80+Vb7o9wlGMc5wQnOcVpznCWc/zLeS5wkUtc5gpXf/h/rXGdG9zkFru+xWxrZkczu5rZ08y+Zv5p5kAzh5o50syxZk40c6qZM82ca6ane7/v//v+n+eib8diYy7tLDbmys5iY67tLDbmxs5iY27tLDbmzs5iY+7tLDbmwc5iY/7bWWzMo53FxjzZWWzMs53FxrzYWWzMq53Fxrx1H/t9lj8=    </DataArray>
-  </PointData>
- </Piece>
- </UnstructuredGrid>
-</VTKFile>
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 b3620c5d74b08f55935fbaf213584dede41630ee..6df457d333f4887cc10563496cab5b2db1b85d5e 100644 (file)
--- 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 b411bccd29eb57cffc6ff1bc8bca6375b5078293..1b20754a1a4737dac26923128eee02723122d5c1 100644 (file)
--- 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 @@
 <Piece NumberOfPoints="14" NumberOfCells="10" >
   <Points>
     <DataArray type="Float64" NumberOfComponents="3" format="binary">
-AQAAAFABAABQAQAANQAAAA==eNpjYMAHPtiTJv4DhziDA7Hiq1eBABOGeFgoCLDiMIeDRHEuHOI8OMT5cIgLYIgDAH+pDF0=
-    </DataArray>
+</DataArray>
   </Points>
 
   <Cells>
     <DataArray type="Int32" Name="connectivity" format="binary">
-AQAAAFAAAABQAAAAKQAAAA==eNotw8cNACAQA0HDkY7Qf7vswyONJBVWhjd2Dp++mNx+/PrjBxBcAI0=
-    </DataArray>
+</DataArray>
     <DataArray type="Int32" Name="offsets" format="binary">
-AQAAACgAAAAoAAAAIgAAAA==eNpjYmBgYAFiNiDmAGIuIOYBYj4gFgBiISAWAWIABwgAbw==
-    </DataArray>
+</DataArray>
     <DataArray type="UInt8" Name="types" format="binary">
-AQAAAAoAAAAKAAAACwAAAA==eNpjZoYBAACvAB8=
-    </DataArray>
+</DataArray>
   </Cells>
   <PointData Scalars="scalars">
     <DataArray type="Float64" Name="x1" format="binary">
-AQAAAHAAAABwAAAALgAAAA==eNpjYEAGH+xR6R9QmsEBiV6wahUTiE4IDWWFinOg0VxQmgdK80FpAQcAUAIJXw==    </DataArray>
+</DataArray>
     <DataArray type="Float64" Name="x2" format="binary">
-AQAAAHAAAABwAAAAFgAAAA==eNpjYMAGPthjpxkc8NMcBGkAb/wF9g==    </DataArray>
+</DataArray>
     <DataArray type="Float64" Name="x3" format="binary">
-AQAAAHAAAABwAAAAFgAAAA==eNpjYMAGPthjpxkc8NMcBGkAb/wF9g==    </DataArray>
+</DataArray>
     <DataArray type="Float64" Name="x4" format="binary">
-AQAAAHAAAABwAAAAFgAAAA==eNpjYMAGPthjpxkc8NMcBGkAb/wF9g==    </DataArray>
+</DataArray>
     <DataArray type="Float64" Name="i" format="binary">
-AQAAAHAAAABwAAAAGQAAAA==eNpjYEAGH+wZsPMd8ItzECkv4AAAaTsGXQ==    </DataArray>
+</DataArray>
   </PointData>
  </Piece>
  </UnstructuredGrid>
@@ -62,32 +58,28 @@ AQAAAHAAAABwAAAAGQAAAA==eNpjYEAGH+wZsPMd8ItzECkv4AAAaTsGXQ==    </DataArray>
 <Piece NumberOfPoints="14" NumberOfCells="10" >
   <Points>
     <DataArray type="Float64" NumberOfComponents="3" format="binary">
-AQAAAFABAABQAQAASgAAAA==eNpjYMAHPtij0oTEf9ij0nDggEbjFF+9CgSYHGA0TDwsFARYHWA0qjEcDqg0IXEuB1QaBngcUGkY4HNApWFAwAGVZmAAAJsiGLk=
-    </DataArray>
+</DataArray>
   </Points>
 
   <Cells>
     <DataArray type="Int32" Name="connectivity" format="binary">
-AQAAAFAAAABQAAAAKQAAAA==eNotw8cNACAQA0HDkY7Qf7vswyONJBVWhjd2Dp++mNx+/PrjBxBcAI0=
-    </DataArray>
+</DataArray>
     <DataArray type="Int32" Name="offsets" format="binary">
-AQAAACgAAAAoAAAAIgAAAA==eNpjYmBgYAFiNiDmAGIuIOYBYj4gFgBiISAWAWIABwgAbw==
-    </DataArray>
+</DataArray>
     <DataArray type="UInt8" Name="types" format="binary">
-AQAAAAoAAAAKAAAACwAAAA==eNpjZoYBAACvAB8=
-    </DataArray>
+</DataArray>
   </Cells>
   <PointData Scalars="scalars">
     <DataArray type="Float64" Name="x1" format="binary">
-AQAAAHAAAABwAAAALgAAAA==eNpjYEAGH+xR6R9QmsEBiV6wahUTiE4IDWWFinOg0VxQmgdK80FpAQcAUAIJXw==    </DataArray>
+</DataArray>
     <DataArray type="Float64" Name="x2" format="binary">
-AQAAAHAAAABwAAAAFgAAAA==eNpjYMAGPthjpxkc8NMcBGkAb/wF9g==    </DataArray>
+</DataArray>
     <DataArray type="Float64" Name="x3" format="binary">
-AQAAAHAAAABwAAAAFgAAAA==eNpjYMAGPthjpxkc8NMcBGkAb/wF9g==    </DataArray>
+</DataArray>
     <DataArray type="Float64" Name="x4" format="binary">
-AQAAAHAAAABwAAAAFgAAAA==eNpjYMAGPthjpxkc8NMcBGkAb/wF9g==    </DataArray>
+</DataArray>
     <DataArray type="Float64" Name="i" format="binary">
-AQAAAHAAAABwAAAAGQAAAA==eNpjYEAGH+wZsPMd8ItzECkv4AAAaTsGXQ==    </DataArray>
+</DataArray>
   </PointData>
  </Piece>
  </UnstructuredGrid>
@@ -109,32 +101,28 @@ AQAAAHAAAABwAAAAGQAAAA==eNpjYEAGH+wZsPMd8ItzECkv4AAAaTsGXQ==    </DataArray>
 <Piece NumberOfPoints="54" NumberOfCells="30" >
   <Points>
     <DataArray type="Float64" NumberOfComponents="3" format="binary">
-AQAAABAFAAAQBQAAoAAAAA==eNqVkMsKw0AIAKVQWETEP2p+ovnI5Od63GPJwS3YTB7enIWZRJGj+bzk1nvuV3kHLtOxp4Ong6eDJ9+rp/Kxn/J12ebxx+f3Nk/wNPQX3/BXnv7K07/PZSrfNfyV5155+vd5/k+D+zS4T4P7XOUK3IA78DjpKnQVugpdha5C16Br0DXoGnQNug5dh65D16Hr0A3oBnQDugHdH/8CMeJb0Q==
-    </DataArray>
+</DataArray>
   </Points>
 
   <Cells>
     <DataArray type="Int32" Name="connectivity" format="binary">
-AQAAAOABAADgAQAAogAAAA==eNpNi8cSgkAQBdecAyJiDggiiGD8/1/zTVUfPHRtV+8b55yriYaoi6Zoia7o4G3R+2v2DkQft78hbSTGYiY8fCJ8mvlUzGkefSEC3HpI89kuaQF9LVa49Q0tZLul7cRenEWEH0RMMz+KhGZ+EhdaxO4qUtx2GS1ml9MSbm+0lN1dFLjtSlrGrqLl3D5oBbuXeOK2e9NKdh9axe2X9gNQBw2p
-    </DataArray>
+</DataArray>
     <DataArray type="Int32" Name="offsets" format="binary">
-AQAAAHgAAAB4AAAATAAAAA==eNoNw5EShFAAAMAHQRAEQRAEQRAEwUEQBEEQBEEQBEEQBH3+7c5sFEKITUzNzC0sraxtbO382Ts4Ojm7uLq5e3h6efv4+vkHNocHRQ==
-    </DataArray>
+</DataArray>
     <DataArray type="UInt8" Name="types" format="binary">
-AQAAAB4AAAAeAAAACwAAAA==eNrj5MQHABB3AQ8=
-    </DataArray>
+</DataArray>
   </Cells>
   <PointData Scalars="scalars">
     <DataArray type="Float64" Name="x1" format="binary">
-AQAAALABAACwAQAANgAAAA==eNpjYEAGH+wZsPJh9A+YvAN54mB6wapVTCA6ITSUFSrOQSd5GM0FpXmgNB+UFhj06gCiMiHx    </DataArray>
+</DataArray>
     <DataArray type="Float64" Name="x2" format="binary">
-AQAAALABAACwAQAAMwAAAA==eNpjYMAGPtgTR//AQTM4kEEvWLWKCR+dEBrKio8GAg4q0VxE0jxE0nxE0gIEaQDf2iHx    </DataArray>
+</DataArray>
     <DataArray type="Float64" Name="x3" format="binary">
-AQAAALABAACwAQAAFwAAAA==eNpjYCAGfLCnDs3gMLA0x5CnAc+qFbA=    </DataArray>
+</DataArray>
     <DataArray type="Float64" Name="x4" format="binary">
-AQAAALABAACwAQAAFwAAAA==eNpjYCAGfLCnDs3gMLA0x5CnAc+qFbA=    </DataArray>
+</DataArray>
     <DataArray type="Float64" Name="i" format="binary">
-AQAAALABAACwAQAAUAAAAA==eNpjYEAGH+yhDAcIxeHAQJS8AJQWgdISUFoGSitQ2RwlKK0CpdWgtAaU1oLSOlBab5DYbwClDaG0EZQ2htImUNoUSptBaXMobeEAANfTFck=    </DataArray>
+</DataArray>
   </PointData>
  </Piece>
  </UnstructuredGrid>
@@ -156,32 +144,28 @@ AQAAALABAACwAQAAUAAAAA==eNpjYEAGH+yhDAcIxeHAQJS8AJQWgdISUFoGSitQ2RwlKK0CpdWgtAaU
 <Piece NumberOfPoints="54" NumberOfCells="30" >
   <Points>
     <DataArray type="Float64" NumberOfComponents="3" format="binary">
-AQAAABAFAAAQBQAA0gAAAA==eNqNUVsOgjAQRCNJQ2rT8tLb2EvAIfFyfvJpEAbDtGPsz2Rmt9PdaVH8Oq/HnzweOdAIHTgLzn7MuW8m/RLzdSN8Tcz7WvIBeqEX8Tkt55zwcVhOuetHbmJ+nvQ+OPC09efr1e4H/dM2XJM5pq2f3xu3/iMvKYfv+6t/EPt4ygf3QpLHOk9N94Gt0IGV4JZ0cEe6S/bLc/atCJ2oe6pDD1SHXou5vZgjELfkw3M15GdFzo58eM9G5NoSB3Yij17k3oocO5FLL/7zRhx4j28uS4pw
-    </DataArray>
+</DataArray>
   </Points>
 
   <Cells>
     <DataArray type="Int32" Name="connectivity" format="binary">
-AQAAAOABAADgAQAAogAAAA==eNpNi8cSgkAQBdecAyJiDggiiGD8/1/zTVUfPHRtV+8b55yriYaoi6Zoia7o4G3R+2v2DkQft78hbSTGYiY8fCJ8mvlUzGkefSEC3HpI89kuaQF9LVa49Q0tZLul7cRenEWEH0RMMz+KhGZ+EhdaxO4qUtx2GS1ml9MSbm+0lN1dFLjtSlrGrqLl3D5oBbuXeOK2e9NKdh9axe2X9gNQBw2p
-    </DataArray>
+</DataArray>
     <DataArray type="Int32" Name="offsets" format="binary">
-AQAAAHgAAAB4AAAATAAAAA==eNoNw5EShFAAAMAHQRAEQRAEQRAEwUEQBEEQBEEQBEEQBH3+7c5sFEKITUzNzC0sraxtbO382Ts4Ojm7uLq5e3h6efv4+vkHNocHRQ==
-    </DataArray>
+</DataArray>
     <DataArray type="UInt8" Name="types" format="binary">
-AQAAAB4AAAAeAAAACwAAAA==eNrj5MQHABB3AQ8=
-    </DataArray>
+</DataArray>
   </Cells>
   <PointData Scalars="scalars">
     <DataArray type="Float64" Name="x1" format="binary">
-AQAAALABAACwAQAANgAAAA==eNpjYEAGH+wZsPJh9A+YvAN54mB6wapVTCA6ITSUFSrOQSd5GM0FpXmgNB+UFhj06gCiMiHx    </DataArray>
+</DataArray>
     <DataArray type="Float64" Name="x2" format="binary">
-AQAAALABAACwAQAAMwAAAA==eNpjYMAGPtgTR//AQTM4kEEvWLWKCR+dEBrKio8GAg4q0VxE0jxE0nxE0gIEaQDf2iHx    </DataArray>
+</DataArray>
     <DataArray type="Float64" Name="x3" format="binary">
-AQAAALABAACwAQAAFwAAAA==eNpjYCAGfLCnDs3gMLA0x5CnAc+qFbA=    </DataArray>
+</DataArray>
     <DataArray type="Float64" Name="x4" format="binary">
-AQAAALABAACwAQAAFwAAAA==eNpjYCAGfLCnDs3gMLA0x5CnAc+qFbA=    </DataArray>
+</DataArray>
     <DataArray type="Float64" Name="i" format="binary">
-AQAAALABAACwAQAAUAAAAA==eNpjYEAGH+yhDAcIxeHAQJS8AJQWgdISUFoGSitQ2RwlKK0CpdWgtAaU1oLSOlBab5DYbwClDaG0EZQ2htImUNoUSptBaXMobeEAANfTFck=    </DataArray>
+</DataArray>
   </PointData>
  </Piece>
  </UnstructuredGrid>
@@ -203,32 +187,28 @@ AQAAALABAACwAQAAUAAAAA==eNpjYEAGH+yhDAcIxeHAQJS8AJQWgdISUFoGSitQ2RwlKK0CpdWgtAaU
 <Piece NumberOfPoints="224" NumberOfCells="100" >
   <Points>
     <DataArray type="Float64" NumberOfComponents="3" format="binary">
-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==
-    </DataArray>
+</DataArray>
   </Points>
 
   <Cells>
     <DataArray type="Int32" Name="connectivity" format="binary">
-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
-    </DataArray>
+</DataArray>
     <DataArray type="Int32" Name="offsets" format="binary">
-AQAAAJABAACQAQAAmAAAAA==eNoNzRGAhEAAAMD9fzkMwzA8DMMwDMMwDMPDMAzDMAzDMAzDw/AHhucVQoiISUh5k5FTUFJR09DS0fNhYGRiZmFlY+fg5OLmy0P4CeFFRExCypuMnIKSipqGlo6eDwMjEzMLKxs7BycXN18ewq+fiJiElDcZOQUlFTUNLR09HwZGJmYWVjZ2Dk4ubr48hD8/ETEJ/xaiL0A=
-    </DataArray>
+</DataArray>
     <DataArray type="UInt8" Name="types" format="binary">
-AQAAAGQAAABkAAAADAAAAA==eNrj4aE9AADtHASx
-    </DataArray>
+</DataArray>
   </Cells>
   <PointData Scalars="scalars">
     <DataArray type="Float64" Name="x1" format="binary">
-AQAAAAAHAAAABwAAQAAAAA==eNpjYEAGH+wZyOLD6B8weYfhIQ6mF6xaxQSiE0JDWaHiHKPyI0IeRnNBaR4ozQelBUbVjaobVTeE1QEAes2Cfw==    </DataArray>
+</DataArray>
     <DataArray type="Float64" Name="x2" format="binary">
-AQAAAAAHAAAABwAASwAAAA==eNpjYMAGPtij0oTkcdE/cNAMDtjpwWYOXnrBqlVM+OiE0FBWfDQQcBCgR+0fWPuJpbmIpHmIpPmIpAWIpEf9MeqPUX9gowFLHIJ/    </DataArray>
+</DataArray>
     <DataArray type="Float64" Name="x3" format="binary">
-AQAAAAAHAAAABwAAOAAAAA==eNpjYCAGfLCnD/2DSjSDwzCgF6xaxTSQdEJoKOtA0kDAMUpTheYaJjTPMKH5hgktMORpAO0qgn8=    </DataArray>
+</DataArray>
     <DataArray type="Float64" Name="x4" format="binary">
-AQAAAAAHAAAABwAAHwAAAA==eNpjYKAG+GA/PGkGh1F6JNMco/QoPUoPYxoAo8lTHg==    </DataArray>
+</DataArray>
     <DataArray type="Float64" Name="i" format="binary">
-AQAAAAAHAAAABwAA4wAAAA==eNrt0TlKZVEYhdEdGhoYGFQgIiIiopZ9e+3K3mevZTuVf2hnSA5B4a3AARiJJ1n3Y3OCy0m+nvctH12fAQ5yiMP80+Vb7o9wlGMc5wQnOcVpznCWc/zLeS5wkUtc5gpXf/h/rXGdG9zkFru+xWxrZkczu5rZ08y+Zv5p5kAzh5o50syxZk40c6qZM82ca6ane7/v//v+n+eib8diYy7tLDbmys5iY67tLDbmxs5iY27tLDbmzs5iY+7tLDbmwc5iY/7bWWzMo53FxjzZWWzMs53FxrzYWWzMq53Fxrx1H/t9lj8=    </DataArray>
+</DataArray>
   </PointData>
  </Piece>
  </UnstructuredGrid>
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 (file)
index e3acdce..0000000
--- a/tests/base/data_out_base_vtu_time_and_cycle.with_zlib=true.output.2
+++ /dev/null
@@ -1,235 +0,0 @@
-==============================
-11.vtu
-==============================
-<?xml version="1.0" ?> 
-<!-- 
-# vtk DataFile Version 3.0
-#This file was generated 
--->
-<VTKFile type="UnstructuredGrid" version="0.1" compressor="vtkZLibDataCompressor" byte_order="LittleEndian">
-<UnstructuredGrid>
-<FieldData>
-<DataArray type="Float32" Name="CYCLE" NumberOfTuples="1" format="ascii">42</DataArray>
-<DataArray type="Float32" Name="TIME" NumberOfTuples="1" format="ascii">3.14159</DataArray>
-</FieldData>
-<Piece NumberOfPoints="14" NumberOfCells="10" >
-  <Points>
-    <DataArray type="Float64" NumberOfComponents="3" format="binary">
-AQAAAFABAABQAQAANQAAAA==eNpjYMAHPtiTJv4DhziDA7Hiq1eBABOGeFgoCLDiMIeDRHEuHOI8OMT5cIgLYIgDAH+pDF0=
-    </DataArray>
-  </Points>
-
-  <Cells>
-    <DataArray type="Int32" Name="connectivity" format="binary">
-AQAAAFAAAABQAAAAKQAAAA==eNotw8cNACAQA0HDkY7Qf7vswyONJBVWhjd2Dp++mNx+/PrjBxBcAI0=
-    </DataArray>
-    <DataArray type="Int32" Name="offsets" format="binary">
-AQAAACgAAAAoAAAAIgAAAA==eNpjYmBgYAFiNiDmAGIuIOYBYj4gFgBiISAWAWIABwgAbw==
-    </DataArray>
-    <DataArray type="UInt8" Name="types" format="binary">
-AQAAAAoAAAAKAAAACwAAAA==eNpjZoYBAACvAB8=
-    </DataArray>
-  </Cells>
-  <PointData Scalars="scalars">
-    <DataArray type="Float64" Name="x1" format="binary">
-AQAAAHAAAABwAAAALgAAAA==eNpjYEAGH+xR6R9QmsEBiV6wahUTiE4IDWWFinOg0VxQmgdK80FpAQcAUAIJXw==    </DataArray>
-    <DataArray type="Float64" Name="x2" format="binary">
-AQAAAHAAAABwAAAAFgAAAA==eNpjYMAGPthjpxkc8NMcBGkAb/wF9g==    </DataArray>
-    <DataArray type="Float64" Name="x3" format="binary">
-AQAAAHAAAABwAAAAFgAAAA==eNpjYMAGPthjpxkc8NMcBGkAb/wF9g==    </DataArray>
-    <DataArray type="Float64" Name="x4" format="binary">
-AQAAAHAAAABwAAAAFgAAAA==eNpjYMAGPthjpxkc8NMcBGkAb/wF9g==    </DataArray>
-    <DataArray type="Float64" Name="i" format="binary">
-AQAAAHAAAABwAAAAGQAAAA==eNpjYEAGH+wZsPMd8ItzECkv4AAAaTsGXQ==    </DataArray>
-  </PointData>
- </Piece>
- </UnstructuredGrid>
-</VTKFile>
-==============================
-12.vtu
-==============================
-<?xml version="1.0" ?> 
-<!-- 
-# vtk DataFile Version 3.0
-#This file was generated 
--->
-<VTKFile type="UnstructuredGrid" version="0.1" compressor="vtkZLibDataCompressor" byte_order="LittleEndian">
-<UnstructuredGrid>
-<FieldData>
-<DataArray type="Float32" Name="CYCLE" NumberOfTuples="1" format="ascii">42</DataArray>
-<DataArray type="Float32" Name="TIME" NumberOfTuples="1" format="ascii">3.14159</DataArray>
-</FieldData>
-<Piece NumberOfPoints="14" NumberOfCells="10" >
-  <Points>
-    <DataArray type="Float64" NumberOfComponents="3" format="binary">
-AQAAAFABAABQAQAASgAAAA==eNpjYMAHPtij0oTEf9ij0nDggEbjFF+9CgSYHGA0TDwsFARYHWA0qjEcDqg0IXEuB1QaBngcUGkY4HNApWFAwAGVZmAAAJsiGLk=
-    </DataArray>
-  </Points>
-
-  <Cells>
-    <DataArray type="Int32" Name="connectivity" format="binary">
-AQAAAFAAAABQAAAAKQAAAA==eNotw8cNACAQA0HDkY7Qf7vswyONJBVWhjd2Dp++mNx+/PrjBxBcAI0=
-    </DataArray>
-    <DataArray type="Int32" Name="offsets" format="binary">
-AQAAACgAAAAoAAAAIgAAAA==eNpjYmBgYAFiNiDmAGIuIOYBYj4gFgBiISAWAWIABwgAbw==
-    </DataArray>
-    <DataArray type="UInt8" Name="types" format="binary">
-AQAAAAoAAAAKAAAACwAAAA==eNpjZoYBAACvAB8=
-    </DataArray>
-  </Cells>
-  <PointData Scalars="scalars">
-    <DataArray type="Float64" Name="x1" format="binary">
-AQAAAHAAAABwAAAALgAAAA==eNpjYEAGH+xR6R9QmsEBiV6wahUTiE4IDWWFinOg0VxQmgdK80FpAQcAUAIJXw==    </DataArray>
-    <DataArray type="Float64" Name="x2" format="binary">
-AQAAAHAAAABwAAAAFgAAAA==eNpjYMAGPthjpxkc8NMcBGkAb/wF9g==    </DataArray>
-    <DataArray type="Float64" Name="x3" format="binary">
-AQAAAHAAAABwAAAAFgAAAA==eNpjYMAGPthjpxkc8NMcBGkAb/wF9g==    </DataArray>
-    <DataArray type="Float64" Name="x4" format="binary">
-AQAAAHAAAABwAAAAFgAAAA==eNpjYMAGPthjpxkc8NMcBGkAb/wF9g==    </DataArray>
-    <DataArray type="Float64" Name="i" format="binary">
-AQAAAHAAAABwAAAAGQAAAA==eNpjYEAGH+wZsPMd8ItzECkv4AAAaTsGXQ==    </DataArray>
-  </PointData>
- </Piece>
- </UnstructuredGrid>
-</VTKFile>
-==============================
-22.vtu
-==============================
-<?xml version="1.0" ?> 
-<!-- 
-# vtk DataFile Version 3.0
-#This file was generated 
--->
-<VTKFile type="UnstructuredGrid" version="0.1" compressor="vtkZLibDataCompressor" byte_order="LittleEndian">
-<UnstructuredGrid>
-<FieldData>
-<DataArray type="Float32" Name="CYCLE" NumberOfTuples="1" format="ascii">42</DataArray>
-<DataArray type="Float32" Name="TIME" NumberOfTuples="1" format="ascii">3.14159</DataArray>
-</FieldData>
-<Piece NumberOfPoints="54" NumberOfCells="30" >
-  <Points>
-    <DataArray type="Float64" NumberOfComponents="3" format="binary">
-AQAAABAFAAAQBQAAoQAAAA==eNqVkMEJwzAMAEWhYIQQ2qhZIh2yXa5PP0secoiaS1L9fIY7WyJH83nIX/d5vso7cJmOPR08HTwdPHlfPZWP8yl/v5a5/fDnvMwdPA39xTf8lae/8vTvc5nm7buGv/L0V57+fZ7/abCfBvtpsJ+rXIEbcAceJ12FrkJXoavQVegadA26Bl2DrkHXoevQdeg6dB26Ad2AbkA3oLvyLyYyW80=
-    </DataArray>
-  </Points>
-
-  <Cells>
-    <DataArray type="Int32" Name="connectivity" format="binary">
-AQAAAOABAADgAQAAogAAAA==eNpNi8cSgkAQBdecAyJiDggiiGD8/1/zTVUfPHRtV+8b55yriYaoi6Zoia7o4G3R+2v2DkQft78hbSTGYiY8fCJ8mvlUzGkefSEC3HpI89kuaQF9LVa49Q0tZLul7cRenEWEH0RMMz+KhGZ+EhdaxO4qUtx2GS1ml9MSbm+0lN1dFLjtSlrGrqLl3D5oBbuXeOK2e9NKdh9axe2X9gNQBw2p
-    </DataArray>
-    <DataArray type="Int32" Name="offsets" format="binary">
-AQAAAHgAAAB4AAAATAAAAA==eNoNw5EShFAAAMAHQRAEQRAEQRAEwUEQBEEQBEEQBEEQBH3+7c5sFEKITUzNzC0sraxtbO382Ts4Ojm7uLq5e3h6efv4+vkHNocHRQ==
-    </DataArray>
-    <DataArray type="UInt8" Name="types" format="binary">
-AQAAAB4AAAAeAAAACwAAAA==eNrj5MQHABB3AQ8=
-    </DataArray>
-  </Cells>
-  <PointData Scalars="scalars">
-    <DataArray type="Float64" Name="x1" format="binary">
-AQAAALABAACwAQAANgAAAA==eNpjYEAGH+wZsPJh9A+YvAN54mB6wapVTCA6ITSUFSrOQSd5GM0FpXmgNB+UFhj06gCiMiHx    </DataArray>
-    <DataArray type="Float64" Name="x2" format="binary">
-AQAAALABAACwAQAAMwAAAA==eNpjYMAGPtgTR//AQTM4kEEvWLWKCR+dEBrKio8GAg4q0VxE0jxE0nxE0gIEaQDf2iHx    </DataArray>
-    <DataArray type="Float64" Name="x3" format="binary">
-AQAAALABAACwAQAAFwAAAA==eNpjYCAGfLCnDs3gMLA0x5CnAc+qFbA=    </DataArray>
-    <DataArray type="Float64" Name="x4" format="binary">
-AQAAALABAACwAQAAFwAAAA==eNpjYCAGfLCnDs3gMLA0x5CnAc+qFbA=    </DataArray>
-    <DataArray type="Float64" Name="i" format="binary">
-AQAAALABAACwAQAAUAAAAA==eNpjYEAGH+yhDAcIxeHAQJS8AJQWgdISUFoGSitQ2RwlKK0CpdWgtAaU1oLSOlBab5DYbwClDaG0EZQ2htImUNoUSptBaXMobeEAANfTFck=    </DataArray>
-  </PointData>
- </Piece>
- </UnstructuredGrid>
-</VTKFile>
-==============================
-23.vtu
-==============================
-<?xml version="1.0" ?> 
-<!-- 
-# vtk DataFile Version 3.0
-#This file was generated 
--->
-<VTKFile type="UnstructuredGrid" version="0.1" compressor="vtkZLibDataCompressor" byte_order="LittleEndian">
-<UnstructuredGrid>
-<FieldData>
-<DataArray type="Float32" Name="CYCLE" NumberOfTuples="1" format="ascii">42</DataArray>
-<DataArray type="Float32" Name="TIME" NumberOfTuples="1" format="ascii">3.14159</DataArray>
-</FieldData>
-<Piece NumberOfPoints="54" NumberOfCells="30" >
-  <Points>
-    <DataArray type="Float64" NumberOfComponents="3" format="binary">
-AQAAABAFAAAQBQAA0gAAAA==eNqNUVsOgjAQRCNJQ2rT8tLb2EvAIfFyfvJpEAbDtGPsz2Rmt9PdaVH8Oq/HnzweOdAIHTgLzn7MuW8m/RLzdSN8Tcz7WvIBeqEX8Tkt55zwcVhOuetHbmJ+nvQ+OPC09efr1e4H/dM2XJM5pq2f3xu3/iMvKYfv+6t/EPt4ygf3QpLHOk9N94Gt0IGV4JZ0cEe6S/bLc/atCJ2oe6pDD1SHXou5vZgjELfkw3M15GdFzo58eM9G5NoSB3Yij17k3oocO5FLL/7zRhx4j28uS4pw
-    </DataArray>
-  </Points>
-
-  <Cells>
-    <DataArray type="Int32" Name="connectivity" format="binary">
-AQAAAOABAADgAQAAogAAAA==eNpNi8cSgkAQBdecAyJiDggiiGD8/1/zTVUfPHRtV+8b55yriYaoi6Zoia7o4G3R+2v2DkQft78hbSTGYiY8fCJ8mvlUzGkefSEC3HpI89kuaQF9LVa49Q0tZLul7cRenEWEH0RMMz+KhGZ+EhdaxO4qUtx2GS1ml9MSbm+0lN1dFLjtSlrGrqLl3D5oBbuXeOK2e9NKdh9axe2X9gNQBw2p
-    </DataArray>
-    <DataArray type="Int32" Name="offsets" format="binary">
-AQAAAHgAAAB4AAAATAAAAA==eNoNw5EShFAAAMAHQRAEQRAEQRAEwUEQBEEQBEEQBEEQBH3+7c5sFEKITUzNzC0sraxtbO382Ts4Ojm7uLq5e3h6efv4+vkHNocHRQ==
-    </DataArray>
-    <DataArray type="UInt8" Name="types" format="binary">
-AQAAAB4AAAAeAAAACwAAAA==eNrj5MQHABB3AQ8=
-    </DataArray>
-  </Cells>
-  <PointData Scalars="scalars">
-    <DataArray type="Float64" Name="x1" format="binary">
-AQAAALABAACwAQAANgAAAA==eNpjYEAGH+wZsPJh9A+YvAN54mB6wapVTCA6ITSUFSrOQSd5GM0FpXmgNB+UFhj06gCiMiHx    </DataArray>
-    <DataArray type="Float64" Name="x2" format="binary">
-AQAAALABAACwAQAAMwAAAA==eNpjYMAGPtgTR//AQTM4kEEvWLWKCR+dEBrKio8GAg4q0VxE0jxE0nxE0gIEaQDf2iHx    </DataArray>
-    <DataArray type="Float64" Name="x3" format="binary">
-AQAAALABAACwAQAAFwAAAA==eNpjYCAGfLCnDs3gMLA0x5CnAc+qFbA=    </DataArray>
-    <DataArray type="Float64" Name="x4" format="binary">
-AQAAALABAACwAQAAFwAAAA==eNpjYCAGfLCnDs3gMLA0x5CnAc+qFbA=    </DataArray>
-    <DataArray type="Float64" Name="i" format="binary">
-AQAAALABAACwAQAAUAAAAA==eNpjYEAGH+yhDAcIxeHAQJS8AJQWgdISUFoGSitQ2RwlKK0CpdWgtAaU1oLSOlBab5DYbwClDaG0EZQ2htImUNoUSptBaXMobeEAANfTFck=    </DataArray>
-  </PointData>
- </Piece>
- </UnstructuredGrid>
-</VTKFile>
-==============================
-33.vtu
-==============================
-<?xml version="1.0" ?> 
-<!-- 
-# vtk DataFile Version 3.0
-#This file was generated 
--->
-<VTKFile type="UnstructuredGrid" version="0.1" compressor="vtkZLibDataCompressor" byte_order="LittleEndian">
-<UnstructuredGrid>
-<FieldData>
-<DataArray type="Float32" Name="CYCLE" NumberOfTuples="1" format="ascii">42</DataArray>
-<DataArray type="Float32" Name="TIME" NumberOfTuples="1" format="ascii">3.14159</DataArray>
-</FieldData>
-<Piece NumberOfPoints="224" NumberOfCells="100" >
-  <Points>
-    <DataArray type="Float64" NumberOfComponents="3" format="binary">
-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==
-    </DataArray>
-  </Points>
-
-  <Cells>
-    <DataArray type="Int32" Name="connectivity" format="binary">
-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
-    </DataArray>
-    <DataArray type="Int32" Name="offsets" format="binary">
-AQAAAJABAACQAQAAmAAAAA==eNoNzRGAhEAAAMD9fzkMwzA8DMMwDMMwDMPDMAzDMAzDMAzDw/AHhucVQoiISUh5k5FTUFJR09DS0fNhYGRiZmFlY+fg5OLmy0P4CeFFRExCypuMnIKSipqGlo6eDwMjEzMLKxs7BycXN18ewq+fiJiElDcZOQUlFTUNLR09HwZGJmYWVjZ2Dk4ubr48hD8/ETEJ/xaiL0A=
-    </DataArray>
-    <DataArray type="UInt8" Name="types" format="binary">
-AQAAAGQAAABkAAAADAAAAA==eNrj4aE9AADtHASx
-    </DataArray>
-  </Cells>
-  <PointData Scalars="scalars">
-    <DataArray type="Float64" Name="x1" format="binary">
-AQAAAAAHAAAABwAAQAAAAA==eNpjYEAGH+wZyOLD6B8weYfhIQ6mF6xaxQSiE0JDWaHiHKPyI0IeRnNBaR4ozQelBUbVjaobVTeE1QEAes2Cfw==    </DataArray>
-    <DataArray type="Float64" Name="x2" format="binary">
-AQAAAAAHAAAABwAASwAAAA==eNpjYMAGPtij0oTkcdE/cNAMDtjpwWYOXnrBqlVM+OiE0FBWfDQQcBCgR+0fWPuJpbmIpHmIpPmIpAWIpEf9MeqPUX9gowFLHIJ/    </DataArray>
-    <DataArray type="Float64" Name="x3" format="binary">
-AQAAAAAHAAAABwAAOAAAAA==eNpjYCAGfLCnD/2DSjSDwzCgF6xaxTSQdEJoKOtA0kDAMUpTheYaJjTPMKH5hgktMORpAO0qgn8=    </DataArray>
-    <DataArray type="Float64" Name="x4" format="binary">
-AQAAAAAHAAAABwAAHwAAAA==eNpjYKAG+GA/PGkGh1F6JNMco/QoPUoPYxoAo8lTHg==    </DataArray>
-    <DataArray type="Float64" Name="i" format="binary">
-AQAAAAAHAAAABwAA4wAAAA==eNrt0TlKZVEYhdEdGhoYGFQgIiIiopZ9e+3K3mevZTuVf2hnSA5B4a3AARiJJ1n3Y3OCy0m+nvctH12fAQ5yiMP80+Vb7o9wlGMc5wQnOcVpznCWc/zLeS5wkUtc5gpXf/h/rXGdG9zkFru+xWxrZkczu5rZ08y+Zv5p5kAzh5o50syxZk40c6qZM82ca6ane7/v//v+n+eib8diYy7tLDbmys5iY67tLDbmxs5iY27tLDbmzs5iY+7tLDbmwc5iY/7bWWzMo53FxjzZWWzMs53FxrzYWWzMq53Fxrx1H/t9lj8=    </DataArray>
-  </PointData>
- </Piece>
- </UnstructuredGrid>
-</VTKFile>
diff --git a/tests/tests.h b/tests/tests.h
index 42eb4a332bf56da80cd5d889b303db5bae2e6bbe..304e74a6535edb18a7e3e8df73fcf72e26bd8612 100644 (file)
--- 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 = "</" + key;
+  while (std::getline(in, line))
+    {
+      if (line.find(opening) != std::string::npos &&
+          line.find("binary") != std::string::npos)
+        {
+          found = true;
+          // remove everything after ">" but keep things after "</"
+          const auto pos = line.find(closing);
+          if (pos != std::string::npos)
+            {
+              line = line.substr(0, line.find(">", 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.
Mirror of the development repository for deal.II

In the beginning the Universe was created. This has made a lot of people very angry and has been widely regarded as a bad move.

Douglas Adams


Typeset in Trocchi and Trocchi Bold Sans Serif.