fix tests to work with the four element tuple

diff --git a/tests/base/functions_04.cc b/tests/base/functions_04.cc
index bad8de546ec501f4fdf4e3fd0dc1610b085a35cb..27c018addbd364821b2fa460f9b9b4542c538c2c 100644 (file)
--- a/tests/base/functions_04.cc
+++ b/tests/base/functions_04.cc
@@ -185,9 +185,15 @@ check_function(const Functions::FlowFunction<dim> &f,
       names[i] = std::string("comp");
     }
 
-  DataOutBase::DXFlags                                             dxflags;
-  DataOutBase::GnuplotFlags                                        gflags;
-  std::vector<std::tuple<unsigned int, unsigned int, std::string>> vectors;
+  DataOutBase::DXFlags      dxflags;
+  DataOutBase::GnuplotFlags gflags;
+
+  std::vector<
+    std::tuple<unsigned int,
+               unsigned int,
+               std::string,
+               DataComponentInterpretation::DataComponentInterpretation>>
+    vectors;
   if (dim == 2)
     DataOutBase::write_gnuplot(patches, names, vectors, gflags, out);
   else

diff --git a/tests/data_out/data_out_04.cc b/tests/data_out/data_out_04.cc
index dc7da079cf355d0c4ebc90e6a1f18f89d39b1d20..4de04eafe4fa353da417537f7c878e37404cbb93 100644 (file)
--- a/tests/data_out/data_out_04.cc
+++ b/tests/data_out/data_out_04.cc
@@ -48,18 +48,32 @@ public:
     return DataOut<dim>::get_dataset_names();
   }
 
-  std::vector<std::tuple<unsigned int, unsigned int, std::string>>
-  get_vector_data_ranges() const
+  std::vector<
+    std::tuple<unsigned int,
+               unsigned int,
+               std::string,
+               DataComponentInterpretation::DataComponentInterpretation>>
+  get_nonscalar_data_ranges() const
   {
     // if we have enough components for a
     // vector solution, make the last dim
     // components a vector
-    std::vector<std::tuple<unsigned int, unsigned int, std::string>> retval;
+    std::vector<
+      std::tuple<unsigned int,
+                 unsigned int,
+                 std::string,
+                 DataComponentInterpretation::DataComponentInterpretation>>
+      retval;
     if (get_dataset_names().size() >= dim)
-      retval.push_back(std::tuple<unsigned int, unsigned int, std::string>(
-        get_dataset_names().size() - dim,
-        get_dataset_names().size() - 1,
-        "vector_data"));
+      retval.push_back(
+        std::tuple<unsigned int,
+                   unsigned int,
+                   std::string,
+                   DataComponentInterpretation::DataComponentInterpretation>(
+          get_dataset_names().size() - dim,
+          get_dataset_names().size() - 1,
+          "vector_data",
+          DataComponentInterpretation::component_is_part_of_vector));
     return retval;
   }
 };
@@ -82,10 +96,14 @@ public:
     return DataOutReader<dim>::get_dataset_names();
   }
 
-  std::vector<std::tuple<unsigned int, unsigned int, std::string>>
-  get_vector_data_ranges() const
+  std::vector<
+    std::tuple<unsigned int,
+               unsigned int,
+               std::string,
+               DataComponentInterpretation::DataComponentInterpretation>>
+  get_nonscalar_data_ranges() const
   {
-    return DataOutReader<dim>::get_vector_data_ranges();
+    return DataOutReader<dim>::get_nonscalar_data_ranges();
   }
 };
 
