]> https://gitweb.dealii.org/ - dealii.git/commitdiff
Windows porting: Minor namespace changes
authorMatthias Maier <tamiko@43-1.org>
Thu, 6 Aug 2015 20:26:09 +0000 (15:26 -0500)
committerMatthias Maier <tamiko@43-1.org>
Thu, 6 Aug 2015 20:28:56 +0000 (15:28 -0500)
include/deal.II/fe/fe.h
include/deal.II/fe/fe_values.h
include/deal.II/fe/mapping.h
include/deal.II/fe/mapping_q1.h

index 189bb3f68bd7e8f2dd89a07873adeef2c9ac3fdf..aa810683d318161e5d0e3b0745fe70cc469ee80e 100644 (file)
@@ -1969,12 +1969,12 @@ protected:
   /**
    * Compute second derivatives by finite differences of gradients.
    */
-  void compute_2nd (const Mapping<dim,spacedim>                                  &mapping,
-                    const typename Triangulation<dim,spacedim>::cell_iterator    &cell,
-                    const unsigned int                                            offset,
-                    const typename Mapping<dim,spacedim>::InternalDataBase       &mapping_internal,
-                    const InternalDataBase                                       &fe_internal,
-                    internal::FEValues::FiniteElementRelatedData<dim,spacedim>   &data) const;
+  void compute_2nd (const Mapping<dim,spacedim>                                         &mapping,
+                    const typename Triangulation<dim,spacedim>::cell_iterator           &cell,
+                    const unsigned int                                                   offset,
+                    const typename Mapping<dim,spacedim>::InternalDataBase              &mapping_internal,
+                    const InternalDataBase                                              &fe_internal,
+                    dealii::internal::FEValues::FiniteElementRelatedData<dim, spacedim> &data) const;
 
   /**
    * Given the pattern of nonzero components for each shape function, compute
@@ -2052,37 +2052,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 Mapping<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 = 0;
+  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 Mapping<dim,spacedim>::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;
 
   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 Mapping<dim,spacedim>::InternalDataBase    &fe_internal,
-                       const internal::FEValues::MappingRelatedData<dim,spacedim> &mapping_data,
-                       internal::FEValues::FiniteElementRelatedData<dim,spacedim> &output_data) const = 0;
+  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 Mapping<dim,spacedim>::InternalDataBase              &fe_internal,
+                       const dealii::internal::FEValues::MappingRelatedData<dim, spacedim> &mapping_data,
+                       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,
-                          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 Mapping<dim,spacedim>::InternalDataBase    &fe_internal,
-                          const internal::FEValues::MappingRelatedData<dim,spacedim> &mapping_data,
-                          internal::FEValues::FiniteElementRelatedData<dim,spacedim> &output_data) const = 0;
+  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 Mapping<dim,spacedim>::InternalDataBase              &fe_internal,
+                          const dealii::internal::FEValues::MappingRelatedData<dim, spacedim> &mapping_data,
+                          dealii::internal::FEValues::FiniteElementRelatedData<dim, spacedim> &output_data) const = 0;
 
   friend class InternalDataBase;
   friend class FEValuesBase<dim,spacedim>;
index 47ccc776421d316dfb67cadcd006622e04152316..222a6103265f211059ae4a17ead96a1cb178ccae 100644 (file)
@@ -1352,8 +1352,8 @@ namespace internal
  * @author Wolfgang Bangerth, 1998, 2003, Guido Kanschat, 2001
  */
 template <int dim, int spacedim>
