]> https://gitweb.dealii.org/ - dealii.git/commitdiff
Replace local static MappingQ1 objects by global StaticMappingQ1.
authorRalf Hartmann <Ralf.Hartmann@dlr.de>
Tue, 21 Feb 2006 12:54:48 +0000 (12:54 +0000)
committerRalf Hartmann <Ralf.Hartmann@dlr.de>
Tue, 21 Feb 2006 12:54:48 +0000 (12:54 +0000)
git-svn-id: https://svn.dealii.org/trunk@12438 0785d39b-7218-0410-832d-ea1e28bc413d

deal.II/deal.II/source/grid/tria_accessor.cc
deal.II/deal.II/source/numerics/data_out.cc
deal.II/deal.II/source/numerics/data_out_rotation.cc
deal.II/deal.II/source/numerics/derivative_approximation.cc
deal.II/deal.II/source/numerics/error_estimator.cc
deal.II/deal.II/source/numerics/matrices.cc

index 2eb854ee4188ce3476ff83613fe6a4f55b459e52..d601a9e130c665bfbfc254a2ff0bc259f0d8ef68 100644 (file)
@@ -1893,12 +1893,9 @@ bool CellAccessor<3>::point_inside (const Point<3> &p) const
                                   // carefully: transform to the
                                   // unit cube
                                   // and check there.
-  static const MappingQ1<dim> mapping;
-
   const TriaRawIterator<dim, CellAccessor<dim> > cell_iterator (*this);
-  return (GeometryInfo<dim>::
-         is_inside_unit_cell (mapping.transform_real_to_unit_cell(cell_iterator,
-                                                                  p)));
+  return (GeometryInfo<dim>::is_inside_unit_cell (
+    StaticMappingQ1<dim>::mapping.transform_real_to_unit_cell(cell_iterator, p)));
 }
 
 
index 9e09dbf3e95b4696c892e4a807dd22f4341160ec..b129a100c642fae262bed5e90e9ee3964c7744c1 100644 (file)
@@ -548,8 +548,7 @@ template <int dim, template <int> class DH>
 void DataOut<dim,DH>::build_patches (const unsigned int n_subdivisions,
                                     const unsigned int n_threads_) 
 {
-  static const MappingQ1<dim> mapping;
-  build_patches (mapping, n_subdivisions, n_threads_);
+  build_patches (StaticMappingQ1<dim>::mapping, n_subdivisions, n_threads_);
 }
 
 
index f3ab44de1d1d563c7779f4cb111464f4a1cd9956..5caa9afd7b17f1989939a762936edbda6715b0f6 100644 (file)
@@ -43,9 +43,8 @@ void DataOutRotation<dim,DH>::build_some_patches (Data &data)
                                   // transformed using a Q1 mapping,
                                   // we don't support anything else
                                   // as well
-  static const MappingQ1<dim> mapping;
   typename SelectFEValues<DH<dim> >::FEValues
