Merge pull request #13336 from tjhei/vtu_newline

VTU: put closing XML on separate line
dealii · Feb 3, 2022 · 7b52b94 · 7b52b94
2 parents 7e34340 + 2c77d9d
commit 7b52b94
Show file tree

Hide file tree

Showing 29 changed files with 548 additions and 273 deletions.
diff --git a/source/base/data_out_base.cc b/source/base/data_out_base.cc
@@ -6186,6 +6186,7 @@ namespace DataOutBase
           } // loop over nodes
 
         vtu_out << data;
+        out << "\n";
         out << "    </DataArray>\n";
 
       } // loop over ranges
@@ -6208,6 +6209,7 @@ namespace DataOutBase
           std::vector<float> data(data_vectors[data_set].begin(),
                                   data_vectors[data_set].end());
           vtu_out << data;
+          out << "\n";
           out << "    </DataArray>\n";
         }
 

diff --git a/tests/data_out/data_out_12.with_zlib=off.output b/tests/data_out/data_out_12.with_zlib=off.output
@@ -29,9 +29,11 @@
   </Cells>
   <PointData Scalars="scalars">
     <DataArray type="Float32" Name="vector" NumberOfComponents="3" format="ascii">
-1.00000 0.00000 0.00000 1.00000 0.00000 0.00000 1.00000 1.00000 0.00000 1.00000 1.00000 0.00000     </DataArray>
+1.00000 0.00000 0.00000 1.00000 0.00000 0.00000 1.00000 1.00000 0.00000 1.00000 1.00000 0.00000 
+    </DataArray>
     <DataArray type="Float32" Name="tensor" NumberOfComponents="9" format="ascii">
-1.00000 0.00000 0.00000 0.00000 1.00000 0.00000 0.00000 0.00000 0.00000 3.00000 0.00000 0.00000 0.00000 1.00000 0.00000 0.00000 0.00000 0.00000 1.00000 0.00000 0.00000 0.00000 3.00000 0.00000 0.00000 0.00000 0.00000 3.00000 1.00000 0.00000 1.00000 2.00000 0.00000 0.00000 0.00000 0.00000     </DataArray>
+1.00000 0.00000 0.00000 0.00000 1.00000 0.00000 0.00000 0.00000 0.00000 3.00000 0.00000 0.00000 0.00000 1.00000 0.00000 0.00000 0.00000 0.00000 1.00000 0.00000 0.00000 0.00000 3.00000 0.00000 0.00000 0.00000 0.00000 3.00000 1.00000 0.00000 1.00000 2.00000 0.00000 0.00000 0.00000 0.00000 
+    </DataArray>
   </PointData>
  </Piece>
  </UnstructuredGrid>
@@ -70,9 +72,11 @@
   </Cells>
   <PointData Scalars="scalars">
     <DataArray type="Float32" Name="vector" NumberOfComponents="3" format="ascii">
-1.00000 0.00000 0.00000 1.00000 0.00000 0.00000 1.00000 1.00000 0.00000 1.00000 1.00000 0.00000 1.00000 0.00000 0.00000 1.00000 0.00000 0.00000 1.00000 1.00000 0.00000 1.00000 1.00000 0.00000     </DataArray>
+1.00000 0.00000 0.00000 1.00000 0.00000 0.00000 1.00000 1.00000 0.00000 1.00000 1.00000 0.00000 1.00000 0.00000 0.00000 1.00000 0.00000 0.00000 1.00000 1.00000 0.00000 1.00000 1.00000 0.00000 
+    </DataArray>
     <DataArray type="Float32" Name="tensor" NumberOfComponents="9" format="ascii">
