Adjust normalize.pl for p4est 1.1+.

We have a number of tests that use p4est output functionality, but the
format p4est writes in has changed in recent p4est versions. Delete the
lines that differ in normalize.pl and adjust stored test output files
accordingly.

diff --git a/tests/distributed_grids/2d_coarse_grid_01.debug.output b/tests/distributed_grids/2d_coarse_grid_01.debug.output
index 71b08ba8aef953c1bde884c28136a376fd876710..39b0180c79e4803589ae0862ccb6153057f9da5f 100644 (file)
--- a/tests/distributed_grids/2d_coarse_grid_01.debug.output
+++ b/tests/distributed_grids/2d_coarse_grid_01.debug.output
@@ -7,8 +7,6 @@ DEAL:2d::Checksum: 786433
     <PPoints>
       <PDataArray type="Float32" Name="Position" NumberOfComponents="3" format="ascii"/>
     </PPoints>
-    <PCellData Scalars="mpirank,treeid">
-      <PDataArray type="Int32" Name="mpirank" format="ascii"/>
       <PDataArray type="Int32" Name="treeid" format="ascii"/>
     </PCellData>
     <PPointData>
@@ -44,8 +42,6 @@ DEAL:2d::Checksum: 3932161
     <PPoints>
       <PDataArray type="Float32" Name="Position" NumberOfComponents="3" format="ascii"/>
     </PPoints>
-    <PCellData Scalars="mpirank,treeid">
-      <PDataArray type="Int32" Name="mpirank" format="ascii"/>
       <PDataArray type="Int32" Name="treeid" format="ascii"/>
     </PCellData>
     <PPointData>
@@ -81,8 +77,6 @@ DEAL:2d::Checksum: 3145729
     <PPoints>
       <PDataArray type="Float32" Name="Position" NumberOfComponents="3" format="ascii"/>
     </PPoints>
-    <PCellData Scalars="mpirank,treeid">
-      <PDataArray type="Int32" Name="mpirank" format="ascii"/>
       <PDataArray type="Int32" Name="treeid" format="ascii"/>
     </PCellData>
     <PPointData>

diff --git a/tests/distributed_grids/2d_coarse_grid_02.debug.output b/tests/distributed_grids/2d_coarse_grid_02.debug.output
index e0689f1aca30b2fb4a9dc7cdf04135ba8ec9a4f9..ef86edf56d7c34c8355080b4c7b9b3082b0b4103 100644 (file)
--- a/tests/distributed_grids/2d_coarse_grid_02.debug.output
+++ b/tests/distributed_grids/2d_coarse_grid_02.debug.output
@@ -6,8 +6,6 @@ DEAL:2d::Checksum: 1364131841
     <PPoints>
       <PDataArray type="Float32" Name="Position" NumberOfComponents="3" format="ascii"/>
     </PPoints>
-    <PCellData Scalars="mpirank,treeid">
-      <PDataArray type="Int32" Name="mpirank" format="ascii"/>
       <PDataArray type="Int32" Name="treeid" format="ascii"/>
     </PCellData>
     <PPointData>

diff --git a/tests/distributed_grids/2d_coarse_grid_03.debug.output b/tests/distributed_grids/2d_coarse_grid_03.debug.output
index e9245c23627a9a1be5423fdd01b6f1f4c8a538af..43458400650d53bb6716c2b32097b2badf947e2b 100644 (file)
--- a/tests/distributed_grids/2d_coarse_grid_03.debug.output
+++ b/tests/distributed_grids/2d_coarse_grid_03.debug.output
@@ -6,8 +6,6 @@ DEAL:2d::Checksum: 7864321
     <PPoints>
       <PDataArray type="Float32" Name="Position" NumberOfComponents="3" format="ascii"/>
     </PPoints>
-    <PCellData Scalars="mpirank,treeid">
-      <PDataArray type="Int32" Name="mpirank" format="ascii"/>
       <PDataArray type="Int32" Name="treeid" format="ascii"/>
     </PCellData>
     <PPointData>

diff --git a/tests/distributed_grids/2d_coarse_grid_04.debug.output b/tests/distributed_grids/2d_coarse_grid_04.debug.output
index b46b7617f90c0ef99ddc09c1933b121b88e30642..3afc66f1ec04ada60e373cf805b6d122920f050b 100644 (file)
--- a/tests/distributed_grids/2d_coarse_grid_04.debug.output
+++ b/tests/distributed_grids/2d_coarse_grid_04.debug.output
@@ -6,8 +6,6 @@ DEAL:2d::Checksum: 15728641
     <PPoints>
       <PDataArray type="Float32" Name="Position" NumberOfComponents="3" format="ascii"/>
     </PPoints>
-    <PCellData Scalars="mpirank,treeid">
-      <PDataArray type="Int32" Name="mpirank" format="ascii"/>
       <PDataArray type="Int32" Name="treeid" format="ascii"/>
     </PCellData>
     <PPointData>

diff --git a/tests/distributed_grids/2d_coarsening_01.debug.output b/tests/distributed_grids/2d_coarsening_01.debug.output
index fc427bca0cf3c8fe29d015f34fb9a0f1b5223c5b..3fdb9ea902c53fba8309b356c72798e439b761a9 100644 (file)
--- a/tests/distributed_grids/2d_coarsening_01.debug.output
+++ b/tests/distributed_grids/2d_coarsening_01.debug.output
@@ -6,8 +6,6 @@ DEAL:2d::Checksum: 3115647706
     <PPoints>
       <PDataArray type="Float32" Name="Position" NumberOfComponents="3" format="ascii"/>
     </PPoints>
