fix dataout related test failures

git-svn-id: https://svn.dealii.org/trunk@32514 0785d39b-7218-0410-832d-ea1e28bc413d

diff --git a/tests/bits/data_out_01.cc b/tests/bits/data_out_01.cc
index d0878b547f0623c78372c68b806e3591d804ccfd..b16b961b589b83b9412019edaeca5180039205a6 100644 (file)
--- a/tests/bits/data_out_01.cc
+++ b/tests/bits/data_out_01.cc
@@ -32,8 +32,8 @@ check_this (const DoFHandler<dim> &dof_handler,
 {
   DataOut<dim> data_out;
   data_out.attach_dof_handler (dof_handler);
-  data_out.add_data_vector (v_node, "node_data", DataOut_DoFData<DoFHandler<dim>,dim,dim>::type_dof_data);
-  data_out.add_data_vector (v_cell, "cell_data", DataOut_DoFData<DoFHandler<dim>,dim,dim>::type_cell_data);
+  data_out.add_data_vector (v_node, "node_data", DataOut<dim>::type_dof_data);
+  data_out.add_data_vector (v_cell, "cell_data", DataOut<dim>::type_cell_data);
   data_out.build_patches ();
 
   data_out.write_dx (deallog.get_file_stream());

diff --git a/tests/bits/data_out_02.cc b/tests/bits/data_out_02.cc
index 02ed8b5243feeb54bf1fb829c7ea734450447526..dd55f86846063e57bd7a9e67ea07d28355881a65 100644 (file)
--- a/tests/bits/data_out_02.cc
+++ b/tests/bits/data_out_02.cc
@@ -39,8 +39,8 @@ check_this (const DoFHandler<dim> &dof_handler,
 
   DataOut<dim> data_out;
   data_out.attach_dof_handler (dof_handler);
-  data_out.add_data_vector (v_node, "node_data");
-  data_out.add_data_vector (v_cell, "cell_data");
+  data_out.add_data_vector (v_node, "node_data", DataOut<dim>::type_dof_data);
+  data_out.add_data_vector (v_cell, "cell_data", DataOut<dim>::type_cell_data);
   data_out.build_patches ();
 
   data_out.write_dx (deallog.get_file_stream());

diff --git a/tests/bits/data_out_03.cc b/tests/bits/data_out_03.cc
index 6af4951375dd7001911a97a605fc4420be806575..0e9a57c171e63d78b043aa5c3fd1d0aeafa9c31b 100644 (file)
--- a/tests/bits/data_out_03.cc
+++ b/tests/bits/data_out_03.cc
@@ -75,8 +75,8 @@ check_this (const DoFHandler<dim> &dof_handler,
 {
   XDataOut<dim> data_out;
   data_out.attach_dof_handler (dof_handler);
-  data_out.add_data_vector (v_node, "node_data");
-  data_out.add_data_vector (v_cell, "cell_data");
+  data_out.add_data_vector (v_node, "node_data", XDataOut<dim>::type_dof_data);
+  data_out.add_data_vector (v_cell, "cell_data", XDataOut<dim>::type_cell_data);
   data_out.build_patches ();
 
   {

diff --git a/tests/bits/data_out_04.cc b/tests/bits/data_out_04.cc
index b8e4924e5e82782916c059cc9a5bfc65950422a3..c525c2bfe416cf96a363c19f256d92aace26baeb 100644 (file)
--- a/tests/bits/data_out_04.cc
+++ b/tests/bits/data_out_04.cc
@@ -101,8 +101,8 @@ check_this (const DoFHandler<dim> &dof_handler,
 {
   XDataOut<dim> data_out;
   data_out.attach_dof_handler (dof_handler);
-  data_out.add_data_vector (v_node, "node_data");
-  data_out.add_data_vector (v_cell, "cell_data");
+  data_out.add_data_vector (v_node, "node_data", XDataOut<dim>::type_dof_data);
+  data_out.add_data_vector (v_cell, "cell_data", XDataOut<dim>::type_cell_data);
   data_out.build_patches ();
 
   {

diff --git a/tests/bits/data_out_05.cc b/tests/bits/data_out_05.cc
index fc27ef3fd20509db7b746afa51b78912be5590ab..8141c0ddcf963e8afeea4ecea28397f3577e12e8 100644 (file)
--- a/tests/bits/data_out_05.cc
+++ b/tests/bits/data_out_05.cc
@@ -74,7 +74,7 @@ check_this (const DoFHandler<dim> &dof_handler,
                                                      "node_data_2"),
                             DataOut<dim>::type_dof_data,
                             data_component_interpretation);
-  data_out.add_data_vector (v_cell, "cell_data");
+  data_out.add_data_vector (v_cell, "cell_data", DataOut<dim>::type_cell_data);
   data_out.build_patches ();
 
   data_out.write_vtk (deallog.get_file_stream());

diff --git a/tests/bits/data_out_08.cc b/tests/bits/data_out_08.cc
index e043d30f393936da8747029362b1734b40376969..f3d6444dc7d7536646d228dc09e2073610f91c61 100644 (file)
--- a/tests/bits/data_out_08.cc
+++ b/tests/bits/data_out_08.cc
@@ -111,9 +111,9 @@ check ()
   // we pick only subdomain==0 which will
   // skip the first of the four cells
   FilteredDataOut<dim> data_out(0);
-  data_out.attach_dof_handler (dof_handler);
+  data_out.attach_dof_handler(dof_handler);
 
-  data_out.add_data_vector (cell_data, "cell_data");
+  data_out.add_data_vector (cell_data, "cell_data", DataOut<dim>::type_cell_data);
   data_out.build_patches ();
 
   data_out.write_deal_II_intermediate (deallog.get_file_stream());

diff --git a/tests/bits/data_out_faces_01.cc b/tests/bits/data_out_faces_01.cc
index c9e1571a0efa4cb6ea1fd665d42a72a7f4eada9d..2c917ef178fe83a580f75cb854efcc451d32e44c 100644 (file)
--- a/tests/bits/data_out_faces_01.cc
+++ b/tests/bits/data_out_faces_01.cc
@@ -42,8 +42,8 @@ my_check_this (const DoFHandler<dim> &dof_handler,
 {
   DataOutFaces<dim> data_out_faces;
   data_out_faces.attach_dof_handler (dof_handler);
-  data_out_faces.add_data_vector (v_node, "node_data");
-  data_out_faces.add_data_vector (v_cell, "cell_data");
+  data_out_faces.add_data_vector (v_node, "node_data", DataOutFaces<dim>::type_dof_data);
+  data_out_faces.add_data_vector (v_cell, "cell_data", DataOutFaces<dim>::type_cell_data);
   data_out_faces.build_patches ();
 
   data_out_faces.write_dx (deallog.get_file_stream());

diff --git a/tests/bits/data_out_faces_02.cc b/tests/bits/data_out_faces_02.cc
index 6947df80d350b3b0c0f215e08e9c35c13324e3dc..f6ff53417a24d80be893d86575fe2750a2551ebc 100644 (file)
--- a/tests/bits/data_out_faces_02.cc
+++ b/tests/bits/data_out_faces_02.cc
@@ -48,8 +48,8 @@ my_check_this (const DoFHandler<dim> &dof_handler,
 
   DataOutFaces<dim> data_out_faces;
   data_out_faces.attach_dof_handler (dof_handler);
-  data_out_faces.add_data_vector (v_node, "node_data");
-  data_out_faces.add_data_vector (v_cell, "cell_data");
+  data_out_faces.add_data_vector (v_node, "node_data", DataOutFaces<dim>::type_dof_data);
+  data_out_faces.add_data_vector (v_cell, "cell_data", DataOutFaces<dim>::type_cell_data);
   data_out_faces.build_patches ();
 
   data_out_faces.write_dx (deallog.get_file_stream());

diff --git a/tests/bits/data_out_faces_03.cc b/tests/bits/data_out_faces_03.cc
index 7d29f336ee019a7776f0a52dae9585ccfbcf4d52..09d2a37ac494f66596c66b16a82948ef5b76daef 100644 (file)
--- a/tests/bits/data_out_faces_03.cc
+++ b/tests/bits/data_out_faces_03.cc
@@ -87,8 +87,8 @@ my_check_this (const DoFHandler<dim> &dof_handler,
 {
   XDataOut<dim> data_out;
   data_out.attach_dof_handler (dof_handler);
-  data_out.add_data_vector (v_node, "node_data");
-  data_out.add_data_vector (v_cell, "cell_data");
+  data_out.add_data_vector (v_node, "node_data", XDataOut<dim>::type_dof_data);
+  data_out.add_data_vector (v_cell, "cell_data", XDataOut<dim>::type_cell_data);
   data_out.build_patches ();
 
   {

diff --git a/tests/bits/data_out_faces_04.cc b/tests/bits/data_out_faces_04.cc
index b4ac0ae4a1d801a7169d6426bfdb3a1202968aec..9c4a5402abdc6c1e822afb1a8e713aac345103c6 100644 (file)
--- a/tests/bits/data_out_faces_04.cc
+++ b/tests/bits/data_out_faces_04.cc
@@ -102,8 +102,8 @@ my_check_this (const DoFHandler<dim> &dof_handler,
 {
   XDataOut<dim> data_out;
   data_out.attach_dof_handler (dof_handler);
-  data_out.add_data_vector (v_node, "node_data");
-  data_out.add_data_vector (v_cell, "cell_data");
+  data_out.add_data_vector (v_node, "node_data", XDataOut<dim>::type_dof_data);
+  data_out.add_data_vector (v_cell, "cell_data", XDataOut<dim>::type_cell_data);
   data_out.build_patches ();
 
   {

diff --git a/tests/bits/data_out_rotation_01.cc b/tests/bits/data_out_rotation_01.cc
index a6b331795ba1d6120add4f0649f4e24885d6e32e..e5c16feda828c55483199ad848a26e789073b589 100644 (file)
--- a/tests/bits/data_out_rotation_01.cc
+++ b/tests/bits/data_out_rotation_01.cc
@@ -42,8 +42,8 @@ my_check_this (const DoFHandler<dim> &dof_handler,
 {
   DataOutRotation<dim> data_out_rotation;
   data_out_rotation.attach_dof_handler (dof_handler);
-  data_out_rotation.add_data_vector (v_node, "node_data");
-  data_out_rotation.add_data_vector (v_cell, "cell_data");
+  data_out_rotation.add_data_vector (v_node, "node_data", DataOutRotation<dim>::type_dof_data);
+  data_out_rotation.add_data_vector (v_cell, "cell_data", DataOutRotation<dim>::type_cell_data);
   data_out_rotation.build_patches (4);
 
   data_out_rotation.write_dx (deallog.get_file_stream());

diff --git a/tests/bits/data_out_rotation_02.cc b/tests/bits/data_out_rotation_02.cc
index 73c8e13f519373bf27b1b742239c8fa6fbcabc4f..52923a184fbf4e17c3f7a5416319e2b8f77fc900 100644 (file)
--- a/tests/bits/data_out_rotation_02.cc
+++ b/tests/bits/data_out_rotation_02.cc
@@ -49,8 +49,8 @@ my_check_this (const DoFHandler<dim> &dof_handler,
 
   DataOutRotation<dim> data_out_rotation;
   data_out_rotation.attach_dof_handler (dof_handler);
-  data_out_rotation.add_data_vector (v_node, "node_data");
-  data_out_rotation.add_data_vector (v_cell, "cell_data");
+  data_out_rotation.add_data_vector (v_node, "node_data", DataOutRotation<dim>::type_dof_data);
+  data_out_rotation.add_data_vector (v_cell, "cell_data", DataOutRotation<dim>::type_cell_data);
   data_out_rotation.build_patches (4);
 
   data_out_rotation.write_dx (deallog.get_file_stream());

diff --git a/tests/bits/data_out_rotation_03.cc b/tests/bits/data_out_rotation_03.cc
index c93f3c30ed2838dd7393fb0bd1e4d12692e23c58..6d289942ee57b3d8a36f794c042ad09d88d7b16e 100644 (file)
--- a/tests/bits/data_out_rotation_03.cc
+++ b/tests/bits/data_out_rotation_03.cc
@@ -85,8 +85,8 @@ my_check_this (const DoFHandler<dim> &dof_handler,
 {
   XDataOut<dim> data_out;
   data_out.attach_dof_handler (dof_handler);
-  data_out.add_data_vector (v_node, "node_data");
-  data_out.add_data_vector (v_cell, "cell_data");
+  data_out.add_data_vector (v_node, "node_data", XDataOut<dim>::type_dof_data);
+  data_out.add_data_vector (v_cell, "cell_data", XDataOut<dim>::type_cell_data);
   data_out.build_patches (4);
 
   {

diff --git a/tests/bits/data_out_rotation_04.cc b/tests/bits/data_out_rotation_04.cc
index c43778c0d0641880ff3ede37e229970501e4b180..d33bf1678bfd7e3384c0bfd57c9ee83bed621cfd 100644 (file)
--- a/tests/bits/data_out_rotation_04.cc
+++ b/tests/bits/data_out_rotation_04.cc
@@ -100,8 +100,8 @@ my_check_this (const DoFHandler<dim> &dof_handler,
 {
   XDataOut<dim> data_out;
   data_out.attach_dof_handler (dof_handler);
-  data_out.add_data_vector (v_node, "node_data");
-  data_out.add_data_vector (v_cell, "cell_data");
+  data_out.add_data_vector (v_node, "node_data", XDataOut<dim>::type_dof_data);
+  data_out.add_data_vector (v_cell, "cell_data", XDataOut<dim>::type_cell_data);
   data_out.build_patches (4);
 
   {

diff --git a/tests/codim_one/data_out.cc b/tests/codim_one/data_out.cc
index 94ad28ef19f4939a99ab2da2d4e23ac1a073ff1a..666947e1b8772d5cbc11701aba220a2bc85a72d5 100644 (file)
--- a/tests/codim_one/data_out.cc
+++ b/tests/codim_one/data_out.cc
@@ -67,8 +67,7 @@ void test(std::string filename)
     numbering(i) = i;
 
   DataOut<dim, DoFHandler<dim,spacedim> > dataout;
-  dataout.attach_dof_handler(dof_handler);
-  dataout.add_data_vector(numbering, "numbering");
+  dataout.add_data_vector(dof_handler, numbering, "numbering");
   dataout.build_patches();
   dataout.write_vtk(logfile);
 }

diff --git a/tests/codim_one/data_out.output b/tests/codim_one/data_out.output
index a9c8f1e8cc2e3e1828ff30297aef83d08687e02a..95c431d20c6c403c2b3d5ba7f7241f26c805250d 100644 (file)
--- a/tests/codim_one/data_out.output
+++ b/tests/codim_one/data_out.output
@@ -107,7 +107,7 @@ CELL_TYPES 31
 POINT_DATA 62
 SCALARS numbering double 1
 LOOKUP_TABLE default
-0.00000 0.00000 1.00000 1.00000 2.00000 2.00000 3.00000 3.00000 4.00000 4.00000 5.00000 5.00000 6.00000 6.00000 7.00000 7.00000 8.00000 8.00000 9.00000 9.00000 10.0000 10.0000 11.0000 11.0000 12.0000 12.0000 13.0000 13.0000 14.0000 14.0000 15.0000 15.0000 16.0000 16.0000 17.0000 17.0000 18.0000 18.0000 19.0000 19.0000 20.0000 20.0000 21.0000 21.0000 22.0000 22.0000 23.0000 23.0000 24.0000 24.0000 25.0000 25.0000 26.0000 26.0000 27.0000 27.0000 28.0000 28.0000 29.0000 29.0000 30.0000 30.0000 
+0.00000 1.00000 1.00000 2.00000 2.00000 3.00000 3.00000 4.00000 4.00000 5.00000 5.00000 6.00000 6.00000 7.00000 7.00000 8.00000 8.00000 9.00000 9.00000 10.0000 10.0000 11.0000 11.0000 12.0000 12.0000 13.0000 13.0000 14.0000 14.0000 15.0000 15.0000 16.0000 16.0000 17.0000 17.0000 18.0000 18.0000 19.0000 19.0000 20.0000 20.0000 21.0000 21.0000 22.0000 22.0000 23.0000 23.0000 24.0000 24.0000 25.0000 25.0000 26.0000 26.0000 27.0000 27.0000 28.0000 28.0000 29.0000 29.0000 30.0000 30.0000 0.00000 
 DEAL::Test<2,3>
 # vtk DataFile Version 3.0
 #This file was generated