]> https://gitweb.dealii.org/ - dealii.git/commitdiff
Reshuffle the argument list of FE::fill_fe_*_values().
authorWolfgang Bangerth <bangerth@math.tamu.edu>
Sat, 7 Nov 2015 20:59:23 +0000 (14:59 -0600)
committerWolfgang Bangerth <bangerth@math.tamu.edu>
Sun, 8 Nov 2015 01:55:06 +0000 (19:55 -0600)
This brings the argument list in line with the changes made to Mapping in #1204.
In essence, it is all about sorting the list in a halfway reasonable order. No
functional changes.

The patch changes all of the derived finite element classes as well. In some cases
it changes the name of arguments to match a uniform style.

17 files changed:
include/deal.II/fe/fe.h
include/deal.II/fe/fe_dgp_nonparametric.h
include/deal.II/fe/fe_face.h
include/deal.II/fe/fe_nothing.h
include/deal.II/fe/fe_poly.h
include/deal.II/fe/fe_poly.templates.h
include/deal.II/fe/fe_poly_face.h
include/deal.II/fe/fe_poly_face.templates.h
include/deal.II/fe/fe_poly_tensor.h
include/deal.II/fe/fe_system.h
source/fe/fe_dgp_nonparametric.cc
source/fe/fe_face.cc
source/fe/fe_nothing.cc
source/fe/fe_poly.cc
source/fe/fe_poly_tensor.cc
source/fe/fe_system.cc
source/fe/fe_values.cc

index 70f222997d6b20a36ffb9f4b5fd1597dd4178408..3b3207449e4946934409627010e5f1da6281d35b 100644 (file)
@@ -2256,36 +2256,36 @@ protected:
    */
   virtual
   void
-  fill_fe_values (const Mapping<dim,spacedim>                                         &mapping,
-                  const typename Triangulation<dim,spacedim>::cell_iterator           &cell,
+  fill_fe_values (const typename Triangulation<dim,spacedim>::cell_iterator           &cell,
+                  const CellSimilarity::Similarity                                     cell_similarity,
                   const Quadrature<dim>                                               &quadrature,
+                  const Mapping<dim,spacedim>                                         &mapping,
                   const typename Mapping<dim,spacedim>::InternalDataBase              &mapping_internal,
-                  const InternalDataBase                                              &fe_internal,
                   const dealii::internal::FEValues::MappingRelatedData<dim, spacedim> &mapping_data,
-                  dealii::internal::FEValues::FiniteElementRelatedData<dim, spacedim> &output_data,
-                  const CellSimilarity::Similarity                                     cell_similarity) const = 0;
+                  const InternalDataBase                                              &fe_internal,
+                  dealii::internal::FEValues::FiniteElementRelatedData<dim, spacedim> &output_data) const = 0;
 
   virtual
   void