-    <PCellData Scalars="mpirank,treeid">
-      <PDataArray type="Int32" Name="mpirank" format="ascii"/>
       <PDataArray type="Int32" Name="treeid" format="ascii"/>
     </PCellData>
     <PPointData>

diff --git a/tests/distributed_grids/2d_coarsening_02.debug.output b/tests/distributed_grids/2d_coarsening_02.debug.output
index 0891a1b5bc2aafc4ba2a35c9e82879b92709ff89..e114261dc54cb97c75558c575e9df11aebd4ddf4 100644 (file)
--- a/tests/distributed_grids/2d_coarsening_02.debug.output
+++ b/tests/distributed_grids/2d_coarsening_02.debug.output
@@ -6,8 +6,6 @@ DEAL:2d::Checksum: 2509440563
     <PPoints>
       <PDataArray type="Float32" Name="Position" NumberOfComponents="3" format="ascii"/>
     </PPoints>
-    <PCellData Scalars="mpirank,treeid">
-      <PDataArray type="Int32" Name="mpirank" format="ascii"/>
       <PDataArray type="Int32" Name="treeid" format="ascii"/>
     </PCellData>
     <PPointData>
@@ -44,8 +42,6 @@ DEAL:2d::Checksum: 618073961
     <PPoints>
       <PDataArray type="Float32" Name="Position" NumberOfComponents="3" format="ascii"/>
     </PPoints>
-    <PCellData Scalars="mpirank,treeid">
-      <PDataArray type="Int32" Name="mpirank" format="ascii"/>
       <PDataArray type="Int32" Name="treeid" format="ascii"/>
     </PCellData>
     <PPointData>
@@ -82,8 +78,6 @@ DEAL:2d::Checksum: 3105364016
     <PPoints>
       <PDataArray type="Float32" Name="Position" NumberOfComponents="3" format="ascii"/>
     </PPoints>
-    <PCellData Scalars="mpirank,treeid">
-      <PDataArray type="Int32" Name="mpirank" format="ascii"/>
       <PDataArray type="Int32" Name="treeid" format="ascii"/>
     </PCellData>
     <PPointData>
@@ -120,8 +114,6 @@ DEAL:2d::Checksum: 4161549821
     <PPoints>
       <PDataArray type="Float32" Name="Position" NumberOfComponents="3" format="ascii"/>
     </PPoints>
-    <PCellData Scalars="mpirank,treeid">
-      <PDataArray type="Int32" Name="mpirank" format="ascii"/>
       <PDataArray type="Int32" Name="treeid" format="ascii"/>
     </PCellData>
     <PPointData>
@@ -158,8 +150,6 @@ DEAL:2d::Checksum: 3780281340
     <PPoints>
       <PDataArray type="Float32" Name="Position" NumberOfComponents="3" format="ascii"/>
     </PPoints>
-    <PCellData Scalars="mpirank,treeid">
-      <PDataArray type="Int32" Name="mpirank" format="ascii"/>
       <PDataArray type="Int32" Name="treeid" format="ascii"/>
     </PCellData>
     <PPointData>
@@ -196,8 +186,6 @@ DEAL:2d::Checksum: 3050318079
     <PPoints>
       <PDataArray type="Float32" Name="Position" NumberOfComponents="3" format="ascii"/>
     </PPoints>
-    <PCellData Scalars="mpirank,treeid">
-      <PDataArray type="Int32" Name="mpirank" format="ascii"/>
       <PDataArray type="Int32" Name="treeid" format="ascii"/>
     </PCellData>
     <PPointData>
@@ -234,8 +222,6 @@ DEAL:2d::Checksum: 3215447093
     <PPoints>
       <PDataArray type="Float32" Name="Position" NumberOfComponents="3" format="ascii"/>
     </PPoints>
-    <PCellData Scalars="mpirank,treeid">
-      <PDataArray type="Int32" Name="mpirank" format="ascii"/>
       <PDataArray type="Int32" Name="treeid" format="ascii"/>
     </PCellData>
     <PPointData>
@@ -272,8 +258,6 @@ DEAL:2d::Checksum: 3706718963
     <PPoints>
       <PDataArray type="Float32" Name="Position" NumberOfComponents="3" format="ascii"/>
     </PPoints>
-    <PCellData Scalars="mpirank,treeid">
-      <PDataArray type="Int32" Name="mpirank" format="ascii"/>
       <PDataArray type="Int32" Name="treeid" format="ascii"/>
     </PCellData>
     <PPointData>
@@ -310,8 +294,6 @@ DEAL:2d::Checksum: 1891273522
     <PPoints>
       <PDataArray type="Float32" Name="Position" NumberOfComponents="3" format="ascii"/>
     </PPoints>
-    <PCellData Scalars="mpirank,treeid">
-      <PDataArray type="Int32" Name="mpirank" format="ascii"/>
       <PDataArray type="Int32" Name="treeid" format="ascii"/>
     </PCellData>
     <PPointData>
@@ -348,8 +330,6 @@ DEAL:2d::Checksum: 1235001238
     <PPoints>
       <PDataArray type="Float32" Name="Position" NumberOfComponents="3" format="ascii"/>
     </PPoints>
