From: bangerth <bangerth@0785d39b-7218-0410-832d-ea1e28bc413d>
Date: Sun, 18 Apr 2010 22:48:33 +0000 (+0000)
Subject: Same here.
X-Git-Url: https://gitweb.dealii.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=1be43b06a6ee72dfc03e96e3a31f8e262d608b5e;p=dealii-svn.git

Same here.


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

diff --git a/deal.II/deal.II/source/numerics/mesh_worker.cc b/deal.II/deal.II/source/numerics/mesh_worker.cc
index ca94d3d38a..b430dd3230 100644
--- a/deal.II/deal.II/source/numerics/mesh_worker.cc
+++ b/deal.II/deal.II/source/numerics/mesh_worker.cc
@@ -16,67 +16,74 @@
 #include <numerics/mesh_worker.h>
 #include <base/quadrature_lib.h>
 
-using namespace dealii;
-using namespace MeshWorker;
+DEAL_II_NAMESPACE_OPEN
 
-template <int dim>
-IntegrationWorker<dim>::IntegrationWorker ()
+namespace MeshWorker
 {
-  cell_flags = update_JxW_values;
-  boundary_flags = UpdateFlags(update_JxW_values | update_normal_vectors);
-  face_flags = boundary_flags;
-  neighbor_flags = update_default;
-}
 
+  template <int dim>
+  IntegrationWorker<dim>::IntegrationWorker ()
+  {
+    cell_flags = update_JxW_values;
+    boundary_flags = UpdateFlags(update_JxW_values | update_normal_vectors);
+    face_flags = boundary_flags;
+    neighbor_flags = update_default;
+  }
 
-template<int dim>
-void
-IntegrationWorker<dim>::initialize_update_flags ()
-{
-  if (cell_selector.has_values() != 0) cell_flags |= update_values;
-  if (cell_selector.has_gradients() != 0) cell_flags |= update_gradients;
-  if (cell_selector.has_hessians() != 0) cell_flags |= update_hessians;
+
+  template<int dim>
+  void
+  IntegrationWorker<dim>::initialize_update_flags ()
+  {
+    if (cell_selector.has_values() != 0) cell_flags |= update_values;
+    if (cell_selector.has_gradients() != 0) cell_flags |= update_gradients;
+    if (cell_selector.has_hessians() != 0) cell_flags |= update_hessians;
   
-  if (boundary_selector.has_values() != 0) boundary_flags |= update_values;
-  if (boundary_selector.has_gradients() != 0) boundary_flags |= update_gradients;
-  if (boundary_selector.has_hessians() != 0) boundary_flags |= update_hessians;
+    if (boundary_selector.has_values() != 0) boundary_flags |= update_values;
+    if (boundary_selector.has_gradients() != 0) boundary_flags |= update_gradients;
+    if (boundary_selector.has_hessians() != 0) boundary_flags |= update_hessians;
   
-  if (face_selector.has_values() != 0) face_flags |= update_values;
-  if (face_selector.has_gradients() != 0) face_flags |= update_gradients;
-  if (face_selector.has_hessians() != 0) face_flags |= update_hessians;
+    if (face_selector.has_values() != 0) face_flags |= update_values;
+    if (face_selector.has_gradients() != 0) face_flags |= update_gradients;
+    if (face_selector.has_hessians() != 0) face_flags |= update_hessians;
   
-  if (face_selector.has_values() != 0) neighbor_flags |= update_values;
-  if (face_selector.has_gradients() != 0) neighbor_flags |= update_gradients;
-  if (face_selector.has_hessians() != 0) neighbor_flags |= update_hessians;  
-}
+    if (face_selector.has_values() != 0) neighbor_flags |= update_values;
+    if (face_selector.has_gradients() != 0) neighbor_flags |= update_gradients;
+    if (face_selector.has_hessians() != 0) neighbor_flags |= update_hessians;  
+  }
 
 
-template<int dim>
-void
-IntegrationWorker<dim>::add_update_flags(
-  const UpdateFlags flags, bool cell, bool boundary, bool face, bool neighbor)
-{
-  if (cell) cell_flags |= flags;
-  if (boundary) boundary_flags |= flags;
-  if (face) face_flags |= flags;
-  if (neighbor) neighbor_flags |= flags;  
-}
+  template<int dim>
+  void
+  IntegrationWorker<dim>::add_update_flags(
+    const UpdateFlags flags, bool cell, bool boundary, bool face, bool neighbor)
+  {
+    if (cell) cell_flags |= flags;
+    if (boundary) boundary_flags |= flags;
+    if (face) face_flags |= flags;
+    if (neighbor) neighbor_flags |= flags;  
+  }
 
   
-template<int dim>
-void
-IntegrationWorker<dim>::initialize_gauss_quadrature(
-  unsigned int cp,
-  unsigned int bp,
-  unsigned int fp)
-{
-  cell_quadrature = QGauss<dim>(cp);
-  boundary_quadrature = QGauss<dim-1>(bp);
-  face_quadrature = QGauss<dim-1>(fp);
+  template<int dim>
+  void
+  IntegrationWorker<dim>::initialize_gauss_quadrature(
+    unsigned int cp,
+    unsigned int bp,
+    unsigned int fp)
+  {
+    cell_quadrature = QGauss<dim>(cp);
+    boundary_quadrature = QGauss<dim-1>(bp);
+    face_quadrature = QGauss<dim-1>(fp);
 
+  }
 }
 
 #if deal_II_dimension > 1
-template class IntegrationWorker<deal_II_dimension>;
+namespace MeshWorker
+{
+  template class IntegrationWorker<deal_II_dimension>;
+}
 #endif
 
+DEAL_II_NAMESPACE_CLOSE