eliminate old style includes for meshworker

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

diff --git a/deal.II/examples/step-12/step-12.cc b/deal.II/examples/step-12/step-12.cc
index c00a76c6188a4f78e29ec3e828104cd61e7024b5..b1a1ab8c2db5ef38b741848d490f4ea365c678cf 100644 (file)
--- a/deal.II/examples/step-12/step-12.cc
+++ b/deal.II/examples/step-12/step-12.cc
@@ -60,10 +60,10 @@
 
                                 // Here come the new include files
                                 // for using the MeshWorker framework:
-#include <deal.II/numerics/mesh_worker.h>
-#include <deal.II/numerics/mesh_worker_info.h>
-#include <deal.II/numerics/mesh_worker_assembler.h>
-#include <deal.II/numerics/mesh_worker_loop.h>
+#include <deal.II/meshworker/dof_info.h>
+#include <deal.II/meshworker/integration_info.h>
+#include <deal.II/meshworker/assembler.h>
+#include <deal.II/meshworker/loop.h>
 
                                 // Like in all programs, we finish
                                 // this section by including the

diff --git a/deal.II/examples/step-39/step-39.cc b/deal.II/examples/step-39/step-39.cc
index 3f890d423baf832d610c375066b9cef3ca2c3cd6..330385f37949a0883c7c8bef55f174262555c2d8 100644 (file)
--- a/deal.II/examples/step-39/step-39.cc
+++ b/deal.II/examples/step-39/step-39.cc
@@ -37,10 +37,10 @@
 
                                 // The include files for using the
                                 // MeshWorker framework
-#include <deal.II/numerics/mesh_worker.h>
-#include <deal.II/numerics/mesh_worker_info.h>
-#include <deal.II/numerics/mesh_worker_assembler.h>
-#include <deal.II/numerics/mesh_worker_loop.h>
+#include <deal.II/meshworker/dof_info.h>
+#include <deal.II/meshworker/integration_info.h>
+#include <deal.II/meshworker/assembler.h>
+#include <deal.II/meshworker/loop.h>
 
                                 // The include file for local
                                 // integrators associated with the

diff --git a/deal.II/include/deal.II/integrators/divergence.h b/deal.II/include/deal.II/integrators/divergence.h
index 27acaba6ea3e64b6c51e24374fa2271457325435..b252e1aff08bb2393173c0060e02468f22d90808 100644 (file)
--- a/deal.II/include/deal.II/integrators/divergence.h
+++ b/deal.II/include/deal.II/integrators/divergence.h
@@ -19,7 +19,7 @@
 #include <deal.II/lac/full_matrix.h>
 #include <deal.II/fe/mapping.h>
 #include <deal.II/fe/fe_values.h>
-#include <deal.II/numerics/mesh_worker_info.h>
+#include <deal.II/meshworker/dof_info.h>
 
 DEAL_II_NAMESPACE_OPEN
 

diff --git a/deal.II/include/deal.II/integrators/elasticity.h b/deal.II/include/deal.II/integrators/elasticity.h
index 744ae05d678098312405258ce12454dc0429be55..13d64a17584de430b243140acfbfa04419aee6d8 100644 (file)
--- a/deal.II/include/deal.II/integrators/elasticity.h
+++ b/deal.II/include/deal.II/integrators/elasticity.h
@@ -1,7 +1,7 @@
 //---------------------------------------------------------------------------
 //    $Id$
 //
-//    Copyright (C) 2010 by the deal.II authors
+//    Copyright (C) 2010, 2011 by the deal.II authors
 //
 //    This file is subject to QPL and may not be  distributed
 //    without copyright and license information. Please refer
@@ -19,7 +19,7 @@
 #include <deal.II/lac/full_matrix.h>
 #include <deal.II/fe/mapping.h>
 #include <deal.II/fe/fe_values.h>
-#include <deal.II/numerics/mesh_worker_info.h>
+#include <deal.II/meshworker/dof_info.h>
 
 DEAL_II_NAMESPACE_OPEN
 

diff --git a/deal.II/include/deal.II/integrators/l2.h b/deal.II/include/deal.II/integrators/l2.h
index 06a4092ce09d7ae59f5a2a6fca46a242cfcfb6de..240ba5cd92e2ff1b6703cbcf2dd9bd98de7327de 100644 (file)
--- a/deal.II/include/deal.II/integrators/l2.h
+++ b/deal.II/include/deal.II/integrators/l2.h
@@ -19,7 +19,7 @@
 #include <deal.II/lac/full_matrix.h>
 #include <deal.II/fe/mapping.h>
 #include <deal.II/fe/fe_values.h>
