]> https://gitweb.dealii.org/ - dealii.git/commitdiff
Make it easier for the compiler to identify which function to call.
authorWolfgang Bangerth <bangerth@math.tamu.edu>
Tue, 12 Apr 2011 02:51:19 +0000 (02:51 +0000)
committerWolfgang Bangerth <bangerth@math.tamu.edu>
Tue, 12 Apr 2011 02:51:19 +0000 (02:51 +0000)
git-svn-id: https://svn.dealii.org/trunk@23576 0785d39b-7218-0410-832d-ea1e28bc413d

deal.II/include/deal.II/numerics/error_estimator.h
deal.II/source/numerics/error_estimator.cc

index f3860d25ec8a2c0ab3d5c037fb944dfab1df5f30..9381a6bc95d936b41c81d8c596f9bb6fa8407864 100644 (file)
@@ -329,11 +329,11 @@ class KellyErrorEstimator
     static void estimate (const Mapping<dim, spacedim>      &mapping,
                          const DH                &dof,
                          const Quadrature<dim-1> &quadrature,
-                         const typename FunctionMap<DH::space_dimension>::type &neumann_bc,
+                         const typename FunctionMap<spacedim>::type &neumann_bc,
                          const InputVector       &solution,
                          Vector<float>           &error,
                          const std::vector<bool> &component_mask = std::vector<bool>(),
-                         const Function<DH::space_dimension>     *coefficients   = 0,
+                         const Function<spacedim>     *coefficients   = 0,
                          const unsigned int       n_threads = numbers::invalid_unsigned_int,
                           const types::subdomain_id_t subdomain_id = types::invalid_subdomain_id,
                           const unsigned int       material_id = numbers::invalid_unsigned_int);
@@ -346,11 +346,11 @@ class KellyErrorEstimator
     template <typename InputVector, class DH>
     static void estimate (const DH                &dof,
                          const Quadrature<dim-1> &quadrature,
-                         const typename FunctionMap<DH::space_dimension>::type &neumann_bc,
+                         const typename FunctionMap<spacedim>::type &neumann_bc,
                          const InputVector       &solution,
                          Vector<float>           &error,
                          const std::vector<bool> &component_mask = std::vector<bool>(),
-                         const Function<DH::space_dimension>     *coefficients   = 0,
+                         const Function<spacedim>     *coefficients   = 0,
                          const unsigned int       n_threads = multithread_info.n_default_threads,
                           const types::subdomain_id_t subdomain_id = types::invalid_subdomain_id,
                           const unsigned int       material_id = numbers::invalid_unsigned_int);
@@ -386,11 +386,11 @@ class KellyErrorEstimator
     static void estimate (const Mapping<dim, spacedim>          &mapping,
                          const DH                    &dof,
                          const Quadrature<dim-1>     &quadrature,
-                         const typename FunctionMap<DH::space_dimension>::type &neumann_bc,
+                         const typename FunctionMap<spacedim>::type &neumann_bc,
                          const std::vector<const InputVector *> &solutions,
                          std::vector<Vector<float>*> &errors,
                          const std::vector<bool>     &component_mask = std::vector<bool>(),
-                         const Function<DH::space_dimension>         *coefficients   = 0,
+                         const Function<spacedim>         *coefficients   = 0,
                          const unsigned int           n_threads = multithread_info.n_default_threads,
                           const types::subdomain_id_t subdomain_id = types::invalid_subdomain_id,
                           const unsigned int           material_id = numbers::invalid_unsigned_int);
@@ -403,11 +403,11 @@ class KellyErrorEstimator
     template <typename InputVector, class DH>
     static void estimate (const DH                    &dof,
                          const Quadrature<dim-1>     &quadrature,
-                         const typename FunctionMap<DH::space_dimension>::type &neumann_bc,
+                         const typename FunctionMap<spacedim>::type &neumann_bc,
                          const std::vector<const InputVector *> &solutions,
                          std::vector<Vector<float>*> &errors,
                          const std::vector<bool>     &component_mask = std::vector<bool>(),
-                         const Function<DH::space_dimension>         *coefficients   = 0,
+                         const Function<spacedim>         *coefficients   = 0,
                          const unsigned int           n_threads = multithread_info.n_default_threads,
                           const types::subdomain_id_t subdomain_id = types::invalid_subdomain_id,
                           const unsigned int           material_id = numbers::invalid_unsigned_int);
