From d7e33d963e6ad26cb6737967b1870c1ca8c178a3 Mon Sep 17 00:00:00 2001 From: bangerth Date: Fri, 19 Nov 2010 03:21:53 +0000 Subject: [PATCH] Reindent a couple places. git-svn-id: https://svn.dealii.org/trunk@22819 0785d39b-7218-0410-832d-ea1e28bc413d --- deal.II/source/fe/mapping_q1.cc | 71 ++++++++++++++++++--------------- 1 file changed, 39 insertions(+), 32 deletions(-) diff --git a/deal.II/source/fe/mapping_q1.cc b/deal.II/source/fe/mapping_q1.cc index 9dfd082f7f..7ce1b98fcd 100644 --- a/deal.II/source/fe/mapping_q1.cc +++ b/deal.II/source/fe/mapping_q1.cc @@ -585,7 +585,7 @@ MappingQ1::get_face_data (const UpdateFlags update_flags, template typename Mapping::InternalDataBase * MappingQ1::get_subface_data (const UpdateFlags update_flags, - const Quadrature& quadrature) const + const Quadrature& quadrature) const { InternalData* data = new InternalData(n_shape_functions); compute_face_data (update_flags, @@ -780,34 +780,36 @@ MappingQ1::fill_fe_values ( if (dim==spacedim) JxW_values[point] = determinant(data.contravariant[point])*weights[point]; - - if ( (dim==1) && (spacedim==2) ) + else if ( (dim==1) && (spacedim==2) ) { data.contravariant[point]=transpose(data.contravariant[point]); JxW_values[point] = data.contravariant[point][0].norm()*weights[point]; if(update_flags & update_normal_vectors) - { - normal_vectors[point][0]=-data.contravariant[point][0][1] - /data.contravariant[point][0].norm(); - normal_vectors[point][1]=data.contravariant[point][0][0] - /data.contravariant[point][0].norm(); - } + { + normal_vectors[point][0] + = -(data.contravariant[point][0][1] + / + data.contravariant[point][0].norm()); + normal_vectors[point][1] + = (data.contravariant[point][0][0] + / + data.contravariant[point][0].norm()); + } } - if ( (dim==2) && (spacedim==3) ) + else if ( (dim==2) && (spacedim==3) ) { data.contravariant[point]=transpose(data.contravariant[point]); cross_product(data.contravariant[point][2], data.contravariant[point][0], - data.contravariant[point][1] - ); + data.contravariant[point][1]); JxW_values[point] = data.contravariant[point][2].norm()*weights[point]; //the cell normal vector //(normal to the surface) //is stored in the 3d //subtensor of the contravariant tensor - data.contravariant[point][2]/=data.contravariant[point][2].norm(); + data.contravariant[point][2] /= data.contravariant[point][2].norm(); if(update_flags & update_normal_vectors) normal_vectors[point]=data.contravariant[point][2]; } @@ -1086,16 +1088,18 @@ MappingQ1::compute_fill_face ( template void -MappingQ1::fill_fe_face_values (const typename Triangulation::cell_iterator &cell, - const unsigned int face_no, - const Quadrature &q, - typename Mapping::InternalDataBase &mapping_data, - std::vector > &quadrature_points, - std::vector &JxW_values, - std::vector > &boundary_forms, - std::vector > &normal_vectors) const +MappingQ1:: +fill_fe_face_values (const typename Triangulation::cell_iterator &cell, + const unsigned int face_no, + const Quadrature &q, + typename Mapping::InternalDataBase &mapping_data, + std::vector > &quadrature_points, + std::vector &JxW_values, + std::vector > &boundary_forms, + std::vector > &normal_vectors) const { - // ensure that the following cast is really correct: + // ensure that the following cast + // is really correct: Assert (dynamic_cast(&mapping_data) != 0, ExcInternalError()); InternalData &data = static_cast(mapping_data); @@ -1118,19 +1122,22 @@ MappingQ1::fill_fe_face_values (const typename Triangulation void -MappingQ1::fill_fe_subface_values (const typename Triangulation::cell_iterator &cell, - const unsigned int face_no, - const unsigned int sub_no, - const Quadrature &q, - typename Mapping::InternalDataBase &mapping_data, - std::vector > &quadrature_points, - std::vector &JxW_values, - std::vector > &boundary_forms, - std::vector > &normal_vectors) const +MappingQ1:: +fill_fe_subface_values (const typename Triangulation::cell_iterator &cell, + const unsigned int face_no, + const unsigned int sub_no, + const Quadrature &q, + typename Mapping::InternalDataBase &mapping_data, + std::vector > &quadrature_points, + std::vector &JxW_values, + std::vector > &boundary_forms, + std::vector > &normal_vectors) const { - // ensure that the following cast is really correct: + // ensure that the following cast + // is really correct: Assert (dynamic_cast(&mapping_data) != 0, ExcInternalError()); InternalData &data = static_cast(mapping_data); -- 2.39.5