From a1cba6de3e3b4c7077a39bbb9d4b46fb4a0dec6e Mon Sep 17 00:00:00 2001
From: heister <heister@0785d39b-7218-0410-832d-ea1e28bc413d>
Date: Wed, 19 Feb 2014 14:43:27 +0000
Subject: [PATCH] fix dataout related test failures

git-svn-id: https://svn.dealii.org/trunk@32514 0785d39b-7218-0410-832d-ea1e28bc413d
---
 tests/bits/data_out_01.cc          | 4 ++--
 tests/bits/data_out_02.cc          | 4 ++--
 tests/bits/data_out_03.cc          | 4 ++--
 tests/bits/data_out_04.cc          | 4 ++--
 tests/bits/data_out_05.cc          | 2 +-
 tests/bits/data_out_08.cc          | 4 ++--
 tests/bits/data_out_faces_01.cc    | 4 ++--
 tests/bits/data_out_faces_02.cc    | 4 ++--
 tests/bits/data_out_faces_03.cc    | 4 ++--
 tests/bits/data_out_faces_04.cc    | 4 ++--
 tests/bits/data_out_rotation_01.cc | 4 ++--
 tests/bits/data_out_rotation_02.cc | 4 ++--
 tests/bits/data_out_rotation_03.cc | 4 ++--
 tests/bits/data_out_rotation_04.cc | 4 ++--
 tests/codim_one/data_out.cc        | 3 +--
 tests/codim_one/data_out.output    | 2 +-
 16 files changed, 29 insertions(+), 30 deletions(-)

diff --git a/tests/bits/data_out_01.cc b/tests/bits/data_out_01.cc
index d0878b547f..b16b961b58 100644
--- 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 02ed8b5243..dd55f86846 100644
--- 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 6af4951375..0e9a57c171 100644
--- 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 b8e4924e5e..c525c2bfe4 100644
--- 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 fc27ef3fd2..8141c0ddcf 100644
--- 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 e043d30f39..f3d6444dc7 100644
--- 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 c9e1571a0e..2c917ef178 100644
--- 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 6947df80d3..f6ff53417a 100644
--- 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 7d29f336ee..09d2a37ac4 100644
--- 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 b4ac0ae4a1..9c4a5402ab 100644
--- 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 a6b331795b..e5c16feda8 100644
--- 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 73c8e13f51..52923a184f 100644
--- 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 c93f3c30ed..6d289942ee 100644
--- 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 c43778c0d0..d33bf1678b 100644
--- 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 94ad28ef19..666947e1b8 100644
--- 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 a9c8f1e8cc..95c431d20c 100644
--- 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 
-- 
2.39.5