@@ -423,11 +423,11 @@ class KellyErrorEstimator
     static void estimate (const Mapping<dim, spacedim>      &mapping,
                          const DH                &dof,
                          const hp::QCollection<dim-1> &quadrature,
-                         const typename FunctionMap<DH::space_dimension>::type &neumann_bc,
+                         const typename FunctionMap<spacedim>::type &neumann_bc,
                          const InputVector       &solution,
                          Vector<float>           &error,
                          const std::vector<bool> &component_mask = std::vector<bool>(),
-                         const Function<DH::space_dimension>     *coefficients   = 0,
+                         const Function<spacedim>     *coefficients   = 0,
                          const unsigned int       n_threads = multithread_info.n_default_threads,
                           const types::subdomain_id_t subdomain_id = types::invalid_subdomain_id,
                           const unsigned int       material_id = numbers::invalid_unsigned_int);
@@ -442,11 +442,11 @@ class KellyErrorEstimator
     template <typename InputVector, class DH>
     static void estimate (const DH                &dof,
                          const hp::QCollection<dim-1> &quadrature,
-                         const typename FunctionMap<DH::space_dimension>::type &neumann_bc,
+                         const typename FunctionMap<spacedim>::type &neumann_bc,
                          const InputVector       &solution,
                          Vector<float>           &error,
                          const std::vector<bool> &component_mask = std::vector<bool>(),
-                         const Function<DH::space_dimension>     *coefficients   = 0,
+                         const Function<spacedim>     *coefficients   = 0,
                          const unsigned int       n_threads = multithread_info.n_default_threads,
                           const types::subdomain_id_t subdomain_id = types::invalid_subdomain_id,
                           const unsigned int       material_id = numbers::invalid_unsigned_int);
@@ -462,11 +462,11 @@ class KellyErrorEstimator
     static void estimate (const Mapping<dim, spacedim>          &mapping,
                          const DH                    &dof,
                          const hp::QCollection<dim-1> &quadrature,
-                         const typename FunctionMap<DH::space_dimension>::type &neumann_bc,
+                         const typename FunctionMap<spacedim>::type &neumann_bc,
                          const std::vector<const InputVector *> &solutions,
                          std::vector<Vector<float>*> &errors,
                          const std::vector<bool>     &component_mask = std::vector<bool>(),
-                         const Function<DH::space_dimension>         *coefficients   = 0,
+                         const Function<spacedim>         *coefficients   = 0,
                          const unsigned int           n_threads = multithread_info.n_default_threads,
                           const types::subdomain_id_t subdomain_id = types::invalid_subdomain_id,
                           const unsigned int           material_id = numbers::invalid_unsigned_int);
@@ -481,11 +481,11 @@ class KellyErrorEstimator
     template <typename InputVector, class DH>
     static void estimate (const DH                    &dof,
                          const hp::QCollection<dim-1> &quadrature,
-                         const typename FunctionMap<DH::space_dimension>::type &neumann_bc,
+                         const typename FunctionMap<spacedim>::type &neumann_bc,
                          const std::vector<const InputVector *> &solutions,
                          std::vector<Vector<float>*> &errors,
                          const std::vector<bool>     &component_mask = std::vector<bool>(),
-                         const Function<DH::space_dimension>*coefficients   = 0,
+                         const Function<spacedim>*    coefficients   = 0,
                          const unsigned int           n_threads = multithread_info.n_default_threads,
                           const types::subdomain_id_t subdomain_id = types::invalid_subdomain_id,
                           const unsigned int           material_id = numbers::invalid_unsigned_int);
index d97bb1af5007e3c5c59ffddf84ccc271b495a3cf..534ede17c6d65e7f44c035e0d495c6a36f47732b 100644 (file)
@@ -238,9 +238,9 @@ namespace internal
                                          * the KellyErrorEstimator::estimate()
                                          * function.
                                          */