-#include <deal.II/numerics/mesh_worker_info.h>
+#include <deal.II/meshworker/dof_info.h>
 
 DEAL_II_NAMESPACE_OPEN
 

diff --git a/deal.II/include/deal.II/integrators/laplace.h b/deal.II/include/deal.II/integrators/laplace.h
index 27e247f3a84eb5500e6a08a325cd1e03a50c486d..13caf5ca5e27fef568b589d29c32c731795211d4 100644 (file)
--- a/deal.II/include/deal.II/integrators/laplace.h
+++ b/deal.II/include/deal.II/integrators/laplace.h
@@ -19,7 +19,7 @@
 #include <deal.II/lac/full_matrix.h>
 #include <deal.II/fe/mapping.h>
 #include <deal.II/fe/fe_values.h>
-#include <deal.II/numerics/mesh_worker_info.h>
+#include <deal.II/meshworker/dof_info.h>
 
 DEAL_II_NAMESPACE_OPEN
 

diff --git a/deal.II/include/deal.II/integrators/maxwell.h b/deal.II/include/deal.II/integrators/maxwell.h
index b7a6c334bafc2988ac0ad4bea8dbae4928d28b25..0a385ee7511fb8aafc305dbc5eda2aaf89f009a0 100644 (file)
--- a/deal.II/include/deal.II/integrators/maxwell.h
+++ b/deal.II/include/deal.II/integrators/maxwell.h
@@ -19,7 +19,7 @@
 #include <deal.II/lac/full_matrix.h>
 #include <deal.II/fe/mapping.h>
 #include <deal.II/fe/fe_values.h>
-#include <deal.II/numerics/mesh_worker_info.h>
+#include <deal.II/meshworker/dof_info.h>
 
 DEAL_II_NAMESPACE_OPEN
 

diff --git a/deal.II/include/deal.II/integrators/patches.h b/deal.II/include/deal.II/integrators/patches.h
index 68d3c9aeb6875fff9783daae8399769a0298f03a..cfb411eace6342615400f3cec3b3ac2f10e0b191 100644 (file)
--- a/deal.II/include/deal.II/integrators/patches.h
+++ b/deal.II/include/deal.II/integrators/patches.h
@@ -18,7 +18,7 @@
 #include <deal.II/base/quadrature.h>
 #include <deal.II/fe/mapping.h>
 #include <deal.II/fe/fe_values.h>
-#include <deal.II/numerics/mesh_worker_info.h>
+#include <deal.II/meshworker/dof_info.h>
 
 DEAL_II_NAMESPACE_OPEN
 

diff --git a/deal.II/include/deal.II/meshworker/assembler.h b/deal.II/include/deal.II/meshworker/assembler.h
index d591b3cf08dab5bfebd7f79f471a152b90ac85ac..2f968c3f7e003833d9ac7df28ab52059c25978e7 100644 (file)
--- a/deal.II/include/deal.II/meshworker/assembler.h
+++ b/deal.II/include/deal.II/meshworker/assembler.h
@@ -17,7 +17,7 @@
 #include <deal.II/base/smartpointer.h>
 #include <deal.II/base/mg_level_object.h>
 #include <deal.II/lac/block_vector.h>
-#include <deal.II/numerics/mesh_worker_info.h>
+#include <deal.II/meshworker/dof_info.h>
 #include <deal.II/multigrid/mg_constrained_dofs.h>
 
 

diff --git a/deal.II/include/deal.II/meshworker/dof_info.h b/deal.II/include/deal.II/meshworker/dof_info.h
index 3eb644ec734696e61f28a2afb1075b26cad2c543..93055edddaa83955a3ea58402bbda25c6325865c 100644 (file)
--- a/deal.II/include/deal.II/meshworker/dof_info.h
+++ b/deal.II/include/deal.II/meshworker/dof_info.h
@@ -10,8 +10,8 @@
 //
 //---------------------------------------------------------------------------
 
-#ifndef __deal2__mesh_worker_info_h
-#define __deal2__mesh_worker_info_h
+#ifndef __deal2__mesh_worker_dof_info_h
+#define __deal2__mesh_worker_dof_info_h
 
 #include <deal.II/base/config.h>
 #include <deal.II/base/quadrature_lib.h>