-    <PCellData Scalars="mpirank,treeid">
-      <PDataArray type="Int32" Name="mpirank" format="ascii"/>
       <PDataArray type="Int32" Name="treeid" format="ascii"/>
     </PCellData>
     <PPointData>
@@ -386,8 +366,6 @@ DEAL:2d::Checksum: 565285806
     <PPoints>
       <PDataArray type="Float32" Name="Position" NumberOfComponents="3" format="ascii"/>
     </PPoints>
-    <PCellData Scalars="mpirank,treeid">
-      <PDataArray type="Int32" Name="mpirank" format="ascii"/>
       <PDataArray type="Int32" Name="treeid" format="ascii"/>
     </PCellData>
     <PPointData>

diff --git a/tests/distributed_grids/2d_refinement_01.debug.output b/tests/distributed_grids/2d_refinement_01.debug.output
index 8376741e983ae345488753b7724d6e6b7b57f5f6..11eae42f4b76be7414ea1cb76a8b2fb3490122f0 100644 (file)
--- a/tests/distributed_grids/2d_refinement_01.debug.output
+++ b/tests/distributed_grids/2d_refinement_01.debug.output
@@ -6,8 +6,6 @@ DEAL:2d::Checksum: 167510149
     <PPoints>
       <PDataArray type="Float32" Name="Position" NumberOfComponents="3" format="ascii"/>
     </PPoints>
-    <PCellData Scalars="mpirank,treeid">
-      <PDataArray type="Int32" Name="mpirank" format="ascii"/>
       <PDataArray type="Int32" Name="treeid" format="ascii"/>
     </PCellData>
     <PPointData>

diff --git a/tests/distributed_grids/2d_refinement_02.debug.output b/tests/distributed_grids/2d_refinement_02.debug.output
index f5464804c4f532cb4e40cf19e3f0c233b817a3cf..efb5ae3a1d39c0ab66ea12c36fc99b17b1d9db3c 100644 (file)
--- a/tests/distributed_grids/2d_refinement_02.debug.output
+++ b/tests/distributed_grids/2d_refinement_02.debug.output
@@ -7,8 +7,6 @@ DEAL:2d::Checksum: 845349260
     <PPoints>
       <PDataArray type="Float32" Name="Position" NumberOfComponents="3" format="ascii"/>
     </PPoints>
-    <PCellData Scalars="mpirank,treeid">
-      <PDataArray type="Int32" Name="mpirank" format="ascii"/>
       <PDataArray type="Int32" Name="treeid" format="ascii"/>
     </PCellData>
     <PPointData>
@@ -46,8 +44,6 @@ DEAL:2d::Checksum: 3572237133
     <PPoints>
       <PDataArray type="Float32" Name="Position" NumberOfComponents="3" format="ascii"/>
     </PPoints>
-    <PCellData Scalars="mpirank,treeid">
-      <PDataArray type="Int32" Name="mpirank" format="ascii"/>
       <PDataArray type="Int32" Name="treeid" format="ascii"/>
     </PCellData>
     <PPointData>
@@ -85,8 +81,6 @@ DEAL:2d::Checksum: 85461166
     <PPoints>
       <PDataArray type="Float32" Name="Position" NumberOfComponents="3" format="ascii"/>
     </PPoints>
-    <PCellData Scalars="mpirank,treeid">
-      <PDataArray type="Int32" Name="mpirank" format="ascii"/>
       <PDataArray type="Int32" Name="treeid" format="ascii"/>
     </PCellData>
     <PPointData>
@@ -124,8 +118,6 @@ DEAL:2d::Checksum: 3376286008
     <PPoints>
       <PDataArray type="Float32" Name="Position" NumberOfComponents="3" format="ascii"/>
     </PPoints>
-    <PCellData Scalars="mpirank,treeid">
-      <PDataArray type="Int32" Name="mpirank" format="ascii"/>
       <PDataArray type="Int32" Name="treeid" format="ascii"/>
     </PCellData>
     <PPointData>
@@ -163,8 +155,6 @@ DEAL:2d::Checksum: 3159296977
     <PPoints>
       <PDataArray type="Float32" Name="Position" NumberOfComponents="3" format="ascii"/>
     </PPoints>
-    <PCellData Scalars="mpirank,treeid">
-      <PDataArray type="Int32" Name="mpirank" format="ascii"/>
       <PDataArray type="Int32" Name="treeid" format="ascii"/>
     </PCellData>
     <PPointData>
@@ -202,8 +192,6 @@ DEAL:2d::Checksum: 2423393502
     <PPoints>
       <PDataArray type="Float32" Name="Position" NumberOfComponents="3" format="ascii"/>
     </PPoints>
-    <PCellData Scalars="mpirank,treeid">
-      <PDataArray type="Int32" Name="mpirank" format="ascii"/>
       <PDataArray type="Int32" Name="treeid" format="ascii"/>
     </PCellData>
     <PPointData>
@@ -241,8 +229,6 @@ DEAL:2d::Checksum: 1740180971
     <PPoints>
       <PDataArray type="Float32" Name="Position" NumberOfComponents="3" format="ascii"/>
     </PPoints>
