--- /dev/null
+//---------------------------------------------------------------------------
+// $Id$
+//
+// Copyright (C) 2010 by the deal.II authors
+//
+// This file is subject to QPL and may not be distributed
+// without copyright and license information. Please refer
+// to the file deal.II/doc/license.html for the text and
+// further information on this license.
+//
+//---------------------------------------------------------------------------
+
+#ifndef __deal2__dof_output_operator_h
+#define __deal2__dof_output_operator_h
+
+#include <base/config.h>
+#include <base/named_data.h>
+#include <base/event.h>
+#include <algorithms/operator.h>
+#include <dofs/dof_handler.h>
+
+#include <fstream>
+
+DEAL_II_NAMESPACE_OPEN
+
+namespace Algorithms
+{
+ template <class VECTOR, int dim, int spacedim=dim>
+ class DoFOutputOperator : public OutputOperator<VECTOR>
+ {
+ public:
+ void initialize (DoFHandler<dim, spacedim>& dof_handler);
+
+ virtual OutputOperator<VECTOR>&
+ operator<<(const NamedData<VECTOR*>& vectors);
+
+ private:
+ SmartPointer<DoFHandler<dim, spacedim>,
+ DoFOutputOperator<VECTOR, dim, spacedim> > dof;
+ };
+
+ template <class VECTOR, int dim, int spacedim>
+ void DoFOutputOperator<VECTOR, dim, spacedim>::initialize(
+ DoFHandler<dim, spacedim>& dof_handler)
+ {
+ dof = &dof_handler;
+ }
+}
+
+
+DEAL_II_NAMESPACE_CLOSE
+
+#endif
--- /dev/null
+//---------------------------------------------------------------------------
+// $Id$
+//
+// Copyright (C) 2006, 2007, 2008, 2009, 2010 by Guido Kanschat
+//
+// This file is subject to QPL and may not be distributed
+// without copyright and license information. Please refer
+// to the file deal.II/doc/license.html for the text and
+// further information on this license.
+//
+//---------------------------------------------------------------------------
+
+#include <numerics/dof_output_operator.h>
+#include <numerics/data_out.h>
+
+DEAL_II_NAMESPACE_OPEN
+
+namespace Algorithms
+{
+ template <class VECTOR, int dim, int spacedim>
+ OutputOperator<VECTOR>&
+ DoFOutputOperator<VECTOR, dim, spacedim>::operator<<(
+ const NamedData<VECTOR*>& vectors)
+ {
+ Assert ((dof!=0), ExcNotInitialized());
+ DataOut<dim> out;
+ out.attach_dof_handler (*dof);
+ out.add_data_vector (*vectors(vectors.find("solution")), "solution");
+ out.add_data_vector (*vectors(vectors.find("update")), "update");
+ out.add_data_vector (*vectors(vectors.find("residual")), "residual");
+ std::ostringstream streamOut;
+ streamOut << "Newton_" << std::setw(3) << std::setfill('0') << this->step;
+ std::ofstream out_filename (streamOut.str().c_str());
+ out.build_patches (2);
+ out.write_gnuplot (out_filename);
+ return *this;
+ }
+}
+
+DEAL_II_NAMESPACE_CLOSE
#include <base/logstream.h>
#include <lac/vector_memory.h>
-#include <numerics/operator.templates.h>
-#include <numerics/newton.templates.h>
-#include <numerics/theta_timestepping.templates.h>
+#include <numerics/dof_output_operator.templates.h>
#include <lac/vector.h>
#include <lac/block_vector.h>
#include <base/smartpointer.h>
#include <lac/solver_control.h>
-#include <numerics/operator.h>
+#include <algorithms/operator.h>
DEAL_II_NAMESPACE_OPEN
//
//---------------------------------------------------------------------------
-#include <numerics/newton.h>
+#include <algorithms/newton.h>
#include <base/parameter_handler.h>
#include <base/logstream.h>
#include <base/config.h>
#include <base/named_data.h>
#include <base/event.h>
-#include <dofs/dof_handler.h>
#include <fstream>
step = s;
return *this;
}
-
- template <class VECTOR, int dim, int spacedim=dim>
- class DoFOutputOperator : public OutputOperator<VECTOR>
- {
- public:
- void initialize (DoFHandler<dim, spacedim>& dof_handler);
-
- virtual OutputOperator<VECTOR>&
- operator<<(const NamedData<VECTOR*>& vectors);
-
- private:
- SmartPointer<DoFHandler<dim, spacedim>,
- DoFOutputOperator<VECTOR, dim, spacedim> > dof;
- };
-
- template <class VECTOR, int dim, int spacedim>
- void DoFOutputOperator<VECTOR, dim, spacedim>::initialize(
- DoFHandler<dim, spacedim>& dof_handler)
- {
- dof = &dof_handler;
- }
}
//
//---------------------------------------------------------------------------
-#include <numerics/operator.h>
-#include <numerics/data_out.h>
+#include <algorithms/operator.h>
DEAL_II_NAMESPACE_OPEN
}
return *this;
}
-
- template <class VECTOR, int dim, int spacedim>
- OutputOperator<VECTOR>&
- DoFOutputOperator<VECTOR, dim, spacedim>::operator<<(
- const NamedData<VECTOR*>& vectors)
- {
- Assert ((dof!=0), ExcNotInitialized());
- DataOut<dim> out;
- out.attach_dof_handler (*dof);
- out.add_data_vector (*vectors(vectors.find("solution")), "solution");
- out.add_data_vector (*vectors(vectors.find("update")), "update");
- out.add_data_vector (*vectors(vectors.find("residual")), "residual");
- std::ostringstream streamOut;
- streamOut << "Newton_" << std::setw(3) << std::setfill('0') << this->step;
- std::ofstream out_filename (streamOut.str().c_str());
- out.build_patches (2);
- out.write_gnuplot (out_filename);
- return *this;
- }
}
DEAL_II_NAMESPACE_CLOSE
#define __deal2__theta_timestepping_h
#include <base/smartpointer.h>
-#include <numerics/operator.h>
-#include <numerics/timestep_control.h>
+#include <algorithms/operator.h>
+#include <algorithms/timestep_control.h>
DEAL_II_NAMESPACE_OPEN
//
//---------------------------------------------------------------------------
-#include <numerics/theta_timestepping.h>
+#include <algorithms/theta_timestepping.h>
#include <base/parameter_handler.h>
#include <lac/vector_memory.h>
#include <base/logstream.h>
#include <lac/vector_memory.h>
-#include <numerics/operator.templates.h>
-#include <numerics/newton.templates.h>
-#include <numerics/theta_timestepping.templates.h>
+#include <algorithms/operator.templates.h>
+#include <algorithms/newton.templates.h>
+#include <algorithms/theta_timestepping.templates.h>
#include <lac/vector.h>
#include <lac/block_vector.h>
namespace Algorithms
{
-#include "operator.all_dimensions.inst"
+#include "operator.inst"
}
DEAL_II_NAMESPACE_CLOSE
//
//---------------------------------------------------------------------------
-#include <numerics/timestep_control.h>
+#include <algorithms/timestep_control.h>
#include <base/parameter_handler.h>
DEAL_II_NAMESPACE_OPEN