diff --git a/deal.II/include/deal.II/numerics/mesh_worker_info.templates.h b/deal.II/include/deal.II/meshworker/dof_info.templates.h
similarity index 98%
rename from deal.II/include/deal.II/numerics/mesh_worker_info.templates.h
rename to deal.II/include/deal.II/meshworker/dof_info.templates.h
index 38227f3e14f0993914362c3c78b047069a94780e..35c46d80298f44f27caafe03eeaad0786e74a053 100644 (file)
--- a/deal.II/include/deal.II/numerics/mesh_worker_info.templates.h
+++ b/deal.II/include/deal.II/meshworker/dof_info.templates.h
@@ -11,7 +11,8 @@
 //---------------------------------------------------------------------------
 
 
-#include <deal.II/numerics/mesh_worker_info.h>
+#include <deal.II/meshworker/dof_info.h>
+#include <deal.II/meshworker/integration_info.h>
 #include <deal.II/base/quadrature_lib.h>
 
 DEAL_II_NAMESPACE_OPEN

diff --git a/deal.II/include/deal.II/meshworker/integration_info.h b/deal.II/include/deal.II/meshworker/integration_info.h
index 3cadf27adfcebac8a733480bc4ff340691d21e2e..796791dfcc10d7ecbc85d5ba9cf0955ccbb9da5d 100644 (file)
--- a/deal.II/include/deal.II/meshworker/integration_info.h
+++ b/deal.II/include/deal.II/meshworker/integration_info.h
@@ -10,8 +10,8 @@
 //
 //---------------------------------------------------------------------------
 
-#ifndef __deal2__mesh_worker_info_h
-#define __deal2__mesh_worker_info_h
+#ifndef __deal2__mesh_worker_integration_info_h
+#define __deal2__mesh_worker_integration_info_h
 
 #include <deal.II/base/config.h>
 #include <deal.II/base/quadrature_lib.h>

diff --git a/deal.II/include/deal.II/meshworker/loop.h b/deal.II/include/deal.II/meshworker/loop.h
index e1a5c2de3c9af16061d668951c104a869b4eae3d..de548b222f83b3b593ffdfae18c63d6d1cd2de2b 100644 (file)
--- a/deal.II/include/deal.II/meshworker/loop.h
+++ b/deal.II/include/deal.II/meshworker/loop.h
@@ -18,7 +18,8 @@
 #include <deal.II/base/work_stream.h>
 #include <deal.II/base/template_constraints.h>
 #include <deal.II/grid/tria.h>
-#include <deal.II/numerics/mesh_worker_info.h>
+#include <deal.II/meshworker/dof_info.h>
+#include <deal.II/meshworker/integration_info.h>
 
 #define DEAL_II_MESHWORKER_PARALLEL 1
 

diff --git a/deal.II/include/deal.II/meshworker/output.h b/deal.II/include/deal.II/meshworker/output.h
index bbf31977f9cfea0431f2c22b627211f1ab15f3ad..98965d19246032079a6192c9739056247fd0059e 100644 (file)
--- a/deal.II/include/deal.II/meshworker/output.h
+++ b/deal.II/include/deal.II/meshworker/output.h
@@ -13,7 +13,7 @@
 #ifndef __deal2__mesh_worker_output_h
 #define __deal2__mesh_worker_output_h
 
-#include <deal.II/numerics/mesh_worker_info.h>
+#include <deal.II/meshworker/dof_info.h>
 #include <deal.II/base/named_data.h>
 #include <deal.II/base/smartpointer.h>
 #include <base/utilities.h>

diff --git a/deal.II/source/numerics/mesh_worker_info.cc b/deal.II/source/numerics/mesh_worker_info.cc
index 37d920fbe87275843b6b0cc812a3c4489fb1b08a..462bd9875e15969279310369b947554611ad54cb 100644 (file)
--- a/deal.II/source/numerics/mesh_worker_info.cc
+++ b/deal.II/source/numerics/mesh_worker_info.cc
@@ -2,7 +2,7 @@
 //    $Id$
 //    Version: $Name$
 //
-//    Copyright (C) 2009, 2010 by the deal.II authors
+//    Copyright (C) 2009, 2010, 2011 by the deal.II authors
 //
 //    This file is subject to QPL and may not be  distributed
 //    without copyright and license information. Please refer
@@ -18,7 +18,7 @@
 #include <deal.II/lac/trilinos_vector.h>
 #include <deal.II/lac/trilinos_block_vector.h>
 
-#include <deal.II/numerics/mesh_worker_info.templates.h>
+#include <deal.II/meshworker/dof_info.templates.h>
 
 DEAL_II_NAMESPACE_OPEN