-1.00000 0.00000 0.00000 0.00000 1.00000 0.00000 0.00000 0.00000 1.00000 -2.00000 0.00000 0.00000 0.00000 -2.00000 0.00000 0.00000 0.00000 3.00000 1.00000 0.00000 0.00000 0.00000 1.00000 0.00000 0.00000 0.00000 0.00100000 2.00000 1.00000 1.00000 1.00000 2.00000 1.00000 1.00000 1.00000 3.00000 0.247186 0.490995 0.131325 0.490995 -0.371056 0.719072 0.131325 0.719072 -0.156008 0.280588 0.467439 0.934953 0.467439 0.0600321 -0.211376 0.934953 -0.211376 0.962976 0.0628610 -0.0117908 -0.667617 -0.0117908 -0.390601 -0.957805 -0.667617 -0.957805 -0.193320 0.00000 0.00000 0.00000 0.00000 0.00000 0.00000 0.00000 0.00000 0.00000     </DataArray>
+1.00000 0.00000 0.00000 0.00000 1.00000 0.00000 0.00000 0.00000 1.00000 -2.00000 0.00000 0.00000 0.00000 -2.00000 0.00000 0.00000 0.00000 3.00000 1.00000 0.00000 0.00000 0.00000 1.00000 0.00000 0.00000 0.00000 0.00100000 2.00000 1.00000 1.00000 1.00000 2.00000 1.00000 1.00000 1.00000 3.00000 0.247186 0.490995 0.131325 0.490995 -0.371056 0.719072 0.131325 0.719072 -0.156008 0.280588 0.467439 0.934953 0.467439 0.0600321 -0.211376 0.934953 -0.211376 0.962976 0.0628610 -0.0117908 -0.667617 -0.0117908 -0.390601 -0.957805 -0.667617 -0.957805 -0.193320 0.00000 0.00000 0.00000 0.00000 0.00000 0.00000 0.00000 0.00000 0.00000 
+    </DataArray>
   </PointData>
  </Piece>
  </UnstructuredGrid>

diff --git a/tests/data_out/data_out_12.with_zlib=on.output b/tests/data_out/data_out_12.with_zlib=on.output
@@ -26,9 +26,11 @@ AQAAAAEAAAABAAAACQAAAA==eNrjBAAACgAK
   </Cells>
   <PointData Scalars="scalars">
     <DataArray type="Float32" Name="vector" NumberOfComponents="3" format="binary">
-AQAAADAAAAAwAAAAFAAAAA==eNpjYGiwZ4ADdDaMj2ADAGQuBHs=    </DataArray>
+AQAAADAAAAAwAAAAFAAAAA==eNpjYGiwZ4ADdDaMj2ADAGQuBHs=
+    </DataArray>
     <DataArray type="Float32" Name="tensor" NumberOfComponents="9" format="binary">
-AQAAAJAAAACQAAAAIgAAAA==eNpjYGiwZ0AB6HwQcHAgrAZdDF0PTAymDkxjqAEAycUGOw==    </DataArray>
+AQAAAJAAAACQAAAAIgAAAA==eNpjYGiwZ0AB6HwQcHAgrAZdDF0PTAymDkxjqAEAycUGOw==
+    </DataArray>
   </PointData>
  </Piece>
  </UnstructuredGrid>
@@ -60,9 +62,11 @@ AQAAAAEAAAABAAAACQAAAA==eNrjAQAADQAN
   </Cells>
   <PointData Scalars="scalars">
     <DataArray type="Float32" Name="vector" NumberOfComponents="3" format="binary">
-AQAAAGAAAABgAAAAFgAAAA==eNpjYGiwZ4ADdDaMj84mXj0An0sI9Q==    </DataArray>
+AQAAAGAAAABgAAAAFgAAAA==eNpjYGiwZ4ADdDaMj84mXj0An0sI9Q==
+    </DataArray>
     <DataArray type="Float32" Name="tensor" NumberOfComponents="9" format="binary">
-AQAAACABAAAgAQAAhAAAAA==eNpjYGiwZ0ABWPkHUMXQ+Q4ODATMyRdqtgIphIjDMDrfwaFArtZuZ/JvO44qNjDN/HvvPlFRC3sQH0TPOSC/T39lv51GyHs78ch8exBt86TUlrM4Yh+ID6KntZbZ2+9tsE3Vc9zz44XWfhB9+8/xfbuNSveD+CB63lfXfQxEAACmEDx/    </DataArray>
+AQAAACABAAAgAQAAhAAAAA==eNpjYGiwZ0ABWPkHUMXQ+Q4ODATMyRdqtgIphIjDMDrfwaFArtZuZ/JvO44qNjDN/HvvPlFRC3sQH0TPOSC/T39lv51GyHs78ch8exBt86TUlrM4Yh+ID6KntZbZ2+9tsE3Vc9zz44XWfhB9+8/xfbuNSveD+CB63lfXfQxEAACmEDx/
+    </DataArray>
   </PointData>
  </Piece>
  </UnstructuredGrid>

diff --git a/tests/data_out/data_out_13.with_zlib=off.output b/tests/data_out/data_out_13.with_zlib=off.output
@@ -29,9 +29,11 @@
   </Cells>
   <PointData Scalars="scalars">
     <DataArray type="Float32" Name="vector" NumberOfComponents="3" format="ascii">