-  fill_fe_face_values (const Mapping<dim,spacedim>                                         &mapping,
-                       const typename Triangulation<dim,spacedim>::cell_iterator           &cell,
+  fill_fe_face_values (const typename Triangulation<dim,spacedim>::cell_iterator           &cell,
                        const unsigned int                                                   face_no,
                        const Quadrature<dim-1>                                             &quadrature,
+                       const Mapping<dim,spacedim>                                         &mapping,
                        const typename Mapping<dim,spacedim>::InternalDataBase              &mapping_internal,
-                       const InternalDataBase                                              &fe_internal,
                        const dealii::internal::FEValues::MappingRelatedData<dim, spacedim> &mapping_data,
+                       const InternalDataBase                                              &fe_internal,
                        dealii::internal::FEValues::FiniteElementRelatedData<dim, spacedim> &output_data) const = 0;
 
   virtual
   void
-  fill_fe_subface_values (const Mapping<dim,spacedim>                                         &mapping,
-                          const typename Triangulation<dim,spacedim>::cell_iterator           &cell,
+  fill_fe_subface_values (const typename Triangulation<dim,spacedim>::cell_iterator           &cell,
                           const unsigned int                                                   face_no,
                           const unsigned int                                                   sub_no,
                           const Quadrature<dim-1>                                             &quadrature,
+                          const Mapping<dim,spacedim>                                         &mapping,
                           const typename Mapping<dim,spacedim>::InternalDataBase              &mapping_internal,
-                          const InternalDataBase                                              &fe_internal,
                           const dealii::internal::FEValues::MappingRelatedData<dim, spacedim> &mapping_data,
+                          const InternalDataBase                                              &fe_internal,
                           dealii::internal::FEValues::FiniteElementRelatedData<dim, spacedim> &output_data) const = 0;
 
   friend class InternalDataBase;
index 50556f7097d94f9d64edced6b394b436928bed7d..33d2b6472474081a6f2b503447911bad8c252040 100644 (file)
@@ -536,37 +536,37 @@ protected:
 
   virtual
   void
-  fill_fe_values (const Mapping<dim,spacedim>                               &mapping,
-                  const typename Triangulation<dim,spacedim>::cell_iterator &cell,
-                  const Quadrature<dim>                                     &quadrature,
-                  const typename Mapping<dim,spacedim>::InternalDataBase    &mapping_internal,
-                  const typename FiniteElement<dim,spacedim>::InternalDataBase    &fe_internal,
-                  const internal::FEValues::MappingRelatedData<dim,spacedim> &mapping_data,
-                  internal::FEValues::FiniteElementRelatedData<dim,spacedim> &output_data,
-                  const CellSimilarity::Similarity                           cell_similarity) const;
+  fill_fe_values (const typename Triangulation<dim,spacedim>::cell_iterator           &cell,
+                  const CellSimilarity::Similarity                                     cell_similarity,
+                  const Quadrature<dim>                                               &quadrature,
+                  const Mapping<dim,spacedim>                                         &mapping,
+                  const typename Mapping<dim,spacedim>::InternalDataBase              &mapping_internal,
+                  const dealii::internal::FEValues::MappingRelatedData<dim, spacedim> &mapping_data,
+                  const typename FiniteElement<dim,spacedim>::InternalDataBase        &fe_internal,
+                  dealii::internal::FEValues::FiniteElementRelatedData<dim, spacedim> &output_data) const;
 
   virtual
   void
-  fill_fe_face_values (const Mapping<dim,spacedim>                               &mapping,
-                       const typename Triangulation<dim,spacedim>::cell_iterator &cell,
-                       const unsigned int                                         face_no,
-                       const Quadrature<dim-1>                                   &quadrature,
-                       const typename Mapping<dim,spacedim>::InternalDataBase    &mapping_internal,
-                       const typename FiniteElement<dim,spacedim>::InternalDataBase    &fe_internal,
-                       const internal::FEValues::MappingRelatedData<dim,spacedim> &mapping_data,
-                       internal::FEValues::FiniteElementRelatedData<dim,spacedim> &output_data) const;
+  fill_fe_face_values (const typename Triangulation<dim,spacedim>::cell_iterator           &cell,
+                       const unsigned int                                                   face_no,
+                       const Quadrature<dim-1>                                             &quadrature,
+                       const Mapping<dim,spacedim>                                         &mapping,
+                       const typename Mapping<dim,spacedim>::InternalDataBase              &mapping_internal,
+                       const dealii::internal::FEValues::MappingRelatedData<dim, spacedim> &mapping_data,
+                       const typename FiniteElement<dim,spacedim>::InternalDataBase        &fe_internal,
+                       dealii::internal::FEValues::FiniteElementRelatedData<dim, spacedim> &output_data) const;
 
   virtual
   void
-  fill_fe_subface_values (const Mapping<dim,spacedim>                               &mapping,
-                          const typename Triangulation<dim,spacedim>::cell_iterator &cell,
-                          const unsigned int                                         face_no,
-                          const unsigned int                                         sub_no,
-                          const Quadrature<dim-1>                                   &quadrature,
-                          const typename Mapping<dim,spacedim>::InternalDataBase    &mapping_internal,
-                          const typename FiniteElement<dim,spacedim>::InternalDataBase    &fe_internal,
-                          const internal::FEValues::MappingRelatedData<dim,spacedim> &mapping_data,
-                          internal::FEValues::FiniteElementRelatedData<dim,spacedim> &output_data) const;
+  fill_fe_subface_values (const typename Triangulation<dim,spacedim>::cell_iterator           &cell,
+                          const unsigned int                                                   face_no,
+                          const unsigned int                                                   sub_no,
+                          const Quadrature<dim-1>                                             &quadrature,
+                          const Mapping<dim,spacedim>                                         &mapping,
+                          const typename Mapping<dim,spacedim>::InternalDataBase              &mapping_internal,
+                          const dealii::internal::FEValues::MappingRelatedData<dim, spacedim> &mapping_data,
+                          const typename FiniteElement<dim,spacedim>::InternalDataBase        &fe_internal,
+                          dealii::internal::FEValues::FiniteElementRelatedData<dim, spacedim> &output_data) const;
 
 private:
 
index acafae2abe753c8d4937e60ee3bd2e184b6279ef..973af22f080bbcea9f8b69324fe93c5ecf80d993 100644 (file)
@@ -280,37 +280,37 @@ protected:
 
   virtual
   void
-  fill_fe_values (const Mapping<1,spacedim>                              &mapping,
-                  const typename Triangulation<1,spacedim>::cell_iterator &cell,
-                  const Quadrature<1>                                     &quadrature,
-                  const typename Mapping<1,spacedim>::InternalDataBase    &mapping_internal,
-                  const typename FiniteElement<1,spacedim>::InternalDataBase    &fe_internal,
-                  const internal::FEValues::MappingRelatedData<1,spacedim> &mapping_data,
-                  internal::FEValues::FiniteElementRelatedData<1,spacedim> &output_data,
-                  const CellSimilarity::Similarity                          cell_similarity) const;
+  fill_fe_values (const typename Triangulation<1,spacedim>::cell_iterator           &cell,
+                  const CellSimilarity::Similarity                                   cell_similarity,
+                  const Quadrature<1>                                               &quadrature,
+                  const Mapping<1,spacedim>                                         &mapping,
+                  const typename Mapping<1,spacedim>::InternalDataBase              &mapping_internal,
+                  const dealii::internal::FEValues::MappingRelatedData<1, spacedim> &mapping_data,
+                  const typename FiniteElement<1,spacedim>::InternalDataBase        &fe_internal,
+                  dealii::internal::FEValues::FiniteElementRelatedData<1, spacedim> &output_data) const;
 
   virtual
   void
-  fill_fe_face_values (const Mapping<1,spacedim>                               &mapping,
-                       const typename Triangulation<1,spacedim>::cell_iterator &cell,
-                       const unsigned int                                         face_no,
-                       const Quadrature<0>                                   &quadrature,
-                       const typename Mapping<1,spacedim>::InternalDataBase    &mapping_internal,
-                       const typename FiniteElement<1,spacedim>::InternalDataBase    &fe_internal,
-                       const internal::FEValues::MappingRelatedData<1,spacedim> &mapping_data,
-                       internal::FEValues::FiniteElementRelatedData<1,spacedim> &output_data) const;
+  fill_fe_face_values (const typename Triangulation<1,spacedim>::cell_iterator           &cell,
+                       const unsigned int                                                 face_no,
+                       const Quadrature<0>                                               &quadrature,
+                       const Mapping<1,spacedim>                                         &mapping,
+                       const typename Mapping<1,spacedim>::InternalDataBase              &mapping_internal,
+                       const dealii::internal::FEValues::MappingRelatedData<1, spacedim> &mapping_data,
+                       const typename FiniteElement<1,spacedim>::InternalDataBase        &fe_internal,
+                       dealii::internal::FEValues::FiniteElementRelatedData<1, spacedim> &output_data) const;
 
   virtual
   void
-  fill_fe_subface_values (const Mapping<1,spacedim>                               &mapping,
-                          const typename Triangulation<1,spacedim>::cell_iterator &cell,
-                          const unsigned int                                         face_no,
-                          const unsigned int                                         sub_no,
-                          const Quadrature<0>                                   &quadrature,
-                          const typename Mapping<1,spacedim>::InternalDataBase    &mapping_internal,
-                          const typename FiniteElement<1,spacedim>::InternalDataBase    &fe_internal,
-                          const internal::FEValues::MappingRelatedData<1,spacedim> &mapping_data,
-                          internal::FEValues::FiniteElementRelatedData<1,spacedim> &output_data) const;
+  fill_fe_subface_values (const typename Triangulation<1,spacedim>::cell_iterator           &cell,
+                          const unsigned int                                                 face_no,
+                          const unsigned int                                                 sub_no,
+                          const Quadrature<0>                                               &quadrature,
+                          const Mapping<1,spacedim>                                         &mapping,
+                          const typename Mapping<1,spacedim>::InternalDataBase              &mapping_internal,
+                          const dealii::internal::FEValues::MappingRelatedData<1, spacedim> &mapping_data,
+                          const typename FiniteElement<1,spacedim>::InternalDataBase        &fe_internal,
+                          dealii::internal::FEValues::FiniteElementRelatedData<1, spacedim> &output_data) const;
 
 
   /**
index 3985b5dac6cd703f8c24364426efbbe7c70ab3a5..90e3ce9567dc4c458aafd6a8eeaba3d326fb2bbe 100644 (file)
@@ -131,37 +131,37 @@ public:
 
   virtual
   void
-  fill_fe_values (const Mapping<dim,spacedim>                               &mapping,
-                  const typename Triangulation<dim,spacedim>::cell_iterator &cell,
-                  const Quadrature<dim>                                     &quadrature,
-                  const typename Mapping<dim,spacedim>::InternalDataBase    &mapping_internal,
-                  const typename FiniteElement<dim,spacedim>::InternalDataBase    &fe_internal,
-                  const internal::FEValues::MappingRelatedData<dim,spacedim> &mapping_data,
-                  internal::FEValues::FiniteElementRelatedData<dim,spacedim> &output_data,
-                  const CellSimilarity::Similarity                           cell_similarity) const;
+  fill_fe_values (const typename Triangulation<dim,spacedim>::cell_iterator           &cell,
+                  const CellSimilarity::Similarity                                     cell_similarity,
+                  const Quadrature<dim>                                               &quadrature,
+                  const Mapping<dim,spacedim>                                         &mapping,
+                  const typename Mapping<dim,spacedim>::InternalDataBase              &mapping_internal,
+                  const dealii::internal::FEValues::MappingRelatedData<dim, spacedim> &mapping_data,
+                  const typename FiniteElement<dim,spacedim>::InternalDataBase        &fe_internal,
+                  dealii::internal::FEValues::FiniteElementRelatedData<dim, spacedim> &output_data) const;
 
   virtual
   void
-  fill_fe_face_values (const Mapping<dim,spacedim>                               &mapping,
-                       const typename Triangulation<dim,spacedim>::cell_iterator &cell,
-                       const unsigned int                                         face_no,
-                       const Quadrature<dim-1>                                   &quadrature,
-                       const typename Mapping<dim,spacedim>::InternalDataBase    &mapping_internal,
-                       const typename FiniteElement<dim,spacedim>::InternalDataBase    &fe_internal,
-                       const internal::FEValues::MappingRelatedData<dim,spacedim> &mapping_data,
-                       internal::FEValues::FiniteElementRelatedData<dim,spacedim> &output_data) const;
+  fill_fe_face_values (const typename Triangulation<dim,spacedim>::cell_iterator           &cell,
+                       const unsigned int                                                   face_no,
+                       const Quadrature<dim-1>                                             &quadrature,
+                       const Mapping<dim,spacedim>                                         &mapping,
+                       const typename Mapping<dim,spacedim>::InternalDataBase              &mapping_internal,
+                       const dealii::internal::FEValues::MappingRelatedData<dim, spacedim> &mapping_data,
+                       const typename FiniteElement<dim,spacedim>::InternalDataBase        &fe_internal,
+                       dealii::internal::FEValues::FiniteElementRelatedData<dim, spacedim> &output_data) const;
 
   virtual
   void
-  fill_fe_subface_values (const Mapping<dim,spacedim>                               &mapping,
-                          const typename Triangulation<dim,spacedim>::cell_iterator &cell,
-                          const unsigned int                                         face_no,
-                          const unsigned int                                         sub_no,
-                          const Quadrature<dim-1>                                   &quadrature,
-                          const typename Mapping<dim,spacedim>::InternalDataBase    &mapping_internal,
-                          const typename FiniteElement<dim,spacedim>::InternalDataBase    &fe_internal,
-                          const internal::FEValues::MappingRelatedData<dim,spacedim> &mapping_data,
-                          internal::FEValues::FiniteElementRelatedData<dim,spacedim> &output_data) const;
+  fill_fe_subface_values (const typename Triangulation<dim,spacedim>::cell_iterator           &cell,
+                          const unsigned int                                                   face_no,
+                          const unsigned int                                                   sub_no,
+                          const Quadrature<dim-1>                                             &quadrature,
+                          const Mapping<dim,spacedim>                                         &mapping,
+                          const typename Mapping<dim,spacedim>::InternalDataBase              &mapping_internal,
+                          const dealii::internal::FEValues::MappingRelatedData<dim, spacedim> &mapping_data,
+                          const typename FiniteElement<dim,spacedim>::InternalDataBase        &fe_internal,
+                          dealii::internal::FEValues::FiniteElementRelatedData<dim, spacedim> &output_data) const;
 
   /**
    * Prepare internal data structures and fill in values independent of the
index a2f3bc3489e9021a8b1637a67a00697581bf1c86..43ba79eb3e47e4cfaae5219ac1fba2a213422ceb 100644 (file)
@@ -306,37 +306,37 @@ protected:
 
   virtual
   void
-  fill_fe_values (const Mapping<dim,spacedim>                               &mapping,
-                  const typename Triangulation<dim,spacedim>::cell_iterator &cell,
-                  const Quadrature<dim>                                     &quadrature,
-                  const typename Mapping<dim,spacedim>::InternalDataBase    &mapping_internal,
-                  const typename FiniteElement<dim,spacedim>::InternalDataBase    &fe_internal,
-                  const internal::FEValues::MappingRelatedData<dim,spacedim> &mapping_data,
-                  internal::FEValues::FiniteElementRelatedData<dim,spacedim> &output_data,
-                  const CellSimilarity::Similarity                           cell_similarity) const;
+  fill_fe_values (const typename Triangulation<dim,spacedim>::cell_iterator           &cell,
+                  const CellSimilarity::Similarity                                     cell_similarity,
+                  const Quadrature<dim>                                               &quadrature,
+                  const Mapping<dim,spacedim>                                         &mapping,
+                  const typename Mapping<dim,spacedim>::InternalDataBase              &mapping_internal,
+                  const dealii::internal::FEValues::MappingRelatedData<dim, spacedim> &mapping_data,
+                  const typename FiniteElement<dim,spacedim>::InternalDataBase        &fe_internal,
+                  dealii::internal::FEValues::FiniteElementRelatedData<dim, spacedim> &output_data) const;
 
   virtual
   void
-  fill_fe_face_values (const Mapping<dim,spacedim>                               &mapping,
-                       const typename Triangulation<dim,spacedim>::cell_iterator &cell,
-                       const unsigned int                                         face_no,
-                       const Quadrature<dim-1>                                   &quadrature,
-                       const typename Mapping<dim,spacedim>::InternalDataBase    &mapping_internal,
-                       const typename FiniteElement<dim,spacedim>::InternalDataBase    &fe_internal,
-                       const internal::FEValues::MappingRelatedData<dim,spacedim> &mapping_data,
-                       internal::FEValues::FiniteElementRelatedData<dim,spacedim> &output_data) const;
+  fill_fe_face_values (const typename Triangulation<dim,spacedim>::cell_iterator           &cell,
+                       const unsigned int                                                   face_no,
+                       const Quadrature<dim-1>                                             &quadrature,
+                       const Mapping<dim,spacedim>                                         &mapping,
+                       const typename Mapping<dim,spacedim>::InternalDataBase              &mapping_internal,
+                       const dealii::internal::FEValues::MappingRelatedData<dim, spacedim> &mapping_data,
+                       const typename FiniteElement<dim,spacedim>::InternalDataBase        &fe_internal,
+                       dealii::internal::FEValues::FiniteElementRelatedData<dim, spacedim> &output_data) const;
 
   virtual
   void
-  fill_fe_subface_values (const Mapping<dim,spacedim>                               &mapping,
-                          const typename Triangulation<dim,spacedim>::cell_iterator &cell,
-                          const unsigned int                                         face_no,
-                          const unsigned int                                         sub_no,
-                          const Quadrature<dim-1>                                   &quadrature,
-                          const typename Mapping<dim,spacedim>::InternalDataBase    &mapping_internal,
-                          const typename FiniteElement<dim,spacedim>::InternalDataBase    &fe_internal,
-                          const internal::FEValues::MappingRelatedData<dim,spacedim> &mapping_data,
-                          internal::FEValues::FiniteElementRelatedData<dim,spacedim> &output_data) const;
+  fill_fe_subface_values (const typename Triangulation<dim,spacedim>::cell_iterator           &cell,
+                          const unsigned int                                                   face_no,
+                          const unsigned int                                                   sub_no,
+                          const Quadrature<dim-1>                                             &quadrature,
+                          const Mapping<dim,spacedim>                                         &mapping,
+                          const typename Mapping<dim,spacedim>::InternalDataBase              &mapping_internal,
+                          const dealii::internal::FEValues::MappingRelatedData<dim, spacedim> &mapping_data,
+                          const typename FiniteElement<dim,spacedim>::InternalDataBase        &fe_internal,
+                          dealii::internal::FEValues::FiniteElementRelatedData<dim, spacedim> &output_data) const;
 
   /**
    * Determine the values that need to be computed on the unit cell to be able
index cd3e28dbd0eb3de0e040b22b89362fbdc4779fd1..fb160960b242301d6536f3c7aba006a9441089c7 100644 (file)
@@ -231,21 +231,21 @@ FE_Poly<POLY,dim,spacedim>::update_each (const UpdateFlags flags) const
 template <class POLY, int dim, int spacedim>
 void
 FE_Poly<POLY,dim,spacedim>::
-fill_fe_values (const Mapping<dim,spacedim>                                  &mapping,
-                const typename Triangulation<dim,spacedim>::cell_iterator &,
-                const Quadrature<dim>                                        &quadrature,
-                const typename Mapping<dim,spacedim>::InternalDataBase       &mapping_internal,
-                const typename FiniteElement<dim,spacedim>::InternalDataBase &fedata,
-                const internal::FEValues::MappingRelatedData<dim,spacedim>   &mapping_data,
-                internal::FEValues::FiniteElementRelatedData<dim,spacedim>   &output_data,
-                const CellSimilarity::Similarity                              cell_similarity) const
+fill_fe_values (const typename Triangulation<dim,spacedim>::cell_iterator &,
+                const CellSimilarity::Similarity                                     cell_similarity,
+                const Quadrature<dim>                                               &quadrature,
+                const Mapping<dim,spacedim>                                         &mapping,
+                const typename Mapping<dim,spacedim>::InternalDataBase              &mapping_internal,
+                const dealii::internal::FEValues::MappingRelatedData<dim, spacedim> &mapping_data,
+                const typename FiniteElement<dim,spacedim>::InternalDataBase        &fe_internal,
+                dealii::internal::FEValues::FiniteElementRelatedData<dim, spacedim> &output_data) const
 {
   // convert data object to internal
   // data for this class. fails with
   // an exception if that is not
   // possible
-  Assert (dynamic_cast<const InternalData *> (&fedata) != 0, ExcInternalError());
-  const InternalData &fe_data = static_cast<const InternalData &> (fedata);
+  Assert (dynamic_cast<const InternalData *> (&fe_internal) != 0, ExcInternalError());
+  const InternalData &fe_data = static_cast<const InternalData &> (fe_internal);
 
   const UpdateFlags flags(fe_data.update_each);
 
@@ -295,31 +295,31 @@ fill_fe_values (const Mapping<dim,spacedim>                                  &ma
 template <class POLY, int dim, int spacedim>
 void
 FE_Poly<POLY,dim,spacedim>::
-fill_fe_face_values (const Mapping<dim,spacedim>                                  &mapping,
-                     const typename Triangulation<dim,spacedim>::cell_iterator    &cell,
-                     const unsigned int                                            face,
-                     const Quadrature<dim-1>                                      &quadrature,
-                     const typename Mapping<dim,spacedim>::InternalDataBase       &mapping_internal,
-                     const typename FiniteElement<dim,spacedim>::InternalDataBase &fedata,
-                     const internal::FEValues::MappingRelatedData<dim,spacedim>   &mapping_data,
-                     internal::FEValues::FiniteElementRelatedData<dim,spacedim>   &output_data) const
+fill_fe_face_values (const typename Triangulation<dim,spacedim>::cell_iterator           &cell,
+                     const unsigned int                                                   face_no,
+                     const Quadrature<dim-1>                                             &quadrature,
+                     const Mapping<dim,spacedim>                                         &mapping,
+                     const typename Mapping<dim,spacedim>::InternalDataBase              &mapping_internal,
+                     const dealii::internal::FEValues::MappingRelatedData<dim, spacedim> &mapping_data,
+                     const typename FiniteElement<dim,spacedim>::InternalDataBase        &fe_internal,
+                     dealii::internal::FEValues::FiniteElementRelatedData<dim, spacedim> &output_data) const
 {
   // convert data object to internal
   // data for this class. fails with
   // an exception if that is not
   // possible
-  Assert (dynamic_cast<const InternalData *> (&fedata) != 0, ExcInternalError());
-  const InternalData &fe_data = static_cast<const InternalData &> (fedata);
+  Assert (dynamic_cast<const InternalData *> (&fe_internal) != 0, ExcInternalError());
+  const InternalData &fe_data = static_cast<const InternalData &> (fe_internal);
 
   // offset determines which data set
   // to take (all data sets for all
   // faces are stored contiguously)
 
   const typename QProjector<dim>::DataSetDescriptor offset
-    = QProjector<dim>::DataSetDescriptor::face (face,
-                                                cell->face_orientation(face),
-                                                cell->face_flip(face),
-                                                cell->face_rotation(face),
+    = QProjector<dim>::DataSetDescriptor::face (face_no,
+                                                cell->face_orientation(face_no),
+                                                cell->face_flip(face_no),
+                                                cell->face_rotation(face_no),
                                                 quadrature.size());
 
   const UpdateFlags flags(fe_data.update_each);
@@ -372,34 +372,34 @@ fill_fe_face_values (const Mapping<dim,spacedim>
 template <class POLY, int dim, int spacedim>
 void
 FE_Poly<POLY,dim,spacedim>::
-fill_fe_subface_values (const Mapping<dim,spacedim>                                  &mapping,
-                        const typename Triangulation<dim,spacedim>::cell_iterator    &cell,
-                        const unsigned int                                            face,
-                        const unsigned int                                            subface,
-                        const Quadrature<dim-1>                                      &quadrature,
-                        const typename Mapping<dim,spacedim>::InternalDataBase       &mapping_internal,
-                        const typename FiniteElement<dim,spacedim>::InternalDataBase &fedata,
-                        const internal::FEValues::MappingRelatedData<dim,spacedim>   &mapping_data,
-                        internal::FEValues::FiniteElementRelatedData<dim,spacedim>   &output_data) const
+fill_fe_subface_values (const typename Triangulation<dim,spacedim>::cell_iterator           &cell,
+                        const unsigned int                                                   face_no,
+                        const unsigned int                                                   sub_no,
+                        const Quadrature<dim-1>                                             &quadrature,
+                        const Mapping<dim,spacedim>                                         &mapping,
+                        const typename Mapping<dim,spacedim>::InternalDataBase              &mapping_internal,
+                        const dealii::internal::FEValues::MappingRelatedData<dim, spacedim> &mapping_data,
+                        const typename FiniteElement<dim,spacedim>::InternalDataBase        &fe_internal,
+                        dealii::internal::FEValues::FiniteElementRelatedData<dim, spacedim> &output_data) const
 {
   // convert data object to internal
   // data for this class. fails with
   // an exception if that is not
   // possible
-  Assert (dynamic_cast<const InternalData *> (&fedata) != 0, ExcInternalError());
-  const InternalData &fe_data = static_cast<const InternalData &> (fedata);
+  Assert (dynamic_cast<const InternalData *> (&fe_internal) != 0, ExcInternalError());
+  const InternalData &fe_data = static_cast<const InternalData &> (fe_internal);
 
   // offset determines which data set
   // to take (all data sets for all
   // sub-faces are stored contiguously)
 
   const typename QProjector<dim>::DataSetDescriptor offset
-    = QProjector<dim>::DataSetDescriptor::subface (face, subface,
-                                                   cell->face_orientation(face),
-                                                   cell->face_flip(face),
-                                                   cell->face_rotation(face),
+    = QProjector<dim>::DataSetDescriptor::subface (face_no, sub_no,
+                                                   cell->face_orientation(face_no),
+                                                   cell->face_flip(face_no),
+                                                   cell->face_rotation(face_no),
                                                    quadrature.size(),
-                                                   cell->subface_case(face));
+                                                   cell->subface_case(face_no));
 
   const UpdateFlags flags(fe_data.update_each);
 
index 294fcee3679b99e9b86e6b7720ebc159a5a2f593..9454af99fdfd14adf54bc6549d4897af13a0828b 100644 (file)
@@ -155,37 +155,37 @@ protected:
 
   virtual
   void
-  fill_fe_values (const Mapping<dim,spacedim>                               &mapping,
-                  const typename Triangulation<dim,spacedim>::cell_iterator &cell,
-                  const Quadrature<dim>                                     &quadrature,
-                  const typename Mapping<dim,spacedim>::InternalDataBase    &mapping_internal,
-                  const typename FiniteElement<dim,spacedim>::InternalDataBase    &fe_internal,
-                  const internal::FEValues::MappingRelatedData<dim,spacedim> &mapping_data,
-                  internal::FEValues::FiniteElementRelatedData<dim,spacedim> &output_data,
-                  const CellSimilarity::Similarity                           cell_similarity) const;
+  fill_fe_values (const typename Triangulation<dim,spacedim>::cell_iterator           &cell,
+                  const CellSimilarity::Similarity                                     cell_similarity,
+                  const Quadrature<dim>                                               &quadrature,
+                  const Mapping<dim,spacedim>                                         &mapping,
+                  const typename Mapping<dim,spacedim>::InternalDataBase              &mapping_internal,
+                  const dealii::internal::FEValues::MappingRelatedData<dim, spacedim> &mapping_data,
+                  const typename FiniteElement<dim,spacedim>::InternalDataBase        &fe_internal,
+                  dealii::internal::FEValues::FiniteElementRelatedData<dim, spacedim> &output_data) const;
 
   virtual
   void
-  fill_fe_face_values (const Mapping<dim,spacedim>                               &mapping,
-                       const typename Triangulation<dim,spacedim>::cell_iterator &cell,
-                       const unsigned int                                         face_no,
-                       const Quadrature<dim-1>                                   &quadrature,
-                       const typename Mapping<dim,spacedim>::InternalDataBase    &mapping_internal,
-                       const typename FiniteElement<dim,spacedim>::InternalDataBase    &fe_internal,
-                       const internal::FEValues::MappingRelatedData<dim,spacedim> &mapping_data,
-                       internal::FEValues::FiniteElementRelatedData<dim,spacedim> &output_data) const;
+  fill_fe_face_values (const typename Triangulation<dim,spacedim>::cell_iterator           &cell,
+                       const unsigned int                                                   face_no,
+                       const Quadrature<dim-1>                                             &quadrature,
+                       const Mapping<dim,spacedim>                                         &mapping,
+                       const typename Mapping<dim,spacedim>::InternalDataBase              &mapping_internal,
+                       const dealii::internal::FEValues::MappingRelatedData<dim, spacedim> &mapping_data,
+                       const typename FiniteElement<dim,spacedim>::InternalDataBase        &fe_internal,
+                       dealii::internal::FEValues::FiniteElementRelatedData<dim, spacedim> &output_data) const;
 
   virtual
   void
-  fill_fe_subface_values (const Mapping<dim,spacedim>                               &mapping,
-                          const typename Triangulation<dim,spacedim>::cell_iterator &cell,
-                          const unsigned int                                         face_no,
-                          const unsigned int                                         sub_no,
-                          const Quadrature<dim-1>                                   &quadrature,
-                          const typename Mapping<dim,spacedim>::InternalDataBase    &mapping_internal,
-                          const typename FiniteElement<dim,spacedim>::InternalDataBase    &fe_internal,
-                          const internal::FEValues::MappingRelatedData<dim,spacedim> &mapping_data,
-                          internal::FEValues::FiniteElementRelatedData<dim,spacedim> &output_data) const;
+  fill_fe_subface_values (const typename Triangulation<dim,spacedim>::cell_iterator           &cell,
+                          const unsigned int                                                   face_no,
+                          const unsigned int                                                   sub_no,
+                          const Quadrature<dim-1>                                             &quadrature,
+                          const Mapping<dim,spacedim>                                         &mapping,
+                          const typename Mapping<dim,spacedim>::InternalDataBase              &mapping_internal,
+                          const dealii::internal::FEValues::MappingRelatedData<dim, spacedim> &mapping_data,
+                          const typename FiniteElement<dim,spacedim>::InternalDataBase        &fe_internal,
+                          dealii::internal::FEValues::FiniteElementRelatedData<dim, spacedim> &output_data) const;
 
   /**
    * Determine the values that need to be computed on the unit cell to be able
index 2e5a78a164ec61a87e91136bd6796831e680f4ec..abeb919b7525606e27b14a54ef34fae649d2e6f5 100644 (file)
@@ -88,14 +88,14 @@ FE_PolyFace<POLY,dim,spacedim>::update_each (const UpdateFlags flags) const
 template <class POLY, int dim, int spacedim>
 void
 FE_PolyFace<POLY,dim,spacedim>::
-fill_fe_values (const Mapping<dim,spacedim> &,
-                const typename Triangulation<dim,spacedim>::cell_iterator &,
+fill_fe_values (const typename Triangulation<dim,spacedim>::cell_iterator &,
+                const CellSimilarity::Similarity                                     ,
                 const Quadrature<dim> &,
+                const Mapping<dim,spacedim> &,
                 const typename Mapping<dim,spacedim>::InternalDataBase &,
+                const dealii::internal::FEValues::MappingRelatedData<dim, spacedim> &,
                 const typename FiniteElement<dim,spacedim>::InternalDataBase &,
-                const internal::FEValues::MappingRelatedData<dim,spacedim> &,
-                internal::FEValues::FiniteElementRelatedData<dim,spacedim> &,
-                const CellSimilarity::Similarity ) const
+                dealii::internal::FEValues::FiniteElementRelatedData<dim, spacedim> &) const
 {
   // Do nothing, since we do not have
   // values in the interior
@@ -106,21 +106,21 @@ fill_fe_values (const Mapping<dim,spacedim> &,
 template <class POLY, int dim, int spacedim>
 void
 FE_PolyFace<POLY,dim,spacedim>::
-fill_fe_face_values (const Mapping<dim,spacedim> &,
-                     const typename Triangulation<dim,spacedim>::cell_iterator &,
-                     const unsigned int face,
-                     const Quadrature<dim-1>& quadrature,
+fill_fe_face_values (const typename Triangulation<dim,spacedim>::cell_iterator &,
+                     const unsigned int                                                   face_no,
+                     const Quadrature<dim-1>                                             &quadrature,
+                     const Mapping<dim,spacedim> &,
                      const typename Mapping<dim,spacedim>::InternalDataBase &,
-                     const typename FiniteElement<dim,spacedim>::InternalDataBase &fedata,
-                     const internal::FEValues::MappingRelatedData<dim,spacedim> &,
-                     internal::FEValues::FiniteElementRelatedData<dim,spacedim> &output_data) const
+                     const dealii::internal::FEValues::MappingRelatedData<dim, spacedim> &,
+                     const typename FiniteElement<dim,spacedim>::InternalDataBase        &fe_internal,
+                     dealii::internal::FEValues::FiniteElementRelatedData<dim, spacedim> &output_data) const
 {
   // convert data object to internal
   // data for this class. fails with
   // an exception if that is not
   // possible
-  Assert (dynamic_cast<const InternalData *> (&fedata) != 0, ExcInternalError());
-  const InternalData &fe_data = static_cast<const InternalData &> (fedata);
+  Assert (dynamic_cast<const InternalData *> (&fe_internal) != 0, ExcInternalError());
+  const InternalData &fe_data = static_cast<const InternalData &> (fe_internal);
 
   if (fe_data.update_each & update_values)
     for (unsigned int i=0; i<quadrature.size(); ++i)
@@ -134,7 +134,7 @@ fill_fe_face_values (const Mapping<dim,spacedim> &,
             // Fill data for quad shape functions
             if (this->dofs_per_quad !=0)
               {
-                const unsigned int foffset = this->first_quad_index + this->dofs_per_quad * face;
+                const unsigned int foffset = this->first_quad_index + this->dofs_per_quad * face_no;
                 for (unsigned int k=0; k<this->dofs_per_quad; ++k)
                   output_data.shape_values(foffset+k,i) = fe_data.shape_values[k+this->first_face_quad_index][i];
               }
@@ -151,7 +151,7 @@ fill_fe_face_values (const Mapping<dim,spacedim> &,
                 for (unsigned int line=0; line<GeometryInfo<dim>::lines_per_face; ++line)
                   {
                     for (unsigned int k=0; k<this->dofs_per_line; ++k)
-                      output_data.shape_values(foffset+GeometryInfo<dim>::face_to_cell_lines(face, line)*this->dofs_per_line+k,i)
+                      output_data.shape_values(foffset+GeometryInfo<dim>::face_to_cell_lines(face_no, line)*this->dofs_per_line+k,i)
                         = fe_data.shape_values[k+(line*this->dofs_per_line)+this->first_face_line_index][i];
                   }
               }
@@ -164,7 +164,7 @@ fill_fe_face_values (const Mapping<dim,spacedim> &,
             // Fill data for vertex shape functions
             if (this->dofs_per_vertex != 0)
               for (unsigned int lvertex=0; lvertex<GeometryInfo<dim>::vertices_per_face; ++lvertex)
-                output_data.shape_values(GeometryInfo<dim>::face_to_cell_vertices(face, lvertex),i)
+                output_data.shape_values(GeometryInfo<dim>::face_to_cell_vertices(face_no, lvertex),i)
                   = fe_data.shape_values[lvertex][i];
             break;
           }
@@ -176,25 +176,25 @@ fill_fe_face_values (const Mapping<dim,spacedim> &,
 template <class POLY, int dim, int spacedim>
 void
 FE_PolyFace<POLY,dim,spacedim>::
-fill_fe_subface_values (const Mapping<dim,spacedim> &,
-                        const typename Triangulation<dim,spacedim>::cell_iterator &,
-                        const unsigned int face,
-                        const unsigned int subface,
-                        const Quadrature<dim-1>& quadrature,
+fill_fe_subface_values (const typename Triangulation<dim,spacedim>::cell_iterator &,
+                        const unsigned int                                                   face_no,
+                        const unsigned int                                                   sub_no,
+                        const Quadrature<dim-1>                                             &quadrature,
+                        const Mapping<dim,spacedim> &,
                         const typename Mapping<dim,spacedim>::InternalDataBase &,
-                        const typename FiniteElement<dim,spacedim>::InternalDataBase &fedata,
-                        const internal::FEValues::MappingRelatedData<dim,spacedim> &,
-                        internal::FEValues::FiniteElementRelatedData<dim,spacedim> &output_data) const
+                        const dealii::internal::FEValues::MappingRelatedData<dim, spacedim> &,
+                        const typename FiniteElement<dim,spacedim>::InternalDataBase        &fe_internal,
+                        dealii::internal::FEValues::FiniteElementRelatedData<dim, spacedim> &output_data) const
 {
   // convert data object to internal
   // data for this class. fails with
   // an exception if that is not
   // possible
-  Assert (dynamic_cast<const InternalData *> (&fedata) != 0, ExcInternalError());
-  const InternalData &fe_data = static_cast<const InternalData &> (fedata);
+  Assert (dynamic_cast<const InternalData *> (&fe_internal) != 0, ExcInternalError());
+  const InternalData &fe_data = static_cast<const InternalData &> (fe_internal);
 
-  const unsigned int foffset = fe_data.shape_values.size() * face;
-  const unsigned int offset = subface*quadrature.size();
+  const unsigned int foffset = fe_data.shape_values.size() * face_no;
+  const unsigned int offset = sub_no*quadrature.size();
 
   if (fe_data.update_each & update_values)
     {
index f1a0a303c2c4ef0c9e580f31b1d856c6174d7399..33ec7876acaccbc2e07a8811bd1bf9d6a875441b 100644 (file)
@@ -316,37 +316,37 @@ protected:
 
   virtual
   void
-  fill_fe_values (const Mapping<dim,spacedim>                               &mapping,
-                  const typename Triangulation<dim,spacedim>::cell_iterator &cell,
-                  const Quadrature<dim>                                     &quadrature,
-                  const typename Mapping<dim,spacedim>::InternalDataBase    &mapping_internal,
-                  const typename FiniteElement<dim,spacedim>::InternalDataBase    &fe_internal,
-                  const internal::FEValues::MappingRelatedData<dim,spacedim> &mapping_data,
-                  internal::FEValues::FiniteElementRelatedData<dim,spacedim> &output_data,
-                  const CellSimilarity::Similarity                           cell_similarity) const;
+  fill_fe_values (const typename Triangulation<dim,spacedim>::cell_iterator           &cell,
+                  const CellSimilarity::Similarity                                     cell_similarity,
+                  const Quadrature<dim>                                               &quadrature,
+                  const Mapping<dim,spacedim>                                         &mapping,
+                  const typename Mapping<dim,spacedim>::InternalDataBase              &mapping_internal,
+                  const dealii::internal::FEValues::MappingRelatedData<dim, spacedim> &mapping_data,
+                  const typename FiniteElement<dim,spacedim>::InternalDataBase        &fe_internal,
+                  dealii::internal::FEValues::FiniteElementRelatedData<dim, spacedim> &output_data) const;
 
   virtual
   void
-  fill_fe_face_values (const Mapping<dim,spacedim>                               &mapping,
-                       const typename Triangulation<dim,spacedim>::cell_iterator &cell,
-                       const unsigned int                                         face_no,
-                       const Quadrature<dim-1>                                   &quadrature,
-                       const typename Mapping<dim,spacedim>::InternalDataBase    &mapping_internal,
-                       const typename FiniteElement<dim,spacedim>::InternalDataBase    &fe_internal,
-                       const internal::FEValues::MappingRelatedData<dim,spacedim> &mapping_data,
-                       internal::FEValues::FiniteElementRelatedData<dim,spacedim> &output_data) const;
+  fill_fe_face_values (const typename Triangulation<dim,spacedim>::cell_iterator           &cell,
+                       const unsigned int                                                   face_no,
+                       const Quadrature<dim-1>                                             &quadrature,
+                       const Mapping<dim,spacedim>                                         &mapping,
+                       const typename Mapping<dim,spacedim>::InternalDataBase              &mapping_internal,
+                       const dealii::internal::FEValues::MappingRelatedData<dim, spacedim> &mapping_data,
+                       const typename FiniteElement<dim,spacedim>::InternalDataBase        &fe_internal,
+                       dealii::internal::FEValues::FiniteElementRelatedData<dim, spacedim> &output_data) const;
 
   virtual
   void
-  fill_fe_subface_values (const Mapping<dim,spacedim>                               &mapping,
-                          const typename Triangulation<dim,spacedim>::cell_iterator &cell,
-                          const unsigned int                                         face_no,
-                          const unsigned int                                         sub_no,
-                          const Quadrature<dim-1>                                   &quadrature,
-                          const typename Mapping<dim,spacedim>::InternalDataBase    &mapping_internal,
-                          const typename FiniteElement<dim,spacedim>::InternalDataBase    &fe_internal,
-                          const internal::FEValues::MappingRelatedData<dim,spacedim> &mapping_data,
-                          internal::FEValues::FiniteElementRelatedData<dim,spacedim> &output_data) const;
+  fill_fe_subface_values (const typename Triangulation<dim,spacedim>::cell_iterator           &cell,
+                          const unsigned int                                                   face_no,
+                          const unsigned int                                                   sub_no,
+                          const Quadrature<dim-1>                                             &quadrature,
+                          const Mapping<dim,spacedim>                                         &mapping,
+                          const typename Mapping<dim,spacedim>::InternalDataBase              &mapping_internal,
+                          const dealii::internal::FEValues::MappingRelatedData<dim, spacedim> &mapping_data,
+                          const typename FiniteElement<dim,spacedim>::InternalDataBase        &fe_internal,
+                          dealii::internal::FEValues::FiniteElementRelatedData<dim, spacedim> &output_data) const;
 
   /**
    * Fields of cell-independent data for FE_PolyTensor. Stores the values of
index ace5ac4e14e133b825e7a6c9eea06c5fcdd3645e..4b64df4fbf9ab9108b3a4f7534c9b07b3533d5f4 100644 (file)
@@ -878,37 +878,37 @@ protected:
 
   virtual
   void
-  fill_fe_values (const Mapping<dim,spacedim>                               &mapping,
-                  const typename Triangulation<dim,spacedim>::cell_iterator &cell,
-                  const Quadrature<dim>                                     &quadrature,
-                  const typename Mapping<dim,spacedim>::InternalDataBase    &mapping_internal,
-                  const typename FiniteElement<dim,spacedim>::InternalDataBase    &fe_internal,
-                  const internal::FEValues::MappingRelatedData<dim,spacedim> &mapping_data,
-                  internal::FEValues::FiniteElementRelatedData<dim,spacedim> &output_data,
-                  const CellSimilarity::Similarity                           cell_similarity) const;
+  fill_fe_values (const typename Triangulation<dim,spacedim>::cell_iterator           &cell,
+                  const CellSimilarity::Similarity                                     cell_similarity,
+                  const Quadrature<dim>                                               &quadrature,
+                  const Mapping<dim,spacedim>                                         &mapping,
+                  const typename Mapping<dim,spacedim>::InternalDataBase              &mapping_internal,
+                  const dealii::internal::FEValues::MappingRelatedData<dim, spacedim> &mapping_data,
+                  const typename FiniteElement<dim,spacedim>::InternalDataBase        &fe_internal,
+                  dealii::internal::FEValues::FiniteElementRelatedData<dim, spacedim> &output_data) const;
 
   virtual
   void
-  fill_fe_face_values (const Mapping<dim,spacedim>                               &mapping,
-                       const typename Triangulation<dim,spacedim>::cell_iterator &cell,
-                       const unsigned int                                         face_no,
-                       const Quadrature<dim-1>                                   &quadrature,
-                       const typename Mapping<dim,spacedim>::InternalDataBase    &mapping_internal,
-                       const typename FiniteElement<dim,spacedim>::InternalDataBase    &fe_internal,
-                       const internal::FEValues::MappingRelatedData<dim,spacedim> &mapping_data,
-                       internal::FEValues::FiniteElementRelatedData<dim,spacedim> &output_data) const;
+  fill_fe_face_values (const typename Triangulation<dim,spacedim>::cell_iterator           &cell,
+                       const unsigned int                                                   face_no,
+                       const Quadrature<dim-1>                                             &quadrature,
+                       const Mapping<dim,spacedim>                                         &mapping,
+                       const typename Mapping<dim,spacedim>::InternalDataBase              &mapping_internal,
+                       const dealii::internal::FEValues::MappingRelatedData<dim, spacedim> &mapping_data,
+                       const typename FiniteElement<dim,spacedim>::InternalDataBase        &fe_internal,
+                       dealii::internal::FEValues::FiniteElementRelatedData<dim, spacedim> &output_data) const;
 
   virtual
   void
-  fill_fe_subface_values (const Mapping<dim,spacedim>                               &mapping,
-                          const typename Triangulation<dim,spacedim>::cell_iterator &cell,
-                          const unsigned int                                         face_no,
-                          const unsigned int                                         sub_no,
-                          const Quadrature<dim-1>                                   &quadrature,
-                          const typename Mapping<dim,spacedim>::InternalDataBase    &mapping_internal,
-                          const typename FiniteElement<dim,spacedim>::InternalDataBase    &fe_internal,
-                          const internal::FEValues::MappingRelatedData<dim,spacedim> &mapping_data,
-                          internal::FEValues::FiniteElementRelatedData<dim,spacedim> &output_data) const;
+  fill_fe_subface_values (const typename Triangulation<dim,spacedim>::cell_iterator           &cell,
+                          const unsigned int                                                   face_no,
+                          const unsigned int                                                   sub_no,
+                          const Quadrature<dim-1>                                             &quadrature,
+                          const Mapping<dim,spacedim>                                         &mapping,
+                          const typename Mapping<dim,spacedim>::InternalDataBase              &mapping_internal,
+                          const dealii::internal::FEValues::MappingRelatedData<dim, spacedim> &mapping_data,
+                          const typename FiniteElement<dim,spacedim>::InternalDataBase        &fe_internal,
+                          dealii::internal::FEValues::FiniteElementRelatedData<dim, spacedim> &output_data) const;
 
   /**
    * Do the work for the three <tt>fill_fe*_values</tt> functions.
index 9cb3f39a4df13a5454b3c1e797b76fe827cbda58..f66cfb0b6bb77b6229fac806ece2d62a3104f135 100644 (file)
@@ -282,26 +282,26 @@ FE_DGPNonparametric<dim,spacedim>::get_data (
 template <int dim, int spacedim>
 void
 FE_DGPNonparametric<dim,spacedim>::
-fill_fe_values (const Mapping<dim,spacedim> &,
-                const typename Triangulation<dim,spacedim>::cell_iterator &,
+fill_fe_values (const typename Triangulation<dim,spacedim>::cell_iterator &,
+                const CellSimilarity::Similarity                                     ,
                 const Quadrature<dim> &,
+                const Mapping<dim,spacedim> &,
                 const typename Mapping<dim,spacedim>::InternalDataBase &,
-                const typename FiniteElement<dim,spacedim>::InternalDataBase &fe_data,
-                const internal::FEValues::MappingRelatedData<dim,spacedim> &mapping_data,
-                internal::FEValues::FiniteElementRelatedData<dim,spacedim> &output_data,
-                const CellSimilarity::Similarity /*cell_similarity*/) const
+                const dealii::internal::FEValues::MappingRelatedData<dim, spacedim> &mapping_data,
+                const typename FiniteElement<dim,spacedim>::InternalDataBase        &fe_internal,
+                dealii::internal::FEValues::FiniteElementRelatedData<dim, spacedim> &output_data) const
 {
-  Assert (fe_data.update_each & update_quadrature_points, ExcInternalError());
+  Assert (fe_internal.update_each & update_quadrature_points, ExcInternalError());
 
   const unsigned int n_q_points = mapping_data.quadrature_points.size();
 
-  std::vector<double> values(fe_data.update_each & update_values ? this->dofs_per_cell : 0);
-  std::vector<Tensor<1,dim> > grads(fe_data.update_each & update_gradients ? this->dofs_per_cell : 0);
-  std::vector<Tensor<2,dim> > grad_grads(fe_data.update_each & update_hessians ? this->dofs_per_cell : 0);
+  std::vector<double> values(fe_internal.update_each & update_values ? this->dofs_per_cell : 0);
+  std::vector<Tensor<1,dim> > grads(fe_internal.update_each & update_gradients ? this->dofs_per_cell : 0);
+  std::vector<Tensor<2,dim> > grad_grads(fe_internal.update_each & update_hessians ? this->dofs_per_cell : 0);
   std::vector<Tensor<3,dim> > empty_vector_of_3rd_order_tensors;
   std::vector<Tensor<4,dim> > empty_vector_of_4th_order_tensors;
 
-  if (fe_data.update_each & (update_values | update_gradients))
+  if (fe_internal.update_each & (update_values | update_gradients))
     for (unsigned int i=0; i<n_q_points; ++i)
       {
         polynomial_space.compute(mapping_data.quadrature_points[i],
@@ -309,15 +309,15 @@ fill_fe_values (const Mapping<dim,spacedim> &,
                                  empty_vector_of_3rd_order_tensors,
                                  empty_vector_of_4th_order_tensors);
 
-        if (fe_data.update_each & update_values)
+        if (fe_internal.update_each & update_values)
           for (unsigned int k=0; k<this->dofs_per_cell; ++k)
             output_data.shape_values[k][i] = values[k];
 
-        if (fe_data.update_each & update_gradients)
+        if (fe_internal.update_each & update_gradients)
           for (unsigned int k=0; k<this->dofs_per_cell; ++k)
             output_data.shape_gradients[k][i] = grads[k];
 
-        if (fe_data.update_each & update_hessians)
+        if (fe_internal.update_each & update_hessians)
           for (unsigned int k=0; k<this->dofs_per_cell; ++k)
             output_data.shape_hessians[k][i] = grad_grads[k];
       }
@@ -328,26 +328,26 @@ fill_fe_values (const Mapping<dim,spacedim> &,
 template <int dim, int spacedim>
 void
 FE_DGPNonparametric<dim,spacedim>::
-fill_fe_face_values (const Mapping<dim,spacedim> &,
-                     const typename Triangulation<dim,spacedim>::cell_iterator &,
-                     const unsigned int,
-                     const Quadrature<dim-1>&,
+fill_fe_face_values (const typename Triangulation<dim,spacedim>::cell_iterator &,
+                     const unsigned int                                                   ,
+                     const Quadrature<dim-1>                                             &,
+                     const Mapping<dim,spacedim> &,
                      const typename Mapping<dim,spacedim>::InternalDataBase &,
-                     const typename FiniteElement<dim,spacedim>::InternalDataBase       &fe_data,
-                     const internal::FEValues::MappingRelatedData<dim,spacedim> &mapping_data,
-                     internal::FEValues::FiniteElementRelatedData<dim,spacedim> &output_data) const
+                     const dealii::internal::FEValues::MappingRelatedData<dim, spacedim> &mapping_data,
+                     const typename FiniteElement<dim,spacedim>::InternalDataBase        &fe_internal,
+                     dealii::internal::FEValues::FiniteElementRelatedData<dim, spacedim> &output_data) const
 {
-  Assert (fe_data.update_each & update_quadrature_points, ExcInternalError());
+  Assert (fe_internal.update_each & update_quadrature_points, ExcInternalError());
 
   const unsigned int n_q_points = mapping_data.quadrature_points.size();
 
-  std::vector<double> values(fe_data.update_each & update_values ? this->dofs_per_cell : 0);
-  std::vector<Tensor<1,dim> > grads(fe_data.update_each & update_gradients ? this->dofs_per_cell : 0);
-  std::vector<Tensor<2,dim> > grad_grads(fe_data.update_each & update_hessians ? this->dofs_per_cell : 0);
+  std::vector<double> values(fe_internal.update_each & update_values ? this->dofs_per_cell : 0);
+  std::vector<Tensor<1,dim> > grads(fe_internal.update_each & update_gradients ? this->dofs_per_cell : 0);
+  std::vector<Tensor<2,dim> > grad_grads(fe_internal.update_each & update_hessians ? this->dofs_per_cell : 0);
   std::vector<Tensor<3,dim> > empty_vector_of_3rd_order_tensors;
   std::vector<Tensor<4,dim> > empty_vector_of_4th_order_tensors;
 
-  if (fe_data.update_each & (update_values | update_gradients))
+  if (fe_internal.update_each & (update_values | update_gradients))
     for (unsigned int i=0; i<n_q_points; ++i)
       {
         polynomial_space.compute(mapping_data.quadrature_points[i],
@@ -355,15 +355,15 @@ fill_fe_face_values (const Mapping<dim,spacedim> &,
                                  empty_vector_of_3rd_order_tensors,
                                  empty_vector_of_4th_order_tensors);
 
-        if (fe_data.update_each & update_values)
+        if (fe_internal.update_each & update_values)
           for (unsigned int k=0; k<this->dofs_per_cell; ++k)
             output_data.shape_values[k][i] = values[k];
 
-        if (fe_data.update_each & update_gradients)
+        if (fe_internal.update_each & update_gradients)
           for (unsigned int k=0; k<this->dofs_per_cell; ++k)
             output_data.shape_gradients[k][i] = grads[k];
 
-        if (fe_data.update_each & update_hessians)
+        if (fe_internal.update_each & update_hessians)
           for (unsigned int k=0; k<this->dofs_per_cell; ++k)
             output_data.shape_hessians[k][i] = grad_grads[k];
       }
@@ -374,27 +374,27 @@ fill_fe_face_values (const Mapping<dim,spacedim> &,
 template <int dim, int spacedim>
 void
 FE_DGPNonparametric<dim,spacedim>::
-fill_fe_subface_values (const Mapping<dim,spacedim> &,
-                        const typename Triangulation<dim,spacedim>::cell_iterator &,
-                        const unsigned int,
-                        const unsigned int,
-                        const Quadrature<dim-1>&,
+fill_fe_subface_values (const typename Triangulation<dim,spacedim>::cell_iterator &,
+                        const unsigned int                                                   ,
+                        const unsigned int                                                   ,
+                        const Quadrature<dim-1>                                             &,
+                        const Mapping<dim,spacedim> &,
                         const typename Mapping<dim,spacedim>::InternalDataBase &,
-                        const typename FiniteElement<dim,spacedim>::InternalDataBase       &fe_data,
-                        const internal::FEValues::MappingRelatedData<dim,spacedim> &mapping_data,
-                        internal::FEValues::FiniteElementRelatedData<dim,spacedim> &output_data) const
+                        const dealii::internal::FEValues::MappingRelatedData<dim, spacedim> &mapping_data,
+                        const typename FiniteElement<dim,spacedim>::InternalDataBase        &fe_internal,
+                        dealii::internal::FEValues::FiniteElementRelatedData<dim, spacedim> &output_data) const
 {
-  Assert (fe_data.update_each & update_quadrature_points, ExcInternalError());
+  Assert (fe_internal.update_each & update_quadrature_points, ExcInternalError());
 
   const unsigned int n_q_points = mapping_data.quadrature_points.size();
 
-  std::vector<double> values(fe_data.update_each & update_values ? this->dofs_per_cell : 0);
-  std::vector<Tensor<1,dim> > grads(fe_data.update_each & update_gradients ? this->dofs_per_cell : 0);
-  std::vector<Tensor<2,dim> > grad_grads(fe_data.update_each & update_hessians ? this->dofs_per_cell : 0);
+  std::vector<double> values(fe_internal.update_each & update_values ? this->dofs_per_cell : 0);
+  std::vector<Tensor<1,dim> > grads(fe_internal.update_each & update_gradients ? this->dofs_per_cell : 0);
+  std::vector<Tensor<2,dim> > grad_grads(fe_internal.update_each & update_hessians ? this->dofs_per_cell : 0);
   std::vector<Tensor<3,dim> > empty_vector_of_3rd_order_tensors;
   std::vector<Tensor<4,dim> > empty_vector_of_4th_order_tensors;
 
-  if (fe_data.update_each & (update_values | update_gradients))
+  if (fe_internal.update_each & (update_values | update_gradients))
     for (unsigned int i=0; i<n_q_points; ++i)
       {
         polynomial_space.compute(mapping_data.quadrature_points[i],
@@ -402,15 +402,15 @@ fill_fe_subface_values (const Mapping<dim,spacedim> &,
                                  empty_vector_of_3rd_order_tensors,
                                  empty_vector_of_4th_order_tensors);
 
-        if (fe_data.update_each & update_values)
+        if (fe_internal.update_each & update_values)
           for (unsigned int k=0; k<this->dofs_per_cell; ++k)
             output_data.shape_values[k][i] = values[k];
 
-        if (fe_data.update_each & update_gradients)
+        if (fe_internal.update_each & update_gradients)
           for (unsigned int k=0; k<this->dofs_per_cell; ++k)
             output_data.shape_gradients[k][i] = grads[k];
 
-        if (fe_data.update_each & update_hessians)
+        if (fe_internal.update_each & update_hessians)
           for (unsigned int k=0; k<this->dofs_per_cell; ++k)
             output_data.shape_hessians[k][i] = grad_grads[k];
       }
index 5297500ea5ec529075b0da8ecdf68b83c8d1ae8f..e3e40dd428c9f1f20fb78a3143a1b270525ca5e9 100644 (file)
@@ -477,14 +477,14 @@ FE_FaceQ<1,spacedim>::update_each (const UpdateFlags flags) const
 template <int spacedim>
 void
 FE_FaceQ<1,spacedim>::
-fill_fe_values(const Mapping<1,spacedim> &,
-               const typename Triangulation<1,spacedim>::cell_iterator &,
+fill_fe_values(const typename Triangulation<1,spacedim>::cell_iterator &,
+               const CellSimilarity::Similarity                                   ,
                const Quadrature<1> &,
+               const Mapping<1,spacedim> &,
                const typename Mapping<1,spacedim>::InternalDataBase &,
+               const dealii::internal::FEValues::MappingRelatedData<1, spacedim> &,
                const typename FiniteElement<1,spacedim>::InternalDataBase &,
-               const internal::FEValues::MappingRelatedData<1,spacedim> &,
-               internal::FEValues::FiniteElementRelatedData<1,spacedim> &,
-               const CellSimilarity::Similarity ) const
+               dealii::internal::FEValues::FiniteElementRelatedData<1, spacedim> &) const
 {
   // Do nothing, since we do not have values in the interior
 }
@@ -494,17 +494,17 @@ fill_fe_values(const Mapping<1,spacedim> &,
 template <int spacedim>
 void
 FE_FaceQ<1,spacedim>::
-fill_fe_face_values (const Mapping<1,spacedim> &,
-                     const typename Triangulation<1,spacedim>::cell_iterator &,
-                     const unsigned int face,
+fill_fe_face_values (const typename Triangulation<1,spacedim>::cell_iterator &,
+                     const unsigned int                                                 face,
                      const Quadrature<0> &,
+                     const Mapping<1,spacedim> &,
                      const typename Mapping<1,spacedim>::InternalDataBase &,
-                     const typename FiniteElement<1,spacedim>::InternalDataBase &fedata,
-                     const internal::FEValues::MappingRelatedData<1,spacedim> &,
-                     internal::FEValues::FiniteElementRelatedData<1,spacedim> &output_data) const
+                     const dealii::internal::FEValues::MappingRelatedData<1, spacedim> &,
+                     const typename FiniteElement<1,spacedim>::InternalDataBase        &fe_internal,
+                     dealii::internal::FEValues::FiniteElementRelatedData<1, spacedim> &output_data) const
 {
   const unsigned int foffset = face;
-  if (fedata.update_each & update_values)
+  if (fe_internal.update_each & update_values)
     {
       for (unsigned int k=0; k<this->dofs_per_cell; ++k)
         output_data.shape_values(k,0) = 0.;
@@ -516,15 +516,15 @@ fill_fe_face_values (const Mapping<1,spacedim> &,
 template <int spacedim>
 void
 FE_FaceQ<1,spacedim>::
-fill_fe_subface_values (const Mapping<1,spacedim> &,
-                        const typename Triangulation<1,spacedim>::cell_iterator &,
-                        const unsigned int ,
-                        const unsigned int ,
+fill_fe_subface_values (const typename Triangulation<1,spacedim>::cell_iterator &,
+                        const unsigned int                                                 ,
+                        const unsigned int                                                 ,
                         const Quadrature<0> &,
+                        const Mapping<1,spacedim> &,
                         const typename Mapping<1,spacedim>::InternalDataBase &,
+                        const dealii::internal::FEValues::MappingRelatedData<1, spacedim> &,
                         const typename FiniteElement<1,spacedim>::InternalDataBase &,
-                        const internal::FEValues::MappingRelatedData<1,spacedim> &,
-                        internal::FEValues::FiniteElementRelatedData<1,spacedim> &) const
+                        dealii::internal::FEValues::FiniteElementRelatedData<1, spacedim> &) const
 {
   Assert(false, ExcMessage("There are no sub-face values to fill in 1D!"));
 }
index 3d5d9733c2451974f8ca5e9ccf3d314c0e0ddfc1..f4a7f96db5094c86e0b1a3a7430fcd3e5ab6e574 100644 (file)
@@ -110,14 +110,14 @@ FE_Nothing<dim,spacedim>::get_data (const UpdateFlags  /*flags*/,
 template <int dim, int spacedim>
 void
 FE_Nothing<dim,spacedim>::
-fill_fe_values (const Mapping<dim,spacedim> & /*mapping*/,
-                const typename Triangulation<dim,spacedim>::cell_iterator & /*cell*/,
-                const Quadrature<dim> & /*quadrature*/,
-                const typename Mapping<dim,spacedim>::InternalDataBase & /*mapping_data*/,
-                const typename FiniteElement<dim,spacedim>::InternalDataBase & /*fedata*/,
-                const internal::FEValues::MappingRelatedData<dim,spacedim> &/*mapping_data*/,
-                internal::FEValues::FiniteElementRelatedData<dim,spacedim> &/*output_data*/,
-                const CellSimilarity::Similarity  /*cell_similarity*/) const
+fill_fe_values (const typename Triangulation<dim,spacedim>::cell_iterator &,
+                const CellSimilarity::Similarity                                     ,
+                const Quadrature<dim> &,
+                const Mapping<dim,spacedim> &,
+                const typename Mapping<dim,spacedim>::InternalDataBase &,
+                const dealii::internal::FEValues::MappingRelatedData<dim, spacedim> &,
+                const typename FiniteElement<dim,spacedim>::InternalDataBase &,
+                dealii::internal::FEValues::FiniteElementRelatedData<dim, spacedim> &) const
 {
   // leave data fields empty
 }
@@ -127,34 +127,38 @@ fill_fe_values (const Mapping<dim,spacedim> & /*mapping*/,
 template <int dim, int spacedim>
 void
 FE_Nothing<dim,spacedim>::
-fill_fe_face_values (const Mapping<dim,spacedim> & /*mapping*/,
-                     const typename Triangulation<dim,spacedim>::cell_iterator & /*cell*/,
-                     const unsigned int /*face*/,
-                     const Quadrature<dim-1> & /*quadrature*/,
-                     const typename Mapping<dim,spacedim>::InternalDataBase & /*mapping_data*/,
-                     const typename FiniteElement<dim,spacedim>::InternalDataBase & /*fedata*/,
-                     const internal::FEValues::MappingRelatedData<dim,spacedim> &/*mapping_data*/,
-                     internal::FEValues::FiniteElementRelatedData<dim,spacedim> &/*output_data*/) const
+fill_fe_face_values (const typename Triangulation<dim,spacedim>::cell_iterator &,
+                     const unsigned int                                                   ,
+                     const Quadrature<dim-1>                                             &,
+                     const Mapping<dim,spacedim> &,
+                     const typename Mapping<dim,spacedim>::InternalDataBase &,
+                     const dealii::internal::FEValues::MappingRelatedData<dim, spacedim> &,
+                     const typename FiniteElement<dim,spacedim>::InternalDataBase &,
+                     dealii::internal::FEValues::FiniteElementRelatedData<dim, spacedim> &) const
 {
   // leave data fields empty
 }
 
+
+
 template <int dim, int spacedim>
 void
 FE_Nothing<dim,spacedim>::
-fill_fe_subface_values (const Mapping<dim,spacedim> & /*mapping*/,
-                        const typename Triangulation<dim,spacedim>::cell_iterator & /*cell*/,
-                        const unsigned int /*face*/,
-                        const unsigned int /*subface*/,
-                        const Quadrature<dim-1> & /*quadrature*/,
-                        const typename Mapping<dim,spacedim>::InternalDataBase & /*mapping_data*/,
-                        const typename FiniteElement<dim,spacedim>::InternalDataBase & /*fedata*/,
-                        const internal::FEValues::MappingRelatedData<dim,spacedim> &/*mapping_data*/,
-                        internal::FEValues::FiniteElementRelatedData<dim,spacedim> &/*output_data*/) const
+fill_fe_subface_values (const typename Triangulation<dim,spacedim>::cell_iterator &,
+                        const unsigned int                                                   ,
+                        const unsigned int                                                   ,
+                        const Quadrature<dim-1>                                             &,
+                        const Mapping<dim,spacedim> &,
+                        const typename Mapping<dim,spacedim>::InternalDataBase &,
+                        const dealii::internal::FEValues::MappingRelatedData<dim, spacedim> &,
+                        const typename FiniteElement<dim,spacedim>::InternalDataBase &,
+                        dealii::internal::FEValues::FiniteElementRelatedData<dim, spacedim> &) const
 {
   // leave data fields empty
 }
 
+
+
 template <int dim, int spacedim>
 bool
 FE_Nothing<dim,spacedim>::is_dominating() const
index c4c49b6ddd5a0637d75d444ac00d06ae7490dd25..bd52bab07826f5ffe6550bfa35bedf4a00cddf41 100644 (file)
@@ -31,21 +31,21 @@ DEAL_II_NAMESPACE_OPEN
 template <>
 void
 FE_Poly<TensorProductPolynomials<1>,1,2>::
-fill_fe_values (const Mapping<1,2>                                &mapping,
-                const Triangulation<1,2>::cell_iterator &,
-                const Quadrature<1>                               &quadrature,
-                const Mapping<1,2>::InternalDataBase              &mapping_internal,
-                const FiniteElement<1,2>::InternalDataBase        &fedata,
-                const internal::FEValues::MappingRelatedData<1,2> &mapping_data,
-                internal::FEValues::FiniteElementRelatedData<1,2> &output_data,
-                const CellSimilarity::Similarity                  cell_similarity) const
+fill_fe_values (const Triangulation<1,2>::cell_iterator &,
+                const CellSimilarity::Similarity                           cell_similarity,
+                const Quadrature<1>                                       &quadrature,
+                const Mapping<1,2>                                        &mapping,
+                const Mapping<1,2>::InternalDataBase                      &mapping_internal,
+                const dealii::internal::FEValues::MappingRelatedData<1,2> &mapping_data,
+                const FiniteElement<1,2>::InternalDataBase                &fe_internal,
+                dealii::internal::FEValues::FiniteElementRelatedData<1,2> &output_data) const
 {
   // convert data object to internal
   // data for this class. fails with
   // an exception if that is not
   // possible
-  Assert (dynamic_cast<const InternalData *> (&fedata) != 0, ExcInternalError());
-  const InternalData &fe_data = static_cast<const InternalData &> (fedata);
+  Assert (dynamic_cast<const InternalData *> (&fe_internal) != 0, ExcInternalError());
+  const InternalData &fe_data = static_cast<const InternalData &> (fe_internal);
 
   for (unsigned int k=0; k<this->dofs_per_cell; ++k)
     {
@@ -90,20 +90,20 @@ fill_fe_values (const Mapping<1,2>                                &mapping,
 template <>
 void
 FE_Poly<TensorProductPolynomials<2>,2,3>::
-fill_fe_values (const Mapping<2,3>                                &mapping,
-                const Triangulation<2,3>::cell_iterator &,
-                const Quadrature<2>                               &quadrature,
-                const Mapping<2,3>::InternalDataBase              &mapping_internal,
-                const FiniteElement<2,3>::InternalDataBase        &fedata,
-                const internal::FEValues::MappingRelatedData<2,3> &mapping_data,
-                internal::FEValues::FiniteElementRelatedData<2,3> &output_data,
-                const CellSimilarity::Similarity                  cell_similarity) const
+fill_fe_values (const Triangulation<2,3>::cell_iterator &,
+                const CellSimilarity::Similarity                           cell_similarity,
+                const Quadrature<2>                                       &quadrature,
+                const Mapping<2,3>                                        &mapping,
+                const Mapping<2,3>::InternalDataBase                      &mapping_internal,
+                const dealii::internal::FEValues::MappingRelatedData<2,3> &mapping_data,
+                const FiniteElement<2,3>::InternalDataBase                &fe_internal,
+                dealii::internal::FEValues::FiniteElementRelatedData<2,3> &output_data) const
 {
 
   // assert that the following dynamics
   // cast is really well-defined.
-  Assert (dynamic_cast<const InternalData *> (&fedata) != 0, ExcInternalError());
-  const InternalData &fe_data = static_cast<const InternalData &> (fedata);
+  Assert (dynamic_cast<const InternalData *> (&fe_internal) != 0, ExcInternalError());
+  const InternalData &fe_data = static_cast<const InternalData &> (fe_internal);
 
   for (unsigned int k=0; k<this->dofs_per_cell; ++k)
     {
@@ -147,22 +147,22 @@ fill_fe_values (const Mapping<2,3>                                &mapping,
 template <>
 void
 FE_Poly<PolynomialSpace<1>,1,2>::
-fill_fe_values (const Mapping<1,2>                                &mapping,
-                const Triangulation<1,2>::cell_iterator &,
-                const Quadrature<1>                               &quadrature,
-                const Mapping<1,2>::InternalDataBase              &mapping_internal,
-                const FiniteElement<1,2>::InternalDataBase        &fedata,
-                const internal::FEValues::MappingRelatedData<1,2> &mapping_data,
-                internal::FEValues::FiniteElementRelatedData<1,2> &output_data,
-                const CellSimilarity::Similarity                  cell_similarity) const
+fill_fe_values (const Triangulation<1,2>::cell_iterator &,
+                const CellSimilarity::Similarity                           cell_similarity,
+                const Quadrature<1>                                       &quadrature,
+                const Mapping<1,2>                                        &mapping,
+                const Mapping<1,2>::InternalDataBase                      &mapping_internal,
+                const dealii::internal::FEValues::MappingRelatedData<1,2> &mapping_data,
+                const FiniteElement<1,2>::InternalDataBase                &fe_internal,
+                dealii::internal::FEValues::FiniteElementRelatedData<1,2> &output_data) const
 {
   // convert data object to internal
   // data for this class. fails with
   // an exception if that is not
   // possible
 
-  Assert (dynamic_cast<const InternalData *> (&fedata) != 0, ExcInternalError());
-  const InternalData &fe_data = static_cast<const InternalData &> (fedata);
+  Assert (dynamic_cast<const InternalData *> (&fe_internal) != 0, ExcInternalError());
+  const InternalData &fe_data = static_cast<const InternalData &> (fe_internal);
 
   for (unsigned int k=0; k<this->dofs_per_cell; ++k)
     {
@@ -206,17 +206,17 @@ fill_fe_values (const Mapping<1,2>                                &mapping,
 template <>
 void
 FE_Poly<PolynomialSpace<2>,2,3>::
-fill_fe_values (const Mapping<2,3>                                &mapping,
-                const Triangulation<2,3>::cell_iterator &,
-                const Quadrature<2>                               &quadrature,
-                const Mapping<2,3>::InternalDataBase              &mapping_internal,
-                const FiniteElement<2,3>::InternalDataBase        &fedata,
-                const internal::FEValues::MappingRelatedData<2,3> &mapping_data,
-                internal::FEValues::FiniteElementRelatedData<2,3> &output_data,
-                const CellSimilarity::Similarity                  cell_similarity) const
+fill_fe_values (const Triangulation<2,3>::cell_iterator &,
+                const CellSimilarity::Similarity                           cell_similarity,
+                const Quadrature<2>                                       &quadrature,
+                const Mapping<2,3>                                        &mapping,
+                const Mapping<2,3>::InternalDataBase                      &mapping_internal,
+                const dealii::internal::FEValues::MappingRelatedData<2,3> &mapping_data,
+                const FiniteElement<2,3>::InternalDataBase                &fe_internal,
+                dealii::internal::FEValues::FiniteElementRelatedData<2,3> &output_data) const
 {
-  Assert (dynamic_cast<const InternalData *> (&fedata) != 0, ExcInternalError());
-  const InternalData &fe_data = static_cast<const InternalData &> (fedata);
+  Assert (dynamic_cast<const InternalData *> (&fe_internal) != 0, ExcInternalError());
+  const InternalData &fe_data = static_cast<const InternalData &> (fe_internal);
 
   for (unsigned int k=0; k<this->dofs_per_cell; ++k)
     {
index dfc24c3bc70c6557c408f2143bc351730524779d..99aa1f533a94c02b054e7e59f254c75f4c0d60e7 100644 (file)
@@ -289,22 +289,22 @@ FE_PolyTensor<POLY,dim,spacedim>::shape_grad_grad_component (const unsigned int
 template <class POLY, int dim, int spacedim>
 void
 FE_PolyTensor<POLY,dim,spacedim>::
-fill_fe_values (const Mapping<dim,spacedim>                                  &mapping,
-                const typename Triangulation<dim,spacedim>::cell_iterator    &cell,
-                const Quadrature<dim>                                        &quadrature,
-                const typename Mapping<dim,spacedim>::InternalDataBase       &mapping_internal,
-                const typename FiniteElement<dim,spacedim>::InternalDataBase &fedata,
-                const internal::FEValues::MappingRelatedData<dim,spacedim>   &mapping_data,
-                internal::FEValues::FiniteElementRelatedData<dim,spacedim>   &output_data,
-                const CellSimilarity::Similarity                              cell_similarity) const
+fill_fe_values (const typename Triangulation<dim,spacedim>::cell_iterator           &cell,
+                const CellSimilarity::Similarity                                     cell_similarity,
+                const Quadrature<dim>                                               &quadrature,
+                const Mapping<dim,spacedim>                                         &mapping,
+                const typename Mapping<dim,spacedim>::InternalDataBase              &mapping_internal,
+                const dealii::internal::FEValues::MappingRelatedData<dim, spacedim> &mapping_data,
+                const typename FiniteElement<dim,spacedim>::InternalDataBase        &fe_internal,
+                dealii::internal::FEValues::FiniteElementRelatedData<dim, spacedim> &output_data) const
 {
   // convert data object to internal
   // data for this class. fails with
   // an exception if that is not
   // possible
-  Assert (dynamic_cast<const InternalData *> (&fedata) != 0,
+  Assert (dynamic_cast<const InternalData *> (&fe_internal) != 0,
           ExcInternalError());
-  const InternalData &fe_data = static_cast<const InternalData &> (fedata);
+  const InternalData &fe_data = static_cast<const InternalData &> (fe_internal);
 
   const unsigned int n_q_points = quadrature.size();
 
@@ -758,22 +758,22 @@ fill_fe_values (const Mapping<dim,spacedim>                                  &ma
 template <class POLY, int dim, int spacedim>
 void
 FE_PolyTensor<POLY,dim,spacedim>::
-fill_fe_face_values (const Mapping<dim,spacedim>                                  &mapping,
-                     const typename Triangulation<dim,spacedim>::cell_iterator    &cell,
-                     const unsigned int                                            face,
-                     const Quadrature<dim-1>                                      &quadrature,
-                     const typename Mapping<dim,spacedim>::InternalDataBase       &mapping_internal,
-                     const typename FiniteElement<dim,spacedim>::InternalDataBase &fedata,
-                     const internal::FEValues::MappingRelatedData<dim,spacedim>   &mapping_data,
-                     internal::FEValues::FiniteElementRelatedData<dim,spacedim>   &output_data) const
+fill_fe_face_values (const typename Triangulation<dim,spacedim>::cell_iterator           &cell,
+                     const unsigned int                                                   face_no,
+                     const Quadrature<dim-1>                                             &quadrature,
+                     const Mapping<dim,spacedim>                                         &mapping,
+                     const typename Mapping<dim,spacedim>::InternalDataBase              &mapping_internal,
+                     const dealii::internal::FEValues::MappingRelatedData<dim, spacedim> &mapping_data,
+                     const typename FiniteElement<dim,spacedim>::InternalDataBase        &fe_internal,
+                     dealii::internal::FEValues::FiniteElementRelatedData<dim, spacedim> &output_data) const
 {
   // convert data object to internal
   // data for this class. fails with
   // an exception if that is not
   // possible
-  Assert (dynamic_cast<const InternalData *> (&fedata) != 0,
+  Assert (dynamic_cast<const InternalData *> (&fe_internal) != 0,
           ExcInternalError());
-  const InternalData &fe_data = static_cast<const InternalData &> (fedata);
+  const InternalData &fe_data = static_cast<const InternalData &> (fe_internal);
 
   const unsigned int n_q_points = quadrature.size();
   // offset determines which data set
@@ -781,10 +781,10 @@ fill_fe_face_values (const Mapping<dim,spacedim>
   // faces are stored contiguously)
 
   const typename QProjector<dim>::DataSetDescriptor offset
-    = QProjector<dim>::DataSetDescriptor::face (face,
-                                                cell->face_orientation(face),
-                                                cell->face_flip(face),
-                                                cell->face_rotation(face),
+    = QProjector<dim>::DataSetDescriptor::face (face_no,
+                                                cell->face_orientation(face_no),
+                                                cell->face_flip(face_no),
+                                                cell->face_rotation(face_no),
                                                 n_q_points);
 
 //TODO: Size assertions
@@ -1217,23 +1217,23 @@ fill_fe_face_values (const Mapping<dim,spacedim>
 template <class POLY, int dim, int spacedim>
 void
 FE_PolyTensor<POLY,dim,spacedim>::
-fill_fe_subface_values (const Mapping<dim,spacedim>                                  &mapping,
-                        const typename Triangulation<dim,spacedim>::cell_iterator    &cell,
-                        const unsigned int                                            face,
-                        const unsigned int                                            subface,
-                        const Quadrature<dim-1>                                      &quadrature,
-                        const typename Mapping<dim,spacedim>::InternalDataBase       &mapping_internal,
-                        const typename FiniteElement<dim,spacedim>::InternalDataBase &fedata,
-                        const internal::FEValues::MappingRelatedData<dim,spacedim>   &mapping_data,
-                        internal::FEValues::FiniteElementRelatedData<dim,spacedim>   &output_data) const
+fill_fe_subface_values (const typename Triangulation<dim,spacedim>::cell_iterator           &cell,
+                        const unsigned int                                                   face_no,
+                        const unsigned int                                                   sub_no,
+                        const Quadrature<dim-1>                                             &quadrature,
+                        const Mapping<dim,spacedim>                                         &mapping,
+                        const typename Mapping<dim,spacedim>::InternalDataBase              &mapping_internal,
+                        const dealii::internal::FEValues::MappingRelatedData<dim, spacedim> &mapping_data,
+                        const typename FiniteElement<dim,spacedim>::InternalDataBase        &fe_internal,
+                        dealii::internal::FEValues::FiniteElementRelatedData<dim, spacedim> &output_data) const
 {
   // convert data object to internal
   // data for this class. fails with
   // an exception if that is not
   // possible
-  Assert (dynamic_cast<const InternalData *> (&fedata) != 0,
+  Assert (dynamic_cast<const InternalData *> (&fe_internal) != 0,
           ExcInternalError());
-  const InternalData &fe_data = static_cast<const InternalData &> (fedata);
+  const InternalData &fe_data = static_cast<const InternalData &> (fe_internal);
 
   const unsigned int n_q_points = quadrature.size();
 
@@ -1241,12 +1241,12 @@ fill_fe_subface_values (const Mapping<dim,spacedim>
   // to take (all data sets for all
   // sub-faces are stored contiguously)
   const typename QProjector<dim>::DataSetDescriptor offset
-    = QProjector<dim>::DataSetDescriptor::subface (face, subface,
-                                                   cell->face_orientation(face),
-                                                   cell->face_flip(face),
-                                                   cell->face_rotation(face),
+    = QProjector<dim>::DataSetDescriptor::subface (face_no, sub_no,
+                                                   cell->face_orientation(face_no),
+                                                   cell->face_flip(face_no),
+                                                   cell->face_rotation(face_no),
                                                    n_q_points,
-                                                   cell->subface_case(face));
+                                                   cell->subface_case(face_no));
 
 //   Assert(mapping_type == independent
 //       || ( mapping_type == independent_on_cartesian
index 51697cfda7d189b1c9f868983fb2d5579f10bf6a..34b97c49d39a1dbf81119cafb95fab0190d3b80d 100644 (file)
@@ -1001,17 +1001,17 @@ FESystem<dim,spacedim>::get_subface_data (const UpdateFlags      flags,
 template <int dim, int spacedim>
 void
 FESystem<dim,spacedim>::
-fill_fe_values (const Mapping<dim,spacedim>                      &mapping,
-                const typename Triangulation<dim,spacedim>::cell_iterator &cell,
-                const Quadrature<dim>                            &quadrature,
-                const typename Mapping<dim,spacedim>::InternalDataBase &mapping_internal,
-                const typename FiniteElement<dim,spacedim>::InternalDataBase &fe_data,
-                const internal::FEValues::MappingRelatedData<dim,spacedim> &mapping_data,
-                internal::FEValues::FiniteElementRelatedData<dim,spacedim> &output_data,
-                const CellSimilarity::Similarity                  cell_similarity) const
+fill_fe_values (const typename Triangulation<dim,spacedim>::cell_iterator           &cell,
+                const CellSimilarity::Similarity                                     cell_similarity,
+                const Quadrature<dim>                                               &quadrature,
+                const Mapping<dim,spacedim>                                         &mapping,
+                const typename Mapping<dim,spacedim>::InternalDataBase              &mapping_internal,
+                const dealii::internal::FEValues::MappingRelatedData<dim, spacedim> &mapping_data,
+                const typename FiniteElement<dim,spacedim>::InternalDataBase        &fe_internal,
+                dealii::internal::FEValues::FiniteElementRelatedData<dim, spacedim> &output_data) const
 {
   compute_fill(mapping, cell, invalid_face_number, invalid_face_number,
-               quadrature, cell_similarity, mapping_internal, fe_data,
+               quadrature, cell_similarity, mapping_internal, fe_internal,
                mapping_data, output_data);
 }
 
@@ -1020,17 +1020,17 @@ fill_fe_values (const Mapping<dim,spacedim>                      &mapping,
 template <int dim, int spacedim>
 void
 FESystem<dim,spacedim>::
-fill_fe_face_values (const Mapping<dim,spacedim>                   &mapping,
-                     const typename Triangulation<dim,spacedim>::cell_iterator &cell,
-                     const unsigned int                    face_no,
-                     const Quadrature<dim-1>              &quadrature,
-                     const typename Mapping<dim,spacedim>::InternalDataBase &mapping_internal,
-                     const typename FiniteElement<dim,spacedim>::InternalDataBase &fe_data,
-                     const internal::FEValues::MappingRelatedData<dim,spacedim> &mapping_data,
-                     internal::FEValues::FiniteElementRelatedData<dim,spacedim> &output_data) const
+fill_fe_face_values (const typename Triangulation<dim,spacedim>::cell_iterator           &cell,
+                     const unsigned int                                                   face_no,
+                     const Quadrature<dim-1>                                             &quadrature,
+                     const Mapping<dim,spacedim>                                         &mapping,
+                     const typename Mapping<dim,spacedim>::InternalDataBase              &mapping_internal,
+                     const dealii::internal::FEValues::MappingRelatedData<dim, spacedim> &mapping_data,
+                     const typename FiniteElement<dim,spacedim>::InternalDataBase        &fe_internal,
+                     dealii::internal::FEValues::FiniteElementRelatedData<dim, spacedim> &output_data) const
 {
   compute_fill (mapping, cell, face_no, invalid_face_number, quadrature,
-                CellSimilarity::none, mapping_internal, fe_data,
+                CellSimilarity::none, mapping_internal, fe_internal,
                 mapping_data, output_data);
 }
 
@@ -1040,18 +1040,18 @@ fill_fe_face_values (const Mapping<dim,spacedim>                   &mapping,
 template <int dim, int spacedim>
 void
 FESystem<dim,spacedim>::
-fill_fe_subface_values (const Mapping<dim,spacedim>                      &mapping,
-                        const typename Triangulation<dim,spacedim>::cell_iterator &cell,
-                        const unsigned int                                face_no,
-                        const unsigned int                                sub_no,
-                        const Quadrature<dim-1>                          &quadrature,
-                        const typename Mapping<dim,spacedim>::InternalDataBase &mapping_internal,
-                        const typename FiniteElement<dim,spacedim>::InternalDataBase &fe_data,
-                        const internal::FEValues::MappingRelatedData<dim,spacedim> &mapping_data,
-                        internal::FEValues::FiniteElementRelatedData<dim,spacedim> &output_data) const
+fill_fe_subface_values (const typename Triangulation<dim,spacedim>::cell_iterator           &cell,
+                        const unsigned int                                                   face_no,
+                        const unsigned int                                                   sub_no,
+                        const Quadrature<dim-1>                                             &quadrature,
+                        const Mapping<dim,spacedim>                                         &mapping,
+                        const typename Mapping<dim,spacedim>::InternalDataBase              &mapping_internal,
+                        const dealii::internal::FEValues::MappingRelatedData<dim, spacedim> &mapping_data,
+                        const typename FiniteElement<dim,spacedim>::InternalDataBase        &fe_internal,
+                        dealii::internal::FEValues::FiniteElementRelatedData<dim, spacedim> &output_data) const
 {
   compute_fill (mapping, cell, face_no, sub_no, quadrature,
-                CellSimilarity::none, mapping_internal, fe_data,
+                CellSimilarity::none, mapping_internal, fe_internal,
                 mapping_data, output_data);
 }
 
@@ -1068,7 +1068,7 @@ compute_fill (const Mapping<dim,spacedim>                      &mapping,
               const Quadrature<dim_1>                          &quadrature,
               const CellSimilarity::Similarity                  cell_similarity,
               const typename Mapping<dim,spacedim>::InternalDataBase &mapping_internal,
-              const typename FiniteElement<dim,spacedim>::InternalDataBase &fedata,
+              const typename FiniteElement<dim,spacedim>::InternalDataBase &fe_internal,
               const internal::FEValues::MappingRelatedData<dim,spacedim> &mapping_data,
               internal::FEValues::FiniteElementRelatedData<dim,spacedim> &output_data) const
 {
@@ -1076,8 +1076,8 @@ compute_fill (const Mapping<dim,spacedim>                      &mapping,
   // data for this class. fails with
   // an exception if that is not
   // possible
-  Assert (dynamic_cast<const InternalData *> (&fedata) != 0, ExcInternalError());
-  const InternalData &fe_data = static_cast<const InternalData &> (fedata);
+  Assert (dynamic_cast<const InternalData *> (&fe_internal) != 0, ExcInternalError());
+  const InternalData &fe_data = static_cast<const InternalData &> (fe_internal);
 
   // Either dim_1==dim
   // (fill_fe_values) or dim_1==dim-1
@@ -1145,14 +1145,20 @@ compute_fill (const Mapping<dim,spacedim>                      &mapping,
         // copied from base_data to data on each face, therefore use
         // base_fe_data.update_flags.
         if (face_no==invalid_face_number)
-          base_fe.fill_fe_values(mapping, cell, *cell_quadrature, mapping_internal,
-                                 base_fe_data, mapping_data, base_data, cell_similarity);
+          base_fe.fill_fe_values(cell, cell_similarity,
+                                 *cell_quadrature,
+                                 mapping, mapping_internal, mapping_data,
+                                 base_fe_data, base_data);
         else if (sub_no==invalid_face_number)
-          base_fe.fill_fe_face_values(mapping, cell, face_no,
-                                      *face_quadrature, mapping_internal, base_fe_data, mapping_data, base_data);
+          base_fe.fill_fe_face_values(cell, face_no,
+                                      *face_quadrature,
+                                      mapping, mapping_internal, mapping_data,
+                                      base_fe_data, base_data);
         else
-          base_fe.fill_fe_subface_values(mapping, cell, face_no, sub_no,
-                                         *face_quadrature, mapping_internal, base_fe_data, mapping_data, base_data);
+          base_fe.fill_fe_subface_values(cell, face_no, sub_no,
+                                         *face_quadrature,
+                                         mapping, mapping_internal, mapping_data,
+                                         base_fe_data, base_data);
 
         // now data has been generated, so copy it. we used to work by
         // looping over all base elements (i.e. this outer loop), then over
index 3bfb04426597c2e064bb032a8df39d2e6ca52a78..7cf2f8bfd8773ea067052c5302de0d61442238e2 100644 (file)
@@ -3758,14 +3758,14 @@ void FEValues<dim,spacedim>::do_reinit ()
   // already filled by the mapping, let it compute the
   // data for the mapped shape function values, gradients,
   // etc.
-  this->get_fe().fill_fe_values(this->get_mapping(),
-                                *this->present_cell,
-                                quadrature,
+  this->get_fe().fill_fe_values(*this->present_cell,
+                                this->cell_similarity,
+                                this->quadrature,
+                                this->get_mapping(),
                                 *this->mapping_data,
-                                *this->fe_data,
                                 this->mapping_output,
-                                this->finite_element_output,
-                                this->cell_similarity);
+                                *this->fe_data,
+                                this->finite_element_output);
 }
 
 
@@ -3963,12 +3963,13 @@ void FEFaceValues<dim,spacedim>::do_reinit (const unsigned int face_no)
                                           *this->mapping_data,
                                           this->mapping_output);
 
-  this->get_fe().fill_fe_face_values(this->get_mapping(),
-                                     *this->present_cell, face_no,
+  this->get_fe().fill_fe_face_values(*this->present_cell,
+                                     face_no,
                                      this->quadrature,
+                                     this->get_mapping(),
                                      *this->mapping_data,
-                                     *this->fe_data,
                                      this->mapping_output,
+                                     *this->fe_data,
                                      this->finite_element_output);
 }
 
@@ -4203,13 +4204,14 @@ void FESubfaceValues<dim,spacedim>::do_reinit (const unsigned int face_no,
                                              *this->mapping_data,
                                              this->mapping_output);
 
-  this->get_fe().fill_fe_subface_values(this->get_mapping(),
-                                        *this->present_cell,
-                                        face_no, subface_no,
+  this->get_fe().fill_fe_subface_values(*this->present_cell,
+                                        face_no,
+                                        subface_no,
                                         this->quadrature,
+                                        this->get_mapping(),
                                         *this->mapping_data,
-                                        *this->fe_data,
                                         this->mapping_output,
+                                        *this->fe_data,
                                         this->finite_element_output);
 }
 

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.