replace the virtual function fet_face by a nonvirtual one that returns present_face...

git-svn-id: https://svn.dealii.org/trunk@3156 0785d39b-7218-0410-832d-ea1e28bc413d

diff --git a/deal.II/deal.II/include/fe/fe_values.h b/deal.II/deal.II/include/fe/fe_values.h
index a77b7bb9884676e518ea9a78d4e6861b02e794d4..be5fa082b967a8d1b6d9a5ae9db123dc83a8a1fe 100644 (file)
--- a/deal.II/deal.II/include/fe/fe_values.h
+++ b/deal.II/deal.II/include/fe/fe_values.h
@@ -961,13 +961,6 @@ class FEFaceValuesBase : public FEValuesBase<dim>
                      const UpdateFlags         update_flags,
                      const FiniteElement<dim> &fe);
     
-                                    /**
-                                     * Virtual destructor needed for
-                                     * the virtual @p{get_face}
-                                     * function.
-                                     */
-    virtual ~FEFaceValuesBase ();
-    
                                     /**
                                      * Return the outward normal vector to
                                      * the cell at the @p{i}th quadrature
@@ -985,10 +978,9 @@ class FEFaceValuesBase : public FEValuesBase<dim>
 
                                     /**
                                      * Return the present
-                                     * face. Implemented in the
-                                     * derived classes.
+                                     * face.
                                      */
-    virtual DoFHandler<dim>::face_iterator get_face() const=0;
+    DoFHandler<dim>::face_iterator get_face() const;
 
 
   protected:
@@ -1059,6 +1051,15 @@ class FEFaceValuesBase : public FEValuesBase<dim>
                                      * in by the finite element class.
                                      */
     vector<Point<dim> >  normal_vectors;
+
+                                    /**
+                                     * Stores the face or subface,
+                                     * resp., that was selected the
+                                     * last time the @p{reinit}
+                                     * function was called. Is used
+                                     * by the @p{get_face} function.
+                                     */
+    DoFHandler<dim>::face_iterator present_face;
 };
 
 
@@ -1130,12 +1131,6 @@ class FEFaceValues : public FEFaceValuesBase<dim>
                                      */
     void reinit (const typename DoFHandler<dim>::cell_iterator &cell,
                 const unsigned int                    face_no);
-
-    
-                                    /**
-                                     * Return the present face.
-                                     */
-    virtual DoFHandler<dim>::face_iterator get_face() const;
 };
 
 
@@ -1273,11 +1268,6 @@ class FESubfaceValues : public FEFaceValuesBase<dim>
                 const unsigned int                    face_no,
                 const unsigned int                    subface_no);
 
-                                    /**
-                                     * Return the present face.
-                                     */
-    virtual DoFHandler<dim>::face_iterator get_face() const;
-
                                     /**
                                      * Exception
                                      */
@@ -1287,16 +1277,6 @@ class FESubfaceValues : public FEFaceValuesBase<dim>
                                      * Exception
                                      */
     DeclException0 (ExcFaceHasNoSubfaces);
-
-  protected:
-    
-                                    /**
-                                     * Store the subface selected
-                                     * last time the @p{reinit}
-                                     * function was called. Is used
-                                     * by the @p{get_face} fuction.
-                                     */
-    DoFHandler<dim>::face_iterator present_subface;
 };
 
 
@@ -1391,13 +1371,6 @@ FEValuesBase<dim>::get_cell() const
 
 /*------------------------ Inline functions: FEFaceValuesBase --------------------*/
 
-
-template <int dim>
-inline
-FEFaceValuesBase<dim>::~FEFaceValuesBase()
-{};
-
-
 template <int dim>
 inline
 const vector<Point<dim> > &
@@ -1409,24 +1382,11 @@ FEFaceValuesBase<dim>::get_normal_vectors () const
 };
 
 
-/*------------------------ Inline functions: FEFaceValues ------------------------*/
-
-template <int dim>
-inline
-DoFHandler<dim>::face_iterator
-FEFaceValues<dim>::get_face() const {
-  return present_cell->face(selected_dataset);
-};
-
-
-
-/*------------------------ Inline functions: FESubfaceValues ------------------------*/
-
 template <int dim>
 inline
 DoFHandler<dim>::face_iterator
-FESubfaceValues<dim>::get_face() const {
-  return present_subface;
+FEFaceValuesBase<dim>::get_face() const {
+  return present_face;
 };
 
 

diff --git a/deal.II/deal.II/source/fe/fe_values.cc b/deal.II/deal.II/source/fe/fe_values.cc
index 3a8e6318914475123be66968abb2e60f3fa277f3..f467218a9c9f0f1b5394cca51ea7744a21b45b7f 100644 (file)
--- a/deal.II/deal.II/source/fe/fe_values.cc
+++ b/deal.II/deal.II/source/fe/fe_values.cc
@@ -561,6 +561,7 @@ void FEFaceValues<dim>::reinit (const typename DoFHandler<dim>::cell_iterator &c
                                const unsigned int                             face_no)
 {
   present_cell  = cell;
+  present_face  = cell->face(face_no);
   selected_dataset = face_no;
 
                                   // assert that the finite elements
@@ -752,7 +753,7 @@ void FESubfaceValues<dim>::reinit (const typename DoFHandler<dim>::cell_iterator
          ExcFaceHasNoSubfaces());
   
   present_cell  = cell;
-  present_subface = cell->face(face_no)->child(subface_no);
+  present_face = cell->face(face_no)->child(subface_no);
   selected_dataset = face_no*(1<<(dim-1)) + subface_no;
 
                                   // assert that the finite elements