From 766c060277c8621a78f0d8c76749abec8ea2ec89 Mon Sep 17 00:00:00 2001 From: kanschat Date: Wed, 28 May 2014 17:52:32 +0000 Subject: [PATCH] prepare for use of parameters git-svn-id: https://svn.dealii.org/trunk@32986 0785d39b-7218-0410-832d-ea1e28bc413d --- deal.II/include/deal.II/numerics/dof_output_operator.h | 6 +++++- .../deal.II/numerics/dof_output_operator.templates.h | 8 ++++---- 2 files changed, 9 insertions(+), 5 deletions(-) diff --git a/deal.II/include/deal.II/numerics/dof_output_operator.h b/deal.II/include/deal.II/numerics/dof_output_operator.h index b9f55a04a2..983bec97a8 100644 --- a/deal.II/include/deal.II/numerics/dof_output_operator.h +++ b/deal.II/include/deal.II/numerics/dof_output_operator.h @@ -20,9 +20,11 @@ #include #include +#include #include #include #include +#include #include @@ -58,9 +60,11 @@ namespace Algorithms private: SmartPointer, DoFOutputOperator > dof; - + const std::string filename_base; const unsigned int digits; + + DataOut out; }; template diff --git a/deal.II/include/deal.II/numerics/dof_output_operator.templates.h b/deal.II/include/deal.II/numerics/dof_output_operator.templates.h index 2bdb0f72e3..76285b16e4 100644 --- a/deal.II/include/deal.II/numerics/dof_output_operator.templates.h +++ b/deal.II/include/deal.II/numerics/dof_output_operator.templates.h @@ -16,7 +16,6 @@ #include -#include DEAL_II_NAMESPACE_OPEN @@ -29,7 +28,9 @@ namespace Algorithms : filename_base(filename_base), digits(digits) - {} + { + out.set_default_format(DataOutBase::gnuplot); + } template @@ -38,8 +39,6 @@ namespace Algorithms const AnyData &data) { Assert ((dof!=0), ExcNotInitialized()); - DataOut out; - out.set_default_format(DataOutBase::gnuplot); out.attach_dof_handler (*dof); for (unsigned int i=0;i