Also adjust testsuite and tutorial programs.

diff --git a/examples/step-18/step-18.cc b/examples/step-18/step-18.cc
index d340b8542a6fe838849bf4eb60a39e034ec915c3..a3fae45e1b8af82f1dbe1330e0f88370c504dd39 100644 (file)
--- a/examples/step-18/step-18.cc
+++ b/examples/step-18/step-18.cc
@@ -1395,7 +1395,7 @@ namespace Step18
                                  Utilities::int_to_string(timestep_no,4) +
                                  ".visit");
         std::ofstream visit_master (visit_master_filename.c_str());
-        data_out.write_visit_record (visit_master, filenames);
+        DataOutBase::write_visit_record (visit_master, filenames);
 
         // Similarly, we write the paraview .pvtu:
         const std::string
@@ -1411,7 +1411,7 @@ namespace Step18
         static std::vector<std::pair<double,std::string> > times_and_names;
         times_and_names.push_back (std::pair<double,std::string> (present_time, pvtu_master_filename));
         std::ofstream pvd_output ("solution.pvd");
-        data_out.write_pvd_record (pvd_output, times_and_names);
+        DataOutBase::write_pvd_record (pvd_output, times_and_names);
       }
 
   }

diff --git a/examples/step-32/step-32.cc b/examples/step-32/step-32.cc
index 0347787b85cd1905526590c9123236b0d3396d3b..6d0812ce236a31014100c0ac6c5a46f5ed289eb5 100644 (file)
--- a/examples/step-32/step-32.cc
+++ b/examples/step-32/step-32.cc
@@ -3435,7 +3435,7 @@ namespace Step32
                                  Utilities::int_to_string (out_index, 5) +
                                  ".visit");
         std::ofstream visit_master (visit_master_filename.c_str());
-        data_out.write_visit_record (visit_master, filenames);
+        DataOutBase::write_visit_record (visit_master, filenames);
       }
 
     computing_timer.exit_section ();

diff --git a/examples/step-42/step-42.cc b/examples/step-42/step-42.cc
index f289de7baac9790afb5ac0335a4a7f7efa329ccb..440a58026056137661337476777cc4d0ccfa45be 100644 (file)
--- a/examples/step-42/step-42.cc
+++ b/examples/step-42/step-42.cc
@@ -1,6 +1,6 @@
 /* ---------------------------------------------------------------------
  *
- * Copyright (C) 2012 - 2015 by the deal.II authors
+ * Copyright (C) 2012 - 2016 by the deal.II authors
  *
  * This file is part of the deal.II library.
  *
@@ -2059,7 +2059,7 @@ namespace Step42
         data_out.write_pvtu_record(pvtu_master_output, filenames);
 
         std::ofstream visit_master_output((output_dir + filename_base + ".visit").c_str());
-        data_out.write_visit_record(visit_master_output, filenames);
+        DataOutBase::write_visit_record(visit_master_output, filenames);
       }
 
     TrilinosWrappers::MPI::Vector tmp(solution);

diff --git a/examples/step-50/step-50.cc b/examples/step-50/step-50.cc
index d43bcc550d5387ae22f2e27af9a709f21223e6bb..bff72b20186e1421b2f207443ff7b533b0f587e1 100644 (file)
--- a/examples/step-50/step-50.cc
+++ b/examples/step-50/step-50.cc
@@ -904,7 +904,7 @@ namespace Step50
                                  Utilities::int_to_string (cycle, 5) +
                                  ".visit");
         std::ofstream visit_master (visit_master_filename.c_str());
-        data_out.write_visit_record (visit_master, filenames);
+        DataOutBase::write_visit_record (visit_master, filenames);
 
         std::cout << "   wrote " << pvtu_master_filename << std::endl;
 

diff --git a/tests/base/data_out_base_pvd.cc b/tests/base/data_out_base_pvd.cc
index 93f0db096e6aed9687d478a6934e9b61a169db92..8b1eb66368a6a6d6b8ce47e3bcc1379532cf7ddf 100644 (file)
--- a/tests/base/data_out_base_pvd.cc
+++ b/tests/base/data_out_base_pvd.cc
@@ -1,6 +1,6 @@
 // ---------------------------------------------------------------------
 //
-// Copyright (C) 2006 - 2014 by the deal.II authors
+// Copyright (C) 2006 - 2014, 2016 by the deal.II authors
 //
 // This file is part of the deal.II library.
 //
@@ -30,27 +30,6 @@
 #include "patches.h"
 
 
-
-std::vector<DataOutBase::Patch<2,2> > patches;
-
-class DataOutX : public DataOutInterface<2,2>
-{
-  virtual
-  const std::vector< ::DataOutBase::Patch<2,2> > &
-  get_patches () const
-  {
-    return patches;
-  }
-
-  virtual
-  std::vector<std::string>
-  get_dataset_names () const
-  {
-    return std::vector<std::string>();
-  }
-};
-
-
 template <int dim, int spacedim>
 void check(std::ostream &out)
 {
@@ -61,8 +40,7 @@ void check(std::ostream &out)
   names[3] = std::make_pair(3.141,"d");
   names[4] = std::make_pair(42e19,"i");
 
-  DataOutX x;
-  x.write_pvd_record (out, names);
+  DataOutBase::write_pvd_record (out, names);
 }
 
 

diff --git a/tests/numerics/data_out.cc b/tests/numerics/data_out.cc
index e58521a3922e7245409a6be7a256dfcf3dbcf7a0..d03c8b5d792e09742602f32e0a5345a5b2e7cf50 100644 (file)
--- a/tests/numerics/data_out.cc
+++ b/tests/numerics/data_out.cc
@@ -1,6 +1,6 @@
 // ---------------------------------------------------------------------
 //
-// Copyright (C) 2000 - 2015 by the deal.II authors
+// Copyright (C) 2000 - 2016 by the deal.II authors
 //
 // This file is part of the deal.II library.
 //
@@ -142,8 +142,8 @@ void LaplaceProblem<2>::output_results () const
       piece_names[1].push_back("subdomain-02.time_step_1.vtk");
       piece_names[2].push_back("subdomain-01.time_step_2.vtk");
       piece_names[2].push_back("subdomain-02.time_step_2.vtk");
-      data_out.write_visit_record(logfile, piece_names);
-      data_out.write_visit_record(logfile, piece_names[01]);
+      DataOutBase::write_visit_record(logfile, piece_names);
+      DataOutBase::write_visit_record(logfile, piece_names[01]);
     };
 
   // test DataOutRotation in 2d

diff --git a/tests/numerics/data_out_10.cc b/tests/numerics/data_out_10.cc
index b45bb696f22b8ebc7af25bc45729201957a00c63..ef3136e1216aecaa3895f555e8b62c9fa84333db 100644 (file)
--- a/tests/numerics/data_out_10.cc
+++ b/tests/numerics/data_out_10.cc
@@ -37,8 +37,6 @@
 
 void test()
 {
-  DataOut<2> data_out;
-
   const unsigned int number_of_time_steps = 3;
   std::vector<std::pair<double,std::vector<std::string > > > times_and_piece_names(number_of_time_steps);
 
@@ -53,7 +51,7 @@ void test()
   times_and_piece_names[2].first = 1.0;
   times_and_piece_names[2].second.push_back("subdomain-01.time_step_2.vtk");
   times_and_piece_names[2].second.push_back("subdomain-02.time_step_2.vtk");
-  data_out.write_visit_record(deallog.get_file_stream(), times_and_piece_names);
+  DataOutBase::write_visit_record(deallog.get_file_stream(), times_and_piece_names);
 
   deallog << "OK" << std::endl;