From 868d1a44608aa6e9f6e7ac8c0b9e1fdbf3258ce7 Mon Sep 17 00:00:00 2001 From: Wolfgang Bangerth Date: Fri, 18 Sep 2015 15:01:31 -0500 Subject: [PATCH] Update a few pieces of implementation. --- include/deal.II/fe/mapping_fe_field.h | 12 ++++++------ source/fe/mapping_fe_field.cc | 18 +++++++++--------- 2 files changed, 15 insertions(+), 15 deletions(-) diff --git a/include/deal.II/fe/mapping_fe_field.h b/include/deal.II/fe/mapping_fe_field.h index 8983d1e33d..de24cfbbf9 100644 --- a/include/deal.II/fe/mapping_fe_field.h +++ b/include/deal.II/fe/mapping_fe_field.h @@ -523,7 +523,7 @@ private: * support points. */ Point - 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 - transform_real_to_unit_cell_internal (const typename Triangulation::cell_iterator &cell, - const Point &p, - const Point &initial_p_unit, - InternalData &mdata) const; + do_transform_real_to_unit_cell (const typename Triangulation::cell_iterator &cell, + const Point &p, + const Point &initial_p_unit, + InternalData &mdata) const; /** * Update internal degrees of freedom. @@ -553,7 +553,7 @@ private: const typename MappingFEField::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 diff --git a/source/fe/mapping_fe_field.cc b/source/fe/mapping_fe_field.cc index 5db7f7227d..4bf8092abe 100644 --- a/source/fe/mapping_fe_field.cc +++ b/source/fe/mapping_fe_field.cc @@ -249,9 +249,9 @@ MappingFEField::preserves_vertex_locations () const template void -MappingFEField::compute_shapes_virtual ( - const std::vector > &unit_points, - typename MappingFEField::InternalData &data) const +MappingFEField:: +compute_shapes_virtual (const std::vector > &unit_points, + typename MappingFEField::InternalData &data) const { const unsigned int n_points=unit_points.size(); @@ -1667,14 +1667,14 @@ transform_unit_to_real_cell (const typename Triangulation::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 Point MappingFEField:: -transform_unit_to_real_cell_internal (const InternalData &data) const +do_transform_unit_to_real_cell (const InternalData &data) const { Point p_real; @@ -1728,7 +1728,7 @@ transform_real_to_unit_cell (const typename Triangulation::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::cell_it template Point MappingFEField:: -transform_real_to_unit_cell_internal +do_transform_real_to_unit_cell (const typename Triangulation::cell_iterator &cell, const Point &p, const Point &initial_p_unit, @@ -1760,7 +1760,7 @@ transform_real_to_unit_cell_internal Point p_unit = initial_p_unit; Point f; compute_shapes_virtual(std::vector > (1, p_unit), mdata); - Point p_real(transform_unit_to_real_cell_internal(mdata)); + Point 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 > (1, p_unit_trial), mdata); // f(x) - Point p_real_trial = transform_unit_to_real_cell_internal(mdata); + Point 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 -- 2.39.5