DataOutBase no longer is a class.

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

diff --git a/tests/base/functions_04.cc b/tests/base/functions_04.cc
index f5107c14d6396bd845ba61e97377cd8f499d3016..3524d65d39336956fe1a0012dcfb60e30071ddcc 100644 (file)
--- a/tests/base/functions_04.cc
+++ b/tests/base/functions_04.cc
@@ -1,7 +1,7 @@
 // ---------------------------------------------------------------------
 // $Id$
 //
-// Copyright (C) 2007 - 2013 by the deal.II authors
+// Copyright (C) 2007 - 2014 by the deal.II authors
 //
 // This file is part of the deal.II library.
 //
@@ -182,15 +182,14 @@ check_function(const Functions::FlowFunction<dim> &f,
     {
       names[i] = std::string("comp");
     }
-
-  DataOutBase dout;
+  
   DataOutBase::DXFlags dxflags;
   DataOutBase::GnuplotFlags gflags;
   std::vector<std_cxx1x::tuple<unsigned int, unsigned int, std::string> > vectors;
   if (dim==2)
-    dout.write_gnuplot(patches, names, vectors, gflags, out);
+    DataOutBase::write_gnuplot(patches, names, vectors, gflags, out);
   else
-    dout.write_dx(patches, names, vectors, dxflags, out);
+    DataOutBase::write_dx(patches, names, vectors, dxflags, out);
 }
 
 

diff --git a/tests/base/functions_singularity.cc b/tests/base/functions_singularity.cc
index 6e15ff79cc07bf591ab895dd30d1b696288143a2..13b6ead1a23233db2053da4ff77e253df07fff46 100644 (file)
--- a/tests/base/functions_singularity.cc
+++ b/tests/base/functions_singularity.cc
@@ -1,7 +1,7 @@
 // ---------------------------------------------------------------------
 // $Id$
 //
-// Copyright (C) 2007 - 2013 by the deal.II authors
+// Copyright (C) 2007 - 2014 by the deal.II authors
 //
 // This file is part of the deal.II library.
 //
@@ -223,14 +223,13 @@ check_function_derivative(const Functions::FlowFunction<dim> &f,
       names[i] = std::string("comp");
     }
 
-  DataOutBase dout;
   DataOutBase::DXFlags dxflags;
   DataOutBase::GnuplotFlags gflags;
   std::vector<std_cxx1x::tuple<unsigned int, unsigned int, std::string> > vectors;
   if (dim==2)
-    dout.write_gnuplot(patches, names, vectors, gflags, out);
+    DataOutBase::write_gnuplot(patches, names, vectors, gflags, out);
   else
-    dout.write_dx(patches, names, vectors, dxflags, out);
+    DataOutBase::write_dx(patches, names, vectors, dxflags, out);
 }
 
 

diff --git a/tests/bits/step-13.cc b/tests/bits/step-13.cc
index a5ab8a882cb407f652fb517245ab888458a7b818..35f88bac8a5b335adcb096860f95354e4623079f 100644 (file)
--- a/tests/bits/step-13.cc
+++ b/tests/bits/step-13.cc
@@ -1,7 +1,7 @@
 // ---------------------------------------------------------------------
 // $Id$
 //
-// Copyright (C) 2005 - 2013 by the deal.II authors
+// Copyright (C) 2005 - 2014 by the deal.II authors
 //
 // This file is part of the deal.II library.
 //
@@ -163,20 +163,20 @@ namespace Evaluation
   {
   public:
     SolutionOutput (const std::string                         &output_name_base,
-                    const typename DataOut<dim>::OutputFormat  output_format);
+                    const DataOutBase::OutputFormat  output_format);
 
     virtual void operator () (const DoFHandler<dim> &dof_handler,
                               const Vector<double>  &solution) const;
   private:
     const std::string                         output_name_base;
