]> https://gitweb.dealii.org/ - dealii.git/commitdiff
move algorithms to lac
authorGuido Kanschat <dr.guido.kanschat@gmail.com>
Sun, 18 Jul 2010 04:00:43 +0000 (04:00 +0000)
committerGuido Kanschat <dr.guido.kanschat@gmail.com>
Sun, 18 Jul 2010 04:00:43 +0000 (04:00 +0000)
git-svn-id: https://svn.dealii.org/trunk@21513 0785d39b-7218-0410-832d-ea1e28bc413d

13 files changed:
deal.II/deal.II/include/numerics/dof_output_operator.h [new file with mode: 0644]
deal.II/deal.II/include/numerics/dof_output_operator.templates.h [new file with mode: 0644]
deal.II/deal.II/source/numerics/operator.cc
deal.II/lac/include/algorithms/newton.h [moved from deal.II/deal.II/include/numerics/newton.h with 99% similarity]
deal.II/lac/include/algorithms/newton.templates.h [moved from deal.II/deal.II/include/numerics/newton.templates.h with 99% similarity]
deal.II/lac/include/algorithms/operator.h [moved from deal.II/deal.II/include/numerics/operator.h with 86% similarity]
deal.II/lac/include/algorithms/operator.templates.h [moved from deal.II/deal.II/include/numerics/operator.templates.h with 67% similarity]
deal.II/lac/include/algorithms/theta_timestepping.h [moved from deal.II/deal.II/include/numerics/theta_timestepping.h with 99% similarity]
deal.II/lac/include/algorithms/theta_timestepping.templates.h [moved from deal.II/deal.II/include/numerics/theta_timestepping.templates.h with 98% similarity]
deal.II/lac/include/algorithms/timestep_control.h [moved from deal.II/deal.II/include/numerics/timestep_control.h with 100% similarity]
deal.II/lac/source/operator.cc [moved from deal.II/deal.II/source/numerics/operator.all_dimensions.cc with 83% similarity]
deal.II/lac/source/operator.inst.in [moved from deal.II/deal.II/source/numerics/operator.all_dimensions.inst.in with 100% similarity]
deal.II/lac/source/timestep_control.cc [moved from deal.II/deal.II/source/numerics/timestep_control.all_dimensions.cc with 98% similarity]

diff --git a/deal.II/deal.II/include/numerics/dof_output_operator.h b/deal.II/deal.II/include/numerics/dof_output_operator.h
new file mode 100644 (file)
index 0000000..691fb3e
--- /dev/null
@@ -0,0 +1,53 @@
+//---------------------------------------------------------------------------
+//    $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
diff --git a/deal.II/deal.II/include/numerics/dof_output_operator.templates.h b/deal.II/deal.II/include/numerics/dof_output_operator.templates.h
new file mode 100644 (file)
index 0000000..fccf083
--- /dev/null
@@ -0,0 +1,40 @@
+//---------------------------------------------------------------------------
+//    $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
index 9e3cd6fe4b024f911f2980adc9c7c5031ee34927..c1e84deae2afbe9918830817f3caacebd8166e18 100644 (file)
@@ -15,9 +15,7 @@
 #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>
similarity index 99%
rename from deal.II/deal.II/include/numerics/newton.h
rename to deal.II/lac/include/algorithms/newton.h
index 9dde15d2d1823ed2f412f7d62d7fac137de64c70..c7531b5179b3b8a7783f5cf146bf1f43a6e7312f 100644 (file)
@@ -15,7 +15,7 @@
 
 #include <base/smartpointer.h>
 #include <lac/solver_control.h>
-#include <numerics/operator.h>
+#include <algorithms/operator.h>
 
 DEAL_II_NAMESPACE_OPEN
 
similarity index 99%
rename from deal.II/deal.II/include/numerics/newton.templates.h
rename to deal.II/lac/include/algorithms/newton.templates.h
index 3728c1fe8c7b49b48e17789757e3ab32b2b803d6..1f741ab9bcd5bd4796ecea4614c21821a6c5f3bf 100644 (file)
@@ -10,7 +10,7 @@
 //
 //---------------------------------------------------------------------------
 
