]> https://gitweb.dealii.org/ - dealii.git/commitdiff
Use 'CellSimilarity::Similarity' instead of 'enum CellSimilarity::Similarity' to...
authorWolfgang Bangerth <bangerth@math.tamu.edu>
Fri, 12 Jun 2009 08:53:35 +0000 (08:53 +0000)
committerWolfgang Bangerth <bangerth@math.tamu.edu>
Fri, 12 Jun 2009 08:53:35 +0000 (08:53 +0000)
git-svn-id: https://svn.dealii.org/trunk@18933 0785d39b-7218-0410-832d-ea1e28bc413d

22 files changed:
deal.II/deal.II/include/fe/fe.h
deal.II/deal.II/include/fe/fe_dgp_nonparametric.h
deal.II/deal.II/include/fe/fe_nedelec.h
deal.II/deal.II/include/fe/fe_poly.h
deal.II/deal.II/include/fe/fe_poly.templates.h
deal.II/deal.II/include/fe/fe_poly_tensor.h
deal.II/deal.II/include/fe/fe_system.h
deal.II/deal.II/include/fe/mapping.h
deal.II/deal.II/include/fe/mapping_cartesian.h
deal.II/deal.II/include/fe/mapping_q.h
deal.II/deal.II/include/fe/mapping_q1.h
deal.II/deal.II/include/fe/mapping_q1_eulerian.h
deal.II/deal.II/include/fe/mapping_q_eulerian.h
deal.II/deal.II/source/fe/fe_dgp_nonparametric.cc
deal.II/deal.II/source/fe/fe_nedelec.cc
deal.II/deal.II/source/fe/fe_poly_tensor.cc
deal.II/deal.II/source/fe/fe_system.cc
deal.II/deal.II/source/fe/mapping_cartesian.cc
deal.II/deal.II/source/fe/mapping_q.cc
deal.II/deal.II/source/fe/mapping_q1.cc
deal.II/deal.II/source/fe/mapping_q1_eulerian.cc
deal.II/deal.II/source/fe/mapping_q_eulerian.cc

index 0d8a1a035fd0b4b135ed278e3f7d055d4dab7ebf..ac61e810624aa5ba3b5deaeb2e41159b732a4b0b 100644 (file)
@@ -2594,7 +2594,7 @@ class FiniteElement : public Subscriptor,
                    typename Mapping<dim,spacedim>::InternalDataBase          &mapping_internal,
                    typename Mapping<dim,spacedim>::InternalDataBase          &fe_internal,
                    FEValuesData<dim,spacedim>                                &data,
