]> https://gitweb.dealii.org/ - dealii.git/commitdiff
Change the boundary value type to match the vector type.
authorWolfgang Bangerth <bangerth@colostate.edu>
Fri, 17 Nov 2017 16:42:59 +0000 (09:42 -0700)
committerWolfgang Bangerth <bangerth@colostate.edu>
Fri, 17 Nov 2017 16:42:59 +0000 (09:42 -0700)
include/deal.II/numerics/error_estimator.h
include/deal.II/numerics/error_estimator.templates.h
source/numerics/error_estimator.inst.in
source/numerics/error_estimator_1d.cc
source/numerics/error_estimator_1d.inst.in

index 6247cfdf2ca255b23b5a8710c71ce1cdae12dee3..92f846d8e40c11a26283a7cf08709d5458d876b8 100644 (file)
@@ -330,7 +330,7 @@ public:
   (const Mapping<dim, spacedim>               &mapping,
    const DoFHandlerType                       &dof,
    const Quadrature<dim-1>                    &quadrature,
-   const typename FunctionMap<spacedim>::type &neumann_bc,
+   const typename FunctionMap<spacedim,typename InputVector::value_type>::type &neumann_bc,
    const InputVector                          &solution,
    Vector<float>                              &error,
    const ComponentMask                        &component_mask = ComponentMask(),
@@ -348,7 +348,7 @@ public:
   static void estimate
   (const DoFHandlerType                       &dof,
    const Quadrature<dim-1>                    &quadrature,
-   const typename FunctionMap<spacedim>::type &neumann_bc,
+   const typename FunctionMap<spacedim,typename InputVector::value_type>::type &neumann_bc,
    const InputVector                          &solution,
    Vector<float>                              &error,
    const ComponentMask                        &component_mask = ComponentMask(),
@@ -376,7 +376,7 @@ public:
   (const Mapping<dim, spacedim>               &mapping,
    const DoFHandlerType                       &dof,
    const Quadrature<dim-1>                    &quadrature,
-   const typename FunctionMap<spacedim>::type &neumann_bc,
+   const typename FunctionMap<spacedim,typename InputVector::value_type>::type &neumann_bc,
    const std::vector<const InputVector *>     &solutions,
    std::vector<Vector<float>*>                &errors,
    const ComponentMask                        &component_mask = ComponentMask(),
@@ -394,7 +394,7 @@ public:
   static void estimate
   (const DoFHandlerType                       &dof,
    const Quadrature<dim-1>                    &quadrature,
-   const typename FunctionMap<spacedim>::type &neumann_bc,
+   const typename FunctionMap<spacedim,typename InputVector::value_type>::type &neumann_bc,
    const std::vector<const InputVector *>     &solutions,
    std::vector<Vector<float>*>                &errors,
    const ComponentMask                        &component_mask = ComponentMask(),
@@ -414,7 +414,7 @@ public:
   (const Mapping<dim, spacedim>               &mapping,
    const DoFHandlerType                       &dof,
    const hp::QCollection<dim-1>               &quadrature,
-   const typename FunctionMap<spacedim>::type &neumann_bc,
+   const typename FunctionMap<spacedim,typename InputVector::value_type>::type &neumann_bc,
    const InputVector                          &solution,
    Vector<float>                              &error,
    const ComponentMask                        &component_mask = ComponentMask(),
@@ -433,7 +433,7 @@ public:
   static void estimate
   (const DoFHandlerType                       &dof,
    const hp::QCollection<dim-1>               &quadrature,
-   const typename FunctionMap<spacedim>::type &neumann_bc,
+   const typename FunctionMap<spacedim,typename InputVector::value_type>::type &neumann_bc,
    const InputVector                          &solution,
    Vector<float>                              &error,
    const ComponentMask                        &component_mask = ComponentMask(),
@@ -453,7 +453,7 @@ public:
   (const Mapping<dim, spacedim>               &mapping,
    const DoFHandlerType                       &dof,
    const hp::QCollection<dim-1>               &quadrature,
-   const typename FunctionMap<spacedim>::type &neumann_bc,
+   const typename FunctionMap<spacedim,typename InputVector::value_type>::type &neumann_bc,
    const std::vector<const InputVector *>     &solutions,
    std::vector<Vector<float>*>                &errors,
    const ComponentMask                        &component_mask = ComponentMask(),
@@ -472,7 +472,7 @@ public:
   static void estimate
   (const DoFHandlerType                       &dof,
    const hp::QCollection<dim-1>               &quadrature,
-   const typename FunctionMap<spacedim>::type &neumann_bc,
+   const typename FunctionMap<spacedim,typename InputVector::value_type>::type &neumann_bc,
    const std::vector<const InputVector *>     &solutions,
    std::vector<Vector<float>*>                &errors,
    const ComponentMask                        &component_mask = ComponentMask(),
@@ -576,7 +576,7 @@ public:
   (const Mapping<1,spacedim>                  &mapping,
    const DoFHandlerType                       &dof,
    const Quadrature<0>                        &quadrature,
-   const typename FunctionMap<spacedim>::type &neumann_bc,
+   const typename FunctionMap<spacedim,typename InputVector::value_type>::type &neumann_bc,
    const InputVector                          &solution,
    Vector<float>                              &error,
    const ComponentMask                        &component_mask = ComponentMask(),
@@ -593,7 +593,7 @@ public:
   static void estimate
   (const DoFHandlerType                       &dof,
    const Quadrature<0>                        &quadrature,
-   const typename FunctionMap<spacedim>::type &neumann_bc,
+   const typename FunctionMap<spacedim,typename InputVector::value_type>::type &neumann_bc,
    const InputVector                          &solution,
    Vector<float>                              &error,
    const ComponentMask                        &component_mask = ComponentMask(),
@@ -620,7 +620,7 @@ public:
   (const Mapping<1,spacedim>                  &mapping,
    const DoFHandlerType                       &dof,
    const Quadrature<0>                        &quadrature,
-   const typename FunctionMap<spacedim>::type &neumann_bc,
+   const typename FunctionMap<spacedim,typename InputVector::value_type>::type &neumann_bc,
    const std::vector<const InputVector *>     &solutions,
    std::vector<Vector<float>*>                &errors,
    const ComponentMask                        &component_mask = ComponentMask(),
@@ -637,7 +637,7 @@ public:
   static void estimate
   (const DoFHandlerType                       &dof,
    const Quadrature<0>                        &quadrature,
-   const typename FunctionMap<spacedim>::type &neumann_bc,
+   const typename FunctionMap<spacedim,typename InputVector::value_type>::type &neumann_bc,
    const std::vector<const InputVector *>     &solutions,
    std::vector<Vector<float>*>                &errors,
    const ComponentMask                        &component_mask = ComponentMask(),
@@ -656,7 +656,7 @@ public:
   (const Mapping<1,spacedim>                  &mapping,
    const DoFHandlerType                       &dof,
    const hp::QCollection<0>                   &quadrature,
-   const typename FunctionMap<spacedim>::type &neumann_bc,
+   const typename FunctionMap<spacedim,typename InputVector::value_type>::type &neumann_bc,
    const InputVector                          &solution,
    Vector<float>                              &error,
    const ComponentMask                        &component_mask = ComponentMask(),
@@ -674,7 +674,7 @@ public:
   static void estimate
   (const DoFHandlerType                       &dof,
    const hp::QCollection<0>                   &quadrature,
-   const typename FunctionMap<spacedim>::type &neumann_bc,
+   const typename FunctionMap<spacedim,typename InputVector::value_type>::type &neumann_bc,
    const InputVector                          &solution,
    Vector<float>                              &error,
    const ComponentMask                        &component_mask = ComponentMask(),
@@ -693,7 +693,7 @@ public:
   (const Mapping<1,spacedim>                  &mapping,
    const DoFHandlerType                       &dof,
    const hp::QCollection<0>                   &quadrature,
-   const typename FunctionMap<spacedim>::type &neumann_bc,
+   const typename FunctionMap<spacedim,typename InputVector::value_type>::type &neumann_bc,
    const std::vector<const InputVector *>     &solutions,
    std::vector<Vector<float>*>                &errors,
    const ComponentMask                        &component_mask = ComponentMask(),
@@ -711,7 +711,7 @@ public:
   static void estimate
   (const DoFHandlerType                       &dof,
    const hp::QCollection<0>                   &quadrature,
-   const typename FunctionMap<spacedim>::type &neumann_bc,
+   const typename FunctionMap<spacedim,typename InputVector::value_type>::type &neumann_bc,
    const std::vector<const InputVector *>     &solutions,
    std::vector<Vector<float>*>                &errors,
    const ComponentMask                        &component_mask = ComponentMask(),
index b0e8d7021353767cd3a69acfe9b948b461056216..dc3a7fa53e571fd57c3009b80b58046090e0fe80 100644 (file)
@@ -169,9 +169,9 @@ namespace internal
        * Some more references to input data to the
        * KellyErrorEstimator::estimate() function.
        */
-      const typename FunctionMap<spacedim>::type *neumann_bc;
-      const ComponentMask                component_mask;
-      const Function<spacedim>                   *coefficients;
+      const typename FunctionMap<spacedim,number>::type *neumann_bc;
+      const ComponentMask                                component_mask;
+      const Function<spacedim>                          *coefficients;
 
       /**
        * Constructor.
@@ -184,7 +184,7 @@ namespace internal
                     const unsigned int n_solution_vectors,
                     const types::subdomain_id subdomain_id,
                     const types::material_id material_id,
-                    const typename FunctionMap<spacedim>::type *neumann_bc,
+                    const typename FunctionMap<spacedim,number>::type *neumann_bc,
                     const ComponentMask                &component_mask,
                     const Function<spacedim>                   *coefficients);
 
@@ -208,7 +208,7 @@ namespace internal
      const unsigned int                                  n_solution_vectors,
      const types::subdomain_id                           subdomain_id,
      const types::material_id                            material_id,
-     const typename FunctionMap<spacedim>::type         *neumann_bc,
+     const typename FunctionMap<spacedim,number>::type         *neumann_bc,
      const ComponentMask                                 &component_mask,
      const Function<spacedim>                           *coefficients)
       :
@@ -420,7 +420,7 @@ namespace internal
           // get the values of the boundary function at the quadrature points
           if (n_components == 1)
             {
-              std::vector<double> g(n_q_points);
+              std::vector<number> g(n_q_points);
               parallel_data.neumann_bc->find(boundary_id)->second
               ->value_list (fe_face_values_cell.get_present_fe_values()
                             .get_quadrature_points(), g);
@@ -431,8 +431,8 @@ namespace internal
             }
           else
             {
-              std::vector<dealii::Vector<double> >
-              g(n_q_points, dealii::Vector<double>(n_components));
+              std::vector<dealii::Vector<number> >
+              g(n_q_points, dealii::Vector<number>(n_components));
               parallel_data.neumann_bc->find(boundary_id)->second
               ->vector_value_list (fe_face_values_cell.get_present_fe_values()
                                    .get_quadrature_points(),
@@ -971,7 +971,7 @@ KellyErrorEstimator<dim, spacedim>::
 estimate (const Mapping<dim, spacedim>               &mapping,
           const DoFHandlerType                       &dof_handler,
           const Quadrature<dim-1>                    &quadrature,
-          const typename FunctionMap<spacedim>::type &neumann_bc,
+          const typename FunctionMap<spacedim,typename InputVector::value_type>::type &neumann_bc,
           const InputVector                          &solution,
           Vector<float>                              &error,
           const ComponentMask                        &component_mask,
@@ -995,7 +995,7 @@ void
 KellyErrorEstimator<dim,spacedim>::
 estimate (const DoFHandlerType                       &dof_handler,
           const Quadrature<dim-1>                    &quadrature,
-          const typename FunctionMap<spacedim>::type &neumann_bc,
+          const typename FunctionMap<spacedim,typename InputVector::value_type>::type &neumann_bc,
           const InputVector                          &solution,
           Vector<float>                              &error,
           const ComponentMask                        &component_mask,
@@ -1018,7 +1018,7 @@ KellyErrorEstimator<dim, spacedim>::
 estimate (const Mapping<dim, spacedim>               &mapping,
           const DoFHandlerType                       &dof_handler,
           const hp::QCollection<dim-1>               &quadrature,
-          const typename FunctionMap<spacedim>::type &neumann_bc,
+          const typename FunctionMap<spacedim,typename InputVector::value_type>::type &neumann_bc,
           const InputVector                          &solution,
           Vector<float>                              &error,
           const ComponentMask                        &component_mask,
@@ -1042,7 +1042,7 @@ void
 KellyErrorEstimator<dim, spacedim>::
 estimate (const DoFHandlerType                       &dof_handler,
           const hp::QCollection<dim-1>               &quadrature,
-          const typename FunctionMap<spacedim>::type &neumann_bc,
+          const typename FunctionMap<spacedim,typename InputVector::value_type>::type &neumann_bc,
           const InputVector                          &solution,
           Vector<float>                              &error,
           const ComponentMask                        &component_mask,
@@ -1067,7 +1067,7 @@ KellyErrorEstimator<dim, spacedim>::
 estimate (const Mapping<dim, spacedim>               &mapping,
           const DoFHandlerType                       &dof_handler,
           const hp::QCollection<dim-1>               &face_quadratures,
-          const typename FunctionMap<spacedim>::type &neumann_bc,
+          const typename FunctionMap<spacedim,typename InputVector::value_type>::type &neumann_bc,
           const std::vector<const InputVector *>     &solutions,
           std::vector<Vector<float>*>                &errors,
           const ComponentMask                        &component_mask,
@@ -1113,7 +1113,7 @@ estimate (const Mapping<dim, spacedim>               &mapping,
   Assert (solutions.size() == errors.size(),
           ExcIncompatibleNumberOfElements(solutions.size(), errors.size()));
 
-  for (typename FunctionMap<spacedim>::type::const_iterator i=neumann_bc.begin();
+  for (typename FunctionMap<spacedim,typename InputVector::value_type>::type::const_iterator i=neumann_bc.begin();
        i!=neumann_bc.end(); ++i)
     Assert (i->second->n_components == n_components,
             ExcInvalidBoundaryFunction(i->first,
@@ -1231,7 +1231,7 @@ KellyErrorEstimator<dim, spacedim>::
 estimate (const Mapping<dim, spacedim>               &mapping,
           const DoFHandlerType                       &dof_handler,
           const Quadrature<dim-1>                    &quadrature,
-          const typename FunctionMap<spacedim>::type &neumann_bc,
+          const typename FunctionMap<spacedim,typename InputVector::value_type>::type &neumann_bc,
           const std::vector<const InputVector *>     &solutions,
           std::vector<Vector<float>*>                &errors,
           const ComponentMask                        &component_mask,
@@ -1255,7 +1255,7 @@ template <typename InputVector, typename DoFHandlerType>
 void KellyErrorEstimator<dim, spacedim>::estimate
 (const DoFHandlerType                       &dof_handler,
  const Quadrature<dim-1>                    &quadrature,
- const typename FunctionMap<spacedim>::type &neumann_bc,
+ const typename FunctionMap<spacedim,typename InputVector::value_type>::type &neumann_bc,
  const std::vector<const InputVector *>     &solutions,
  std::vector<Vector<float>*>                &errors,
  const ComponentMask                        &component_mask,
@@ -1277,7 +1277,7 @@ template <typename InputVector, typename DoFHandlerType>
 void KellyErrorEstimator<dim, spacedim>::estimate
 (const DoFHandlerType                       &dof_handler,
  const hp::QCollection<dim-1>               &quadrature,
- const typename FunctionMap<spacedim>::type &neumann_bc,
+ const typename FunctionMap<spacedim,typename InputVector::value_type>::type &neumann_bc,
  const std::vector<const InputVector *>     &solutions,
  std::vector<Vector<float>*>                &errors,
  const ComponentMask                        &component_mask,
index 4fac2a9289def30a6ec18558fbc34884dbbb3f80..5c45b395c0fea7abff2b06ce6386d4106cd18bfc 100644 (file)
@@ -31,7 +31,7 @@ for (VEC : VECTOR_TYPES ; deal_II_dimension : DIMENSIONS; deal_II_space_dimensio
     estimate<VEC,DH<deal_II_dimension,deal_II_space_dimension> > (const Mapping<deal_II_dimension, deal_II_space_dimension>      &,
             const DH<deal_II_dimension,deal_II_space_dimension>   &,
             const Quadrature<deal_II_dimension-1> &,
-            const FunctionMap<deal_II_space_dimension>::type &,
+            const FunctionMap<deal_II_space_dimension,VEC::value_type>::type &,
             const VEC       &,
             Vector<float>           &,
             const ComponentMask &,
@@ -47,7 +47,7 @@ for (VEC : VECTOR_TYPES ; deal_II_dimension : DIMENSIONS; deal_II_space_dimensio
     estimate<VEC,DH<deal_II_dimension,deal_II_space_dimension> > (
         const DH<deal_II_dimension,deal_II_space_dimension>   &,
         const Quadrature<deal_II_dimension-1> &,
-        const FunctionMap<deal_II_space_dimension>::type &,
+        const FunctionMap<deal_II_space_dimension,VEC::value_type>::type &,
         const VEC       &,
         Vector<float>           &,
         const ComponentMask &,
@@ -63,7 +63,7 @@ for (VEC : VECTOR_TYPES ; deal_II_dimension : DIMENSIONS; deal_II_space_dimensio
     estimate<VEC,DH<deal_II_dimension,deal_II_space_dimension> > (const Mapping<deal_II_dimension, deal_II_space_dimension>      &,
             const DH<deal_II_dimension,deal_II_space_dimension>   &,
             const Quadrature<deal_II_dimension-1> &,
-            const FunctionMap<deal_II_space_dimension>::type &,
+            const FunctionMap<deal_II_space_dimension,VEC::value_type>::type &,
             const std::vector<const VEC *>       &,
             std::vector<Vector<float> *>         &,
             const ComponentMask &,
@@ -79,7 +79,7 @@ for (VEC : VECTOR_TYPES ; deal_II_dimension : DIMENSIONS; deal_II_space_dimensio
     estimate<VEC,DH<deal_II_dimension,deal_II_space_dimension> > (
         const DH<deal_II_dimension,deal_II_space_dimension>   &,
         const Quadrature<deal_II_dimension-1> &,
-        const FunctionMap<deal_II_space_dimension>::type &,
+        const FunctionMap<deal_II_space_dimension,VEC::value_type>::type &,
         const std::vector<const VEC *>       &,
         std::vector<Vector<float> *>         &,
         const ComponentMask &,
@@ -95,7 +95,7 @@ for (VEC : VECTOR_TYPES ; deal_II_dimension : DIMENSIONS; deal_II_space_dimensio
     estimate<VEC,DH<deal_II_dimension,deal_II_space_dimension> > (const Mapping<deal_II_dimension, deal_II_space_dimension>      &,
             const DH<deal_II_dimension,deal_II_space_dimension>   &,
             const hp::QCollection<deal_II_dimension-1> &,
-            const FunctionMap<deal_II_space_dimension>::type &,
+            const FunctionMap<deal_II_space_dimension,VEC::value_type>::type &,
             const VEC       &,
             Vector<float>           &,
             const ComponentMask &,
@@ -111,7 +111,7 @@ for (VEC : VECTOR_TYPES ; deal_II_dimension : DIMENSIONS; deal_II_space_dimensio
     estimate<VEC,DH<deal_II_dimension,deal_II_space_dimension> > (
         const DH<deal_II_dimension,deal_II_space_dimension>   &,
         const hp::QCollection<deal_II_dimension-1> &,
-        const FunctionMap<deal_II_space_dimension>::type &,
+        const FunctionMap<deal_II_space_dimension,VEC::value_type>::type &,
         const VEC       &,
         Vector<float>           &,
         const ComponentMask &,
@@ -127,7 +127,7 @@ for (VEC : VECTOR_TYPES ; deal_II_dimension : DIMENSIONS; deal_II_space_dimensio
     estimate<VEC,DH<deal_II_dimension,deal_II_space_dimension> > (const Mapping<deal_II_dimension, deal_II_space_dimension>      &,
             const DH<deal_II_dimension,deal_II_space_dimension>   &,
             const hp::QCollection<deal_II_dimension-1> &,
-            const FunctionMap<deal_II_space_dimension>::type &,
+            const FunctionMap<deal_II_space_dimension,VEC::value_type>::type &,
             const std::vector<const VEC *>       &,
             std::vector<Vector<float> *>         &,
             const ComponentMask &,
@@ -143,7 +143,7 @@ for (VEC : VECTOR_TYPES ; deal_II_dimension : DIMENSIONS; deal_II_space_dimensio
     estimate<VEC,DH<deal_II_dimension,deal_II_space_dimension> > (
         const DH<deal_II_dimension,deal_II_space_dimension>   &,
         const hp::QCollection<deal_II_dimension-1> &,
-        const FunctionMap<deal_II_space_dimension>::type &,
+        const FunctionMap<deal_II_space_dimension,VEC::value_type>::type &,
         const std::vector<const VEC *>       &,
         std::vector<Vector<float> *>         &,
         const ComponentMask &,
index 0211ca4c881a703506e1b3d59abdf184e9c73823..3d85f3f562b4c4f7d110f85512d624bf1031f52e 100644 (file)
@@ -58,7 +58,7 @@ KellyErrorEstimator<1,spacedim>::
 estimate (const Mapping<1,spacedim>                  &mapping,
           const DoFHandlerType                       &dof_handler,
           const Quadrature<0>                        &quadrature,
-          const typename FunctionMap<spacedim>::type &neumann_bc,
+          const typename FunctionMap<spacedim,typename InputVector::value_type>::type &neumann_bc,
           const InputVector                          &solution,
           Vector<float>                              &error,
           const ComponentMask                        &component_mask,
@@ -82,7 +82,7 @@ void
 KellyErrorEstimator<1,spacedim>::
 estimate (const DoFHandlerType                       &dof_handler,
           const Quadrature<0>                        &quadrature,
-          const typename FunctionMap<spacedim>::type &neumann_bc,
+          const typename FunctionMap<spacedim,typename InputVector::value_type>::type &neumann_bc,
           const InputVector                          &solution,
           Vector<float>                              &error,
           const ComponentMask                        &component_mask,
@@ -103,7 +103,7 @@ void
 KellyErrorEstimator<1,spacedim>::
 estimate (const DoFHandlerType                       &dof_handler,
           const Quadrature<0>                        &quadrature,
-          const typename FunctionMap<spacedim>::type &neumann_bc,
+          const typename FunctionMap<spacedim,typename InputVector::value_type>::type &neumann_bc,
           const std::vector<const InputVector *>     &solutions,
           std::vector<Vector<float>*>                &errors,
           const ComponentMask                        &component_mask,
@@ -125,7 +125,7 @@ KellyErrorEstimator<1,spacedim>::
 estimate (const Mapping<1,spacedim>                  &mapping,
           const DoFHandlerType                       &dof_handler,
           const hp::QCollection<0>                   &quadrature,
-          const typename FunctionMap<spacedim>::type &neumann_bc,
+          const typename FunctionMap<spacedim,typename InputVector::value_type>::type &neumann_bc,
           const InputVector                          &solution,
           Vector<float>                              &error,
           const ComponentMask                        &component_mask,
@@ -148,7 +148,7 @@ void
 KellyErrorEstimator<1,spacedim>::
 estimate (const DoFHandlerType                       &dof_handler,
           const hp::QCollection<0>                   &quadrature,
-          const typename FunctionMap<spacedim>::type &neumann_bc,
+          const typename FunctionMap<spacedim,typename InputVector::value_type>::type &neumann_bc,
           const InputVector                          &solution,
           Vector<float>                              &error,
           const ComponentMask                        &component_mask,
@@ -169,7 +169,7 @@ void
 KellyErrorEstimator<1,spacedim>::
 estimate (const DoFHandlerType                       &dof_handler,
           const hp::QCollection<0>                   &quadrature,
-          const typename FunctionMap<spacedim>::type &neumann_bc,
+          const typename FunctionMap<spacedim,typename InputVector::value_type>::type &neumann_bc,
           const std::vector<const InputVector *>     &solutions,
           std::vector<Vector<float>*>                &errors,
           const ComponentMask                        &component_mask,
@@ -191,7 +191,7 @@ void KellyErrorEstimator<1,spacedim>::
 estimate (const Mapping<1,spacedim>                  & /*mapping*/,
           const DoFHandlerType                       & /*dof_handler*/,
           const hp::QCollection<0> &,
-          const typename FunctionMap<spacedim>::type & /*neumann_bc*/,
+          const typename FunctionMap<spacedim,typename InputVector::value_type>::type & /*neumann_bc*/,
           const std::vector<const InputVector *>     & /*solutions*/,
           std::vector<Vector<float>*>                & /*errors*/,
           const ComponentMask                        & /*component_mask_*/,
@@ -211,7 +211,7 @@ void KellyErrorEstimator<1,spacedim>::
 estimate (const Mapping<1,spacedim>                  &mapping,
           const DoFHandlerType                       &dof_handler,
           const Quadrature<0> &,
-          const typename FunctionMap<spacedim>::type &neumann_bc,
+          const typename FunctionMap<spacedim,typename InputVector::value_type>::type &neumann_bc,
           const std::vector<const InputVector *>     &solutions,
           std::vector<Vector<float>*>                &errors,
           const ComponentMask                        &component_mask,
@@ -257,7 +257,7 @@ estimate (const Mapping<1,spacedim>                  &mapping,
                      "indicator for internal boundaries in your boundary "
                      "value map."));
 
-  for (typename FunctionMap<spacedim>::type::const_iterator i=neumann_bc.begin();
+  for (typename FunctionMap<spacedim,typename InputVector::value_type>::type::const_iterator i=neumann_bc.begin();
        i!=neumann_bc.end(); ++i)
     Assert (i->second->n_components == n_components,
             ExcInvalidBoundaryFunction(i->first,
@@ -288,7 +288,7 @@ estimate (const Mapping<1,spacedim>                  &mapping,
           (coefficient->n_components == 1),
           ExcInvalidCoefficient());
 
-  for (typename FunctionMap<spacedim>::type::const_iterator i=neumann_bc.begin();
+  for (typename FunctionMap<spacedim,typename InputVector::value_type>::type::const_iterator i=neumann_bc.begin();
        i!=neumann_bc.end(); ++i)
     Assert (i->second->n_components == n_components,
             ExcInvalidBoundaryFunction(i->first,
@@ -395,7 +395,7 @@ estimate (const Mapping<1,spacedim>                  &mapping,
               {
                 if (n_components==1)
                   {
-                    const double
+                    const typename InputVector::value_type
                     v = neumann_bc.find(n)->second->value(cell->vertex(n));
 
                     for (unsigned int s=0; s<n_solution_vectors; ++s)
@@ -403,7 +403,7 @@ estimate (const Mapping<1,spacedim>                  &mapping,
                   }
                 else
                   {
-                    Vector<double> v(n_components);
+                    Vector<typename InputVector::value_type> v(n_components);
                     neumann_bc.find(n)->second->vector_value(cell->vertex(n), v);
 
                     for (unsigned int s=0; s<n_solution_vectors; ++s)
index d337d86e90cd83aaca9568b9691048dfa23bcf84..89565d7bb9176bb61be4ca5925c20bb665b77310 100644 (file)
@@ -24,7 +24,7 @@ for (VEC : VECTOR_TYPES ; deal_II_dimension : DIMENSIONS; deal_II_space_dimensio
     estimate<VEC,DH<deal_II_dimension,deal_II_space_dimension> > (const Mapping<deal_II_dimension, deal_II_space_dimension>      &,
             const DH<deal_II_dimension,deal_II_space_dimension>   &,
             const Quadrature<deal_II_dimension-1> &,
-            const FunctionMap<deal_II_space_dimension>::type &,
+            const FunctionMap<deal_II_space_dimension,VEC::value_type>::type &,
             const VEC       &,
             Vector<float>           &,
             const ComponentMask &,
@@ -39,7 +39,7 @@ for (VEC : VECTOR_TYPES ; deal_II_dimension : DIMENSIONS; deal_II_space_dimensio
     estimate<VEC,DH<deal_II_dimension,deal_II_space_dimension> > (
         const DH<deal_II_dimension,deal_II_space_dimension>   &,
         const Quadrature<deal_II_dimension-1> &,
-        const FunctionMap<deal_II_space_dimension>::type &,
+        const FunctionMap<deal_II_space_dimension,VEC::value_type>::type &,
         const VEC       &,
         Vector<float>           &,
         const ComponentMask &,
@@ -54,7 +54,7 @@ for (VEC : VECTOR_TYPES ; deal_II_dimension : DIMENSIONS; deal_II_space_dimensio
     estimate<VEC,DH<deal_II_dimension,deal_II_space_dimension> > (const Mapping<deal_II_dimension, deal_II_space_dimension>      &,
             const DH<deal_II_dimension,deal_II_space_dimension>   &,
             const Quadrature<deal_II_dimension-1> &,
-            const FunctionMap<deal_II_space_dimension>::type &,
+            const FunctionMap<deal_II_space_dimension,VEC::value_type>::type &,
             const std::vector<const VEC *>       &,
             std::vector<Vector<float> *>         &,
             const ComponentMask &,
@@ -69,7 +69,7 @@ for (VEC : VECTOR_TYPES ; deal_II_dimension : DIMENSIONS; deal_II_space_dimensio
     estimate<VEC,DH<deal_II_dimension,deal_II_space_dimension> > (
         const DH<deal_II_dimension,deal_II_space_dimension>   &,
         const Quadrature<deal_II_dimension-1> &,
-        const FunctionMap<deal_II_space_dimension>::type &,
+        const FunctionMap<deal_II_space_dimension,VEC::value_type>::type &,
         const std::vector<const VEC *>       &,
         std::vector<Vector<float> *>         &,
         const ComponentMask &,
@@ -84,7 +84,7 @@ for (VEC : VECTOR_TYPES ; deal_II_dimension : DIMENSIONS; deal_II_space_dimensio
     estimate<VEC,DH<deal_II_dimension,deal_II_space_dimension> > (const Mapping<deal_II_dimension, deal_II_space_dimension>      &,
             const DH<deal_II_dimension,deal_II_space_dimension>   &,
             const hp::QCollection<deal_II_dimension-1> &,
-            const FunctionMap<deal_II_space_dimension>::type &,
+            const FunctionMap<deal_II_space_dimension,VEC::value_type>::type &,
             const VEC       &,
             Vector<float>           &,
             const ComponentMask &,
@@ -99,7 +99,7 @@ for (VEC : VECTOR_TYPES ; deal_II_dimension : DIMENSIONS; deal_II_space_dimensio
     estimate<VEC,DH<deal_II_dimension,deal_II_space_dimension> > (
         const DH<deal_II_dimension,deal_II_space_dimension>   &,
         const hp::QCollection<deal_II_dimension-1> &,
-        const FunctionMap<deal_II_space_dimension>::type &,
+        const FunctionMap<deal_II_space_dimension,VEC::value_type>::type &,
         const VEC       &,
         Vector<float>           &,
         const ComponentMask &,
@@ -114,7 +114,7 @@ for (VEC : VECTOR_TYPES ; deal_II_dimension : DIMENSIONS; deal_II_space_dimensio
     estimate<VEC,DH<deal_II_dimension,deal_II_space_dimension> > (const Mapping<deal_II_dimension, deal_II_space_dimension>      &,
             const DH<deal_II_dimension,deal_II_space_dimension>   &,
             const hp::QCollection<deal_II_dimension-1> &,
-            const FunctionMap<deal_II_space_dimension>::type &,
+            const FunctionMap<deal_II_space_dimension,VEC::value_type>::type &,
             const std::vector<const VEC *>       &,
             std::vector<Vector<float> *>         &,
             const ComponentMask &,
@@ -129,7 +129,7 @@ for (VEC : VECTOR_TYPES ; deal_II_dimension : DIMENSIONS; deal_II_space_dimensio
     estimate<VEC,DH<deal_II_dimension,deal_II_space_dimension> > (
         const DH<deal_II_dimension,deal_II_space_dimension>   &,
         const hp::QCollection<deal_II_dimension-1> &,
-        const FunctionMap<deal_II_space_dimension>::type &,
+        const FunctionMap<deal_II_space_dimension,VEC::value_type>::type &,
         const std::vector<const VEC *>       &,
         std::vector<Vector<float> *>         &,
         const ComponentMask &,

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.