From: bangerth Date: Thu, 8 Feb 2007 21:39:10 +0000 (+0000) Subject: Implement a version indicator for the intermediate format. X-Git-Url: https://gitweb.dealii.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=0ce358b1a518e9ba770a646832792198902f22c7;p=dealii-svn.git Implement a version indicator for the intermediate format. git-svn-id: https://svn.dealii.org/trunk@14426 0785d39b-7218-0410-832d-ea1e28bc413d --- diff --git a/deal.II/base/include/base/data_out_base.h b/deal.II/base/include/base/data_out_base.h index b8cc312142..3003469eae 100644 --- a/deal.II/base/include/base/data_out_base.h +++ b/deal.II/base/include/base/data_out_base.h @@ -1234,6 +1234,20 @@ class DataOutBase */ struct Deal_II_IntermediateFlags { + /** + * An indicator of the + * currect file format + * version used to write + * intermediate format. We do + * not attempt to be backward + * compatible, so this number + * is used only to verify + * that the format we are + * writing is what the + * current readers and + * writers understand. + */ + static const unsigned int format_version = 2; private: /** * Dummy entry to suppress compiler diff --git a/deal.II/base/source/data_out_base.cc b/deal.II/base/source/data_out_base.cc index 4b83c442c5..5df8eb3e9f 100644 --- a/deal.II/base/source/data_out_base.cc +++ b/deal.II/base/source/data_out_base.cc @@ -158,7 +158,7 @@ compute_node( //TODO: Should this go to the utilities namespace? // Compute n^dim, where dim is a template parameter -template +template inline unsigned int template_power (const unsigned int n) { @@ -204,6 +204,8 @@ compute_sizes(const std::vector >& patches, template const unsigned int DataOutBase::Patch::space_dim; +const unsigned int DataOutBase::Deal_II_IntermediateFlags::format_version; + template @@ -3455,7 +3457,8 @@ write_deal_II_intermediate (const std::vector > &patches, // then write a header out << "[deal.II intermediate format graphics data]" << '\n' - << "[written by " << DEAL_II_PACKAGE_STRING << "]" << '\n'; + << "[written by " << DEAL_II_PACKAGE_STRING << "]" << '\n' + << "[Version: " << Deal_II_IntermediateFlags::format_version << "]" << '\n'; out << data_names.size() << '\n'; for (unsigned int i=0; i::read (std::istream &in) tmp.swap (dataset_names); } - // then check that we have the correct - // header of this file. both the first and - // second real lines have to match, as well - // as the dimension information written - // before that + // then check that we have the + // correct header of this + // file. both the first and second + // real lines have to match, as + // well as the dimension + // information written before that + // and the Version information + // written in the third line { std::pair dimension_info @@ -3976,6 +3982,18 @@ DataOutReader::read (std::istream &in) Assert (header == s.str(), ExcUnexpectedInput(s.str(),header)); } + { + std::string header; + getline (in, header); + + std::ostringstream s; + s << "[Version: " << DataOutBase::Deal_II_IntermediateFlags::format_version << "]"; + + Assert (header == s.str(), + ExcMessage("Invalid or incompatible file format. Intermediate format " + "files can only be read by the same deal.II version as they " + "are written by.")); + } // then read the rest of the data unsigned int n_datasets; diff --git a/deal.II/doc/news/changes.html b/deal.II/doc/news/changes.html index 8b89ff1245..836eb3a794 100644 --- a/deal.II/doc/news/changes.html +++ b/deal.II/doc/news/changes.html @@ -397,6 +397,16 @@ inconvenience this causes.