-    const typename DataOut<dim>::OutputFormat output_format;
+    const DataOutBase::OutputFormat output_format;
   };
 
 
   template <int dim>
   SolutionOutput<dim>::
   SolutionOutput (const std::string                         &output_name_base,
-                  const typename DataOut<dim>::OutputFormat  output_format)
+                  const DataOutBase::OutputFormat  output_format)
     :
     output_name_base (output_name_base),
     output_format (output_format)
@@ -783,7 +783,7 @@ void solve_problem (const std::string &solver_name)
 
   Evaluation::SolutionOutput<dim>
   postprocessor2 (std::string("solution-")+solver_name,
-                  DataOut<dim>::gnuplot);
+                  DataOutBase::gnuplot);
 
   std::list<Evaluation::EvaluationBase<dim> *> postprocessor_list;
   postprocessor_list.push_back (&postprocessor1);

diff --git a/tests/bits/step-14.cc b/tests/bits/step-14.cc
index 558b70fa7ecb7501e6d147587274f1c83e0f3aae..83d847fb815f6b74d7a3f750e38a645548a67f08 100644 (file)
--- a/tests/bits/step-14.cc
+++ b/tests/bits/step-14.cc
@@ -1,7 +1,7 @@
 // ---------------------------------------------------------------------
 // $Id$
 //
-// Copyright (C) 2005 - 2013 by the deal.II authors
+// Copyright (C) 2005 - 2014 by the deal.II authors
 //
 // This file is part of the deal.II library.
 //
@@ -660,7 +660,7 @@ namespace LaplaceSolver
              << this->refinement_cycle
              << ".gnuplot"
              << std::ends;
-    data_out.write (deallog.get_file_stream(), DataOut<dim>::gnuplot);
+    data_out.write (deallog.get_file_stream(), DataOutBase::gnuplot);
   }
 
 
@@ -1635,7 +1635,7 @@ namespace LaplaceSolver
              << this->refinement_cycle
              << ".gnuplot"
              << std::ends;
-    data_out.write (deallog.get_file_stream(), DataOut<dim>::gnuplot);
+    data_out.write (deallog.get_file_stream(), DataOutBase::gnuplot);
   }
 
 

diff --git a/tests/hp/step-13.cc b/tests/hp/step-13.cc
index 0773ff956b9697b66e8c2e85be96476f7eba1ff2..b9838a1531ae121c62bf9263b46b0b1ba7a1109c 100644 (file)
--- a/tests/hp/step-13.cc
+++ b/tests/hp/step-13.cc
@@ -1,7 +1,7 @@
 // ---------------------------------------------------------------------
 // $Id$
 //
-// Copyright (C) 2005 - 2013 by the deal.II authors
+// Copyright (C) 2005 - 2014 by the deal.II authors
 //
 // This file is part of the deal.II library.
 //
@@ -163,20 +163,20 @@ namespace Evaluation
   {
   public:
     SolutionOutput (const std::string                         &output_name_base,
-                    const typename DataOut<dim>::OutputFormat  output_format);
+                    const DataOutBase::OutputFormat  output_format);
 
     virtual void operator () (const hp::DoFHandler<dim> &dof_handler,
                               const Vector<double>  &solution) const;
   private:
     const std::string                         output_name_base;
-    const typename DataOut<dim>::OutputFormat output_format;
+    const DataOutBase::OutputFormat output_format;
   };
 
 
   template <int dim>
   SolutionOutput<dim>::
   SolutionOutput (const std::string                         &output_name_base,
-                  const typename DataOut<dim>::OutputFormat  output_format)
+                  const DataOutBase::OutputFormat  output_format)
     :
     output_name_base (output_name_base),
     output_format (output_format)
@@ -783,7 +783,7 @@ void solve_problem (const std::string &solver_name)
 
   Evaluation::SolutionOutput<dim>
   postprocessor2 (std::string("solution-")+solver_name,
-                  DataOut<dim>::gnuplot);
+                  DataOutBase::gnuplot);
 
   std::list<Evaluation::EvaluationBase<dim> *> postprocessor_list;
   postprocessor_list.push_back (&postprocessor1);