-1.00000 0.00000 0.00000 1.00000 0.00000 0.00000 1.00000 1.00000 0.00000 1.00000 1.00000 0.00000     </DataArray>
+1.00000 0.00000 0.00000 1.00000 0.00000 0.00000 1.00000 1.00000 0.00000 1.00000 1.00000 0.00000 
+    </DataArray>
     <DataArray type="Float32" Name="tensor" NumberOfComponents="9" format="ascii">
-1.00000 0.00000 0.00000 0.00000 1.00000 0.00000 0.00000 0.00000 0.00000 3.00000 0.00000 0.00000 0.00000 1.00000 0.00000 0.00000 0.00000 0.00000 1.00000 0.00000 0.00000 0.00000 3.00000 0.00000 0.00000 0.00000 0.00000 3.00000 1.00000 0.00000 1.00000 2.00000 0.00000 0.00000 0.00000 0.00000     </DataArray>
+1.00000 0.00000 0.00000 0.00000 1.00000 0.00000 0.00000 0.00000 0.00000 3.00000 0.00000 0.00000 0.00000 1.00000 0.00000 0.00000 0.00000 0.00000 1.00000 0.00000 0.00000 0.00000 3.00000 0.00000 0.00000 0.00000 0.00000 3.00000 1.00000 0.00000 1.00000 2.00000 0.00000 0.00000 0.00000 0.00000 
+    </DataArray>
   </PointData>
  </Piece>
  </UnstructuredGrid>
@@ -86,9 +88,11 @@
   </Cells>
   <PointData Scalars="scalars">
     <DataArray type="Float32" Name="vector" NumberOfComponents="3" format="ascii">
-1.00000 0.00000 0.00000 1.00000 0.00000 0.00000 1.00000 1.00000 0.00000 1.00000 1.00000 0.00000 1.00000 0.00000 0.00000 1.00000 0.00000 0.00000 1.00000 1.00000 0.00000 1.00000 1.00000 0.00000     </DataArray>
+1.00000 0.00000 0.00000 1.00000 0.00000 0.00000 1.00000 1.00000 0.00000 1.00000 1.00000 0.00000 1.00000 0.00000 0.00000 1.00000 0.00000 0.00000 1.00000 1.00000 0.00000 1.00000 1.00000 0.00000 
+    </DataArray>
     <DataArray type="Float32" Name="tensor" NumberOfComponents="9" format="ascii">
-1.00000 0.00000 0.00000 0.00000 1.00000 0.00000 0.00000 0.00000 1.00000 -2.00000 0.00000 0.00000 0.00000 -2.00000 0.00000 0.00000 0.00000 3.00000 1.00000 0.00000 0.00000 0.00000 1.00000 0.00000 0.00000 0.00000 0.00100000 2.00000 1.00000 1.00000 1.00000 2.00000 1.00000 1.00000 1.00000 3.00000 0.247186 0.490995 0.131325 0.490995 -0.371056 0.719072 0.131325 0.719072 -0.156008 0.280588 0.467439 0.934953 0.467439 0.0600321 -0.211376 0.934953 -0.211376 0.962976 0.0628610 -0.0117908 -0.667617 -0.0117908 -0.390601 -0.957805 -0.667617 -0.957805 -0.193320 0.00000 0.00000 0.00000 0.00000 0.00000 0.00000 0.00000 0.00000 0.00000     </DataArray>
+1.00000 0.00000 0.00000 0.00000 1.00000 0.00000 0.00000 0.00000 1.00000 -2.00000 0.00000 0.00000 0.00000 -2.00000 0.00000 0.00000 0.00000 3.00000 1.00000 0.00000 0.00000 0.00000 1.00000 0.00000 0.00000 0.00000 0.00100000 2.00000 1.00000 1.00000 1.00000 2.00000 1.00000 1.00000 1.00000 3.00000 0.247186 0.490995 0.131325 0.490995 -0.371056 0.719072 0.131325 0.719072 -0.156008 0.280588 0.467439 0.934953 0.467439 0.0600321 -0.211376 0.934953 -0.211376 0.962976 0.0628610 -0.0117908 -0.667617 -0.0117908 -0.390601 -0.957805 -0.667617 -0.957805 -0.193320 0.00000 0.00000 0.00000 0.00000 0.00000 0.00000 0.00000 0.00000 0.00000 
+    </DataArray>
   </PointData>
  </Piece>
  </UnstructuredGrid>

