From a158a3e4ab4781d8cb8a92b39f957f1c9681bae1 Mon Sep 17 00:00:00 2001 From: David Wells Date: Wed, 29 Jun 2016 14:05:10 -0400 Subject: [PATCH] Prefer VectorType to EulerVectorType, part 2. Mentioned in the discussion of commit 51be370b15. --- source/fe/mapping_q_eulerian.cc | 62 ++++++++++++++++----------------- 1 file changed, 31 insertions(+), 31 deletions(-) diff --git a/source/fe/mapping_q_eulerian.cc b/source/fe/mapping_q_eulerian.cc index d3500e72a8..4683798e06 100644 --- a/source/fe/mapping_q_eulerian.cc +++ b/source/fe/mapping_q_eulerian.cc @@ -38,10 +38,10 @@ DEAL_II_NAMESPACE_OPEN // .... MAPPING Q EULERIAN CONSTRUCTOR -template -MappingQEulerian::MappingQEulerianGeneric:: -MappingQEulerianGeneric (const unsigned int degree, - const MappingQEulerian &mapping_q_eulerian) +template +MappingQEulerian::MappingQEulerianGeneric:: +MappingQEulerianGeneric (const unsigned int degree, + const MappingQEulerian &mapping_q_eulerian) : MappingQGeneric(degree), mapping_q_eulerian (mapping_q_eulerian), @@ -51,10 +51,10 @@ MappingQEulerianGeneric (const unsigned int degree, update_values | update_q_points) {} -template -MappingQEulerian:: -MappingQEulerian (const unsigned int degree, - const EulerVectorType &euler_vector, +template +MappingQEulerian:: +MappingQEulerian (const unsigned int degree, + const VectorType &euler_vector, const DoFHandler &euler_dof_handler) : MappingQ(degree, true), @@ -64,7 +64,7 @@ MappingQEulerian (const unsigned int degree, // reset the q1 mapping we use for interior cells (and previously // set by the MappingQ constructor) to a MappingQ1Eulerian with the // current vector - this->q1_mapping.reset (new MappingQ1Eulerian(euler_vector, + this->q1_mapping.reset (new MappingQ1Eulerian(euler_vector, euler_dof_handler)); // also reset the qp mapping pointer with our own class @@ -73,11 +73,11 @@ MappingQEulerian (const unsigned int degree, -template -MappingQEulerian:: -MappingQEulerian (const unsigned int degree, +template +MappingQEulerian:: +MappingQEulerian (const unsigned int degree, const DoFHandler &euler_dof_handler, - const EulerVectorType &euler_vector) + const VectorType &euler_vector) : MappingQ(degree, true), euler_vector(&euler_vector), @@ -86,7 +86,7 @@ MappingQEulerian (const unsigned int degree, // reset the q1 mapping we use for interior cells (and previously // set by the MappingQ constructor) to a MappingQ1Eulerian with the // current vector - this->q1_mapping.reset (new MappingQ1Eulerian(euler_vector, + this->q1_mapping.reset (new MappingQ1Eulerian(euler_vector, euler_dof_handler)); // also reset the qp mapping pointer with our own class @@ -95,21 +95,21 @@ MappingQEulerian (const unsigned int degree, -template +template Mapping * -MappingQEulerian::clone () const +MappingQEulerian::clone () const { - return new MappingQEulerian(this->get_degree(), - *euler_vector, - *euler_dof_handler); + return new MappingQEulerian(this->get_degree(), + *euler_vector, + *euler_dof_handler); } // .... SUPPORT QUADRATURE CONSTRUCTOR -template -MappingQEulerian::MappingQEulerianGeneric:: +template +MappingQEulerian::MappingQEulerianGeneric:: SupportQuadrature:: SupportQuadrature (const unsigned int map_degree) : @@ -141,9 +141,9 @@ SupportQuadrature (const unsigned int map_degree) // .... COMPUTE MAPPING SUPPORT POINTS -template +template std_cxx11::array, GeometryInfo::vertices_per_cell> -MappingQEulerian:: +MappingQEulerian:: get_vertices (const typename Triangulation::cell_iterator &cell) const { @@ -161,9 +161,9 @@ get_vertices -template +template std_cxx11::array, GeometryInfo::vertices_per_cell> -MappingQEulerian::MappingQEulerianGeneric:: +MappingQEulerian::MappingQEulerianGeneric:: get_vertices (const typename Triangulation::cell_iterator &cell) const { @@ -173,9 +173,9 @@ get_vertices -template +template std::vector > -MappingQEulerian::MappingQEulerianGeneric:: +MappingQEulerian::MappingQEulerianGeneric:: compute_mapping_support_points (const typename Triangulation::cell_iterator &cell) const { // first, basic assertion with respect to vector size, @@ -211,9 +211,9 @@ compute_mapping_support_points (const typename Triangulation::cell Assert (n_components >= spacedim, ExcDimensionMismatch(n_components, spacedim) ); - std::vector > + std::vector > shift_vector(n_support_pts, - Vector(n_components)); + Vector(n_components)); // fill shift vector for each support point using an fe_values object. make // sure that the fe_values variable isn't used simultaneously from different @@ -237,9 +237,9 @@ compute_mapping_support_points (const typename Triangulation::cell -template +template CellSimilarity::Similarity -MappingQEulerian:: +MappingQEulerian:: fill_fe_values (const typename Triangulation::cell_iterator &cell, const CellSimilarity::Similarity , const Quadrature &quadrature, -- 2.39.5