@@ -126,23 +144,24 @@ check_this(const DoFHandler<dim> &dof_handler,
     Assert(data_out.get_patches()[i] == reader.get_patches()[i],
            ExcInternalError());
 
-  deallog << data_out.get_vector_data_ranges().size() << std::endl;
-  Assert(data_out.get_vector_data_ranges().size() ==
-           reader.get_vector_data_ranges().size(),
+  deallog << data_out.get_nonscalar_data_ranges().size() << std::endl;
+  Assert(data_out.get_nonscalar_data_ranges().size() ==
+           reader.get_nonscalar_data_ranges().size(),
          ExcInternalError());
-  for (unsigned int i = 0; i < data_out.get_vector_data_ranges().size(); ++i)
+  for (unsigned int i = 0; i < data_out.get_nonscalar_data_ranges().size(); ++i)
     {
-      deallog << std::get<0>(data_out.get_vector_data_ranges()[i]) << ' '
-              << std::get<1>(data_out.get_vector_data_ranges()[i]) << ' '
-              << std::get<2>(data_out.get_vector_data_ranges()[i]) << std::endl;
-      Assert(std::get<0>(data_out.get_vector_data_ranges()[i]) ==
-               std::get<0>(reader.get_vector_data_ranges()[i]),
+      deallog << std::get<0>(data_out.get_nonscalar_data_ranges()[i]) << ' '
+              << std::get<1>(data_out.get_nonscalar_data_ranges()[i]) << ' '
+              << std::get<2>(data_out.get_nonscalar_data_ranges()[i])
+              << std::endl;
+      Assert(std::get<0>(data_out.get_nonscalar_data_ranges()[i]) ==
+               std::get<0>(reader.get_nonscalar_data_ranges()[i]),
              ExcInternalError());
-      Assert(std::get<1>(data_out.get_vector_data_ranges()[i]) ==
-               std::get<1>(reader.get_vector_data_ranges()[i]),
+      Assert(std::get<1>(data_out.get_nonscalar_data_ranges()[i]) ==
+               std::get<1>(reader.get_nonscalar_data_ranges()[i]),
              ExcInternalError());
-      Assert(std::get<2>(data_out.get_vector_data_ranges()[i]) ==
-               std::get<2>(reader.get_vector_data_ranges()[i]),
+      Assert(std::get<2>(data_out.get_nonscalar_data_ranges()[i]) ==
+               std::get<2>(reader.get_nonscalar_data_ranges()[i]),
              ExcInternalError());
     }
 

diff --git a/tests/data_out/data_out_base.cc b/tests/data_out/data_out_base.cc
index 8672b4f1f16c51231c54219520ce6a4705ba826e..6faa336a0cb9cc2fb81862ce0a54a09437ba1178 100644 (file)
--- a/tests/data_out/data_out_base.cc
+++ b/tests/data_out/data_out_base.cc
@@ -48,7 +48,12 @@ write_patches(const std::vector<DataOutBase::Patch<dim, spacedim>> &patches,
   DataOutBase::VtkFlags                  vtkflags;
   DataOutBase::Deal_II_IntermediateFlags deal_II_intermediateflags;
 
-  std::vector<std::tuple<unsigned int, unsigned int, std::string>> vectors;
+  std::vector<
+    std::tuple<unsigned int,
+               unsigned int,
+               std::string,
+               DataComponentInterpretation::DataComponentInterpretation>>
+    vectors;
 
   WRITE(dx);
   if (dim == 2)

diff --git a/tests/data_out/data_out_base_dx.cc b/tests/data_out/data_out_base_dx.cc
index 314977c305474c58b93871ebafd520d8553ab951..28503deac9e00f2aa18cb482fc00fafd35d774b9 100644 (file)
--- a/tests/data_out/data_out_base_dx.cc
+++ b/tests/data_out/data_out_base_dx.cc
@@ -47,7 +47,12 @@ check(DataOutBase::DXFlags flags, std::ostream &out)
   names[3] = "x4";
   names[4] = "i";
 
-  std::vector<std::tuple<unsigned int, unsigned int, std::string>> vectors;
+  std::vector<
+    std::tuple<unsigned int,
+               unsigned int,
+               std::string,
+               DataComponentInterpretation::DataComponentInterpretation>>
+    vectors;
 
   DataOutBase::write_dx(patches, names, vectors, flags, out);
 }
@@ -66,7 +71,12 @@ check_cont(unsigned int         ncells,
 
   std::vector<std::string> names(1);
   names[0] = "CutOff";
-  std::vector<std::tuple<unsigned int, unsigned int, std::string>> vectors;
+  std::vector<
+    std::tuple<unsigned int,
+               unsigned int,
+               std::string,
+               DataComponentInterpretation::DataComponentInterpretation>>
+    vectors;
   DataOutBase::write_dx(patches, names, vectors, flags, out);
 }
 

diff --git a/tests/data_out/data_out_base_eps.cc b/tests/data_out/data_out_base_eps.cc
index 054c2ff27374d9641ba314fffd3a2f26e74bac4d..8cdd401858b870295f112f9b339272146aac1d88 100644 (file)
--- a/tests/data_out/data_out_base_eps.cc
+++ b/tests/data_out/data_out_base_eps.cc
@@ -46,7 +46,12 @@ check(DataOutBase::EpsFlags flags, std::ostream &out)
   names[2] = "x3";
   names[3] = "x4";
   names[4] = "i";
-  std::vector<std::tuple<unsigned int, unsigned int, std::string>> vectors;
+  std::vector<
+    std::tuple<unsigned int,
+               unsigned int,
+               std::string,
+               DataComponentInterpretation::DataComponentInterpretation>>
+    vectors;
   DataOutBase::write_eps(patches, names, vectors, flags, out);
 }
 
@@ -64,7 +69,12 @@ check_cont(unsigned int          ncells,
 
   std::vector<std::string> names(1);
   names[0] = "CutOff";
-  std::vector<std::tuple<unsigned int, unsigned int, std::string>> vectors;
+  std::vector<
+    std::tuple<unsigned int,
+               unsigned int,
+               std::string,
+               DataComponentInterpretation::DataComponentInterpretation>>
+    vectors;
   DataOutBase::write_eps(patches, names, vectors, flags, out);
 }
 

diff --git a/tests/data_out/data_out_base_gmv.cc b/tests/data_out/data_out_base_gmv.cc
index df5b32e9ad6f6a5ff7918745766d5868635d9c3d..183d2a9e24bfee670135eb96380657cb7b1e2054 100644 (file)
--- a/tests/data_out/data_out_base_gmv.cc
+++ b/tests/data_out/data_out_base_gmv.cc
@@ -44,7 +44,12 @@ check(DataOutBase::GmvFlags flags, std::ostream &out)
   names[2] = "x3";
   names[3] = "x4";
   names[4] = "i";
-  std::vector<std::tuple<unsigned int, unsigned int, std::string>> vectors;
+  std::vector<
+    std::tuple<unsigned int,
+               unsigned int,
+               std::string,
+               DataComponentInterpretation::DataComponentInterpretation>>
+    vectors;
   DataOutBase::write_gmv(patches, names, vectors, flags, out);
 }
 

diff --git a/tests/data_out/data_out_base_gnuplot.cc b/tests/data_out/data_out_base_gnuplot.cc
index 55b45828b3f8b320168daf52722b3de016bd58dc..166ad369f94217d0b2480f92c133381907ef7064 100644 (file)
--- a/tests/data_out/data_out_base_gnuplot.cc
+++ b/tests/data_out/data_out_base_gnuplot.cc
@@ -44,7 +44,12 @@ check(DataOutBase::GnuplotFlags flags, std::ostream &out)
   names[2] = "x3";
   names[3] = "x4";
   names[4] = "i";
-  std::vector<std::tuple<unsigned int, unsigned int, std::string>> vectors;
+  std::vector<
+    std::tuple<unsigned int,
+               unsigned int,
+               std::string,
+               DataComponentInterpretation::DataComponentInterpretation>>
+    vectors;
   DataOutBase::write_gnuplot(patches, names, vectors, flags, out);
 }
 

diff --git a/tests/data_out/data_out_base_gnuplot_02.cc b/tests/data_out/data_out_base_gnuplot_02.cc
index 493508083accafb4aed34b4c9ee8cbf6a4a826d5..0e2efb4c0e36df9495197df78d89f5009c613dd9 100644 (file)
--- a/tests/data_out/data_out_base_gnuplot_02.cc
+++ b/tests/data_out/data_out_base_gnuplot_02.cc
@@ -46,7 +46,12 @@ check(DataOutBase::GnuplotFlags flags, std::ostream &out)
   names[2] = "x3";
   names[3] = "x4";
   names[4] = "i";
-  std::vector<std::tuple<unsigned int, unsigned int, std::string>> vectors;
+  std::vector<
+    std::tuple<unsigned int,
+               unsigned int,
+               std::string,
+               DataComponentInterpretation::DataComponentInterpretation>>
+    vectors;
   DataOutBase::write_gnuplot(patches, names, vectors, flags, out);
 }
 

diff --git a/tests/data_out/data_out_base_gnuplot_labels.cc b/tests/data_out/data_out_base_gnuplot_labels.cc
index 79cacc6256d8051df4080072432919f68fcb17c5..e7cff5ea75cf70820ffb568dd59125ca0c6cfae8 100644 (file)
--- a/tests/data_out/data_out_base_gnuplot_labels.cc
+++ b/tests/data_out/data_out_base_gnuplot_labels.cc
@@ -49,7 +49,12 @@ check(DataOutBase::GnuplotFlags flags, std::ostream &out)
   names[2] = "x3";
   names[3] = "x4";
   names[4] = "i";
-  std::vector<std::tuple<unsigned int, unsigned int, std::string>> vectors;
+  std::vector<
+    std::tuple<unsigned int,
+               unsigned int,
+               std::string,
+               DataComponentInterpretation::DataComponentInterpretation>>
+    vectors;
   DataOutBase::write_gnuplot(patches, names, vectors, flags, out);
 }
 

