From 2c1c3249a2e5e5fb15410051a8fead68c7ebeefe Mon Sep 17 00:00:00 2001 From: kanschat Date: Tue, 6 Sep 2011 15:56:41 +0000 Subject: [PATCH] eliminate old style includes for meshworker git-svn-id: https://svn.dealii.org/trunk@24271 0785d39b-7218-0410-832d-ea1e28bc413d --- deal.II/examples/step-12/step-12.cc | 8 ++++---- deal.II/examples/step-39/step-39.cc | 8 ++++---- deal.II/include/deal.II/integrators/divergence.h | 2 +- deal.II/include/deal.II/integrators/elasticity.h | 4 ++-- deal.II/include/deal.II/integrators/l2.h | 2 +- deal.II/include/deal.II/integrators/laplace.h | 2 +- deal.II/include/deal.II/integrators/maxwell.h | 2 +- deal.II/include/deal.II/integrators/patches.h | 2 +- deal.II/include/deal.II/meshworker/assembler.h | 2 +- deal.II/include/deal.II/meshworker/dof_info.h | 4 ++-- .../dof_info.templates.h} | 3 ++- deal.II/include/deal.II/meshworker/integration_info.h | 4 ++-- deal.II/include/deal.II/meshworker/loop.h | 3 ++- deal.II/include/deal.II/meshworker/output.h | 2 +- deal.II/source/numerics/mesh_worker_info.cc | 4 ++-- 15 files changed, 27 insertions(+), 25 deletions(-) rename deal.II/include/deal.II/{numerics/mesh_worker_info.templates.h => meshworker/dof_info.templates.h} (98%) diff --git a/deal.II/examples/step-12/step-12.cc b/deal.II/examples/step-12/step-12.cc index c00a76c618..b1a1ab8c2d 100644 --- 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 -#include -#include -#include +#include +#include +#include +#include // 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 3f890d423b..330385f379 100644 --- 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 -#include -#include -#include +#include +#include +#include +#include // 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 27acaba6ea..b252e1aff0 100644 --- a/deal.II/include/deal.II/integrators/divergence.h +++ b/deal.II/include/deal.II/integrators/divergence.h @@ -19,7 +19,7 @@ #include #include #include -#include +#include 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 744ae05d67..13d64a1758 100644 --- 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 #include #include -#include +#include 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 06a4092ce0..240ba5cd92 100644 --- a/deal.II/include/deal.II/integrators/l2.h +++ b/deal.II/include/deal.II/integrators/l2.h @@ -19,7 +19,7 @@ #include #include #include -#include +#include 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 27e247f3a8..13caf5ca5e 100644 --- a/deal.II/include/deal.II/integrators/laplace.h +++ b/deal.II/include/deal.II/integrators/laplace.h @@ -19,7 +19,7 @@ #include #include #include -#include +#include 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 b7a6c334ba..0a385ee751 100644 --- a/deal.II/include/deal.II/integrators/maxwell.h +++ b/deal.II/include/deal.II/integrators/maxwell.h @@ -19,7 +19,7 @@ #include #include #include -#include +#include 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 68d3c9aeb6..cfb411eace 100644 --- a/deal.II/include/deal.II/integrators/patches.h +++ b/deal.II/include/deal.II/integrators/patches.h @@ -18,7 +18,7 @@ #include #include #include -#include +#include 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 d591b3cf08..2f968c3f7e 100644 --- a/deal.II/include/deal.II/meshworker/assembler.h +++ b/deal.II/include/deal.II/meshworker/assembler.h @@ -17,7 +17,7 @@ #include #include #include -#include +#include #include diff --git a/deal.II/include/deal.II/meshworker/dof_info.h b/deal.II/include/deal.II/meshworker/dof_info.h index 3eb644ec73..93055eddda 100644 --- 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 #include 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 38227f3e14..35c46d8029 100644 --- 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 +#include +#include #include 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 3cadf27adf..796791dfcc 100644 --- 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 #include diff --git a/deal.II/include/deal.II/meshworker/loop.h b/deal.II/include/deal.II/meshworker/loop.h index e1a5c2de3c..de548b222f 100644 --- a/deal.II/include/deal.II/meshworker/loop.h +++ b/deal.II/include/deal.II/meshworker/loop.h @@ -18,7 +18,8 @@ #include #include #include -#include +#include +#include #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 bbf31977f9..98965d1924 100644 --- 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 +#include #include #include #include diff --git a/deal.II/source/numerics/mesh_worker_info.cc b/deal.II/source/numerics/mesh_worker_info.cc index 37d920fbe8..462bd9875e 100644 --- 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 #include -#include +#include DEAL_II_NAMESPACE_OPEN -- 2.39.5