From: Denis Davydov <davydden@gmail.com>
Date: Thu, 21 Jun 2018 13:05:59 +0000 (+0200)
Subject: fix tests to work with the four element tuple
X-Git-Tag: v9.1.0-rc1~1005^2~1
X-Git-Url: https://gitweb.dealii.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=816d37fb6950b48ef3ee9687ec5ad93ec7e96d2a;p=dealii.git

fix tests to work with the four element tuple
---

diff --git a/tests/base/functions_04.cc b/tests/base/functions_04.cc
index bad8de546e..27c018addb 100644
--- 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 dc7da079cf..4de04eafe4 100644
--- 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 8672b4f1f1..6faa336a0c 100644
--- 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 314977c305..28503deac9 100644
--- 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 054c2ff273..8cdd401858 100644
--- 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 df5b32e9ad..183d2a9e24 100644
--- 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 55b45828b3..166ad369f9 100644
--- 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 493508083a..0e2efb4c0e 100644
--- 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 79cacc6256..e7cff5ea75 100644
--- 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 98a1f21fde..eabc327867 100644
--- 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 0c24f9153d..e37a362040 100644
--- 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 e663894006..42509b7be5 100644
--- 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 bb31dd00e7..d184d4c0f3 100644
--- 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 42f52d8b4c..02cebeb23b 100644
--- 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 daa6ad6133..14e4aa74ac 100644
--- 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 1c34fc5479..64435a53dc 100644
--- 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 08560a654f..e1d9cd1778 100644
--- 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 34b55023ac..15db452ce0 100644
--- 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 5c28d38e31..10d9855dcb 100644
--- 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 891c77ef3d..d392053b95 100644
--- 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 17f299454b..e984240d2b 100644
--- 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 acbf0fa503..eb18f58784 100644
--- 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 1ce332ce30..f140def043 100644
--- 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 6b80389ad8..d60592afff 100644
--- 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 4e29d9729a..db340dd381 100644
--- 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 64567218cf..55e28ce3ab 100644
--- 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());
     }