diff --git a/tests/data_out/data_out_base_povray.cc b/tests/data_out/data_out_base_povray.cc
index 98a1f21fde43ff06282069debcb56d45ba62d392..eabc32786779d9ab1a19776a29d4c50af3bf1a3f 100644 (file)
--- a/tests/data_out/data_out_base_povray.cc
+++ b/tests/data_out/data_out_base_povray.cc
@@ -46,7 +46,12 @@ check(DataOutBase::PovrayFlags flags, std::ostream &out)
   names[2] = "x3";
   names[3] = "x4";
   names[4] = "i";
-  std::vector<std::tuple<unsigned int, unsigned int, std::string>> vectors;
+  std::vector<
+    std::tuple<unsigned int,
+               unsigned int,
+               std::string,
+               DataComponentInterpretation::DataComponentInterpretation>>
+    vectors;
   DataOutBase::write_povray(patches, names, vectors, flags, out);
 }
 
@@ -64,7 +69,12 @@ check_cont(unsigned int             ncells,
 
   std::vector<std::string> names(1);
   names[0] = "CutOff";
-  std::vector<std::tuple<unsigned int, unsigned int, std::string>> vectors;
+  std::vector<
+    std::tuple<unsigned int,
+               unsigned int,
+               std::string,
+               DataComponentInterpretation::DataComponentInterpretation>>
+    vectors;
   DataOutBase::write_povray(patches, names, vectors, flags, out);
 }
 