-    <PCellData Scalars="mpirank,treeid">
-      <PDataArray type="Int32" Name="mpirank" format="ascii"/>
       <PDataArray type="Int32" Name="treeid" format="ascii"/>
     </PCellData>
     <PPointData>
@@ -280,8 +266,6 @@ DEAL:2d::Checksum: 4005236580
     <PPoints>
       <PDataArray type="Float32" Name="Position" NumberOfComponents="3" format="ascii"/>
     </PPoints>
-    <PCellData Scalars="mpirank,treeid">
-      <PDataArray type="Int32" Name="mpirank" format="ascii"/>
       <PDataArray type="Int32" Name="treeid" format="ascii"/>
     </PCellData>
     <PPointData>
@@ -319,8 +303,6 @@ DEAL:2d::Checksum: 2695303719
     <PPoints>
       <PDataArray type="Float32" Name="Position" NumberOfComponents="3" format="ascii"/>
     </PPoints>
-    <PCellData Scalars="mpirank,treeid">
-      <PDataArray type="Int32" Name="mpirank" format="ascii"/>
       <PDataArray type="Int32" Name="treeid" format="ascii"/>
     </PCellData>
     <PPointData>
@@ -358,8 +340,6 @@ DEAL:2d::Checksum: 1187058508
     <PPoints>
       <PDataArray type="Float32" Name="Position" NumberOfComponents="3" format="ascii"/>
     </PPoints>
-    <PCellData Scalars="mpirank,treeid">
-      <PDataArray type="Int32" Name="mpirank" format="ascii"/>
       <PDataArray type="Int32" Name="treeid" format="ascii"/>
     </PCellData>
     <PPointData>
@@ -397,8 +377,6 @@ DEAL:2d::Checksum: 1372132310
     <PPoints>
       <PDataArray type="Float32" Name="Position" NumberOfComponents="3" format="ascii"/>
     </PPoints>
-    <PCellData Scalars="mpirank,treeid">
-      <PDataArray type="Int32" Name="mpirank" format="ascii"/>
       <PDataArray type="Int32" Name="treeid" format="ascii"/>
     </PCellData>
     <PPointData>

diff --git a/tests/distributed_grids/3d_coarse_grid_01.debug.output b/tests/distributed_grids/3d_coarse_grid_01.debug.output
index 44a87a9ffa3e7846b45e5884b481e27c7b71a12b..2e5074d12103c070b49278783e433b0199d1c7e7 100644 (file)
--- a/tests/distributed_grids/3d_coarse_grid_01.debug.output
+++ b/tests/distributed_grids/3d_coarse_grid_01.debug.output
@@ -7,8 +7,6 @@ DEAL:3d::Checksum: 1048577
     <PPoints>
       <PDataArray type="Float32" Name="Position" NumberOfComponents="3" format="ascii"/>
     </PPoints>
-    <PCellData Scalars="mpirank,treeid">
-      <PDataArray type="Int32" Name="mpirank" format="ascii"/>
       <PDataArray type="Int32" Name="treeid" format="ascii"/>
     </PCellData>
     <PPointData>
@@ -44,8 +42,6 @@ DEAL:3d::Checksum: 7340033
     <PPoints>
       <PDataArray type="Float32" Name="Position" NumberOfComponents="3" format="ascii"/>
     </PPoints>
-    <PCellData Scalars="mpirank,treeid">
-      <PDataArray type="Int32" Name="mpirank" format="ascii"/>
       <PDataArray type="Int32" Name="treeid" format="ascii"/>
     </PCellData>
     <PPointData>
@@ -81,8 +77,6 @@ DEAL:3d::Checksum: 6291457
     <PPoints>
       <PDataArray type="Float32" Name="Position" NumberOfComponents="3" format="ascii"/>
     </PPoints>
-    <PCellData Scalars="mpirank,treeid">
-      <PDataArray type="Int32" Name="mpirank" format="ascii"/>
       <PDataArray type="Int32" Name="treeid" format="ascii"/>
     </PCellData>
     <PPointData>

diff --git a/tests/distributed_grids/3d_coarse_grid_02.debug.output b/tests/distributed_grids/3d_coarse_grid_02.debug.output
index 98dc02a1aa94460bc381a5d7f9c5f8043890548d..c41a0fe810d5d6c45b74fc9b778f55dd049c610d 100644 (file)
--- a/tests/distributed_grids/3d_coarse_grid_02.debug.output
+++ b/tests/distributed_grids/3d_coarse_grid_02.debug.output
@@ -6,8 +6,6 @@ DEAL:3d:/1.in::Checksum: 104595457
     <PPoints>
       <PDataArray type="Float32" Name="Position" NumberOfComponents="3" format="ascii"/>
     </PPoints>
-    <PCellData Scalars="mpirank,treeid">
-      <PDataArray type="Int32" Name="mpirank" format="ascii"/>
       <PDataArray type="Int32" Name="treeid" format="ascii"/>
     </PCellData>
     <PPointData>
@@ -42,8 +40,6 @@ DEAL:3d:/2.in::Checksum: 377487361
     <PPoints>
       <PDataArray type="Float32" Name="Position" NumberOfComponents="3" format="ascii"/>
     </PPoints>
-    <PCellData Scalars="mpirank,treeid">
-      <PDataArray type="Int32" Name="mpirank" format="ascii"/>
       <PDataArray type="Int32" Name="treeid" format="ascii"/>
     </PCellData>
     <PPointData>