-#include <numerics/newton.h>
+#include <algorithms/newton.h>
 
 #include <base/parameter_handler.h>
 #include <base/logstream.h>
similarity index 86%
rename from deal.II/deal.II/include/numerics/operator.h
rename to deal.II/lac/include/algorithms/operator.h
index cad77faf3b5e1f375486e0d8cce2ee30e0b3a7de..5c4f3d03e246ea5d44fdc05ac296ba81927eb839 100644 (file)
@@ -16,7 +16,6 @@
 #include <base/config.h>
 #include <base/named_data.h>
 #include <base/event.h>
-#include <dofs/dof_handler.h>
 
 #include <fstream>
 
@@ -134,27 +133,6 @@ namespace Algorithms
     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;  
-  }
 }
 
 
similarity index 67%
rename from deal.II/deal.II/include/numerics/operator.templates.h
rename to deal.II/lac/include/algorithms/operator.templates.h
index cf27cc2a91ca9754270325852c44842cbab3dcaf..c2b33837088fb5427216998cbecbdc377069a2f5 100644 (file)
@@ -10,8 +10,7 @@
 //
 //---------------------------------------------------------------------------
 
-#include <numerics/operator.h>
-#include <numerics/data_out.h>
+#include <algorithms/operator.h>
 
 DEAL_II_NAMESPACE_OPEN
 
@@ -76,25 +75,6 @@ namespace Algorithms
     }
     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
similarity index 99%
rename from deal.II/deal.II/include/numerics/theta_timestepping.h
rename to deal.II/lac/include/algorithms/theta_timestepping.h
index 339a289c9a8cd37d8202f59f3f3093cbfb8b0a77..787ff9df0e137fff010c51e7239b392db0ee9f99 100644 (file)
@@ -14,8 +14,8 @@
 #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
 
similarity index 98%
rename from deal.II/deal.II/include/numerics/theta_timestepping.templates.h
rename to deal.II/lac/include/algorithms/theta_timestepping.templates.h
index 7b8c9c56bc644dc3f2fc910f982901c023ff5d91..8efc3a2ca197b287176b66b6697e7a358aaf661f 100644 (file)
@@ -10,7 +10,7 @@
 //
 //---------------------------------------------------------------------------
 
-#include <numerics/theta_timestepping.h>
+#include <algorithms/theta_timestepping.h>
 
 #include <base/parameter_handler.h>
 #include <lac/vector_memory.h>
similarity index 83%
rename from deal.II/deal.II/source/numerics/operator.all_dimensions.cc
rename to deal.II/lac/source/operator.cc
index 79332ded65e38b1e039ad3d4f3f5cb50719fdc50..f5a2121e40d6dce296901f90bd4f7253de8845e4 100644 (file)
@@ -15,9 +15,9 @@
 #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>
@@ -31,7 +31,7 @@ DEAL_II_NAMESPACE_OPEN
 
 namespace Algorithms
 {
-#include "operator.all_dimensions.inst"
+#include "operator.inst"
 }
 
 DEAL_II_NAMESPACE_CLOSE
similarity index 98%
rename from deal.II/deal.II/source/numerics/timestep_control.all_dimensions.cc
rename to deal.II/lac/source/timestep_control.cc
index b2f0fb81a100e51f699cbdc86420fb8fc11720a9..9c080ad88a5642024f20f9f92c5d60f077aa993f 100644 (file)
@@ -10,7 +10,7 @@
 //
 //---------------------------------------------------------------------------
 
-#include <numerics/timestep_control.h>
+#include <algorithms/timestep_control.h>
 #include <base/parameter_handler.h>
 
 DEAL_II_NAMESPACE_OPEN

In the beginning the Universe was created. This has made a lot of people very angry and has been widely regarded as a bad move.

Douglas Adams


Typeset in Trocchi and Trocchi Bold Sans Serif.