From: Wolfgang Bangerth Date: Mon, 24 Nov 2014 02:22:38 +0000 (-0600) Subject: Adjust normalize.pl for p4est 1.1+. X-Git-Tag: v8.2.0-rc1~47^2 X-Git-Url: https://gitweb.dealii.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=448af721f3375177099c9115e45836807a89b5c6;p=dealii.git 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 71b08ba8ae..39b0180c79 100644 --- 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 - - @@ -44,8 +42,6 @@ DEAL:2d::Checksum: 3932161 - - @@ -81,8 +77,6 @@ DEAL:2d::Checksum: 3145729 - - diff --git a/tests/distributed_grids/2d_coarse_grid_02.debug.output b/tests/distributed_grids/2d_coarse_grid_02.debug.output index e0689f1aca..ef86edf56d 100644 --- 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 - - diff --git a/tests/distributed_grids/2d_coarse_grid_03.debug.output b/tests/distributed_grids/2d_coarse_grid_03.debug.output index e9245c2362..4345840065 100644 --- 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 - - diff --git a/tests/distributed_grids/2d_coarse_grid_04.debug.output b/tests/distributed_grids/2d_coarse_grid_04.debug.output index b46b7617f9..3afc66f1ec 100644 --- 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 - - diff --git a/tests/distributed_grids/2d_coarsening_01.debug.output b/tests/distributed_grids/2d_coarsening_01.debug.output index fc427bca0c..3fdb9ea902 100644 --- 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 - - diff --git a/tests/distributed_grids/2d_coarsening_02.debug.output b/tests/distributed_grids/2d_coarsening_02.debug.output index 0891a1b5bc..e114261dc5 100644 --- 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 - - @@ -44,8 +42,6 @@ DEAL:2d::Checksum: 618073961 - - @@ -82,8 +78,6 @@ DEAL:2d::Checksum: 3105364016 - - @@ -120,8 +114,6 @@ DEAL:2d::Checksum: 4161549821 - - @@ -158,8 +150,6 @@ DEAL:2d::Checksum: 3780281340 - - @@ -196,8 +186,6 @@ DEAL:2d::Checksum: 3050318079 - - @@ -234,8 +222,6 @@ DEAL:2d::Checksum: 3215447093 - - @@ -272,8 +258,6 @@ DEAL:2d::Checksum: 3706718963 - - @@ -310,8 +294,6 @@ DEAL:2d::Checksum: 1891273522 - - @@ -348,8 +330,6 @@ DEAL:2d::Checksum: 1235001238 - - @@ -386,8 +366,6 @@ DEAL:2d::Checksum: 565285806 - - diff --git a/tests/distributed_grids/2d_refinement_01.debug.output b/tests/distributed_grids/2d_refinement_01.debug.output index 8376741e98..11eae42f4b 100644 --- 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 - - diff --git a/tests/distributed_grids/2d_refinement_02.debug.output b/tests/distributed_grids/2d_refinement_02.debug.output index f5464804c4..efb5ae3a1d 100644 --- 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 - - @@ -46,8 +44,6 @@ DEAL:2d::Checksum: 3572237133 - - @@ -85,8 +81,6 @@ DEAL:2d::Checksum: 85461166 - - @@ -124,8 +118,6 @@ DEAL:2d::Checksum: 3376286008 - - @@ -163,8 +155,6 @@ DEAL:2d::Checksum: 3159296977 - - @@ -202,8 +192,6 @@ DEAL:2d::Checksum: 2423393502 - - @@ -241,8 +229,6 @@ DEAL:2d::Checksum: 1740180971 - - @@ -280,8 +266,6 @@ DEAL:2d::Checksum: 4005236580 - - @@ -319,8 +303,6 @@ DEAL:2d::Checksum: 2695303719 - - @@ -358,8 +340,6 @@ DEAL:2d::Checksum: 1187058508 - - @@ -397,8 +377,6 @@ DEAL:2d::Checksum: 1372132310 - - diff --git a/tests/distributed_grids/3d_coarse_grid_01.debug.output b/tests/distributed_grids/3d_coarse_grid_01.debug.output index 44a87a9ffa..2e5074d121 100644 --- 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 - - @@ -44,8 +42,6 @@ DEAL:3d::Checksum: 7340033 - - @@ -81,8 +77,6 @@ DEAL:3d::Checksum: 6291457 - - diff --git a/tests/distributed_grids/3d_coarse_grid_02.debug.output b/tests/distributed_grids/3d_coarse_grid_02.debug.output index 98dc02a1aa..c41a0fe810 100644 --- 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 - - @@ -42,8 +40,6 @@ DEAL:3d:/2.in::Checksum: 377487361 - - @@ -78,8 +74,6 @@ DEAL:3d:/3.in::Checksum: 2097153 - - @@ -114,8 +108,6 @@ DEAL:3d:/4.in::Checksum: 1613561857 - - @@ -150,8 +142,6 @@ DEAL:3d:/evil_0.in::Checksum: 10485761 - - @@ -186,8 +176,6 @@ DEAL:3d:/evil_1.in::Checksum: 10485761 - - @@ -222,8 +210,6 @@ DEAL:3d:/evil_2.in::Checksum: 10485761 - - @@ -258,8 +244,6 @@ DEAL:3d:/evil_3.in::Checksum: 10485761 - - @@ -294,8 +278,6 @@ DEAL:3d:/evil_4.in::Checksum: 10485761 - - diff --git a/tests/distributed_grids/3d_coarse_grid_03.debug.output b/tests/distributed_grids/3d_coarse_grid_03.debug.output index a38955175d..c8c0b91a44 100644 --- 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 - - diff --git a/tests/distributed_grids/3d_coarse_grid_04.debug.output b/tests/distributed_grids/3d_coarse_grid_04.debug.output index d505a3347c..276982358c 100644 --- 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 - - diff --git a/tests/distributed_grids/3d_coarse_grid_05.debug.output b/tests/distributed_grids/3d_coarse_grid_05.debug.output index 9b85d3bce0..acecbf3e7e 100644 --- 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 - - @@ -42,8 +40,6 @@ DEAL:3d::Checksum: 2097153 - - diff --git a/tests/distributed_grids/3d_coarsening_01.debug.output b/tests/distributed_grids/3d_coarsening_01.debug.output index 6eb9651e58..958484cd06 100644 --- 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 - - diff --git a/tests/distributed_grids/3d_coarsening_02.debug.output b/tests/distributed_grids/3d_coarsening_02.debug.output index f4b01d0276..218d19c5fb 100644 --- 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 - - @@ -44,8 +42,6 @@ DEAL:3d::Checksum: 4074805283 - - @@ -82,8 +78,6 @@ DEAL:3d::Checksum: 3041338616 - - @@ -120,8 +114,6 @@ DEAL:3d::Checksum: 272602556 - - @@ -158,8 +150,6 @@ DEAL:3d::Checksum: 1092886437 - - @@ -196,8 +186,6 @@ DEAL:3d::Checksum: 2787894795 - - diff --git a/tests/distributed_grids/3d_refinement_01.debug.output b/tests/distributed_grids/3d_refinement_01.debug.output index beb54b1bf7..96d3d930fa 100644 --- 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 - - diff --git a/tests/distributed_grids/3d_refinement_02.debug.output b/tests/distributed_grids/3d_refinement_02.debug.output index aa2146397b..86d7064934 100644 --- 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 - - @@ -46,8 +44,6 @@ DEAL:3d::Checksum: 2270560503 - - @@ -85,8 +81,6 @@ DEAL:3d::Checksum: 2925396400 - - @@ -124,8 +118,6 @@ DEAL:3d::Checksum: 1537540822 - - @@ -163,8 +155,6 @@ DEAL:3d::Checksum: 1304691596 - - @@ -202,8 +192,6 @@ DEAL:3d::Checksum: 2660631649 - - @@ -241,8 +229,6 @@ DEAL:3d::Checksum: 2875720905 - - @@ -280,8 +266,6 @@ DEAL:3d::Checksum: 3630367993 - - @@ -319,8 +303,6 @@ DEAL:3d::Checksum: 2062748577 - - diff --git a/tests/distributed_grids/3d_refinement_03.debug.output b/tests/distributed_grids/3d_refinement_03.debug.output index 73f2b46bad..e59173d51d 100644 --- 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 - - diff --git a/tests/distributed_grids/codim_01.debug.output b/tests/distributed_grids/codim_01.debug.output index 60e4f04890..52837ae194 100644 --- 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 - - diff --git a/tests/mpi/codim_01.mpirun=3.debug.output b/tests/mpi/codim_01.mpirun=3.debug.output index 63b0ba3d1d..2d2a5a9ba1 100644 --- 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 - - diff --git a/tests/normalize.pl b/tests/normalize.pl index 343937dfc4..c35aca2630 100644 --- 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 **** +# +# +# +# ! +# ! +# +# +# +# +# --- 6,15 ---- +# +# +# +# ! +# +# + +# + +# +# +# +# +# To deal with these issues, we simply delete these lines +s/.*