-class FEValuesBase : protected internal::FEValues::MappingRelatedData<dim,spacedim>,
-  protected internal::FEValues::FiniteElementRelatedData<dim,spacedim>,
+class FEValuesBase : protected dealii::internal::FEValues::MappingRelatedData<dim, spacedim>,
+  protected dealii::internal::FEValues::FiniteElementRelatedData<dim, spacedim>,
   public Subscriptor
 {
 public:
index a2fcbcdff34a044cf36a86fa44073cad98a0d503..db5d63dc0e7f013fae7b2a3eeb137c2cd45228cf 100644 (file)
@@ -787,11 +787,11 @@ private:
    */
   virtual
   CellSimilarity::Similarity
-  fill_fe_values (const typename Triangulation<dim,spacedim>::cell_iterator &cell,
-                  const CellSimilarity::Similarity                           cell_similarity,
-                  const Quadrature<dim>                                     &quadrature,
-                  const InternalDataBase                                    &internal_data,
-                  internal::FEValues::MappingRelatedData<dim,spacedim>      &output_data) const = 0;
+  fill_fe_values (const typename Triangulation<dim,spacedim>::cell_iterator    &cell,
+                  const CellSimilarity::Similarity                              cell_similarity,
+                  const Quadrature<dim>                                        &quadrature,
+                  const InternalDataBase                                       &internal_data,
+                  dealii::internal::FEValues::MappingRelatedData<dim,spacedim> &output_data) const = 0;
 
   /**
    * This function is the equivalent to Mapping::fill_fe_values(),
@@ -820,11 +820,11 @@ private:
    *   @p internal_data object.
    */
   virtual void
-  fill_fe_face_values (const typename Triangulation<dim,spacedim>::cell_iterator &cell,
-                       const unsigned int                                         face_no,
-                       const Quadrature<dim-1>                                   &quadrature,
-                       const InternalDataBase                                    &internal_data,
-                       internal::FEValues::MappingRelatedData<dim,spacedim>      &output_data) const = 0;
+  fill_fe_face_values (const typename Triangulation<dim,spacedim>::cell_iterator    &cell,
+                       const unsigned int                                            face_no,
+                       const Quadrature<dim-1>                                      &quadrature,
+                       const InternalDataBase                                       &internal_data,
+                       dealii::internal::FEValues::MappingRelatedData<dim,spacedim> &output_data) const = 0;
 
   /**
    * This function is the equivalent to Mapping::fill_fe_values(),
@@ -856,12 +856,12 @@ private:
    *   @p internal_data object.
    */
   virtual void
-  fill_fe_subface_values (const typename Triangulation<dim,spacedim>::cell_iterator &cell,
-                          const unsigned int                                         face_no,
-                          const unsigned int                                         subface_no,
-                          const Quadrature<dim-1>                                   &quadrature,
-                          const InternalDataBase                                    &internal_data,
-                          internal::FEValues::MappingRelatedData<dim,spacedim>      &output_data) const = 0;
+  fill_fe_subface_values (const typename Triangulation<dim,spacedim>::cell_iterator     &cell,
+                          const unsigned int                                             face_no,
+                          const unsigned int                                             subface_no,
+                          const Quadrature<dim-1>                                       &quadrature,
+                          const InternalDataBase                                        &internal_data,
+                          dealii::internal::FEValues::MappingRelatedData<dim, spacedim> &output_data) const = 0;
 
   /**
    * Give class @p FEValues access to the private <tt>get_...data</tt> and
index efd0ea8731f5e8cf0acc8b6964c20174cb0361f9..b3cd90fd66e1fc19d528ec65f2f30502596e63bb 100644 (file)
@@ -324,11 +324,11 @@ public:
    */
   virtual
   CellSimilarity::Similarity
-  fill_fe_values (const typename Triangulation<dim,spacedim>::cell_iterator &cell,
-                  const CellSimilarity::Similarity                           cell_similarity,
-                  const Quadrature<dim>                                     &quadrature,
-                  const typename Mapping<dim,spacedim>::InternalDataBase    &internal_data,
-                  internal::FEValues::MappingRelatedData<dim,spacedim>      &output_data) const;
+  fill_fe_values (const typename Triangulation<dim,spacedim>::cell_iterator     &cell,
+                  const CellSimilarity::Similarity                               cell_similarity,
+                  const Quadrature<dim>                                         &quadrature,
+                  const typename Mapping<dim,spacedim>::InternalDataBase        &internal_data,
+                  dealii::internal::FEValues::MappingRelatedData<dim, spacedim> &output_data) const;
 
   /**
    * Compute mapping-related information for a face of a cell.
@@ -336,11 +336,11 @@ public:
    * a discussion of purpose and arguments of this function.
    */
   virtual void
-  fill_fe_face_values (const typename Triangulation<dim,spacedim>::cell_iterator &cell,
-                       const unsigned int                                         face_no,
-                       const Quadrature<dim-1>                                   &quadrature,
-                       const typename Mapping<dim,spacedim>::InternalDataBase    &internal_data,
-                       internal::FEValues::MappingRelatedData<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 typename Mapping<dim,spacedim>::InternalDataBase        &internal_data,
+                       dealii::internal::FEValues::MappingRelatedData<dim, spacedim> &output_data) const;
 
   /**
    * Compute mapping-related information for a child of a face of a cell.
@@ -348,12 +348,12 @@ public:
    * a discussion of purpose and arguments of this function.
    */
   virtual void
-  fill_fe_subface_values (const typename Triangulation<dim,spacedim>::cell_iterator &cell,
-                          const unsigned int                                         face_no,
-                          const unsigned int                                         subface_no,
-                          const Quadrature<dim-1>                                   &quadrature,
-                          const typename Mapping<dim,spacedim>::InternalDataBase    &internal_data,
-                          internal::FEValues::MappingRelatedData<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                                             subface_no,
+                          const Quadrature<dim-1>                                       &quadrature,
+                          const typename Mapping<dim,spacedim>::InternalDataBase        &internal_data,
+                          dealii::internal::FEValues::MappingRelatedData<dim, spacedim> &output_data) const;
 
   /**
    * Compute shape values and/or derivatives.

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.