@@ -78,8 +74,6 @@ DEAL:3d:/3.in::Checksum: 2097153
     <PPoints>
       <PDataArray type="Float32" Name="Position" NumberOfComponents="3" format="ascii"/>
     </PPoints>
-    <PCellData Scalars="mpirank,treeid">
-      <PDataArray type="Int32" Name="mpirank" format="ascii"/>
       <PDataArray type="Int32" Name="treeid" format="ascii"/>
     </PCellData>
     <PPointData>
@@ -114,8 +108,6 @@ DEAL:3d:/4.in::Checksum: 1613561857
     <PPoints>
       <PDataArray type="Float32" Name="Position" NumberOfComponents="3" format="ascii"/>
     </PPoints>
-    <PCellData Scalars="mpirank,treeid">
-      <PDataArray type="Int32" Name="mpirank" format="ascii"/>
       <PDataArray type="Int32" Name="treeid" format="ascii"/>
     </PCellData>
     <PPointData>
@@ -150,8 +142,6 @@ DEAL:3d:/evil_0.in::Checksum: 10485761
     <PPoints>
       <PDataArray type="Float32" Name="Position" NumberOfComponents="3" format="ascii"/>
     </PPoints>
-    <PCellData Scalars="mpirank,treeid">
-      <PDataArray type="Int32" Name="mpirank" format="ascii"/>
       <PDataArray type="Int32" Name="treeid" format="ascii"/>
     </PCellData>
     <PPointData>
@@ -186,8 +176,6 @@ DEAL:3d:/evil_1.in::Checksum: 10485761
     <PPoints>
       <PDataArray type="Float32" Name="Position" NumberOfComponents="3" format="ascii"/>
     </PPoints>
-    <PCellData Scalars="mpirank,treeid">
-      <PDataArray type="Int32" Name="mpirank" format="ascii"/>
       <PDataArray type="Int32" Name="treeid" format="ascii"/>
     </PCellData>
     <PPointData>
@@ -222,8 +210,6 @@ DEAL:3d:/evil_2.in::Checksum: 10485761
     <PPoints>
       <PDataArray type="Float32" Name="Position" NumberOfComponents="3" format="ascii"/>
     </PPoints>
-    <PCellData Scalars="mpirank,treeid">
-      <PDataArray type="Int32" Name="mpirank" format="ascii"/>
       <PDataArray type="Int32" Name="treeid" format="ascii"/>
     </PCellData>
     <PPointData>
@@ -258,8 +244,6 @@ DEAL:3d:/evil_3.in::Checksum: 10485761
     <PPoints>
       <PDataArray type="Float32" Name="Position" NumberOfComponents="3" format="ascii"/>
     </PPoints>
-    <PCellData Scalars="mpirank,treeid">
-      <PDataArray type="Int32" Name="mpirank" format="ascii"/>
       <PDataArray type="Int32" Name="treeid" format="ascii"/>
     </PCellData>
     <PPointData>
@@ -294,8 +278,6 @@ DEAL:3d:/evil_4.in::Checksum: 10485761
     <PPoints>
       <PDataArray type="Float32" Name="Position" NumberOfComponents="3" format="ascii"/>
     </PPoints>
-    <PCellData Scalars="mpirank,treeid">
-      <PDataArray type="Int32" Name="mpirank" format="ascii"/>
       <PDataArray type="Int32" Name="treeid" format="ascii"/>
     </PCellData>
     <PPointData>

diff --git a/tests/distributed_grids/3d_coarse_grid_03.debug.output b/tests/distributed_grids/3d_coarse_grid_03.debug.output
index a38955175d98b16116a0ff3224229888793134a2..c8c0b91a44080fae45ded0e7f9502bcb941341e6 100644 (file)
--- a/tests/distributed_grids/3d_coarse_grid_03.debug.output
+++ b/tests/distributed_grids/3d_coarse_grid_03.debug.output
@@ -6,8 +6,6 @@ DEAL:3d::Checksum: 1585446913
     <PPoints>
       <PDataArray type="Float32" Name="Position" NumberOfComponents="3" format="ascii"/>
     </PPoints>
-    <PCellData Scalars="mpirank,treeid">
-      <PDataArray type="Int32" Name="mpirank" format="ascii"/>
       <PDataArray type="Int32" Name="treeid" format="ascii"/>
     </PCellData>
     <PPointData>

diff --git a/tests/distributed_grids/3d_coarse_grid_04.debug.output b/tests/distributed_grids/3d_coarse_grid_04.debug.output
index d505a3347c724cde951faf8fe376530d62612ecc..276982358cfefa023eeee8ba6460c170970cb7a3 100644 (file)
--- a/tests/distributed_grids/3d_coarse_grid_04.debug.output
+++ b/tests/distributed_grids/3d_coarse_grid_04.debug.output
@@ -6,8 +6,6 @@ DEAL:3d::Checksum: 2097153
     <PPoints>
       <PDataArray type="Float32" Name="Position" NumberOfComponents="3" format="ascii"/>
     </PPoints>
-    <PCellData Scalars="mpirank,treeid">
-      <PDataArray type="Int32" Name="mpirank" format="ascii"/>
       <PDataArray type="Int32" Name="treeid" format="ascii"/>
     </PCellData>
     <PPointData>