diff --git a/tests/data_out/data_out_base_tecplot.cc b/tests/data_out/data_out_base_tecplot.cc
index 0c24f9153d115ced54d360857d24899ad0c02234..e37a3620406138f05a0be0e7693660913b16242b 100644 (file)
--- a/tests/data_out/data_out_base_tecplot.cc
+++ b/tests/data_out/data_out_base_tecplot.cc
@@ -44,7 +44,12 @@ check(DataOutBase::TecplotFlags flags, std::ostream &out)
   names[2] = "x3";
   names[3] = "x4";
   names[4] = "i";
-  std::vector<std::tuple<unsigned int, unsigned int, std::string>> vectors;
+  std::vector<
+    std::tuple<unsigned int,
+               unsigned int,
+               std::string,
+               DataComponentInterpretation::DataComponentInterpretation>>
+    vectors;
   DataOutBase::write_tecplot(patches, names, vectors, flags, out);
 }
 

diff --git a/tests/data_out/data_out_base_tecplot_bin.cc b/tests/data_out/data_out_base_tecplot_bin.cc
index e663894006653cd70f5f9ced796975e143857ccf..42509b7be587bafe2edc3ce54d363ac62cbf6342 100644 (file)
--- a/tests/data_out/data_out_base_tecplot_bin.cc
+++ b/tests/data_out/data_out_base_tecplot_bin.cc
@@ -41,7 +41,12 @@ check(DataOutBase::TecplotFlags flags, std::ostream &out)
   names[2] = "x3";
   names[3] = "x4";
   names[4] = "i";
-  std::vector<std::tuple<unsigned int, unsigned int, std::string>> vectors;
+  std::vector<
+    std::tuple<unsigned int,
+               unsigned int,
+               std::string,
+               DataComponentInterpretation::DataComponentInterpretation>>
+    vectors;
   DataOutBase::write_tecplot_binary(patches, names, vectors, flags, out);
 }
 

diff --git a/tests/data_out/data_out_base_vtk.cc b/tests/data_out/data_out_base_vtk.cc
index bb31dd00e7776834f9d708b1b86f9f652772584e..d184d4c0f3ec1e6d07bff68b6fda505e2fe94689 100644 (file)
--- a/tests/data_out/data_out_base_vtk.cc
+++ b/tests/data_out/data_out_base_vtk.cc
@@ -44,7 +44,12 @@ check(DataOutBase::VtkFlags flags, std::ostream &out)
   names[2] = "x3";
   names[3] = "x4";
   names[4] = "i";
-  std::vector<std::tuple<unsigned int, unsigned int, std::string>> vectors;
+  std::vector<
+    std::tuple<unsigned int,
+               unsigned int,
+               std::string,
+               DataComponentInterpretation::DataComponentInterpretation>>
+    vectors;
   DataOutBase::write_vtk(patches, names, vectors, flags, out);
 }
 

diff --git a/tests/data_out/data_out_base_vtk_02.cc b/tests/data_out/data_out_base_vtk_02.cc
index 42f52d8b4c42fd71391324fc814c77a174032349..02cebeb23ba05663dbc02b54075338660b8620ef 100644 (file)
--- a/tests/data_out/data_out_base_vtk_02.cc
+++ b/tests/data_out/data_out_base_vtk_02.cc
@@ -46,7 +46,12 @@ check(DataOutBase::VtkFlags flags, std::ostream &out)
   names[2] = "x3";
   names[3] = "x4";
   names[4] = "i";