-       const typename FunctionMap<DH::space_dimension>::type *neumann_bc;
+       const typename FunctionMap<spacedim>::type *neumann_bc;
        const std::vector<bool>                component_mask;
-       const Function<DH::space_dimension>                   *coefficients;
+       const Function<spacedim>                   *coefficients;
 
                                         /**
                                          * Constructor.
@@ -253,9 +253,9 @@ namespace internal
                      const unsigned int n_solution_vectors,
                      const types::subdomain_id_t subdomain_id,
                      const unsigned int material_id,
-                     const typename FunctionMap<DH::space_dimension>::type *neumann_bc,
+                     const typename FunctionMap<spacedim>::type *neumann_bc,
                      const std::vector<bool>                component_mask,
-                     const Function<DH::space_dimension>                   *coefficients);
+                     const Function<spacedim>                   *coefficients);
 
                                         /**
                                          * Resize the arrays so that they fit the
@@ -277,9 +277,9 @@ namespace internal
                  const unsigned int n_solution_vectors,
                  const types::subdomain_id_t subdomain_id,
                  const unsigned int material_id,
-                 const typename FunctionMap<DH::space_dimension>::type *neumann_bc,
+                 const typename FunctionMap<spacedim>::type *neumann_bc,
                  const std::vector<bool>                component_mask,
-                 const Function<DH::space_dimension>         *coefficients)
+                 const Function<spacedim>         *coefficients)
                    :
                    finite_element (fe),
                    face_quadratures (face_quadratures),
@@ -1435,11 +1435,11 @@ KellyErrorEstimator<dim, spacedim>::
 estimate (const Mapping<dim, spacedim>      &mapping,
           const DH                &dof_handler,
           const Quadrature<dim-1> &quadrature,
-          const typename FunctionMap<DH::space_dimension>::type &neumann_bc,
+          const typename FunctionMap<spacedim>::type &neumann_bc,
           const InputVector       &solution,
           Vector<float>           &error,
           const std::vector<bool> &component_mask,
-          const Function<DH::space_dimension>     *coefficients,
+          const Function<spacedim>     *coefficients,
           const unsigned int       n_threads,
           const types::subdomain_id_t subdomain_id,
           const unsigned int       material_id)
@@ -1458,11 +1458,11 @@ void
 KellyErrorEstimator<dim,spacedim>::
 estimate (const DH                &dof_handler,
           const Quadrature<dim-1> &quadrature,
-          const typename FunctionMap<DH::space_dimension>::type &neumann_bc,
+          const typename FunctionMap<spacedim>::type &neumann_bc,
           const InputVector       &solution,
           Vector<float>           &error,
           const std::vector<bool> &component_mask,
-          const Function<DH::space_dimension>     *coefficients,
+          const Function<spacedim>     *coefficients,
           const unsigned int       n_threads,
           const types::subdomain_id_t subdomain_id,
           const unsigned int       material_id)
@@ -1481,11 +1481,11 @@ KellyErrorEstimator<dim, spacedim>::
 estimate (const Mapping<dim, spacedim>      &mapping,
           const DH                &dof_handler,
           const hp::QCollection<dim-1> &quadrature,
-          const typename FunctionMap<DH::space_dimension>::type &neumann_bc,
+          const typename FunctionMap<spacedim>::type &neumann_bc,
           const InputVector       &solution,
           Vector<float>           &error,
           const std::vector<bool> &component_mask,
-          const Function<DH::space_dimension>     *coefficients,
+          const Function<spacedim>     *coefficients,
           const unsigned int       n_threads,
           const types::subdomain_id_t subdomain_id,
           const unsigned int       material_id)
@@ -1504,11 +1504,11 @@ void
 KellyErrorEstimator<dim, spacedim>::
 estimate (const DH                &dof_handler,
           const hp::QCollection<dim-1> &quadrature,
-          const typename FunctionMap<DH::space_dimension>::type &neumann_bc,
+          const typename FunctionMap<spacedim>::type &neumann_bc,
           const InputVector       &solution,
           Vector<float>           &error,
           const std::vector<bool> &component_mask,
-          const Function<DH::space_dimension>     *coefficients,
+          const Function<spacedim>     *coefficients,
           const unsigned int       n_threads,
           const types::subdomain_id_t subdomain_id,
           const unsigned int       material_id)
@@ -1529,11 +1529,11 @@ KellyErrorEstimator<dim, spacedim>::
 estimate (const Mapping<dim, spacedim>                  &mapping,
           const DH                            &dof_handler,
           const hp::QCollection<dim-1>        &face_quadratures,
-          const typename FunctionMap<DH::space_dimension>::type &neumann_bc,
+          const typename FunctionMap<spacedim>::type &neumann_bc,
           const std::vector<const InputVector *> &solutions,
           std::vector<Vector<float>*>              &errors,
           const std::vector<bool>                  &component_mask_,
-          const Function<DH::space_dimension>                 *coefficients,
+          const Function<spacedim>                 *coefficients,
           const unsigned int                   ,
           const types::subdomain_id_t          subdomain_id_,
           const unsigned int                   material_id)
@@ -1573,7 +1573,7 @@ estimate (const Mapping<dim, spacedim>                  &mapping,
   Assert (solutions.size() == errors.size(),
          ExcIncompatibleNumberOfElements(solutions.size(), errors.size()));
 
-  for (typename FunctionMap<DH::space_dimension>::type::const_iterator i=neumann_bc.begin();
+  for (typename FunctionMap<spacedim>::type::const_iterator i=neumann_bc.begin();
        i!=neumann_bc.end(); ++i)
     Assert (i->second->n_components == n_components,
             ExcInvalidBoundaryFunction());
@@ -1706,11 +1706,11 @@ KellyErrorEstimator<dim, spacedim>::
 estimate (const Mapping<dim, spacedim>                  &mapping,
           const DH                            &dof_handler,
           const Quadrature<dim-1>             &quadrature,
-          const typename FunctionMap<DH::space_dimension>::type &neumann_bc,
+          const typename FunctionMap<spacedim>::type &neumann_bc,
           const std::vector<const InputVector *> &solutions,
           std::vector<Vector<float>*>              &errors,
           const std::vector<bool>                  &component_mask,
-          const Function<DH::space_dimension>                 *coefficients,
+          const Function<spacedim>                 *coefficients,
           const unsigned int                   n_threads,
           const types::subdomain_id_t          subdomain_id,
           const unsigned int                   material_id)
@@ -1728,11 +1728,11 @@ template <int dim, int spacedim>
 template <typename InputVector, class DH>
 void KellyErrorEstimator<dim, spacedim>::estimate (const DH                            &dof_handler,
                                         const Quadrature<dim-1>             &quadrature,
-                                        const typename FunctionMap<DH::space_dimension>::type &neumann_bc,
+                                        const typename FunctionMap<spacedim>::type &neumann_bc,
                                         const std::vector<const InputVector *> &solutions,
                                         std::vector<Vector<float>*>              &errors,
                                         const std::vector<bool>                  &component_mask,
-                                        const Function<DH::space_dimension>                 *coefficients,
+                                        const Function<spacedim>                 *coefficients,
                                         const unsigned int                   n_threads,
                                          const types::subdomain_id_t subdomain_id,
                                          const unsigned int       material_id)
@@ -1749,11 +1749,11 @@ template <int dim, int spacedim>
 template <typename InputVector, class DH>
 void KellyErrorEstimator<dim, spacedim>::estimate (const DH                            &dof_handler,
                                         const hp::QCollection<dim-1>             &quadrature,
-                                        const typename FunctionMap<DH::space_dimension>::type &neumann_bc,
+                                        const typename FunctionMap<spacedim>::type &neumann_bc,
                                         const std::vector<const InputVector *> &solutions,
                                         std::vector<Vector<float>*>              &errors,
                                         const std::vector<bool>                  &component_mask,
-                                        const Function<DH::space_dimension>                 *coefficients,
+                                        const Function<spacedim>                 *coefficients,
                                         const unsigned int                   n_threads,
                                          const types::subdomain_id_t subdomain_id,
                                          const unsigned int       material_id)

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.