diff --git a/tests/data_out/data_out_13.with_zlib=on.output b/tests/data_out/data_out_13.with_zlib=on.output
@@ -26,9 +26,11 @@ AQAAAAEAAAABAAAACQAAAA==eNrjBAAACgAK
   </Cells>
   <PointData Scalars="scalars">
     <DataArray type="Float32" Name="vector" NumberOfComponents="3" format="binary">
-AQAAADAAAAAwAAAAFAAAAA==eNpjYGiwZ4ADdDaMj2ADAGQuBHs=    </DataArray>
+AQAAADAAAAAwAAAAFAAAAA==eNpjYGiwZ4ADdDaMj2ADAGQuBHs=
+    </DataArray>
     <DataArray type="Float32" Name="tensor" NumberOfComponents="9" format="binary">
-AQAAAJAAAACQAAAAIgAAAA==eNpjYGiwZ0AB6HwQcHAgrAZdDF0PTAymDkxjqAEAycUGOw==    </DataArray>
+AQAAAJAAAACQAAAAIgAAAA==eNpjYGiwZ0AB6HwQcHAgrAZdDF0PTAymDkxjqAEAycUGOw==
+    </DataArray>
   </PointData>
  </Piece>
  </UnstructuredGrid>
@@ -76,9 +78,11 @@ AQAAAAEAAAABAAAACQAAAA==eNrjAQAADQAN
   </Cells>
   <PointData Scalars="scalars">
     <DataArray type="Float32" Name="vector" NumberOfComponents="3" format="binary">
-AQAAAGAAAABgAAAAFgAAAA==eNpjYGiwZ4ADdDaMj84mXj0An0sI9Q==    </DataArray>
+AQAAAGAAAABgAAAAFgAAAA==eNpjYGiwZ4ADdDaMj84mXj0An0sI9Q==
+    </DataArray>
     <DataArray type="Float32" Name="tensor" NumberOfComponents="9" format="binary">
-AQAAACABAAAgAQAAhAAAAA==eNpjYGiwZ0ABWPkHUMXQ+Q4ODATMyRdqtgIphIjDMDrfwaFArtZuZ/JvO44qNjDN/HvvPlFRC3sQH0TPOSC/T39lv51GyHs78ch8exBt86TUlrM4Yh+ID6KntZbZ2+9tsE3Vc9zz44XWfhB9+8/xfbuNSveD+CB63lfXfQxEAACmEDx/    </DataArray>
+AQAAACABAAAgAQAAhAAAAA==eNpjYGiwZ0ABWPkHUMXQ+Q4ODATMyRdqtgIphIjDMDrfwaFArtZuZ/JvO44qNjDN/HvvPlFRC3sQH0TPOSC/T39lv51GyHs78ch8exBt86TUlrM4Yh+ID6KntZbZ2+9tsE3Vc9zz44XWfhB9+8/xfbuNSveD+CB63lfXfQxEAACmEDx/
+    </DataArray>
   </PointData>
  </Piece>
  </UnstructuredGrid>

diff --git a/tests/data_out/data_out_base_vtu_02.with_zlib=true.output b/tests/data_out/data_out_base_vtu_02.with_zlib=true.output
@@ -28,15 +28,20 @@ AQAAAAQAAAAEAAAADAAAAA==eNpjZGRkBAAADgAF
   </Cells>
   <PointData Scalars="scalars">
     <DataArray type="Float32" Name="x1" format="binary">
-AQAAABAAAAAQAAAAEgAAAA==eNpjYACBBnsg4QBEDgAJRwGA    </DataArray>
+AQAAABAAAAAQAAAAEgAAAA==eNpjYACBBnsg4QBEDgAJRwGA
+    </DataArray>
     <DataArray type="Float32" Name="x2" format="binary">
-AQAAABAAAAAQAAAAEgAAAA==eNpjYACBBnsg4QBEDgAJRwGA    </DataArray>
+AQAAABAAAAAQAAAAEgAAAA==eNpjYACBBnsg4QBEDgAJRwGA
+    </DataArray>
     <DataArray type="Float32" Name="x3" format="binary">
-AQAAABAAAAAQAAAAEgAAAA==eNpjYACBBnsg4QBEDgAJRwGA    </DataArray>
+AQAAABAAAAAQAAAAEgAAAA==eNpjYACBBnsg4QBEDgAJRwGA
+    </DataArray>
     <DataArray type="Float32" Name="x4" format="binary">