diff --git a/tests/distributed_grids/3d_coarse_grid_05.debug.output b/tests/distributed_grids/3d_coarse_grid_05.debug.output
index 9b85d3bce0903e249fdb9780bf2beaeb17fe8200..acecbf3e7e1b9582cff1a839d279281f7f781328 100644 (file)
--- a/tests/distributed_grids/3d_coarse_grid_05.debug.output
+++ b/tests/distributed_grids/3d_coarse_grid_05.debug.output
@@ -6,8 +6,6 @@ DEAL:2d::Checksum: 1572865
     <PPoints>
       <PDataArray type="Float32" Name="Position" NumberOfComponents="3" format="ascii"/>
     </PPoints>
-    <PCellData Scalars="mpirank,treeid">
-      <PDataArray type="Int32" Name="mpirank" format="ascii"/>
       <PDataArray type="Int32" Name="treeid" format="ascii"/>
     </PCellData>
     <PPointData>
@@ -42,8 +40,6 @@ DEAL:3d::Checksum: 2097153
     <PPoints>
       <PDataArray type="Float32" Name="Position" NumberOfComponents="3" format="ascii"/>
     </PPoints>
-    <PCellData Scalars="mpirank,treeid">
-      <PDataArray type="Int32" Name="mpirank" format="ascii"/>
       <PDataArray type="Int32" Name="treeid" format="ascii"/>
     </PCellData>
     <PPointData>

diff --git a/tests/distributed_grids/3d_coarsening_01.debug.output b/tests/distributed_grids/3d_coarsening_01.debug.output
index 6eb9651e58ec9d2415bf47942c7aaac501e5e661..958484cd0689f48de5dda144b524e0f66c6a69df 100644 (file)
--- a/tests/distributed_grids/3d_coarsening_01.debug.output
+++ b/tests/distributed_grids/3d_coarsening_01.debug.output
@@ -6,8 +6,6 @@ DEAL:3d::Checksum: 141886106
     <PPoints>
       <PDataArray type="Float32" Name="Position" NumberOfComponents="3" format="ascii"/>
     </PPoints>
-    <PCellData Scalars="mpirank,treeid">
-      <PDataArray type="Int32" Name="mpirank" format="ascii"/>
       <PDataArray type="Int32" Name="treeid" format="ascii"/>
     </PCellData>
     <PPointData>

diff --git a/tests/distributed_grids/3d_coarsening_02.debug.output b/tests/distributed_grids/3d_coarsening_02.debug.output
index f4b01d027604c9b3f9476410c9be3b351edb842a..218d19c5fbc1b191ea4c1578788711be9efc9195 100644 (file)
--- a/tests/distributed_grids/3d_coarsening_02.debug.output
+++ b/tests/distributed_grids/3d_coarsening_02.debug.output
@@ -6,8 +6,6 @@ DEAL:3d::Checksum: 353044419
     <PPoints>
       <PDataArray type="Float32" Name="Position" NumberOfComponents="3" format="ascii"/>
     </PPoints>
-    <PCellData Scalars="mpirank,treeid">
-      <PDataArray type="Int32" Name="mpirank" format="ascii"/>
       <PDataArray type="Int32" Name="treeid" format="ascii"/>
     </PCellData>
     <PPointData>
@@ -44,8 +42,6 @@ DEAL:3d::Checksum: 4074805283
     <PPoints>
       <PDataArray type="Float32" Name="Position" NumberOfComponents="3" format="ascii"/>
     </PPoints>
-    <PCellData Scalars="mpirank,treeid">
-      <PDataArray type="Int32" Name="mpirank" format="ascii"/>
       <PDataArray type="Int32" Name="treeid" format="ascii"/>
     </PCellData>
     <PPointData>
@@ -82,8 +78,6 @@ DEAL:3d::Checksum: 3041338616
     <PPoints>
       <PDataArray type="Float32" Name="Position" NumberOfComponents="3" format="ascii"/>
     </PPoints>
-    <PCellData Scalars="mpirank,treeid">
-      <PDataArray type="Int32" Name="mpirank" format="ascii"/>
       <PDataArray type="Int32" Name="treeid" format="ascii"/>
     </PCellData>
     <PPointData>
@@ -120,8 +114,6 @@ DEAL:3d::Checksum: 272602556
     <PPoints>
       <PDataArray type="Float32" Name="Position" NumberOfComponents="3" format="ascii"/>
     </PPoints>
-    <PCellData Scalars="mpirank,treeid">
-      <PDataArray type="Int32" Name="mpirank" format="ascii"/>
       <PDataArray type="Int32" Name="treeid" format="ascii"/>
     </PCellData>
     <PPointData>
@@ -158,8 +150,6 @@ DEAL:3d::Checksum: 1092886437
     <PPoints>
       <PDataArray type="Float32" Name="Position" NumberOfComponents="3" format="ascii"/>
     </PPoints>
-    <PCellData Scalars="mpirank,treeid">
-      <PDataArray type="Int32" Name="mpirank" format="ascii"/>
       <PDataArray type="Int32" Name="treeid" format="ascii"/>
     </PCellData>
     <PPointData>
@@ -196,8 +186,6 @@ DEAL:3d::Checksum: 2787894795
     <PPoints>
       <PDataArray type="Float32" Name="Position" NumberOfComponents="3" format="ascii"/>
     </PPoints>