-  std::vector<std::tuple<unsigned int, unsigned int, std::string>> vectors;
+  std::vector<
+    std::tuple<unsigned int,
+               unsigned int,
+               std::string,
+               DataComponentInterpretation::DataComponentInterpretation>>
+    vectors;
   DataOutBase::write_vtk(patches, names, vectors, flags, out);
 }
 

diff --git a/tests/data_out/data_out_base_vtk_cycle.cc b/tests/data_out/data_out_base_vtk_cycle.cc
index daa6ad61330547436bbac2431499581c288a0b91..14e4aa74acbe581a37076be656a2d15a1253ee6d 100644 (file)
--- a/tests/data_out/data_out_base_vtk_cycle.cc
+++ b/tests/data_out/data_out_base_vtk_cycle.cc
@@ -47,7 +47,12 @@ check(DataOutBase::VtkFlags flags, std::ostream &out)
   names[2] = "x3";
   names[3] = "x4";
   names[4] = "i";
-  std::vector<std::tuple<unsigned int, unsigned int, std::string>> vectors;
+  std::vector<
+    std::tuple<unsigned int,
+               unsigned int,
+               std::string,
+               DataComponentInterpretation::DataComponentInterpretation>>
+    vectors;
   DataOutBase::write_vtk(patches, names, vectors, flags, out);
 }
 

diff --git a/tests/data_out/data_out_base_vtk_time.cc b/tests/data_out/data_out_base_vtk_time.cc
index 1c34fc5479903f1fd8eda82d370d769cc44205f4..64435a53dc0838061d3f5f1ab701afaf5ce4e407 100644 (file)
--- a/tests/data_out/data_out_base_vtk_time.cc
+++ b/tests/data_out/data_out_base_vtk_time.cc
@@ -47,7 +47,12 @@ check(DataOutBase::VtkFlags flags, std::ostream &out)
   names[2] = "x3";
   names[3] = "x4";
   names[4] = "i";
-  std::vector<std::tuple<unsigned int, unsigned int, std::string>> vectors;
+  std::vector<
+    std::tuple<unsigned int,
+               unsigned int,
+               std::string,
+               DataComponentInterpretation::DataComponentInterpretation>>
+    vectors;
   DataOutBase::write_vtk(patches, names, vectors, flags, out);
 }
 

diff --git a/tests/data_out/data_out_base_vtk_time_and_cycle.cc b/tests/data_out/data_out_base_vtk_time_and_cycle.cc
index 08560a654f2352f73b6e64bdb5bf9d826a6194eb..e1d9cd1778600fa0d040ad239ff9aca7ea838643 100644 (file)
--- a/tests/data_out/data_out_base_vtk_time_and_cycle.cc
+++ b/tests/data_out/data_out_base_vtk_time_and_cycle.cc
@@ -47,7 +47,12 @@ check(DataOutBase::VtkFlags flags, std::ostream &out)
   names[2] = "x3";
   names[3] = "x4";
   names[4] = "i";
-  std::vector<std::tuple<unsigned int, unsigned int, std::string>> vectors;
+  std::vector<
+    std::tuple<unsigned int,
+               unsigned int,
+               std::string,
+               DataComponentInterpretation::DataComponentInterpretation>>
+    vectors;
   DataOutBase::write_vtk(patches, names, vectors, flags, out);
 }
 

diff --git a/tests/data_out/data_out_base_vtu.cc b/tests/data_out/data_out_base_vtu.cc
index 34b55023aca93417eda3ec3ebbae04059a57b45d..15db452ce09c6593a91f28685eb973b11e39813f 100644 (file)
--- a/tests/data_out/data_out_base_vtu.cc
+++ b/tests/data_out/data_out_base_vtu.cc
@@ -40,7 +40,12 @@ check(DataOutBase::VtkFlags flags, std::ostream &out)
   names[2] = "x3";
   names[3] = "x4";
   names[4] = "i";
-  std::vector<std::tuple<unsigned int, unsigned int, std::string>> vectors;
+  std::vector<
+    std::tuple<unsigned int,
+               unsigned int,
+               std::string,
+               DataComponentInterpretation::DataComponentInterpretation>>
+    vectors;
   DataOutBase::write_vtu(patches, names, vectors, flags, out);
 }
 