-                   enum CellSimilarity::Similarity                           &cell_similarity) const = 0;
+                   CellSimilarity::Similarity                           &cell_similarity) const = 0;
     
                                     /**
                                      * Fill the fields of
index 75fe93f3904fd85e7fb52cf1157bdbf2b98ef768..f0890fa8a15d19870c23ada93f18769fc052c242 100644 (file)
@@ -484,7 +484,7 @@ class FE_DGPNonparametric : public FiniteElement<dim,spacedim>
                    typename Mapping<dim,spacedim>::InternalDataBase      &mapping_internal,
                    typename Mapping<dim,spacedim>::InternalDataBase      &fe_internal,
                    FEValuesData<dim,spacedim>                            &data,
-                   enum CellSimilarity::Similarity                       &cell_similarity) const;
+                   CellSimilarity::Similarity                       &cell_similarity) const;
     
                                     /**
                                      * Implementation of the same
index ed790b721f8eb2fa7c10ffba914a919c3c9ef8e3..47522137861006f55cde1418b7f1162d3e0a771e 100644 (file)
@@ -418,7 +418,7 @@ class FE_Nedelec : public FiniteElement<dim,spacedim>
                    typename Mapping<dim,spacedim>::InternalDataBase &mapping_internal,
                    typename Mapping<dim,spacedim>::InternalDataBase &fe_internal,
                    FEValuesData<dim,spacedim>                       &data,
-                   enum CellSimilarity::Similarity                  &cell_similarity) const;
+                   CellSimilarity::Similarity                  &cell_similarity) const;
     
                                     /**
                                      * Implementation of the same
index a8f4228660dead07edb9cdd4bf1d214a409a0815..44a549144fbe55c403ae6bf2bcf4f60be17c444a 100644 (file)
@@ -224,7 +224,7 @@ class FE_Poly : public FiniteElement<dim,spacedim>
                    typename Mapping<dim,spacedim>::InternalDataBase      &mapping_internal,
                    typename Mapping<dim,spacedim>::InternalDataBase      &fe_internal,
                    FEValuesData<dim,spacedim>                            &data,
-                   enum CellSimilarity::Similarity                       &cell_similarity) const;
+                   CellSimilarity::Similarity                       &cell_similarity) const;
     
     virtual void
     fill_fe_face_values (const Mapping<dim,spacedim> &mapping,
index d99571c01645250077eb3a2be7ce0b5ff41cbfdc..f75abfb8b61cf9c40f356b3e357fc10965b0c17d 100644 (file)
@@ -245,7 +245,7 @@ FE_Poly<TensorProductPolynomials<1>,1,2>::fill_fe_values
    Mapping<1,2>::InternalDataBase            &mapping_data,
    Mapping<1,2>::InternalDataBase            &fedata,
    FEValuesData<1,2>                         &data,
-   enum CellSimilarity::Similarity           &cell_similarity) const
+   CellSimilarity::Similarity           &cell_similarity) const
 {
                                   // convert data object to internal
                                   // data for this class. fails with
@@ -288,7 +288,7 @@ FE_Poly<TensorProductPolynomials<2>,2,3>::fill_fe_values
    Mapping<2,3>::InternalDataBase          &mapping_data,
    Mapping<2,3>::InternalDataBase          &fedata,
    FEValuesData<2,3>                       &data,
-   enum CellSimilarity::Similarity         &cell_similarity) const
+   CellSimilarity::Similarity         &cell_similarity) const
 {
 
                                   // assert that the following dynamics
@@ -330,7 +330,7 @@ FE_Poly<PolynomialSpace<1>,1,2>::fill_fe_values (
   Mapping<1,2>::InternalDataBase          &mapping_data,
   Mapping<1,2>::InternalDataBase          &fedata,
   FEValuesData<1,2>                       &data,
-  enum CellSimilarity::Similarity         &cell_similarity) const
+  CellSimilarity::Similarity         &cell_similarity) const
 {
                                   // convert data object to internal
                                   // data for this class. fails with
@@ -375,7 +375,7 @@ FE_Poly<PolynomialSpace<2>,2,3>::fill_fe_values
    Mapping<2,3>::InternalDataBase          &mapping_data,
    Mapping<2,3>::InternalDataBase          &fedata,
    FEValuesData<2,3>                       &data,
-   enum CellSimilarity::Similarity         &cell_similarity) const
+   CellSimilarity::Similarity         &cell_similarity) const
 {
   Assert (dynamic_cast<InternalData *> (&fedata) != 0, ExcInternalError());
   InternalData &fe_data = static_cast<InternalData &> (fedata);
@@ -414,7 +414,7 @@ FE_Poly<POLY,dim,spacedim>::fill_fe_values
    typename Mapping<dim,spacedim>::InternalDataBase &mapping_data,
    typename Mapping<dim,spacedim>::InternalDataBase &fedata,
    FEValuesData<dim,spacedim>                       &data,
-   enum CellSimilarity::Similarity                  &cell_similarity) const
+   CellSimilarity::Similarity                  &cell_similarity) const
 {
                                   // convert data object to internal
                                   // data for this class. fails with
index afd36801c7096b30176322dea45acf6d310dfc1c..4eae2179e944b02c4225337b428f2c95a7b73868 100644 (file)
@@ -240,7 +240,7 @@ class FE_PolyTensor : public FiniteElement<dim,spacedim>
                    typename Mapping<dim,spacedim>::InternalDataBase  &mapping_internal,
                    typename Mapping<dim,spacedim>::InternalDataBase  &fe_internal,
                    FEValuesData<dim,spacedim>                        &data,
-                   enum CellSimilarity::Similarity                   &cell_similarity) const;
+                   CellSimilarity::Similarity                   &cell_similarity) const;
     
     virtual void
     fill_fe_face_values (const Mapping<dim,spacedim> &mapping,
index 349c0ae07201506011eddb1011e4f5045e72ba2a..a1de9d84ed4220ca35b7381b57ca6b2540618402 100644 (file)
@@ -615,7 +615,7 @@ class FESystem : public FiniteElement<dim,spacedim>
                    typename Mapping<dim,spacedim>::InternalDataBase &mapping_data,
                    typename Mapping<dim,spacedim>::InternalDataBase &fe_data,
                    FEValuesData<dim,spacedim>                       &data,
-                   enum CellSimilarity::Similarity                  &cell_similarity) const;
+                   CellSimilarity::Similarity                  &cell_similarity) const;
 
                                     /**
                                      * Implementation of the same
@@ -685,7 +685,7 @@ class FESystem : public FiniteElement<dim,spacedim>
                       const unsigned int                                face_no,
                       const unsigned int                                sub_no,
                       const Quadrature<dim_1>                          &quadrature,
-                      enum CellSimilarity::Similarity                   cell_similarity,
+                      CellSimilarity::Similarity                   cell_similarity,
                       typename Mapping<dim,spacedim>::InternalDataBase &mapping_data,
                       typename Mapping<dim,spacedim>::InternalDataBase &fe_data,
                       FEValuesData<dim,spacedim>                       &data) const ;
index ca4b219cd252bca323db298662c4bd0380486706..ad7c193492f2e0cbb2c3c217cecd60241d50a3aa 100644 (file)
@@ -553,7 +553,7 @@ class Mapping : public Subscriptor
                    std::vector<Tensor<3,spacedim> >                          &jacobian_grads,
                    std::vector<Tensor<2,spacedim> >                          &inverse_jacobians,
                    std::vector<Point<spacedim> >                             &cell_normal_vectors,
-                   enum CellSimilarity::Similarity                           &cell_similarity
+                   CellSimilarity::Similarity                           &cell_similarity
                   ) const=0;
 
 
index 709a830abcbbeb5933d583161203dae51eb55d3f..8fa505d91a6824af33d1694b38bc03ba3b8471a2 100644 (file)
@@ -68,7 +68,7 @@ class MappingCartesian : public Mapping<dim,spacedim>
                    std::vector<Tensor<3,spacedim> >                          &jacobian_grads,
                    std::vector<Tensor<2,spacedim> >                          &inverse_jacobians,
                    std::vector<Point<spacedim> >   &,
-                   enum CellSimilarity::Similarity                           &cell_similarity) const ;
+                   CellSimilarity::Similarity                           &cell_similarity) const ;
 
 
     virtual void
@@ -181,7 +181,7 @@ class MappingCartesian : public Mapping<dim,spacedim>
     void compute_fill (const typename Triangulation<dim,spacedim>::cell_iterator &cell,
                       const unsigned int face_no,
                       const unsigned int sub_no,
-                      const enum CellSimilarity::Similarity cell_similarity,
+                      const CellSimilarity::Similarity cell_similarity,
                       InternalData& data,
                       std::vector<Point<dim> > &quadrature_points,
                       std::vector<Point<dim> >& normal_vectors) const;
index 3860fac6c4456fc3e9da9a9cea982bbbcefcdc25..deb56a34f1be83300ed3e4a1826050d823ddb7b9 100644 (file)
@@ -212,7 +212,7 @@ class MappingQ : public MappingQ1<dim,spacedim>
                    std::vector<Tensor<3,spacedim> >                          &jacobian_grads,
                    std::vector<Tensor<2,spacedim> >                          &inverse_jacobians,
                     std::vector<Point<spacedim> >                             &cell_normal_vectors,
-                   enum CellSimilarity::Similarity                           &cell_similarity) const ;
+                   CellSimilarity::Similarity                           &cell_similarity) const ;
 
                                     /**
                                      * Implementation of the interface in
index ea81d72fd2e887bfe0456adbbbda476fac1fc064..8df810df35238be553e2c8369f16183e641f1c61 100644 (file)
@@ -302,7 +302,7 @@ class MappingQ1 : public Mapping<dim,spacedim>
                    std::vector<Tensor<3,spacedim> >                          &jacobian_grads,
                    std::vector<Tensor<2,spacedim> >                          &inverse_jacobians,
                    std::vector<Point<spacedim> >                             &cell_normal_vectors,
-                   enum CellSimilarity::Similarity                           &cell_similarity) const;
+                   CellSimilarity::Similarity                           &cell_similarity) const;
 
                                     /**
                                      * Implementation of the interface in
@@ -385,7 +385,7 @@ class MappingQ1 : public Mapping<dim,spacedim>
     void compute_fill (const typename Triangulation<dim,spacedim>::cell_iterator &cell,
                       const unsigned int      npts,
                       const DataSetDescriptor data_set,
-                      const enum CellSimilarity::Similarity cell_similarity,
+                      const CellSimilarity::Similarity cell_similarity,
                       InternalData           &data,
                       std::vector<Point<spacedim> > &quadrature_points) const;
     
index 6ac156bb147b65647a066a7b481304ce4e5734c5..c8f4f6a0e18d714e5e7c8ad36723908efb1ac5e3 100644 (file)
@@ -159,7 +159,7 @@ class MappingQ1Eulerian : public MappingQ1<dim,spacedim>
                    std::vector<Tensor<3,spacedim> >                          &jacobian_grads,
                    std::vector<Tensor<2,spacedim> >                          &inverse_jacobians,
                    std::vector<Point<spacedim> >                             &cell_normal_vectors,
-                   enum CellSimilarity::Similarity                           &cell_similarity) const;
+                   CellSimilarity::Similarity                           &cell_similarity) const;
 
                                     /**
                                      * Reference to the vector of
index 6bb053388e78ad6b5f61321ac21e7ec105b63a57..f4d3529b971425ae6c61259a3beb07de4e2273e4 100644 (file)
@@ -162,7 +162,7 @@ class MappingQEulerian : public MappingQ<dim, spacedim>
                    std::vector<Tensor<3,spacedim> >                          &jacobian_grads,
                    std::vector<Tensor<2,spacedim> >                          &inverse_jacobians,
                    std::vector<Point<spacedim> >                             &cell_normal_vectors,
-                   enum CellSimilarity::Similarity                           &cell_similarity) const;
+                   CellSimilarity::Similarity                           &cell_similarity) const;
 
                                      /**
                                       * Reference to the vector of
index 71cba1c8bc98acb04bcaed4db05c256810e8181d..369d8ba1c684e431d580f0c2a77530c12f87fe8a 100644 (file)
@@ -292,7 +292,7 @@ FE_DGPNonparametric<dim,spacedim>::fill_fe_values (
   typename Mapping<dim,spacedim>::InternalDataBase&,
   typename Mapping<dim,spacedim>::InternalDataBase& fedata,
   FEValuesData<dim,spacedim>&data,
-  enum CellSimilarity::Similarity &/*cell_similarity*/) const
+  CellSimilarity::Similarity &/*cell_similarity*/) const
 {
                                   // convert data object to internal
                                   // data for this class. fails with
index e6639c46f9fa07675b502b09cd5c5c01e371c92e..cd958fbb2332b0d67f5c9edbc8c8a23d725f80c3 100644 (file)
@@ -997,7 +997,7 @@ FE_Nedelec<dim,spacedim>::fill_fe_values
    typename Mapping<dim,spacedim>::InternalDataBase &mapping_data,
    typename Mapping<dim,spacedim>::InternalDataBase &fedata,
    FEValuesData<dim,spacedim>                       &data,
-   enum CellSimilarity::Similarity                  &/*cell_similarity*/) const
+   CellSimilarity::Similarity                  &/*cell_similarity*/) const
 {
                                   // convert data object to internal
                                   // data for this class. fails with
index 9abae0427ac3f379ab9cb55263ac1976fe66196d..8b1b92a8bd2a015a6a90c21ccc63accdd3e0cd0e 100644 (file)
@@ -373,7 +373,7 @@ FE_PolyTensor<POLY,dim,spacedim>::fill_fe_values (
   typename Mapping<dim,spacedim>::InternalDataBase &mapping_data,
   typename Mapping<dim,spacedim>::InternalDataBase &fedata,
   FEValuesData<dim,spacedim>                       &data,
-  enum CellSimilarity::Similarity                  &cell_similarity) const
+  CellSimilarity::Similarity                  &cell_similarity) const
 {
                                   // convert data object to internal
                                   // data for this class. fails with
index 8acc18e68d7a2b25c332d5df5670788325388afe..94843f74ab1951379f4596f36a33067486fbbe72 100644 (file)
@@ -670,7 +670,7 @@ fill_fe_values (const Mapping<dim,spacedim>                      &mapping,
                 typename Mapping<dim,spacedim>::InternalDataBase &mapping_data,
                 typename Mapping<dim,spacedim>::InternalDataBase &fe_data,
                 FEValuesData<dim,spacedim>                       &data,
-               enum CellSimilarity::Similarity                  &cell_similarity) const
+               CellSimilarity::Similarity                  &cell_similarity) const
 {
   compute_fill(mapping, cell, invalid_face_number, invalid_face_number,
               quadrature, cell_similarity, mapping_data, fe_data, data);
@@ -723,7 +723,7 @@ compute_fill (const Mapping<dim,spacedim>                      &mapping,
               const unsigned int                                face_no,
               const unsigned int                                sub_no,
               const Quadrature<dim_1>                          &quadrature,
-             enum CellSimilarity::Similarity                   cell_similarity,
+             CellSimilarity::Similarity                   cell_similarity,
               typename Mapping<dim,spacedim>::InternalDataBase &mapping_data,
               typename Mapping<dim,spacedim>::InternalDataBase &fedata,
               FEValuesData<dim,spacedim>                       &data) const
index acdfc8b32f100485ed0d1863bb19e732306f45bd..39196105ab70a1ead67bd71f470aae37fc438834 100644 (file)
@@ -132,7 +132,7 @@ void
 MappingCartesian<dim, spacedim>::compute_fill (const typename Triangulation<dim,spacedim>::cell_iterator &cell,
                                               const unsigned int        face_no,
                                               const unsigned int        sub_no,
-                                              const enum CellSimilarity::Similarity cell_similarity,
+                                              const CellSimilarity::Similarity cell_similarity,
                                               InternalData             &data,
                                               std::vector<Point<dim> > &quadrature_points,
                                               std::vector<Point<dim> > &normal_vectors) const
@@ -310,7 +310,7 @@ fill_fe_values (const typename Triangulation<dim,spacedim>::cell_iterator& cell,
                std::vector<Tensor<3,spacedim> >& jacobian_grads,
                std::vector<Tensor<2,spacedim> >& inverse_jacobians,
                std::vector<Point<spacedim> >       &,
-               enum CellSimilarity::Similarity& cell_similarity) const
+               CellSimilarity::Similarity& cell_similarity) const
 {
                                   // convert data object to internal
                                   // data for this class. fails with
index cea0b4f45c46a482f9fdf766f172fcc218e10133..a77a6b8c84e08013c80445178d7f5128d3b7b386 100644 (file)
@@ -314,7 +314,7 @@ MappingQ<dim,spacedim>::fill_fe_values (
   std::vector<Tensor<3,spacedim> >                          &jacobian_grads,
   std::vector<Tensor<2,spacedim> >                          &inverse_jacobians,
   std::vector<Point<spacedim> >                             &cell_normal_vectors,
-  enum CellSimilarity::Similarity                           &cell_similarity) const
+  CellSimilarity::Similarity                           &cell_similarity) const
 {
                                   // convert data object to internal
                                   // data for this class. fails with
index b2f07faa873d83bc11473f4d3b90f25f3f843855..ca0f2c818a5fb99a3443398408adba2770b4c9e8 100644 (file)
@@ -606,7 +606,7 @@ void
 MappingQ1<dim,spacedim>::compute_fill (const typename Triangulation<dim,spacedim>::cell_iterator &cell,
                                       const unsigned int  n_q_points,
                                               const DataSetDescriptor  data_set,
-                                      const enum CellSimilarity::Similarity cell_similarity,
+                                      const CellSimilarity::Similarity cell_similarity,
                                       InternalData  &data,
                                       std::vector<Point<spacedim> > &quadrature_points) const
 {
@@ -745,7 +745,7 @@ MappingQ1<dim,spacedim>::fill_fe_values (
   std::vector<Tensor<3,spacedim> >                          &jacobian_grads,
   std::vector<Tensor<2,spacedim> >                          &inverse_jacobians,
   std::vector<Point<spacedim> >                             &cell_normal_vectors,
-  enum CellSimilarity::Similarity                           &cell_similarity) const
+  CellSimilarity::Similarity                           &cell_similarity) const
 {
   // ensure that the following cast is really correct:
   Assert (dynamic_cast<InternalData *>(&mapping_data) != 0, 
index 4444b1bab89fd12cc0632a8cc7fe0623c038d6a2..006e9dc0b8a032eb6fd0127da845ad110069e9c9 100644 (file)
@@ -127,7 +127,7 @@ MappingQ1Eulerian<dim,EulerVectorType,spacedim>::fill_fe_values (
   std::vector<Tensor<3,spacedim> >                          &jacobian_grads,
   std::vector<Tensor<2,spacedim> >                          &inverse_jacobians,
   std::vector<Point<spacedim> >                             &cell_normal_vectors,
-  enum CellSimilarity::Similarity                           &cell_similarity) const
+  CellSimilarity::Similarity                           &cell_similarity) const
 {
                                   // disable any previously detected
                                   // similarity and then enter the
index 568f9845fb33f91e348ed7d5811a47395da5b369..283d074019f0754c1e9cba91ede773ded5283b83 100644 (file)
@@ -194,7 +194,7 @@ MappingQEulerian<dim,EulerVectorType,spacedim>::fill_fe_values (
   std::vector<Tensor<3,spacedim> >                          &jacobian_grads,
   std::vector<Tensor<2,spacedim> >                          &inverse_jacobians,
   std::vector<Point<spacedim> >                             &cell_normal_vectors,
-  enum CellSimilarity::Similarity                           &cell_similarity) const
+  CellSimilarity::Similarity                           &cell_similarity) const
 {
                                   // disable any previously detected
                                   // similarity and hand on to the respective

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.