-    <PCellData Scalars="mpirank,treeid">
-      <PDataArray type="Int32" Name="mpirank" format="ascii"/>
       <PDataArray type="Int32" Name="treeid" format="ascii"/>
     </PCellData>
     <PPointData>

diff --git a/tests/distributed_grids/3d_refinement_01.debug.output b/tests/distributed_grids/3d_refinement_01.debug.output
index beb54b1bf7432a6c613f6013045277ed0f4f1055..96d3d930facd036bfcbf0c61a3f42262e4d464be 100644 (file)
--- a/tests/distributed_grids/3d_refinement_01.debug.output
+++ b/tests/distributed_grids/3d_refinement_01.debug.output
@@ -6,8 +6,6 @@ DEAL:3d::Checksum: 190316601
     <PPoints>
       <PDataArray type="Float32" Name="Position" NumberOfComponents="3" format="ascii"/>
     </PPoints>
-    <PCellData Scalars="mpirank,treeid">
-      <PDataArray type="Int32" Name="mpirank" format="ascii"/>
       <PDataArray type="Int32" Name="treeid" format="ascii"/>
     </PCellData>
     <PPointData>

diff --git a/tests/distributed_grids/3d_refinement_02.debug.output b/tests/distributed_grids/3d_refinement_02.debug.output
index aa2146397b3b1f11f5a625c22f4ba1cb7f238782..86d706493448b46a1e24fb8dc0a808dbde1b254d 100644 (file)
--- a/tests/distributed_grids/3d_refinement_02.debug.output
+++ b/tests/distributed_grids/3d_refinement_02.debug.output
@@ -7,8 +7,6 @@ DEAL:3d::Checksum: 1061879988
     <PPoints>
       <PDataArray type="Float32" Name="Position" NumberOfComponents="3" format="ascii"/>
     </PPoints>
-    <PCellData Scalars="mpirank,treeid">
-      <PDataArray type="Int32" Name="mpirank" format="ascii"/>
       <PDataArray type="Int32" Name="treeid" format="ascii"/>
     </PCellData>
     <PPointData>
@@ -46,8 +44,6 @@ DEAL:3d::Checksum: 2270560503
     <PPoints>
       <PDataArray type="Float32" Name="Position" NumberOfComponents="3" format="ascii"/>
     </PPoints>
-    <PCellData Scalars="mpirank,treeid">
-      <PDataArray type="Int32" Name="mpirank" format="ascii"/>
       <PDataArray type="Int32" Name="treeid" format="ascii"/>
     </PCellData>
     <PPointData>
@@ -85,8 +81,6 @@ DEAL:3d::Checksum: 2925396400
     <PPoints>
       <PDataArray type="Float32" Name="Position" NumberOfComponents="3" format="ascii"/>
     </PPoints>
-    <PCellData Scalars="mpirank,treeid">
-      <PDataArray type="Int32" Name="mpirank" format="ascii"/>
       <PDataArray type="Int32" Name="treeid" format="ascii"/>
     </PCellData>
     <PPointData>
@@ -124,8 +118,6 @@ DEAL:3d::Checksum: 1537540822
     <PPoints>
       <PDataArray type="Float32" Name="Position" NumberOfComponents="3" format="ascii"/>
     </PPoints>
-    <PCellData Scalars="mpirank,treeid">
-      <PDataArray type="Int32" Name="mpirank" format="ascii"/>
       <PDataArray type="Int32" Name="treeid" format="ascii"/>
     </PCellData>
     <PPointData>
@@ -163,8 +155,6 @@ DEAL:3d::Checksum: 1304691596
     <PPoints>
       <PDataArray type="Float32" Name="Position" NumberOfComponents="3" format="ascii"/>
     </PPoints>
-    <PCellData Scalars="mpirank,treeid">
-      <PDataArray type="Int32" Name="mpirank" format="ascii"/>
       <PDataArray type="Int32" Name="treeid" format="ascii"/>
     </PCellData>
     <PPointData>
@@ -202,8 +192,6 @@ DEAL:3d::Checksum: 2660631649
     <PPoints>
       <PDataArray type="Float32" Name="Position" NumberOfComponents="3" format="ascii"/>
     </PPoints>
-    <PCellData Scalars="mpirank,treeid">
-      <PDataArray type="Int32" Name="mpirank" format="ascii"/>
       <PDataArray type="Int32" Name="treeid" format="ascii"/>
     </PCellData>
     <PPointData>
@@ -241,8 +229,6 @@ DEAL:3d::Checksum: 2875720905
     <PPoints>
       <PDataArray type="Float32" Name="Position" NumberOfComponents="3" format="ascii"/>
     </PPoints>
-    <PCellData Scalars="mpirank,treeid">
-      <PDataArray type="Int32" Name="mpirank" format="ascii"/>
       <PDataArray type="Int32" Name="treeid" format="ascii"/>
     </PCellData>
     <PPointData>
@@ -280,8 +266,6 @@ DEAL:3d::Checksum: 3630367993
     <PPoints>
       <PDataArray type="Float32" Name="Position" NumberOfComponents="3" format="ascii"/>
     </PPoints>
-    <PCellData Scalars="mpirank,treeid">
-      <PDataArray type="Int32" Name="mpirank" format="ascii"/>
       <PDataArray type="Int32" Name="treeid" format="ascii"/>
     </PCellData>
     <PPointData>