diff --git a/tests/data_out/data_out_base_vtu_02.cc b/tests/data_out/data_out_base_vtu_02.cc
index 5c28d38e318616f4971ca542b53d6dc33567cd95..10d9855dcb2a6aba553dc807be685ecf1e2add09 100644 (file)
--- a/tests/data_out/data_out_base_vtu_02.cc
+++ b/tests/data_out/data_out_base_vtu_02.cc
@@ -46,7 +46,12 @@ check(DataOutBase::VtkFlags flags, std::ostream &out)
   names[2] = "x3";
   names[3] = "x4";
   names[4] = "i";
-  std::vector<std::tuple<unsigned int, unsigned int, std::string>> vectors;
+  std::vector<
+    std::tuple<unsigned int,
+               unsigned int,
+               std::string,
+               DataComponentInterpretation::DataComponentInterpretation>>
+    vectors;
   DataOutBase::write_vtu(patches, names, vectors, flags, out);
 }
 

diff --git a/tests/data_out/data_out_base_vtu_compression_levels.cc b/tests/data_out/data_out_base_vtu_compression_levels.cc
index 891c77ef3d880002730fe3ba319f8eecc1d4b02c..d392053b95c652ee45fcc80b738321f70e8795f8 100644 (file)
--- a/tests/data_out/data_out_base_vtu_compression_levels.cc
+++ b/tests/data_out/data_out_base_vtu_compression_levels.cc
@@ -41,7 +41,12 @@ check(DataOutBase::VtkFlags flags, std::ostream &out)
   names[2] = "x3";
   names[3] = "x4";
   names[4] = "i";
-  std::vector<std::tuple<unsigned int, unsigned int, std::string>> vectors;
+  std::vector<
+    std::tuple<unsigned int,
+               unsigned int,
+               std::string,
+               DataComponentInterpretation::DataComponentInterpretation>>
+    vectors;
   DataOutBase::write_vtu(patches, names, vectors, flags, out);
 }
 

diff --git a/tests/data_out/data_out_base_vtu_cycle.cc b/tests/data_out/data_out_base_vtu_cycle.cc
index 17f299454becd10dde32ff6243c8b769d8a7d311..e984240d2b041ddebf990f0d4ee9f58cecabb0b2 100644 (file)
--- a/tests/data_out/data_out_base_vtu_cycle.cc
+++ b/tests/data_out/data_out_base_vtu_cycle.cc
@@ -42,7 +42,12 @@ check(DataOutBase::VtkFlags flags, std::ostream &out)
   names[2] = "x3";
   names[3] = "x4";
   names[4] = "i";
-  std::vector<std::tuple<unsigned int, unsigned int, std::string>> vectors;
+  std::vector<
+    std::tuple<unsigned int,
+               unsigned int,
+               std::string,
+               DataComponentInterpretation::DataComponentInterpretation>>
+    vectors;
   DataOutBase::write_vtu(patches, names, vectors, flags, out);
 }
 

diff --git a/tests/data_out/data_out_base_vtu_time.cc b/tests/data_out/data_out_base_vtu_time.cc
index acbf0fa503ce1a2e4638309ba6c07b549734a7e0..eb18f587845818bcb2462ef1aa05b47b4b4e5960 100644 (file)
--- a/tests/data_out/data_out_base_vtu_time.cc
+++ b/tests/data_out/data_out_base_vtu_time.cc
@@ -42,7 +42,12 @@ check(DataOutBase::VtkFlags flags, std::ostream &out)
   names[2] = "x3";
   names[3] = "x4";
   names[4] = "i";
-  std::vector<std::tuple<unsigned int, unsigned int, std::string>> vectors;
+  std::vector<
+    std::tuple<unsigned int,
+               unsigned int,
+               std::string,
+               DataComponentInterpretation::DataComponentInterpretation>>
+    vectors;
   DataOutBase::write_vtu(patches, names, vectors, flags, out);
 }
 

diff --git a/tests/data_out/data_out_base_vtu_time_and_cycle.cc b/tests/data_out/data_out_base_vtu_time_and_cycle.cc
index 1ce332ce301556521ab2dbb9701400df4bd88697..f140def0431847a6cb337e2963f0f0f01f7cad67 100644 (file)
--- a/tests/data_out/data_out_base_vtu_time_and_cycle.cc
+++ b/tests/data_out/data_out_base_vtu_time_and_cycle.cc
@@ -43,7 +43,12 @@ check(DataOutBase::VtkFlags flags, std::ostream &out)
   names[2] = "x3";
   names[3] = "x4";
   names[4] = "i";
-  std::vector<std::tuple<unsigned int, unsigned int, std::string>> vectors;
+  std::vector<
+    std::tuple<unsigned int,
+               unsigned int,
+               std::string,
+               DataComponentInterpretation::DataComponentInterpretation>>
+    vectors;
   DataOutBase::write_vtu(patches, names, vectors, flags, out);
 }
 

