From: Denis Davydov Date: Fri, 3 Apr 2015 07:13:04 +0000 (+0200) Subject: indentation with astyle 2.04 instead of 2.05 X-Git-Tag: v8.3.0-rc1~184^2~6 X-Git-Url: https://gitweb.dealii.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=acddad27302d66aa2adb575b8b04060ecea8dec5;p=dealii.git indentation with astyle 2.04 instead of 2.05 --- diff --git a/include/deal.II/numerics/fe_field_function.templates.h b/include/deal.II/numerics/fe_field_function.templates.h index 28d8e4a911..a905771c09 100644 --- a/include/deal.II/numerics/fe_field_function.templates.h +++ b/include/deal.II/numerics/fe_field_function.templates.h @@ -88,7 +88,7 @@ namespace Functions update_values); fe_v.reinit(cell); std::vector< Vector > - vvalues (1, Vector(values.size())); + vvalues (1, Vector(values.size())); fe_v.get_function_values(data_vector, vvalues); values = vvalues[0]; } @@ -197,7 +197,7 @@ namespace Functions update_hessians); fe_v.reinit(cell); std::vector< Vector > - vvalues (1, Vector(values.size())); + vvalues (1, Vector(values.size())); fe_v.get_function_laplacians(data_vector, vvalues); values = vvalues[0]; } diff --git a/include/deal.II/numerics/vector_tools.templates.h b/include/deal.II/numerics/vector_tools.templates.h index 05892ca6f0..23d525bde0 100644 --- a/include/deal.II/numerics/vector_tools.templates.h +++ b/include/deal.II/numerics/vector_tools.templates.h @@ -6070,9 +6070,9 @@ namespace VectorTools IDScratchData::IDScratchData (const IDScratchData &data) : x_fe_values(data.x_fe_values.get_mapping_collection(), - data.x_fe_values.get_fe_collection(), - data.x_fe_values.get_quadrature_collection(), - data.x_fe_values.get_update_flags()) + data.x_fe_values.get_fe_collection(), + data.x_fe_values.get_quadrature_collection(), + data.x_fe_values.get_update_flags()) {} template diff --git a/source/fe/fe_values.cc b/source/fe/fe_values.cc index d75931d1e2..44751451d6 100644 --- a/source/fe/fe_values.cc +++ b/source/fe/fe_values.cc @@ -3371,10 +3371,10 @@ FEValues::FEValues (const Mapping &mapping, const UpdateFlags update_flags) : FEValuesBase (q.size(), - fe.dofs_per_cell, - update_default, - mapping, - fe), + fe.dofs_per_cell, + update_default, + mapping, + fe), quadrature (q) { initialize (update_flags); @@ -3388,10 +3388,10 @@ FEValues::FEValues (const FiniteElement &fe, const UpdateFlags update_flags) : FEValuesBase (q.size(), - fe.dofs_per_cell, - update_default, - StaticMappingQ1::mapping, - fe), + fe.dofs_per_cell, + update_default, + StaticMappingQ1::mapping, + fe), quadrature (q) { initialize (update_flags); @@ -3567,10 +3567,10 @@ FEFaceValuesBase::FEFaceValuesBase (const unsigned int n_q_points, const Quadrature& quadrature) : FEValuesBase (n_q_points, - dofs_per_cell, - update_default, - mapping, - fe), + dofs_per_cell, + update_default, + mapping, + fe), quadrature(quadrature) {} @@ -3613,10 +3613,10 @@ FEFaceValues::FEFaceValues (const Mapping &map const UpdateFlags update_flags) : FEFaceValuesBase (quadrature.size(), - fe.dofs_per_cell, - update_flags, - mapping, - fe, quadrature) + fe.dofs_per_cell, + update_flags, + mapping, + fe, quadrature) { initialize (update_flags); } @@ -3629,10 +3629,10 @@ FEFaceValues::FEFaceValues (const FiniteElement &fe, const UpdateFlags update_flags) : FEFaceValuesBase (quadrature.size(), - fe.dofs_per_cell, - update_flags, - StaticMappingQ1::mapping, - fe, quadrature) + fe.dofs_per_cell, + update_flags, + StaticMappingQ1::mapping, + fe, quadrature) { initialize (update_flags); } @@ -3772,10 +3772,10 @@ FESubfaceValues::FESubfaceValues (const Mapping const UpdateFlags update_flags) : FEFaceValuesBase (quadrature.size(), - fe.dofs_per_cell, - update_flags, - mapping, - fe, quadrature) + fe.dofs_per_cell, + update_flags, + mapping, + fe, quadrature) { initialize (update_flags); } @@ -3788,10 +3788,10 @@ FESubfaceValues::FESubfaceValues (const FiniteElement (quadrature.size(), - fe.dofs_per_cell, - update_flags, - StaticMappingQ1::mapping, - fe, quadrature) + fe.dofs_per_cell, + update_flags, + StaticMappingQ1::mapping, + fe, quadrature) { initialize (update_flags); } diff --git a/source/numerics/error_estimator.cc b/source/numerics/error_estimator.cc index 37ce002fca..f73a36ead9 100644 --- a/source/numerics/error_estimator.cc +++ b/source/numerics/error_estimator.cc @@ -221,38 +221,38 @@ namespace internal finite_element (fe), face_quadratures (face_quadratures), fe_face_values_cell (mapping, - finite_element, - face_quadratures, - update_gradients | - update_JxW_values | - (need_quadrature_points ? - update_quadrature_points : - UpdateFlags()) | - update_normal_vectors), + finite_element, + face_quadratures, + update_gradients | + update_JxW_values | + (need_quadrature_points ? + update_quadrature_points : + UpdateFlags()) | + update_normal_vectors), fe_face_values_neighbor (mapping, - finite_element, - face_quadratures, - update_gradients), + finite_element, + face_quadratures, + update_gradients), fe_subface_values (mapping, - finite_element, - face_quadratures, - update_gradients), + finite_element, + face_quadratures, + update_gradients), phi (n_solution_vectors, - std::vector > - (face_quadratures.max_n_quadrature_points(), - std::vector (fe.n_components()))), + std::vector > + (face_quadratures.max_n_quadrature_points(), + std::vector (fe.n_components()))), psi (n_solution_vectors, - std::vector > > - (face_quadratures.max_n_quadrature_points(), - std::vector > (fe.n_components()))), + std::vector > > + (face_quadratures.max_n_quadrature_points(), + std::vector > (fe.n_components()))), neighbor_psi (n_solution_vectors, - std::vector > > - (face_quadratures.max_n_quadrature_points(), - std::vector > (fe.n_components()))), + std::vector > > + (face_quadratures.max_n_quadrature_points(), + std::vector > (fe.n_components()))), normal_vectors (face_quadratures.max_n_quadrature_points()), coefficient_values1 (face_quadratures.max_n_quadrature_points()), coefficient_values (face_quadratures.max_n_quadrature_points(), - dealii::Vector (fe.n_components())), + dealii::Vector (fe.n_components())), JxW_values (face_quadratures.max_n_quadrature_points()), subdomain_id (subdomain_id), material_id (material_id),