From: Ralf Hartmann Date: Tue, 21 Feb 2006 12:54:48 +0000 (+0000) Subject: Replace local static MappingQ1 objects by global StaticMappingQ1. X-Git-Tag: v8.0.0~12244 X-Git-Url: https://gitweb.dealii.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=615b6e57696109d92d8a314e82c4ad629217f102;p=dealii.git Replace local static MappingQ1 objects by global StaticMappingQ1. git-svn-id: https://svn.dealii.org/trunk@12438 0785d39b-7218-0410-832d-ea1e28bc413d --- diff --git a/deal.II/deal.II/source/grid/tria_accessor.cc b/deal.II/deal.II/source/grid/tria_accessor.cc index 2eb854ee41..d601a9e130 100644 --- a/deal.II/deal.II/source/grid/tria_accessor.cc +++ b/deal.II/deal.II/source/grid/tria_accessor.cc @@ -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 mapping; - const TriaRawIterator > cell_iterator (*this); - return (GeometryInfo:: - is_inside_unit_cell (mapping.transform_real_to_unit_cell(cell_iterator, - p))); + return (GeometryInfo::is_inside_unit_cell ( + StaticMappingQ1::mapping.transform_real_to_unit_cell(cell_iterator, p))); } diff --git a/deal.II/deal.II/source/numerics/data_out.cc b/deal.II/deal.II/source/numerics/data_out.cc index 9e09dbf3e9..b129a100c6 100644 --- a/deal.II/deal.II/source/numerics/data_out.cc +++ b/deal.II/deal.II/source/numerics/data_out.cc @@ -548,8 +548,7 @@ template class DH> void DataOut::build_patches (const unsigned int n_subdivisions, const unsigned int n_threads_) { - static const MappingQ1 mapping; - build_patches (mapping, n_subdivisions, n_threads_); + build_patches (StaticMappingQ1::mapping, n_subdivisions, n_threads_); } diff --git a/deal.II/deal.II/source/numerics/data_out_rotation.cc b/deal.II/deal.II/source/numerics/data_out_rotation.cc index f3ab44de1d..5caa9afd7b 100644 --- a/deal.II/deal.II/source/numerics/data_out_rotation.cc +++ b/deal.II/deal.II/source/numerics/data_out_rotation.cc @@ -43,9 +43,8 @@ void DataOutRotation::build_some_patches (Data &data) // transformed using a Q1 mapping, // we don't support anything else // as well - static const MappingQ1 mapping; typename SelectFEValues >::FEValues - x_fe_patch_values (mapping, this->dofs->get_fe(), + x_fe_patch_values (StaticMappingQ1::mapping, this->dofs->get_fe(), patch_points, update_values); const unsigned int n_patches_per_circle = data.n_patches_per_circle; diff --git a/deal.II/deal.II/source/numerics/derivative_approximation.cc b/deal.II/deal.II/source/numerics/derivative_approximation.cc index 108e28ff5e..c516101546 100644 --- a/deal.II/deal.II/source/numerics/derivative_approximation.cc +++ b/deal.II/deal.II/source/numerics/derivative_approximation.cc @@ -414,8 +414,7 @@ approximate_gradient (const DH &dof_handler, const unsigned int component) { Assert (DEAL_II_COMPAT_MAPPING, ExcCompatibility("mapping")); - static const MappingQ1 mapping; - approximate_derivative,dim> (mapping, + approximate_derivative,dim> (StaticMappingQ1::mapping, dof_handler, solution, component, @@ -449,8 +448,7 @@ approximate_second_derivative (const DH &dof_handler, const unsigned int component) { Assert (DEAL_II_COMPAT_MAPPING, ExcCompatibility("mapping")); - static const MappingQ1 mapping; - approximate_derivative,dim> (mapping, + approximate_derivative,dim> (StaticMappingQ1::mapping, dof_handler, solution, component, diff --git a/deal.II/deal.II/source/numerics/error_estimator.cc b/deal.II/deal.II/source/numerics/error_estimator.cc index 1b56a8111c..68f928132a 100644 --- a/deal.II/deal.II/source/numerics/error_estimator.cc +++ b/deal.II/deal.II/source/numerics/error_estimator.cc @@ -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 &dof_handler, const unsigned int material_id) { Assert (DEAL_II_COMPAT_MAPPING, ExcCompatibility("mapping")); - static const MappingQ1 mapping; - estimate(mapping, dof_handler, quadrature, neumann_bc, solution, + estimate(StaticMappingQ1::mapping, dof_handler, quadrature, neumann_bc, solution, error, component_mask, coefficients, n_threads, subdomain_id, material_id); } @@ -922,8 +919,7 @@ void KellyErrorEstimator::estimate (const DoFHandler &do const unsigned int material_id) { Assert (DEAL_II_COMPAT_MAPPING, ExcCompatibility("mapping")); - static const MappingQ1 mapping; - estimate(mapping, dof_handler, quadrature, neumann_bc, solutions, + estimate(StaticMappingQ1::mapping, dof_handler, quadrature, neumann_bc, solutions, errors, component_mask, coefficients, n_threads, subdomain_id, material_id); } diff --git a/deal.II/deal.II/source/numerics/matrices.cc b/deal.II/deal.II/source/numerics/matrices.cc index e681960f93..439f384a90 100644 --- a/deal.II/deal.II/source/numerics/matrices.cc +++ b/deal.II/deal.II/source/numerics/matrices.cc @@ -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 &dof, const Function * const coefficient) { Assert (DEAL_II_COMPAT_MAPPING, ExcCompatibility("mapping")); - static const MappingQ1 mapping; - create_mass_matrix(mapping, dof, q, matrix, coefficient); + create_mass_matrix(StaticMappingQ1::mapping, dof, q, matrix, coefficient); } @@ -500,8 +499,8 @@ void MatrixCreator::create_mass_matrix (const DoFHandler &dof, const Function * const coefficient) { Assert (DEAL_II_COMPAT_MAPPING, ExcCompatibility("mapping")); - static const MappingQ1 mapping; - create_mass_matrix(mapping, dof, q, matrix, rhs, rhs_vector, coefficient); + create_mass_matrix(StaticMappingQ1::mapping, + dof, q, matrix, rhs, rhs_vector, coefficient); } @@ -946,9 +945,8 @@ void MatrixCreator::create_boundary_mass_matrix (const DoFHandler &dof, const Function * const a) { Assert (DEAL_II_COMPAT_MAPPING, ExcCompatibility("mapping")); - static const MappingQ1 mapping; - create_boundary_mass_matrix(mapping, dof, q, matrix, rhs, rhs_vector, - dof_to_boundary_mapping, a); + create_boundary_mass_matrix(StaticMappingQ1::mapping, dof, q, + matrix,rhs, rhs_vector, dof_to_boundary_mapping, a); } @@ -1126,8 +1124,7 @@ void MatrixCreator::create_laplace_matrix (const DoFHandler &dof, const Function * const coefficient) { Assert (DEAL_II_COMPAT_MAPPING, ExcCompatibility("mapping")); - static const MappingQ1 mapping; - create_laplace_matrix(mapping, dof, q, matrix, coefficient); + create_laplace_matrix(StaticMappingQ1::mapping, dof, q, matrix, coefficient); } @@ -1329,8 +1326,8 @@ void MatrixCreator::create_laplace_matrix (const DoFHandler &dof, const Function * const coefficient) { Assert (DEAL_II_COMPAT_MAPPING, ExcCompatibility("mapping")); - static const MappingQ1 mapping; - create_laplace_matrix(mapping, dof, q, matrix, rhs, rhs_vector, coefficient); + create_laplace_matrix(StaticMappingQ1::mapping, dof, q, + matrix, rhs, rhs_vector, coefficient); }