diff --git a/tests/data_out/data_out_faces_04.cc b/tests/data_out/data_out_faces_04.cc
index 6b80389ad838056c643d1d9e5d1b9754edb9ee87..d60592afffb04aea10c953e874524236b539085f 100644 (file)
--- a/tests/data_out/data_out_faces_04.cc
+++ b/tests/data_out/data_out_faces_04.cc
@@ -48,10 +48,14 @@ public:
     return DataOutFaces<dim>::get_dataset_names();
   }
 
-  std::vector<std::tuple<unsigned int, unsigned int, std::string>>
-  get_vector_data_ranges() const
+  std::vector<
+    std::tuple<unsigned int,
+               unsigned int,
+               std::string,
+               DataComponentInterpretation::DataComponentInterpretation>>
+  get_nonscalar_data_ranges() const
   {
-    return DataOutFaces<dim>::get_vector_data_ranges();
+    return DataOutFaces<dim>::get_nonscalar_data_ranges();
   }
 };
 
@@ -73,10 +77,14 @@ public:
     return DataOutReader<dim - 1, dim>::get_dataset_names();
   }
 
-  std::vector<std::tuple<unsigned int, unsigned int, std::string>>
-  get_vector_data_ranges() const
+  std::vector<
+    std::tuple<unsigned int,
+               unsigned int,
+               std::string,
+               DataComponentInterpretation::DataComponentInterpretation>>
+  get_nonscalar_data_ranges() const
   {
-    return DataOutReader<dim - 1, dim>::get_vector_data_ranges();
+    return DataOutReader<dim - 1, dim>::get_nonscalar_data_ranges();
   }
 };
 