-AQAAABAAAAAQAAAAEgAAAA==eNpjYACBBnsg4QBEDgAJRwGA    </DataArray>
+AQAAABAAAAAQAAAAEgAAAA==eNpjYACBBnsg4QBEDgAJRwGA
+    </DataArray>
     <DataArray type="Float32" Name="i" format="binary">
-AQAAABAAAAAQAAAACwAAAA==eNpjYEAFAAAQAAE=    </DataArray>
+AQAAABAAAAAQAAAACwAAAA==eNpjYEAFAAAQAAE=
+    </DataArray>
   </PointData>
  </Piece>
  </UnstructuredGrid>
@@ -71,15 +76,20 @@ AQAAAAQAAAAEAAAADAAAAA==eNpjZGRkBAAADgAF
   </Cells>
   <PointData Scalars="scalars">
     <DataArray type="Float32" Name="x1" format="binary">
-AQAAABAAAAAQAAAAEgAAAA==eNpjYACBBnsg4QBEDgAJRwGA    </DataArray>
+AQAAABAAAAAQAAAAEgAAAA==eNpjYACBBnsg4QBEDgAJRwGA
+    </DataArray>
     <DataArray type="Float32" Name="x2" format="binary">
-AQAAABAAAAAQAAAAEgAAAA==eNpjYACBBnsg4QBEDgAJRwGA    </DataArray>
+AQAAABAAAAAQAAAAEgAAAA==eNpjYACBBnsg4QBEDgAJRwGA
+    </DataArray>
     <DataArray type="Float32" Name="x3" format="binary">
-AQAAABAAAAAQAAAAEgAAAA==eNpjYACBBnsg4QBEDgAJRwGA    </DataArray>
+AQAAABAAAAAQAAAAEgAAAA==eNpjYACBBnsg4QBEDgAJRwGA
+    </DataArray>
     <DataArray type="Float32" Name="x4" format="binary">
-AQAAABAAAAAQAAAAEgAAAA==eNpjYACBBnsg4QBEDgAJRwGA    </DataArray>
+AQAAABAAAAAQAAAAEgAAAA==eNpjYACBBnsg4QBEDgAJRwGA
+    </DataArray>
     <DataArray type="Float32" Name="i" format="binary">
-AQAAABAAAAAQAAAACwAAAA==eNpjYEAFAAAQAAE=    </DataArray>
+AQAAABAAAAAQAAAACwAAAA==eNpjYEAFAAAQAAE=
+    </DataArray>
   </PointData>
  </Piece>
  </UnstructuredGrid>
@@ -114,15 +124,20 @@ AQAAAAQAAAAEAAAADAAAAA==eNpjZGRkBAAADgAF
   </Cells>
   <PointData Scalars="scalars">
     <DataArray type="Float32" Name="x1" format="binary">
-AQAAABAAAAAQAAAAEgAAAA==eNpjYACBBnsg4QBEDgAJRwGA    </DataArray>
+AQAAABAAAAAQAAAAEgAAAA==eNpjYACBBnsg4QBEDgAJRwGA
+    </DataArray>
     <DataArray type="Float32" Name="x2" format="binary">
-AQAAABAAAAAQAAAAEgAAAA==eNpjYACBBnsg4QBEDgAJRwGA    </DataArray>
+AQAAABAAAAAQAAAAEgAAAA==eNpjYACBBnsg4QBEDgAJRwGA
+    </DataArray>
     <DataArray type="Float32" Name="x3" format="binary">
-AQAAABAAAAAQAAAAEgAAAA==eNpjYACBBnsg4QBEDgAJRwGA    </DataArray>
+AQAAABAAAAAQAAAAEgAAAA==eNpjYACBBnsg4QBEDgAJRwGA
+    </DataArray>
     <DataArray type="Float32" Name="x4" format="binary">
-AQAAABAAAAAQAAAAEgAAAA==eNpjYACBBnsg4QBEDgAJRwGA    </DataArray>
+AQAAABAAAAAQAAAAEgAAAA==eNpjYACBBnsg4QBEDgAJRwGA
+    </DataArray>
     <DataArray type="Float32" Name="i" format="binary">
-AQAAABAAAAAQAAAACwAAAA==eNpjYEAFAAAQAAE=    </DataArray>
+AQAAABAAAAAQAAAACwAAAA==eNpjYEAFAAAQAAE=
+    </DataArray>
   </PointData>
  </Piece>
  </UnstructuredGrid>