From: bangerth Date: Sun, 21 Aug 2011 00:22:17 +0000 (+0000) Subject: Fix a real error: The copy constructor of MappingQ did not copy X-Git-Url: https://gitweb.dealii.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=e62c71893e7bbfa259653d35572d6c0b1a0779ee;p=dealii-svn.git Fix a real error: The copy constructor of MappingQ did not copy n_outer but rather initialized it with garbage. git-svn-id: https://svn.dealii.org/trunk@24133 0785d39b-7218-0410-832d-ea1e28bc413d --- diff --git a/deal.II/source/fe/mapping_q.cc b/deal.II/source/fe/mapping_q.cc index 526bd86f83..874491dd0a 100644 --- a/deal.II/source/fe/mapping_q.cc +++ b/deal.II/source/fe/mapping_q.cc @@ -115,8 +115,9 @@ MappingQ::MappingQ (const unsigned int p, degree(p), n_inner(Utilities::fixed_power(degree-1)), n_outer((dim==1) ? 2 : - (dim==2) ? 4+4*(degree-1) - :8+12*(degree-1)+6*(degree-1)*(degree-1)), + ((dim==2) ? + 4+4*(degree-1) : + 8+12*(degree-1)+6*(degree-1)*(degree-1))), tensor_pols(0), n_shape_functions(Utilities::fixed_power(degree+1)), renumber(FETools:: @@ -157,7 +158,7 @@ MappingQ::MappingQ (const MappingQ &mapping) MappingQ1(), degree(mapping.degree), n_inner(mapping.n_inner), - n_outer(n_outer), + n_outer(mapping.n_outer), tensor_pols(0), n_shape_functions(mapping.n_shape_functions), renumber(mapping.renumber), @@ -1360,8 +1361,8 @@ transform_unit_to_real_cell (const typename Triangulation::cell_it if(p_data->shape_values.size()mapping_support_points.size()) p_data->mapping_support_points.resize (GeometryInfo::vertices_per_cell); - - + + return this->transform_unit_to_real_cell_internal(*p_data); } @@ -1400,7 +1401,7 @@ transform_real_to_unit_cell (const typename Triangulation::cell_it // points on the vertices. if(mdata->shape_values.size()::vertices_per_cell); - + this->transform_real_to_unit_cell_internal(cell, p, *mdata, p_unit); }