@@ -128,23 +136,24 @@ my_check_this(const DoFHandler<dim> &dof_handler,
     AssertThrow(data_out.get_patches()[i] == reader.get_patches()[i],
                 ExcInternalError());
 
-  deallog << data_out.get_vector_data_ranges().size() << std::endl;
-  Assert(data_out.get_vector_data_ranges().size() ==
-           reader.get_vector_data_ranges().size(),
+  deallog << data_out.get_nonscalar_data_ranges().size() << std::endl;
+  Assert(data_out.get_nonscalar_data_ranges().size() ==
+           reader.get_nonscalar_data_ranges().size(),
          ExcInternalError());
-  for (unsigned int i = 0; i < data_out.get_vector_data_ranges().size(); ++i)
+  for (unsigned int i = 0; i < data_out.get_nonscalar_data_ranges().size(); ++i)
     {
-      deallog << std::get<0>(data_out.get_vector_data_ranges()[i]) << ' '
-              << std::get<1>(data_out.get_vector_data_ranges()[i]) << ' '
-              << std::get<2>(data_out.get_vector_data_ranges()[i]) << std::endl;
-      Assert(std::get<0>(data_out.get_vector_data_ranges()[i]) ==
-               std::get<0>(reader.get_vector_data_ranges()[i]),
+      deallog << std::get<0>(data_out.get_nonscalar_data_ranges()[i]) << ' '
+              << std::get<1>(data_out.get_nonscalar_data_ranges()[i]) << ' '
+              << std::get<2>(data_out.get_nonscalar_data_ranges()[i])
+              << std::endl;
+      Assert(std::get<0>(data_out.get_nonscalar_data_ranges()[i]) ==
+               std::get<0>(reader.get_nonscalar_data_ranges()[i]),
              ExcInternalError());
-      Assert(std::get<1>(data_out.get_vector_data_ranges()[i]) ==
-               std::get<1>(reader.get_vector_data_ranges()[i]),
+      Assert(std::get<1>(data_out.get_nonscalar_data_ranges()[i]) ==
+               std::get<1>(reader.get_nonscalar_data_ranges()[i]),
              ExcInternalError());
-      Assert(std::get<2>(data_out.get_vector_data_ranges()[i]) ==
-               std::get<2>(reader.get_vector_data_ranges()[i]),
+      Assert(std::get<2>(data_out.get_nonscalar_data_ranges()[i]) ==
+               std::get<2>(reader.get_nonscalar_data_ranges()[i]),
              ExcInternalError());
     }
 

diff --git a/tests/data_out/data_out_reader_01.cc b/tests/data_out/data_out_reader_01.cc
index 4e29d9729a78252256596f6972eba10131be9dca..db340dd3811d97c1e85fc2ad4a5d8ede876bcbae 100644 (file)
--- a/tests/data_out/data_out_reader_01.cc
+++ b/tests/data_out/data_out_reader_01.cc
@@ -40,7 +40,12 @@ check()
   names[2] = "x3";
   names[3] = "x4";
   names[4] = "i";
-  std::vector<std::tuple<unsigned int, unsigned int, std::string>> vectors;
+  std::vector<
+    std::tuple<unsigned int,
+               unsigned int,
+               std::string,
+               DataComponentInterpretation::DataComponentInterpretation>>
+    vectors;
 
   std::ostringstream old_data;
   DataOutBase::write_deal_II_intermediate(

diff --git a/tests/data_out/data_out_rotation_04.cc b/tests/data_out/data_out_rotation_04.cc
index 64567218cf27de498f7e8d011b1802493726d8da..55e28ce3ab46d8e3d4d342bdaddfb63d36428192 100644 (file)
--- a/tests/data_out/data_out_rotation_04.cc
+++ b/tests/data_out/data_out_rotation_04.cc
@@ -48,10 +48,14 @@ public:
     return DataOutRotation<dim>::get_dataset_names();
   }
 
-  std::vector<std::tuple<unsigned int, unsigned int, std::string>>
-  get_vector_data_ranges() const
+  std::vector<
+    std::tuple<unsigned int,
+               unsigned int,
+               std::string,
+               DataComponentInterpretation::DataComponentInterpretation>>
+  get_nonscalar_data_ranges() const
   {
-    return DataOutRotation<dim>::get_vector_data_ranges();
+    return DataOutRotation<dim>::get_nonscalar_data_ranges();
   }
 };
 
@@ -73,10 +77,14 @@ public:
     return DataOutReader<dim + 1>::get_dataset_names();
   }
 
-  std::vector<std::tuple<unsigned int, unsigned int, std::string>>
-  get_vector_data_ranges() const
+  std::vector<
+    std::tuple<unsigned int,
+               unsigned int,
+               std::string,
+               DataComponentInterpretation::DataComponentInterpretation>>
+  get_nonscalar_data_ranges() const
   {
-    return DataOutReader<dim + 1>::get_vector_data_ranges();
+    return DataOutReader<dim + 1>::get_nonscalar_data_ranges();
   }
 };
 
@@ -130,23 +138,24 @@ my_check_this(const DoFHandler<dim> &dof_handler,
     AssertThrow(data_out.get_patches()[i] == reader.get_patches()[i],
                 ExcInternalError());
 
-  deallog << data_out.get_vector_data_ranges().size() << std::endl;
-  Assert(data_out.get_vector_data_ranges().size() ==
-           reader.get_vector_data_ranges().size(),
+  deallog << data_out.get_nonscalar_data_ranges().size() << std::endl;
+  Assert(data_out.get_nonscalar_data_ranges().size() ==
+           reader.get_nonscalar_data_ranges().size(),
          ExcInternalError());
-  for (unsigned int i = 0; i < data_out.get_vector_data_ranges().size(); ++i)
+  for (unsigned int i = 0; i < data_out.get_nonscalar_data_ranges().size(); ++i)
     {
-      deallog << std::get<0>(data_out.get_vector_data_ranges()[i]) << ' '
-              << std::get<1>(data_out.get_vector_data_ranges()[i]) << ' '
-              << std::get<2>(data_out.get_vector_data_ranges()[i]) << std::endl;
-      Assert(std::get<0>(data_out.get_vector_data_ranges()[i]) ==
-               std::get<0>(reader.get_vector_data_ranges()[i]),
+      deallog << std::get<0>(data_out.get_nonscalar_data_ranges()[i]) << ' '
+              << std::get<1>(data_out.get_nonscalar_data_ranges()[i]) << ' '
+              << std::get<2>(data_out.get_nonscalar_data_ranges()[i])
+              << std::endl;
+      Assert(std::get<0>(data_out.get_nonscalar_data_ranges()[i]) ==
+               std::get<0>(reader.get_nonscalar_data_ranges()[i]),
              ExcInternalError());
-      Assert(std::get<1>(data_out.get_vector_data_ranges()[i]) ==
-               std::get<1>(reader.get_vector_data_ranges()[i]),
+      Assert(std::get<1>(data_out.get_nonscalar_data_ranges()[i]) ==
+               std::get<1>(reader.get_nonscalar_data_ranges()[i]),
              ExcInternalError());
-      Assert(std::get<2>(data_out.get_vector_data_ranges()[i]) ==
-               std::get<2>(reader.get_vector_data_ranges()[i]),
+      Assert(std::get<2>(data_out.get_nonscalar_data_ranges()[i]) ==
+               std::get<2>(reader.get_nonscalar_data_ranges()[i]),
              ExcInternalError());
     }