-    x_fe_patch_values (mapping, this->dofs->get_fe(),
+    x_fe_patch_values (StaticMappingQ1<dim>::mapping, this->dofs->get_fe(),
                        patch_points, update_values);
 
   const unsigned int n_patches_per_circle = data.n_patches_per_circle;
index 108e28ff5e3f64b97f9caa27460b0d1199d80674..c516101546aebf7a72956b694b8379ea105d6b58 100644 (file)
@@ -414,8 +414,7 @@ approximate_gradient (const DH<dim>         &dof_handler,
                      const unsigned int     component)
 {
   Assert (DEAL_II_COMPAT_MAPPING, ExcCompatibility("mapping"));
-  static const MappingQ1<dim> mapping;
-  approximate_derivative<Gradient<dim>,dim> (mapping,
+  approximate_derivative<Gradient<dim>,dim> (StaticMappingQ1<dim>::mapping,
                                              dof_handler,
                                              solution,
                                              component,
@@ -449,8 +448,7 @@ approximate_second_derivative (const DH<dim>         &dof_handler,
                               const unsigned int     component)
 {
   Assert (DEAL_II_COMPAT_MAPPING, ExcCompatibility("mapping"));
-  static const MappingQ1<dim> mapping;
-  approximate_derivative<SecondDerivative<dim>,dim> (mapping,
+  approximate_derivative<SecondDerivative<dim>,dim> (StaticMappingQ1<dim>::mapping,
                                                     dof_handler,
                                                     solution,
                                                     component,
index 1b56a8111ca4c52fad389e06204bc449fcd0e0ae..68f928132af887e54a494ac2f23b89c69628624e 100644 (file)
@@ -102,8 +102,7 @@ estimate (const DoFHandler<1>   &dof_handler,
           const unsigned int       material_id)
 {
   Assert (DEAL_II_COMPAT_MAPPING, ExcCompatibility("mapping"));
-  static const MappingQ1<1> mapping;
-  estimate(mapping, dof_handler, quadrature, neumann_bc, solution,
+  estimate(StaticMappingQ1<1>::mapping, dof_handler, quadrature, neumann_bc, solution,
           error, component_mask, coefficients, n_threads, subdomain_id, material_id);
 }
 
@@ -124,8 +123,7 @@ estimate (const DoFHandler<1>   &dof_handler,
           const unsigned int       material_id)
 {
   Assert (DEAL_II_COMPAT_MAPPING, ExcCompatibility("mapping"));
-  static const MappingQ1<1> mapping;
-  estimate(mapping, dof_handler, quadrature, neumann_bc, solutions,
+  estimate(StaticMappingQ1<1>::mapping, dof_handler, quadrature, neumann_bc, solutions,
           errors, component_mask, coefficients, n_threads, subdomain_id, material_id);
 }
 
@@ -446,8 +444,7 @@ estimate (const DoFHandler<dim>   &dof_handler,
           const unsigned int       material_id)
 {
   Assert (DEAL_II_COMPAT_MAPPING, ExcCompatibility("mapping"));
-  static const MappingQ1<dim> mapping;
-  estimate(mapping, dof_handler, quadrature, neumann_bc, solution,
+  estimate(StaticMappingQ1<dim>::mapping, dof_handler, quadrature, neumann_bc, solution,
           error, component_mask, coefficients, n_threads,
            subdomain_id, material_id);
 }
@@ -922,8 +919,7 @@ void KellyErrorEstimator<dim>::estimate (const DoFHandler<dim>               &do
                                          const unsigned int       material_id)
 {
   Assert (DEAL_II_COMPAT_MAPPING, ExcCompatibility("mapping"));  
-  static const MappingQ1<dim> mapping;
-  estimate(mapping, dof_handler, quadrature, neumann_bc, solutions,
+  estimate(StaticMappingQ1<dim>::mapping, dof_handler, quadrature, neumann_bc, solutions,
           errors, component_mask, coefficients, n_threads,
            subdomain_id, material_id);
 }
index e681960f9320d43d44c8e5e93df201710c7282bb..439f384a906b95f23f66417d7221e07e778714ea 100644 (file)
@@ -2,7 +2,7 @@
 //    $Id$
 //    Version: $Name$
 //
-//    Copyright (C) 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005 by the deal.II authors
+//    Copyright (C) 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006 by the deal.II authors
 //
 //    This file is subject to QPL and may not be  distributed
 //    without copyright and license information. Please refer
@@ -302,8 +302,7 @@ void MatrixCreator::create_mass_matrix (const DoFHandler<dim>    &dof,
                                        const Function<dim> * const coefficient)
 {
   Assert (DEAL_II_COMPAT_MAPPING, ExcCompatibility("mapping"));
-  static const MappingQ1<dim> mapping;
-  create_mass_matrix(mapping, dof, q, matrix, coefficient);
+  create_mass_matrix(StaticMappingQ1<dim>::mapping, dof, q, matrix, coefficient);
 }
 
 
@@ -500,8 +499,8 @@ void MatrixCreator::create_mass_matrix (const DoFHandler<dim>    &dof,
                                        const Function<dim> * const coefficient)
 {
   Assert (DEAL_II_COMPAT_MAPPING, ExcCompatibility("mapping"));
-  static const MappingQ1<dim> mapping;
-  create_mass_matrix(mapping, dof, q, matrix, rhs, rhs_vector, coefficient);
+  create_mass_matrix(StaticMappingQ1<dim>::mapping,
+                    dof, q, matrix, rhs, rhs_vector, coefficient);
 }
 
 
@@ -946,9 +945,8 @@ void MatrixCreator::create_boundary_mass_matrix (const DoFHandler<dim>     &dof,
                                                 const Function<dim> * const a)
 {
   Assert (DEAL_II_COMPAT_MAPPING, ExcCompatibility("mapping"));
-  static const MappingQ1<dim> mapping;
-  create_boundary_mass_matrix(mapping, dof, q, matrix, rhs, rhs_vector,
-                             dof_to_boundary_mapping, a);
+  create_boundary_mass_matrix(StaticMappingQ1<dim>::mapping, dof, q,
+                             matrix,rhs, rhs_vector, dof_to_boundary_mapping, a);
 }
 
 
@@ -1126,8 +1124,7 @@ void MatrixCreator::create_laplace_matrix (const DoFHandler<dim>    &dof,
                                           const Function<dim> * const coefficient)
 {
   Assert (DEAL_II_COMPAT_MAPPING, ExcCompatibility("mapping"));
-  static const MappingQ1<dim> mapping;
-  create_laplace_matrix(mapping, dof, q, matrix, coefficient);
+  create_laplace_matrix(StaticMappingQ1<dim>::mapping, dof, q, matrix, coefficient);
 }
 
 
@@ -1329,8 +1326,8 @@ void MatrixCreator::create_laplace_matrix (const DoFHandler<dim>    &dof,
                                           const Function<dim> * const coefficient)
 {
   Assert (DEAL_II_COMPAT_MAPPING, ExcCompatibility("mapping"));
-  static const MappingQ1<dim> mapping;  
-  create_laplace_matrix(mapping, dof, q, matrix, rhs, rhs_vector, coefficient);
+  create_laplace_matrix(StaticMappingQ1<dim>::mapping, dof, q,
+                       matrix, rhs, rhs_vector, coefficient);
 }
 
 

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.