From e98aa188da9c987382072be612bc3132d5ebbb5f Mon Sep 17 00:00:00 2001 From: bangerth Date: Mon, 3 Feb 2014 14:24:09 +0000 Subject: [PATCH] DataOutBase no longer is a class. git-svn-id: https://svn.dealii.org/trunk@32384 0785d39b-7218-0410-832d-ea1e28bc413d --- tests/base/functions_04.cc | 9 ++++----- tests/base/functions_singularity.cc | 7 +++---- tests/bits/step-13.cc | 10 +++++----- tests/bits/step-14.cc | 6 +++--- tests/hp/step-13.cc | 10 +++++----- 5 files changed, 20 insertions(+), 22 deletions(-) diff --git a/tests/base/functions_04.cc b/tests/base/functions_04.cc index f5107c14d6..3524d65d39 100644 --- 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 &f, { names[i] = std::string("comp"); } - - DataOutBase dout; + DataOutBase::DXFlags dxflags; DataOutBase::GnuplotFlags gflags; std::vector > 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 6e15ff79cc..13b6ead1a2 100644 --- 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 &f, names[i] = std::string("comp"); } - DataOutBase dout; DataOutBase::DXFlags dxflags; DataOutBase::GnuplotFlags gflags; std::vector > 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 a5ab8a882c..35f88bac8a 100644 --- 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::OutputFormat output_format); + const DataOutBase::OutputFormat output_format); virtual void operator () (const DoFHandler &dof_handler, const Vector &solution) const; private: const std::string output_name_base; - const typename DataOut::OutputFormat output_format; + const DataOutBase::OutputFormat output_format; }; template SolutionOutput:: SolutionOutput (const std::string &output_name_base, - const typename DataOut::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 postprocessor2 (std::string("solution-")+solver_name, - DataOut::gnuplot); + DataOutBase::gnuplot); std::list *> postprocessor_list; postprocessor_list.push_back (&postprocessor1); diff --git a/tests/bits/step-14.cc b/tests/bits/step-14.cc index 558b70fa7e..83d847fb81 100644 --- 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::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::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 0773ff956b..b9838a1531 100644 --- 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::OutputFormat output_format); + const DataOutBase::OutputFormat output_format); virtual void operator () (const hp::DoFHandler &dof_handler, const Vector &solution) const; private: const std::string output_name_base; - const typename DataOut::OutputFormat output_format; + const DataOutBase::OutputFormat output_format; }; template SolutionOutput:: SolutionOutput (const std::string &output_name_base, - const typename DataOut::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 postprocessor2 (std::string("solution-")+solver_name, - DataOut::gnuplot); + DataOutBase::gnuplot); std::list *> postprocessor_list; postprocessor_list.push_back (&postprocessor1); -- 2.39.5