]> https://gitweb.dealii.org/ - dealii.git/commitdiff
Update a few pieces of implementation.
authorWolfgang Bangerth <bangerth@math.tamu.edu>
Fri, 18 Sep 2015 20:01:31 +0000 (15:01 -0500)
committerWolfgang Bangerth <bangerth@math.tamu.edu>
Thu, 1 Oct 2015 20:11:55 +0000 (15:11 -0500)
include/deal.II/fe/mapping_fe_field.h
source/fe/mapping_fe_field.cc

index 8983d1e33d8f946e32394074cd4d36ddc7864527..de24cfbbf9365035f7b2a6f1ca3c325028d052a9 100644 (file)
@@ -523,7 +523,7 @@ private:
    * support points.
    */
   Point<spacedim>
-  transform_unit_to_real_cell_internal (const InternalData &mdata) const;
+  do_transform_unit_to_real_cell (const InternalData &mdata) const;
 
 
   /**
@@ -541,10 +541,10 @@ private:
    * @p mdata will be changed by this function.
    */
   Point<dim>
-  transform_real_to_unit_cell_internal (const typename Triangulation<dim,spacedim>::cell_iterator &cell,
-                                        const Point<spacedim> &p,
-                                        const Point<dim> &initial_p_unit,
-                                        InternalData &mdata) const;
+  do_transform_real_to_unit_cell (const typename Triangulation<dim,spacedim>::cell_iterator &cell,
+                                  const Point<spacedim> &p,
+                                  const Point<dim> &initial_p_unit,
+                                  InternalData &mdata) const;
 
   /**
    * Update internal degrees of freedom.
@@ -553,7 +553,7 @@ private:
                             const typename MappingFEField<dim, spacedim>::InternalData &data) const;
 
   /**
-   * Reimplemented from Mapping. See the documentation of the base class for
+   * See the documentation of the base class for
    * detailed information.
    */
   virtual void
index 5db7f7227db40ec827f91fe4c781cec676aa1a64..4bf8092abe761cef387b43c92fe9d7b7934b5a48 100644 (file)
@@ -249,9 +249,9 @@ MappingFEField<dim,spacedim,DH,VECTOR>::preserves_vertex_locations () const
 
 template<int dim, int spacedim, class VECTOR, class DH>
 void
-MappingFEField<dim,spacedim,VECTOR,DH>::compute_shapes_virtual (
-  const std::vector<Point<dim> > &unit_points,
-  typename MappingFEField<dim, spacedim>::InternalData &data) const
+MappingFEField<dim,spacedim,VECTOR,DH>::
+compute_shapes_virtual (const std::vector<Point<dim> > &unit_points,
+                        typename MappingFEField<dim, spacedim>::InternalData &data) const
 {
   const unsigned int n_points=unit_points.size();
 
@@ -1667,14 +1667,14 @@ transform_unit_to_real_cell (const typename Triangulation<dim,spacedim>::cell_it
 
   update_internal_dofs(cell, *mdata);
 
-  return this->transform_unit_to_real_cell_internal(*mdata);
+  return do_transform_unit_to_real_cell(*mdata);
 }
 
 
 template<int dim, int spacedim, class VECTOR, class DH>
 Point<spacedim>
 MappingFEField<dim,spacedim,VECTOR,DH>::
-transform_unit_to_real_cell_internal (const InternalData &data) const
+do_transform_unit_to_real_cell (const InternalData &data) const
 {
   Point<spacedim> p_real;
 
@@ -1728,7 +1728,7 @@ transform_real_to_unit_cell (const typename Triangulation<dim,spacedim>::cell_it
 
   update_internal_dofs(cell, *mdata);
 
-  return this->transform_real_to_unit_cell_internal(cell, p, initial_p_unit, *mdata);
+  return do_transform_real_to_unit_cell(cell, p, initial_p_unit, *mdata);
 
 }
 
@@ -1736,7 +1736,7 @@ transform_real_to_unit_cell (const typename Triangulation<dim,spacedim>::cell_it
 template<int dim, int spacedim, class VECTOR, class DH>
 Point<dim>
 MappingFEField<dim,spacedim,VECTOR,DH>::
-transform_real_to_unit_cell_internal
+do_transform_real_to_unit_cell
 (const typename Triangulation<dim,spacedim>::cell_iterator &cell,
  const Point<spacedim>                            &p,
  const Point<dim>                                 &initial_p_unit,
@@ -1760,7 +1760,7 @@ transform_real_to_unit_cell_internal
   Point<dim> p_unit = initial_p_unit;
   Point<dim> f;
   compute_shapes_virtual(std::vector<Point<dim> > (1, p_unit), mdata);
-  Point<spacedim> p_real(transform_unit_to_real_cell_internal(mdata));
+  Point<spacedim> p_real(do_transform_unit_to_real_cell(mdata));
   Tensor<1,spacedim> p_minus_F = p - p_real;
   const double eps = 1.e-12*cell->diameter();
   const unsigned int newton_iteration_limit = 20;
@@ -1807,7 +1807,7 @@ transform_real_to_unit_cell_internal
           // at new p_unit point
           compute_shapes_virtual(std::vector<Point<dim> > (1, p_unit_trial), mdata);
           // f(x)
-          Point<spacedim> p_real_trial = transform_unit_to_real_cell_internal(mdata);
+          Point<spacedim> p_real_trial = do_transform_unit_to_real_cell(mdata);
           const Tensor<1,spacedim> f_trial = p - p_real_trial;
           // see if we are making progress with the current step length
           // and if not, reduce it by a factor of two and try again

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.