base

    +
  1. New: The deal.II intermediate format has been + changed. Since files in this format are only meant to be + processed by exactly the same version of deal.II, this should + be of no concern to users. However, this restriction was + previously undocumented, even if implied. The documentation for + this has now been updated. +
    + (WB 2007/02/08) +

    +
  2. New: The new Functions::Monomial class implements monomials as a function object.
    diff --git a/tests/base/data_out_base/cmp/generic b/tests/base/data_out_base/cmp/generic index 7dfe730d8f..6812241220 100644 --- a/tests/base/data_out_base/cmp/generic +++ b/tests/base/data_out_base/cmp/generic @@ -156,6 +156,7 @@ Writing deal_II_intermediate dimensions 1,2 1 2 [deal.II intermediate format graphics data] [written by deal.II 5.3.pre] +[Version: 2] 2 first name last name @@ -1258,6 +1259,7 @@ Writing deal_II_intermediate dimensions 2,2 2 2 [deal.II intermediate format graphics data] [written by deal.II 5.3.pre] +[Version: 2] 2 first name last name @@ -2046,6 +2048,7 @@ Writing deal_II_intermediate dimensions 2,3 2 3 [deal.II intermediate format graphics data] [written by deal.II 5.3.pre] +[Version: 2] 2 first name last name @@ -10410,6 +10413,7 @@ Writing deal_II_intermediate dimensions 3,3 3 3 [deal.II intermediate format graphics data] [written by deal.II 5.3.pre] +[Version: 2] 2 first name last name diff --git a/tests/base/data_out_base/cmp/x86_64-unknown-linux-gnu+gcc3.3 b/tests/base/data_out_base/cmp/x86_64-unknown-linux-gnu+gcc3.3 index 7dfe730d8f..6812241220 100644 --- a/tests/base/data_out_base/cmp/x86_64-unknown-linux-gnu+gcc3.3 +++ b/tests/base/data_out_base/cmp/x86_64-unknown-linux-gnu+gcc3.3 @@ -156,6 +156,7 @@ Writing deal_II_intermediate dimensions 1,2 1 2 [deal.II intermediate format graphics data] [written by deal.II 5.3.pre] +[Version: 2] 2 first name last name @@ -1258,6 +1259,7 @@ Writing deal_II_intermediate dimensions 2,2 2 2 [deal.II intermediate format graphics data] [written by deal.II 5.3.pre] +[Version: 2] 2 first name last name @@ -2046,6 +2048,7 @@ Writing deal_II_intermediate dimensions 2,3 2 3 [deal.II intermediate format graphics data] [written by deal.II 5.3.pre] +[Version: 2] 2 first name last name @@ -10410,6 +10413,7 @@ Writing deal_II_intermediate dimensions 3,3 3 3 [deal.II intermediate format graphics data] [written by deal.II 5.3.pre] +[Version: 2] 2 first name last name diff --git a/tests/bits/data_out_01/cmp/generic b/tests/bits/data_out_01/cmp/generic index fcc5ccdc84..bfc9397598 100644 --- a/tests/bits/data_out_01/cmp/generic +++ b/tests/bits/data_out_01/cmp/generic @@ -158,6 +158,7 @@ LOOKUP_TABLE default 1 1 [deal.II intermediate format graphics data] [written by deal.II 5.3.pre] +[Version: 2] 2 node_data cell_data @@ -615,6 +616,7 @@ LOOKUP_TABLE default 2 2 [deal.II intermediate format graphics data] [written by deal.II 5.3.pre] +[Version: 2] 2 node_data cell_data @@ -2904,6 +2906,7 @@ LOOKUP_TABLE default 3 3 [deal.II intermediate format graphics data] [written by deal.II 5.3.pre] +[Version: 2] 2 node_data cell_data @@ -3203,6 +3206,7 @@ LOOKUP_TABLE default 1 1 [deal.II intermediate format graphics data] [written by deal.II 5.3.pre] +[Version: 2] 2 node_data cell_data @@ -3660,6 +3664,7 @@ LOOKUP_TABLE default 2 2 [deal.II intermediate format graphics data] [written by deal.II 5.3.pre] +[Version: 2] 2 node_data cell_data @@ -5949,6 +5954,7 @@ LOOKUP_TABLE default 3 3 [deal.II intermediate format graphics data] [written by deal.II 5.3.pre] +[Version: 2] 2 node_data cell_data @@ -6248,6 +6254,7 @@ LOOKUP_TABLE default 1 1 [deal.II intermediate format graphics data] [written by deal.II 5.3.pre] +[Version: 2] 2 node_data cell_data @@ -6705,6 +6712,7 @@ LOOKUP_TABLE default 2 2 [deal.II intermediate format graphics data] [written by deal.II 5.3.pre] +[Version: 2] 2 node_data cell_data @@ -8994,6 +9002,7 @@ LOOKUP_TABLE default 3 3 [deal.II intermediate format graphics data] [written by deal.II 5.3.pre] +[Version: 2] 2 node_data cell_data @@ -9293,6 +9302,7 @@ LOOKUP_TABLE default 1 1 [deal.II intermediate format graphics data] [written by deal.II 5.3.pre] +[Version: 2] 2 node_data cell_data @@ -9750,6 +9760,7 @@ LOOKUP_TABLE default 2 2 [deal.II intermediate format graphics data] [written by deal.II 5.3.pre] +[Version: 2] 2 node_data cell_data @@ -12039,6 +12050,7 @@ LOOKUP_TABLE default 3 3 [deal.II intermediate format graphics data] [written by deal.II 5.3.pre] +[Version: 2] 2 node_data cell_data @@ -12338,6 +12350,7 @@ LOOKUP_TABLE default 1 1 [deal.II intermediate format graphics data] [written by deal.II 5.3.pre] +[Version: 2] 2 node_data cell_data @@ -12795,6 +12808,7 @@ LOOKUP_TABLE default 2 2 [deal.II intermediate format graphics data] [written by deal.II 5.3.pre] +[Version: 2] 2 node_data cell_data @@ -15084,6 +15098,7 @@ LOOKUP_TABLE default 3 3 [deal.II intermediate format graphics data] [written by deal.II 5.3.pre] +[Version: 2] 2 node_data cell_data @@ -15383,6 +15398,7 @@ LOOKUP_TABLE default 1 1 [deal.II intermediate format graphics data] [written by deal.II 5.3.pre] +[Version: 2] 2 node_data cell_data @@ -15840,6 +15856,7 @@ LOOKUP_TABLE default 2 2 [deal.II intermediate format graphics data] [written by deal.II 5.3.pre] +[Version: 2] 2 node_data cell_data @@ -18129,6 +18146,7 @@ LOOKUP_TABLE default 3 3 [deal.II intermediate format graphics data] [written by deal.II 5.3.pre] +[Version: 2] 2 node_data cell_data @@ -18730,6 +18748,7 @@ LOOKUP_TABLE default 2 2 [deal.II intermediate format graphics data] [written by deal.II 5.3.pre] +[Version: 2] 3 node_data_0 node_data_1 @@ -21276,6 +21295,7 @@ LOOKUP_TABLE default 3 3 [deal.II intermediate format graphics data] [written by deal.II 5.3.pre] +[Version: 2] 4 node_data_0 node_data_1 diff --git a/tests/bits/data_out_02/cmp/generic b/tests/bits/data_out_02/cmp/generic index fcc5ccdc84..bfc9397598 100644 --- a/tests/bits/data_out_02/cmp/generic +++ b/tests/bits/data_out_02/cmp/generic @@ -158,6 +158,7 @@ LOOKUP_TABLE default 1 1 [deal.II intermediate format graphics data] [written by deal.II 5.3.pre] +[Version: 2] 2 node_data cell_data @@ -615,6 +616,7 @@ LOOKUP_TABLE default 2 2 [deal.II intermediate format graphics data] [written by deal.II 5.3.pre] +[Version: 2] 2 node_data cell_data @@ -2904,6 +2906,7 @@ LOOKUP_TABLE default 3 3 [deal.II intermediate format graphics data] [written by deal.II 5.3.pre] +[Version: 2] 2 node_data cell_data @@ -3203,6 +3206,7 @@ LOOKUP_TABLE default 1 1 [deal.II intermediate format graphics data] [written by deal.II 5.3.pre] +[Version: 2] 2 node_data cell_data @@ -3660,6 +3664,7 @@ LOOKUP_TABLE default 2 2 [deal.II intermediate format graphics data] [written by deal.II 5.3.pre] +[Version: 2] 2 node_data cell_data @@ -5949,6 +5954,7 @@ LOOKUP_TABLE default 3 3 [deal.II intermediate format graphics data] [written by deal.II 5.3.pre] +[Version: 2] 2 node_data cell_data @@ -6248,6 +6254,7 @@ LOOKUP_TABLE default 1 1 [deal.II intermediate format graphics data] [written by deal.II 5.3.pre] +[Version: 2] 2 node_data cell_data @@ -6705,6 +6712,7 @@ LOOKUP_TABLE default 2 2 [deal.II intermediate format graphics data] [written by deal.II 5.3.pre] +[Version: 2] 2 node_data cell_data @@ -8994,6 +9002,7 @@ LOOKUP_TABLE default 3 3 [deal.II intermediate format graphics data] [written by deal.II 5.3.pre] +[Version: 2] 2 node_data cell_data @@ -9293,6 +9302,7 @@ LOOKUP_TABLE default 1 1 [deal.II intermediate format graphics data] [written by deal.II 5.3.pre] +[Version: 2] 2 node_data cell_data @@ -9750,6 +9760,7 @@ LOOKUP_TABLE default 2 2 [deal.II intermediate format graphics data] [written by deal.II 5.3.pre] +[Version: 2] 2 node_data cell_data @@ -12039,6 +12050,7 @@ LOOKUP_TABLE default 3 3 [deal.II intermediate format graphics data] [written by deal.II 5.3.pre] +[Version: 2] 2 node_data cell_data @@ -12338,6 +12350,7 @@ LOOKUP_TABLE default 1 1 [deal.II intermediate format graphics data] [written by deal.II 5.3.pre] +[Version: 2] 2 node_data cell_data @@ -12795,6 +12808,7 @@ LOOKUP_TABLE default 2 2 [deal.II intermediate format graphics data] [written by deal.II 5.3.pre] +[Version: 2] 2 node_data cell_data @@ -15084,6 +15098,7 @@ LOOKUP_TABLE default 3 3 [deal.II intermediate format graphics data] [written by deal.II 5.3.pre] +[Version: 2] 2 node_data cell_data @@ -15383,6 +15398,7 @@ LOOKUP_TABLE default 1 1 [deal.II intermediate format graphics data] [written by deal.II 5.3.pre] +[Version: 2] 2 node_data cell_data @@ -15840,6 +15856,7 @@ LOOKUP_TABLE default 2 2 [deal.II intermediate format graphics data] [written by deal.II 5.3.pre] +[Version: 2] 2 node_data cell_data @@ -18129,6 +18146,7 @@ LOOKUP_TABLE default 3 3 [deal.II intermediate format graphics data] [written by deal.II 5.3.pre] +[Version: 2] 2 node_data cell_data @@ -18730,6 +18748,7 @@ LOOKUP_TABLE default 2 2 [deal.II intermediate format graphics data] [written by deal.II 5.3.pre] +[Version: 2] 3 node_data_0 node_data_1 @@ -21276,6 +21295,7 @@ LOOKUP_TABLE default 3 3 [deal.II intermediate format graphics data] [written by deal.II 5.3.pre] +[Version: 2] 4 node_data_0 node_data_1 diff --git a/tests/bits/data_out_faces_01/cmp/generic b/tests/bits/data_out_faces_01/cmp/generic index e5c4b8ef31..c8337ff53d 100644 --- a/tests/bits/data_out_faces_01/cmp/generic +++ b/tests/bits/data_out_faces_01/cmp/generic @@ -362,6 +362,7 @@ LOOKUP_TABLE default 1 2 [deal.II intermediate format graphics data] [written by deal.II 5.3.pre] +[Version: 2] 2 node_data cell_data @@ -2289,6 +2290,7 @@ LOOKUP_TABLE default 2 3 [deal.II intermediate format graphics data] [written by deal.II 5.3.pre] +[Version: 2] 2 node_data cell_data @@ -2954,6 +2956,7 @@ LOOKUP_TABLE default 1 2 [deal.II intermediate format graphics data] [written by deal.II 5.3.pre] +[Version: 2] 2 node_data cell_data @@ -4881,6 +4884,7 @@ LOOKUP_TABLE default 2 3 [deal.II intermediate format graphics data] [written by deal.II 5.3.pre] +[Version: 2] 2 node_data cell_data @@ -5546,6 +5550,7 @@ LOOKUP_TABLE default 1 2 [deal.II intermediate format graphics data] [written by deal.II 5.3.pre] +[Version: 2] 2 node_data cell_data @@ -7473,6 +7478,7 @@ LOOKUP_TABLE default 2 3 [deal.II intermediate format graphics data] [written by deal.II 5.3.pre] +[Version: 2] 2 node_data cell_data @@ -8138,6 +8144,7 @@ LOOKUP_TABLE default 1 2 [deal.II intermediate format graphics data] [written by deal.II 5.3.pre] +[Version: 2] 2 node_data cell_data @@ -10065,6 +10072,7 @@ LOOKUP_TABLE default 2 3 [deal.II intermediate format graphics data] [written by deal.II 5.3.pre] +[Version: 2] 2 node_data cell_data @@ -10730,6 +10738,7 @@ LOOKUP_TABLE default 1 2 [deal.II intermediate format graphics data] [written by deal.II 5.3.pre] +[Version: 2] 2 node_data cell_data @@ -12657,6 +12666,7 @@ LOOKUP_TABLE default 2 3 [deal.II intermediate format graphics data] [written by deal.II 5.3.pre] +[Version: 2] 2 node_data cell_data @@ -13322,6 +13332,7 @@ LOOKUP_TABLE default 1 2 [deal.II intermediate format graphics data] [written by deal.II 5.3.pre] +[Version: 2] 2 node_data cell_data @@ -15249,6 +15260,7 @@ LOOKUP_TABLE default 2 3 [deal.II intermediate format graphics data] [written by deal.II 5.3.pre] +[Version: 2] 2 node_data cell_data @@ -15941,6 +15953,7 @@ LOOKUP_TABLE default 1 2 [deal.II intermediate format graphics data] [written by deal.II 5.3.pre] +[Version: 2] 3 node_data_0 node_data_1 @@ -18149,6 +18162,7 @@ LOOKUP_TABLE default 2 3 [deal.II intermediate format graphics data] [written by deal.II 5.3.pre] +[Version: 2] 4 node_data_0 node_data_1 diff --git a/tests/bits/data_out_faces_02/cmp/generic b/tests/bits/data_out_faces_02/cmp/generic index e5c4b8ef31..c8337ff53d 100644 --- a/tests/bits/data_out_faces_02/cmp/generic +++ b/tests/bits/data_out_faces_02/cmp/generic @@ -362,6 +362,7 @@ LOOKUP_TABLE default 1 2 [deal.II intermediate format graphics data] [written by deal.II 5.3.pre] +[Version: 2] 2 node_data cell_data @@ -2289,6 +2290,7 @@ LOOKUP_TABLE default 2 3 [deal.II intermediate format graphics data] [written by deal.II 5.3.pre] +[Version: 2] 2 node_data cell_data @@ -2954,6 +2956,7 @@ LOOKUP_TABLE default 1 2 [deal.II intermediate format graphics data] [written by deal.II 5.3.pre] +[Version: 2] 2 node_data cell_data @@ -4881,6 +4884,7 @@ LOOKUP_TABLE default 2 3 [deal.II intermediate format graphics data] [written by deal.II 5.3.pre] +[Version: 2] 2 node_data cell_data @@ -5546,6 +5550,7 @@ LOOKUP_TABLE default 1 2 [deal.II intermediate format graphics data] [written by deal.II 5.3.pre] +[Version: 2] 2 node_data cell_data @@ -7473,6 +7478,7 @@ LOOKUP_TABLE default 2 3 [deal.II intermediate format graphics data] [written by deal.II 5.3.pre] +[Version: 2] 2 node_data cell_data @@ -8138,6 +8144,7 @@ LOOKUP_TABLE default 1 2 [deal.II intermediate format graphics data] [written by deal.II 5.3.pre] +[Version: 2] 2 node_data cell_data @@ -10065,6 +10072,7 @@ LOOKUP_TABLE default 2 3 [deal.II intermediate format graphics data] [written by deal.II 5.3.pre] +[Version: 2] 2 node_data cell_data @@ -10730,6 +10738,7 @@ LOOKUP_TABLE default 1 2 [deal.II intermediate format graphics data] [written by deal.II 5.3.pre] +[Version: 2] 2 node_data cell_data @@ -12657,6 +12666,7 @@ LOOKUP_TABLE default 2 3 [deal.II intermediate format graphics data] [written by deal.II 5.3.pre] +[Version: 2] 2 node_data cell_data @@ -13322,6 +13332,7 @@ LOOKUP_TABLE default 1 2 [deal.II intermediate format graphics data] [written by deal.II 5.3.pre] +[Version: 2] 2 node_data cell_data @@ -15249,6 +15260,7 @@ LOOKUP_TABLE default 2 3 [deal.II intermediate format graphics data] [written by deal.II 5.3.pre] +[Version: 2] 2 node_data cell_data @@ -15941,6 +15953,7 @@ LOOKUP_TABLE default 1 2 [deal.II intermediate format graphics data] [written by deal.II 5.3.pre] +[Version: 2] 3 node_data_0 node_data_1 @@ -18149,6 +18162,7 @@ LOOKUP_TABLE default 2 3 [deal.II intermediate format graphics data] [written by deal.II 5.3.pre] +[Version: 2] 4 node_data_0 node_data_1 diff --git a/tests/bits/data_out_rotation_01/cmp/generic b/tests/bits/data_out_rotation_01/cmp/generic index fa5afd7ab8..72856b5b92 100644 --- a/tests/bits/data_out_rotation_01/cmp/generic +++ b/tests/bits/data_out_rotation_01/cmp/generic @@ -669,6 +669,7 @@ LOOKUP_TABLE default 2 2 [deal.II intermediate format graphics data] [written by deal.II 5.3.pre] +[Version: 2] 2 node_data cell_data @@ -4795,6 +4796,7 @@ LOOKUP_TABLE default 3 3 [deal.II intermediate format graphics data] [written by deal.II 5.3.pre] +[Version: 2] 2 node_data cell_data @@ -5723,6 +5725,7 @@ LOOKUP_TABLE default 2 2 [deal.II intermediate format graphics data] [written by deal.II 5.3.pre] +[Version: 2] 2 node_data cell_data @@ -9849,6 +9852,7 @@ LOOKUP_TABLE default 3 3 [deal.II intermediate format graphics data] [written by deal.II 5.3.pre] +[Version: 2] 2 node_data cell_data @@ -10777,6 +10781,7 @@ LOOKUP_TABLE default 2 2 [deal.II intermediate format graphics data] [written by deal.II 5.3.pre] +[Version: 2] 2 node_data cell_data @@ -14903,6 +14908,7 @@ LOOKUP_TABLE default 3 3 [deal.II intermediate format graphics data] [written by deal.II 5.3.pre] +[Version: 2] 2 node_data cell_data @@ -15831,6 +15837,7 @@ LOOKUP_TABLE default 2 2 [deal.II intermediate format graphics data] [written by deal.II 5.3.pre] +[Version: 2] 2 node_data cell_data @@ -19957,6 +19964,7 @@ LOOKUP_TABLE default 3 3 [deal.II intermediate format graphics data] [written by deal.II 5.3.pre] +[Version: 2] 2 node_data cell_data @@ -20885,6 +20893,7 @@ LOOKUP_TABLE default 2 2 [deal.II intermediate format graphics data] [written by deal.II 5.3.pre] +[Version: 2] 2 node_data cell_data @@ -25011,6 +25020,7 @@ LOOKUP_TABLE default 3 3 [deal.II intermediate format graphics data] [written by deal.II 5.3.pre] +[Version: 2] 2 node_data cell_data @@ -25939,6 +25949,7 @@ LOOKUP_TABLE default 2 2 [deal.II intermediate format graphics data] [written by deal.II 5.3.pre] +[Version: 2] 2 node_data cell_data @@ -30065,6 +30076,7 @@ LOOKUP_TABLE default 3 3 [deal.II intermediate format graphics data] [written by deal.II 5.3.pre] +[Version: 2] 2 node_data cell_data @@ -34390,6 +34402,7 @@ LOOKUP_TABLE default 3 3 [deal.II intermediate format graphics data] [written by deal.II 5.3.pre] +[Version: 2] 3 node_data_0 node_data_1 diff --git a/tests/bits/data_out_rotation_01/cmp/i686-pc-linux-gnu+gcc4.0 b/tests/bits/data_out_rotation_01/cmp/i686-pc-linux-gnu+gcc4.0 index 1a27ff8235..66fbab4487 100644 --- a/tests/bits/data_out_rotation_01/cmp/i686-pc-linux-gnu+gcc4.0 +++ b/tests/bits/data_out_rotation_01/cmp/i686-pc-linux-gnu+gcc4.0 @@ -669,6 +669,7 @@ LOOKUP_TABLE default 2 2 [deal.II intermediate format graphics data] [written by deal.II 5.3.pre] +[Version: 2] 2 node_data cell_data @@ -4795,6 +4796,7 @@ LOOKUP_TABLE default 3 3 [deal.II intermediate format graphics data] [written by deal.II 5.3.pre] +[Version: 2] 2 node_data cell_data @@ -5723,6 +5725,7 @@ LOOKUP_TABLE default 2 2 [deal.II intermediate format graphics data] [written by deal.II 5.3.pre] +[Version: 2] 2 node_data cell_data @@ -9849,6 +9852,7 @@ LOOKUP_TABLE default 3 3 [deal.II intermediate format graphics data] [written by deal.II 5.3.pre] +[Version: 2] 2 node_data cell_data @@ -10777,6 +10781,7 @@ LOOKUP_TABLE default 2 2 [deal.II intermediate format graphics data] [written by deal.II 5.3.pre] +[Version: 2] 2 node_data cell_data @@ -14903,6 +14908,7 @@ LOOKUP_TABLE default 3 3 [deal.II intermediate format graphics data] [written by deal.II 5.3.pre] +[Version: 2] 2 node_data cell_data @@ -15831,6 +15837,7 @@ LOOKUP_TABLE default 2 2 [deal.II intermediate format graphics data] [written by deal.II 5.3.pre] +[Version: 2] 2 node_data cell_data @@ -19957,6 +19964,7 @@ LOOKUP_TABLE default 3 3 [deal.II intermediate format graphics data] [written by deal.II 5.3.pre] +[Version: 2] 2 node_data cell_data @@ -20885,6 +20893,7 @@ LOOKUP_TABLE default 2 2 [deal.II intermediate format graphics data] [written by deal.II 5.3.pre] +[Version: 2] 2 node_data cell_data @@ -25011,6 +25020,7 @@ LOOKUP_TABLE default 3 3 [deal.II intermediate format graphics data] [written by deal.II 5.3.pre] +[Version: 2] 2 node_data cell_data @@ -25939,6 +25949,7 @@ LOOKUP_TABLE default 2 2 [deal.II intermediate format graphics data] [written by deal.II 5.3.pre] +[Version: 2] 2 node_data cell_data @@ -30065,6 +30076,7 @@ LOOKUP_TABLE default 3 3 [deal.II intermediate format graphics data] [written by deal.II 5.3.pre] +[Version: 2] 2 node_data cell_data @@ -34390,6 +34402,7 @@ LOOKUP_TABLE default 3 3 [deal.II intermediate format graphics data] [written by deal.II 5.3.pre] +[Version: 2] 3 node_data_0 node_data_1 diff --git a/tests/bits/data_out_rotation_01/cmp/powerpc-apple-darwin8.8.0+gcc4.0 b/tests/bits/data_out_rotation_01/cmp/powerpc-apple-darwin8.8.0+gcc4.0 index 19f344c4ff..cc3cc3861a 100644 --- a/tests/bits/data_out_rotation_01/cmp/powerpc-apple-darwin8.8.0+gcc4.0 +++ b/tests/bits/data_out_rotation_01/cmp/powerpc-apple-darwin8.8.0+gcc4.0 @@ -669,6 +669,7 @@ LOOKUP_TABLE default 2 2 [deal.II intermediate format graphics data] [written by deal.II 5.3.pre] +[Version: 2] 2 node_data cell_data @@ -4783,6 +4784,7 @@ LOOKUP_TABLE default 3 3 [deal.II intermediate format graphics data] [written by deal.II 5.3.pre] +[Version: 2] 2 node_data cell_data @@ -5683,6 +5685,7 @@ LOOKUP_TABLE default 2 2 [deal.II intermediate format graphics data] [written by deal.II 5.3.pre] +[Version: 2] 2 node_data cell_data @@ -9797,6 +9800,7 @@ LOOKUP_TABLE default 3 3 [deal.II intermediate format graphics data] [written by deal.II 5.3.pre] +[Version: 2] 2 node_data cell_data @@ -10697,6 +10701,7 @@ LOOKUP_TABLE default 2 2 [deal.II intermediate format graphics data] [written by deal.II 5.3.pre] +[Version: 2] 2 node_data cell_data @@ -14811,6 +14816,7 @@ LOOKUP_TABLE default 3 3 [deal.II intermediate format graphics data] [written by deal.II 5.3.pre] +[Version: 2] 2 node_data cell_data @@ -15711,6 +15717,7 @@ LOOKUP_TABLE default 2 2 [deal.II intermediate format graphics data] [written by deal.II 5.3.pre] +[Version: 2] 2 node_data cell_data @@ -19825,6 +19832,7 @@ LOOKUP_TABLE default 3 3 [deal.II intermediate format graphics data] [written by deal.II 5.3.pre] +[Version: 2] 2 node_data cell_data @@ -20725,6 +20733,7 @@ LOOKUP_TABLE default 2 2 [deal.II intermediate format graphics data] [written by deal.II 5.3.pre] +[Version: 2] 2 node_data cell_data @@ -24839,6 +24848,7 @@ LOOKUP_TABLE default 3 3 [deal.II intermediate format graphics data] [written by deal.II 5.3.pre] +[Version: 2] 2 node_data cell_data @@ -25739,6 +25749,7 @@ LOOKUP_TABLE default 2 2 [deal.II intermediate format graphics data] [written by deal.II 5.3.pre] +[Version: 2] 2 node_data cell_data @@ -29853,6 +29864,7 @@ LOOKUP_TABLE default 3 3 [deal.II intermediate format graphics data] [written by deal.II 5.3.pre] +[Version: 2] 2 node_data cell_data @@ -34150,6 +34162,7 @@ LOOKUP_TABLE default 3 3 [deal.II intermediate format graphics data] [written by deal.II 5.3.pre] +[Version: 2] 3 node_data_0 node_data_1 diff --git a/tests/bits/data_out_rotation_01/cmp/x86_64-unknown-linux-gnu+gcc3.3 b/tests/bits/data_out_rotation_01/cmp/x86_64-unknown-linux-gnu+gcc3.3 index 3d272ad7ad..8d48721c5a 100644 --- a/tests/bits/data_out_rotation_01/cmp/x86_64-unknown-linux-gnu+gcc3.3 +++ b/tests/bits/data_out_rotation_01/cmp/x86_64-unknown-linux-gnu+gcc3.3 @@ -669,6 +669,7 @@ LOOKUP_TABLE default 2 2 [deal.II intermediate format graphics data] [written by deal.II 5.3.pre] +[Version: 2] 2 node_data cell_data @@ -4795,6 +4796,7 @@ LOOKUP_TABLE default 3 3 [deal.II intermediate format graphics data] [written by deal.II 5.3.pre] +[Version: 2] 2 node_data cell_data @@ -5723,6 +5725,7 @@ LOOKUP_TABLE default 2 2 [deal.II intermediate format graphics data] [written by deal.II 5.3.pre] +[Version: 2] 2 node_data cell_data @@ -9849,6 +9852,7 @@ LOOKUP_TABLE default 3 3 [deal.II intermediate format graphics data] [written by deal.II 5.3.pre] +[Version: 2] 2 node_data cell_data @@ -10777,6 +10781,7 @@ LOOKUP_TABLE default 2 2 [deal.II intermediate format graphics data] [written by deal.II 5.3.pre] +[Version: 2] 2 node_data cell_data @@ -14903,6 +14908,7 @@ LOOKUP_TABLE default 3 3 [deal.II intermediate format graphics data] [written by deal.II 5.3.pre] +[Version: 2] 2 node_data cell_data @@ -15831,6 +15837,7 @@ LOOKUP_TABLE default 2 2 [deal.II intermediate format graphics data] [written by deal.II 5.3.pre] +[Version: 2] 2 node_data cell_data @@ -19957,6 +19964,7 @@ LOOKUP_TABLE default 3 3 [deal.II intermediate format graphics data] [written by deal.II 5.3.pre] +[Version: 2] 2 node_data cell_data @@ -20885,6 +20893,7 @@ LOOKUP_TABLE default 2 2 [deal.II intermediate format graphics data] [written by deal.II 5.3.pre] +[Version: 2] 2 node_data cell_data @@ -25011,6 +25020,7 @@ LOOKUP_TABLE default 3 3 [deal.II intermediate format graphics data] [written by deal.II 5.3.pre] +[Version: 2] 2 node_data cell_data @@ -25939,6 +25949,7 @@ LOOKUP_TABLE default 2 2 [deal.II intermediate format graphics data] [written by deal.II 5.3.pre] +[Version: 2] 2 node_data cell_data @@ -30065,6 +30076,7 @@ LOOKUP_TABLE default 3 3 [deal.II intermediate format graphics data] [written by deal.II 5.3.pre] +[Version: 2] 2 node_data cell_data @@ -34390,6 +34402,7 @@ LOOKUP_TABLE default 3 3 [deal.II intermediate format graphics data] [written by deal.II 5.3.pre] +[Version: 2] 3 node_data_0 node_data_1 diff --git a/tests/bits/data_out_rotation_02/cmp/generic b/tests/bits/data_out_rotation_02/cmp/generic index 53a4155591..1b139c642d 100644 --- a/tests/bits/data_out_rotation_02/cmp/generic +++ b/tests/bits/data_out_rotation_02/cmp/generic @@ -678,6 +678,7 @@ LOOKUP_TABLE default 2 2 [deal.II intermediate format graphics data] [written by deal.II 5.3.pre] +[Version: 2] 2 node_data cell_data @@ -4829,6 +4830,7 @@ LOOKUP_TABLE default 3 3 [deal.II intermediate format graphics data] [written by deal.II 5.3.pre] +[Version: 2] 2 node_data cell_data @@ -5766,6 +5768,7 @@ LOOKUP_TABLE default 2 2 [deal.II intermediate format graphics data] [written by deal.II 5.3.pre] +[Version: 2] 2 node_data cell_data @@ -9917,6 +9920,7 @@ LOOKUP_TABLE default 3 3 [deal.II intermediate format graphics data] [written by deal.II 5.3.pre] +[Version: 2] 2 node_data cell_data @@ -10854,6 +10858,7 @@ LOOKUP_TABLE default 2 2 [deal.II intermediate format graphics data] [written by deal.II 5.3.pre] +[Version: 2] 2 node_data cell_data @@ -15005,6 +15010,7 @@ LOOKUP_TABLE default 3 3 [deal.II intermediate format graphics data] [written by deal.II 5.3.pre] +[Version: 2] 2 node_data cell_data @@ -15942,6 +15948,7 @@ LOOKUP_TABLE default 2 2 [deal.II intermediate format graphics data] [written by deal.II 5.3.pre] +[Version: 2] 2 node_data cell_data @@ -20093,6 +20100,7 @@ LOOKUP_TABLE default 3 3 [deal.II intermediate format graphics data] [written by deal.II 5.3.pre] +[Version: 2] 2 node_data cell_data @@ -21030,6 +21038,7 @@ LOOKUP_TABLE default 2 2 [deal.II intermediate format graphics data] [written by deal.II 5.3.pre] +[Version: 2] 2 node_data cell_data @@ -25181,6 +25190,7 @@ LOOKUP_TABLE default 3 3 [deal.II intermediate format graphics data] [written by deal.II 5.3.pre] +[Version: 2] 2 node_data cell_data @@ -26118,6 +26128,7 @@ LOOKUP_TABLE default 2 2 [deal.II intermediate format graphics data] [written by deal.II 5.3.pre] +[Version: 2] 2 node_data cell_data @@ -30269,6 +30280,7 @@ LOOKUP_TABLE default 3 3 [deal.II intermediate format graphics data] [written by deal.II 5.3.pre] +[Version: 2] 2 node_data cell_data @@ -34619,6 +34631,7 @@ LOOKUP_TABLE default 3 3 [deal.II intermediate format graphics data] [written by deal.II 5.3.pre] +[Version: 2] 3 node_data_0 node_data_1 diff --git a/tests/bits/data_out_rotation_02/cmp/i686-pc-linux-gnu+gcc4.0 b/tests/bits/data_out_rotation_02/cmp/i686-pc-linux-gnu+gcc4.0 index 1a27ff8235..66fbab4487 100644 --- a/tests/bits/data_out_rotation_02/cmp/i686-pc-linux-gnu+gcc4.0 +++ b/tests/bits/data_out_rotation_02/cmp/i686-pc-linux-gnu+gcc4.0 @@ -669,6 +669,7 @@ LOOKUP_TABLE default 2 2 [deal.II intermediate format graphics data] [written by deal.II 5.3.pre] +[Version: 2] 2 node_data cell_data @@ -4795,6 +4796,7 @@ LOOKUP_TABLE default 3 3 [deal.II intermediate format graphics data] [written by deal.II 5.3.pre] +[Version: 2] 2 node_data cell_data @@ -5723,6 +5725,7 @@ LOOKUP_TABLE default 2 2 [deal.II intermediate format graphics data] [written by deal.II 5.3.pre] +[Version: 2] 2 node_data cell_data @@ -9849,6 +9852,7 @@ LOOKUP_TABLE default 3 3 [deal.II intermediate format graphics data] [written by deal.II 5.3.pre] +[Version: 2] 2 node_data cell_data @@ -10777,6 +10781,7 @@ LOOKUP_TABLE default 2 2 [deal.II intermediate format graphics data] [written by deal.II 5.3.pre] +[Version: 2] 2 node_data cell_data @@ -14903,6 +14908,7 @@ LOOKUP_TABLE default 3 3 [deal.II intermediate format graphics data] [written by deal.II 5.3.pre] +[Version: 2] 2 node_data cell_data @@ -15831,6 +15837,7 @@ LOOKUP_TABLE default 2 2 [deal.II intermediate format graphics data] [written by deal.II 5.3.pre] +[Version: 2] 2 node_data cell_data @@ -19957,6 +19964,7 @@ LOOKUP_TABLE default 3 3 [deal.II intermediate format graphics data] [written by deal.II 5.3.pre] +[Version: 2] 2 node_data cell_data @@ -20885,6 +20893,7 @@ LOOKUP_TABLE default 2 2 [deal.II intermediate format graphics data] [written by deal.II 5.3.pre] +[Version: 2] 2 node_data cell_data @@ -25011,6 +25020,7 @@ LOOKUP_TABLE default 3 3 [deal.II intermediate format graphics data] [written by deal.II 5.3.pre] +[Version: 2] 2 node_data cell_data @@ -25939,6 +25949,7 @@ LOOKUP_TABLE default 2 2 [deal.II intermediate format graphics data] [written by deal.II 5.3.pre] +[Version: 2] 2 node_data cell_data @@ -30065,6 +30076,7 @@ LOOKUP_TABLE default 3 3 [deal.II intermediate format graphics data] [written by deal.II 5.3.pre] +[Version: 2] 2 node_data cell_data @@ -34390,6 +34402,7 @@ LOOKUP_TABLE default 3 3 [deal.II intermediate format graphics data] [written by deal.II 5.3.pre] +[Version: 2] 3 node_data_0 node_data_1 diff --git a/tests/bits/data_out_rotation_02/cmp/x86_64-unknown-linux-gnu+gcc3.3 b/tests/bits/data_out_rotation_02/cmp/x86_64-unknown-linux-gnu+gcc3.3 index 3d272ad7ad..8d48721c5a 100644 --- a/tests/bits/data_out_rotation_02/cmp/x86_64-unknown-linux-gnu+gcc3.3 +++ b/tests/bits/data_out_rotation_02/cmp/x86_64-unknown-linux-gnu+gcc3.3 @@ -669,6 +669,7 @@ LOOKUP_TABLE default 2 2 [deal.II intermediate format graphics data] [written by deal.II 5.3.pre] +[Version: 2] 2 node_data cell_data @@ -4795,6 +4796,7 @@ LOOKUP_TABLE default 3 3 [deal.II intermediate format graphics data] [written by deal.II 5.3.pre] +[Version: 2] 2 node_data cell_data @@ -5723,6 +5725,7 @@ LOOKUP_TABLE default 2 2 [deal.II intermediate format graphics data] [written by deal.II 5.3.pre] +[Version: 2] 2 node_data cell_data @@ -9849,6 +9852,7 @@ LOOKUP_TABLE default 3 3 [deal.II intermediate format graphics data] [written by deal.II 5.3.pre] +[Version: 2] 2 node_data cell_data @@ -10777,6 +10781,7 @@ LOOKUP_TABLE default 2 2 [deal.II intermediate format graphics data] [written by deal.II 5.3.pre] +[Version: 2] 2 node_data cell_data @@ -14903,6 +14908,7 @@ LOOKUP_TABLE default 3 3 [deal.II intermediate format graphics data] [written by deal.II 5.3.pre] +[Version: 2] 2 node_data cell_data @@ -15831,6 +15837,7 @@ LOOKUP_TABLE default 2 2 [deal.II intermediate format graphics data] [written by deal.II 5.3.pre] +[Version: 2] 2 node_data cell_data @@ -19957,6 +19964,7 @@ LOOKUP_TABLE default 3 3 [deal.II intermediate format graphics data] [written by deal.II 5.3.pre] +[Version: 2] 2 node_data cell_data @@ -20885,6 +20893,7 @@ LOOKUP_TABLE default 2 2 [deal.II intermediate format graphics data] [written by deal.II 5.3.pre] +[Version: 2] 2 node_data cell_data @@ -25011,6 +25020,7 @@ LOOKUP_TABLE default 3 3 [deal.II intermediate format graphics data] [written by deal.II 5.3.pre] +[Version: 2] 2 node_data cell_data @@ -25939,6 +25949,7 @@ LOOKUP_TABLE default 2 2 [deal.II intermediate format graphics data] [written by deal.II 5.3.pre] +[Version: 2] 2 node_data cell_data @@ -30065,6 +30076,7 @@ LOOKUP_TABLE default 3 3 [deal.II intermediate format graphics data] [written by deal.II 5.3.pre] +[Version: 2] 2 node_data cell_data @@ -34390,6 +34402,7 @@ LOOKUP_TABLE default 3 3 [deal.II intermediate format graphics data] [written by deal.II 5.3.pre] +[Version: 2] 3 node_data_0 node_data_1 diff --git a/tests/bits/data_out_stack_01/cmp/generic b/tests/bits/data_out_stack_01/cmp/generic index eec90a0751..f5c03d2c82 100644 --- a/tests/bits/data_out_stack_01/cmp/generic +++ b/tests/bits/data_out_stack_01/cmp/generic @@ -375,6 +375,7 @@ LOOKUP_TABLE default 2 2 [deal.II intermediate format graphics data] [written by deal.II 5.3.pre] +[Version: 2] 2 node_data cell_data @@ -930,6 +931,7 @@ LOOKUP_TABLE default 2 2 [deal.II intermediate format graphics data] [written by deal.II 5.3.pre] +[Version: 2] 2 node_data cell_data @@ -1485,6 +1487,7 @@ LOOKUP_TABLE default 2 2 [deal.II intermediate format graphics data] [written by deal.II 5.3.pre] +[Version: 2] 2 node_data cell_data @@ -2040,6 +2043,7 @@ LOOKUP_TABLE default 2 2 [deal.II intermediate format graphics data] [written by deal.II 5.3.pre] +[Version: 2] 2 node_data cell_data @@ -2595,6 +2599,7 @@ LOOKUP_TABLE default 2 2 [deal.II intermediate format graphics data] [written by deal.II 5.3.pre] +[Version: 2] 2 node_data cell_data @@ -3150,6 +3155,7 @@ LOOKUP_TABLE default 2 2 [deal.II intermediate format graphics data] [written by deal.II 5.3.pre] +[Version: 2] 2 node_data cell_data diff --git a/tests/bits/data_out_stack_02/cmp/generic b/tests/bits/data_out_stack_02/cmp/generic index eec90a0751..f5c03d2c82 100644 --- a/tests/bits/data_out_stack_02/cmp/generic +++ b/tests/bits/data_out_stack_02/cmp/generic @@ -375,6 +375,7 @@ LOOKUP_TABLE default 2 2 [deal.II intermediate format graphics data] [written by deal.II 5.3.pre] +[Version: 2] 2 node_data cell_data @@ -930,6 +931,7 @@ LOOKUP_TABLE default 2 2 [deal.II intermediate format graphics data] [written by deal.II 5.3.pre] +[Version: 2] 2 node_data cell_data @@ -1485,6 +1487,7 @@ LOOKUP_TABLE default 2 2 [deal.II intermediate format graphics data] [written by deal.II 5.3.pre] +[Version: 2] 2 node_data cell_data @@ -2040,6 +2043,7 @@ LOOKUP_TABLE default 2 2 [deal.II intermediate format graphics data] [written by deal.II 5.3.pre] +[Version: 2] 2 node_data cell_data @@ -2595,6 +2599,7 @@ LOOKUP_TABLE default 2 2 [deal.II intermediate format graphics data] [written by deal.II 5.3.pre] +[Version: 2] 2 node_data cell_data @@ -3150,6 +3155,7 @@ LOOKUP_TABLE default 2 2 [deal.II intermediate format graphics data] [written by deal.II 5.3.pre] +[Version: 2] 2 node_data cell_data