@@ -319,8 +303,6 @@ DEAL:3d::Checksum: 2062748577
     <PPoints>
       <PDataArray type="Float32" Name="Position" NumberOfComponents="3" format="ascii"/>
     </PPoints>
-    <PCellData Scalars="mpirank,treeid">
-      <PDataArray type="Int32" Name="mpirank" format="ascii"/>
       <PDataArray type="Int32" Name="treeid" format="ascii"/>
     </PCellData>
     <PPointData>

diff --git a/tests/distributed_grids/3d_refinement_03.debug.output b/tests/distributed_grids/3d_refinement_03.debug.output
index 73f2b46bad4e7e0d5e073deb29d4672dde9b4f3a..e59173d51d2ee1b9f856ef96a28327c13de511b3 100644 (file)
--- a/tests/distributed_grids/3d_refinement_03.debug.output
+++ b/tests/distributed_grids/3d_refinement_03.debug.output
@@ -6,8 +6,6 @@ DEAL:3d::Checksum: 2760466831
     <PPoints>
       <PDataArray type="Float32" Name="Position" NumberOfComponents="3" format="ascii"/>
     </PPoints>
-    <PCellData Scalars="mpirank,treeid">
-      <PDataArray type="Int32" Name="mpirank" format="ascii"/>
       <PDataArray type="Int32" Name="treeid" format="ascii"/>
     </PCellData>
     <PPointData>

diff --git a/tests/distributed_grids/codim_01.debug.output b/tests/distributed_grids/codim_01.debug.output
index 60e4f0489063b41c62e7d4469f657c7fb591af0a..52837ae194478ca16d4d52d3a25ead08caadd489 100644 (file)
--- a/tests/distributed_grids/codim_01.debug.output
+++ b/tests/distributed_grids/codim_01.debug.output
@@ -6,8 +6,6 @@ DEAL:2-3::Checksum: 1736441989
     <PPoints>
       <PDataArray type="Float32" Name="Position" NumberOfComponents="3" format="ascii"/>
     </PPoints>
-    <PCellData Scalars="mpirank,treeid">
-      <PDataArray type="Int32" Name="mpirank" format="ascii"/>
       <PDataArray type="Int32" Name="treeid" format="ascii"/>
     </PCellData>
     <PPointData>

diff --git a/tests/mpi/codim_01.mpirun=3.debug.output b/tests/mpi/codim_01.mpirun=3.debug.output
index 63b0ba3d1d253f52accad9bae3477388a87c49a5..2d2a5a9ba108cc7ccdca28bc07258f534cdce622 100644 (file)
--- a/tests/mpi/codim_01.mpirun=3.debug.output
+++ b/tests/mpi/codim_01.mpirun=3.debug.output
@@ -6,8 +6,6 @@ DEAL:0:2-3::Checksum: 296355976
     <PPoints>
       <PDataArray type="Float32" Name="Position" NumberOfComponents="3" format="ascii"/>
     </PPoints>
-    <PCellData Scalars="mpirank,treeid">
-      <PDataArray type="Int32" Name="mpirank" format="ascii"/>
       <PDataArray type="Int32" Name="treeid" format="ascii"/>
     </PCellData>
     <PPointData>

diff --git a/tests/normalize.pl b/tests/normalize.pl
index 343937dfc444c54724afc504fed9484b721144b3..c35aca2630f318912cc5989f38e6866158421393 100644 (file)
--- a/tests/normalize.pl
+++ b/tests/normalize.pl
@@ -1,6 +1,6 @@
 ## ---------------------------------------------------------------------
 ##
-## Copyright (C) 2001 - 2013 by the deal.II authors
+## Copyright (C) 2001 - 2014 by the deal.II authors
 ##
 ## This file is part of the deal.II library.
 ##
@@ -57,3 +57,33 @@ s/^DEAL.*::_.*\n//g;
 # Normalize version string by replacing (for example) 'written by
 # deal.II 8.1.pre' by written by 'written by deal.II x.y.z'
 s/written by deal\.II \d+\.\d+\.(pre|\d+)/written by deal.II x.y.z/;
+
+
+# different p4est versions output different text in VTU output. For
+# example, we get these kinds of differences:
+# ***************
+# *** 6,14 ****
+#       <PPoints>
+#         <PDataArray type="Float32" Name="Position" NumberOfComponents="3" form# at="ascii"/>
+#       </PPoints>
+# !     <PCellData Scalars="mpirank,treeid">
+# !       <PDataArray type="Int32" Name="mpirank" format="ascii"/>
+#         <PDataArray type="Int32" Name="treeid" format="ascii"/>
+#       </PCellData>
+#       <PPointData>
+#       </PPointData>
+# --- 6,15 ----
+#       <PPoints>
+#         <PDataArray type="Float32" Name="Position" NumberOfComponents="3" form# at="ascii"/>
+#       </PPoints>
+# !     <PCellData Scalars="treeid,level,mpirank">
+#         <PDataArray type="Int32" Name="treeid" format="ascii"/>
+# +       <PDataArray type="UInt8" Name="level" format="ascii"/>
+# +       <PDataArray type="Int32" Name="mpirank" format="ascii"/>
+#       </PCellData>
+#       <PPointData>
+#       </PPointData>
+#
+# To deal with these issues, we simply delete these lines
+s/.*<PCellData Scalars.*\n//g;
+s/.*<PDataArray type.*(mpirank|level).*\n//g;