From 301475d875ebe1520cd5c4edd9ec3a4502f90140 Mon Sep 17 00:00:00 2001 From: Denis Davydov Date: Thu, 2 Apr 2015 14:48:53 +0200 Subject: [PATCH] indentation --- .../numerics/fe_field_function.templates.h | 2 +- .../deal.II/numerics/vector_tools.templates.h | 6 +- source/fe/fe_values.cc | 60 +++++++++---------- source/lac/vector.cc | 6 +- source/numerics/data_out_dof_data.cc | 10 ++-- source/numerics/derivative_approximation.cc | 4 +- source/numerics/error_estimator.cc | 48 +++++++-------- 7 files changed, 68 insertions(+), 68 deletions(-) diff --git a/include/deal.II/numerics/fe_field_function.templates.h b/include/deal.II/numerics/fe_field_function.templates.h index 6b85b89271..0831775511 100644 --- a/include/deal.II/numerics/fe_field_function.templates.h +++ b/include/deal.II/numerics/fe_field_function.templates.h @@ -321,7 +321,7 @@ namespace Functions std::vector< Tensor<1,dim> > &viq = values[maps[i][q]]; const unsigned int s = vgrads[q].size(); viq.resize(s); - for (unsigned int l=0;l::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 94025418a0..d75931d1e2 100644 --- a/source/fe/fe_values.cc +++ b/source/fe/fe_values.cc @@ -509,7 +509,7 @@ namespace FEValuesViews &shape_derivatives[shape_function_data[shape_function].row_index][0]; for (unsigned int q_point=0; q_point >::type(*shape_derivative_ptr++); + typename ProductType >::type(*shape_derivative_ptr++); } } @@ -686,7 +686,7 @@ namespace FEValuesViews &shape_gradients[snc][0]; for (unsigned int q_point=0; q_point >::type (symmetrize_single_row(comp, *shape_gradient_ptr++)); + typename ProductType >::type (symmetrize_single_row(comp, *shape_gradient_ptr++)); } else for (unsigned int q_point=0; q_point::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/lac/vector.cc b/source/lac/vector.cc index 18dee6b06d..e95b25dcee 100644 --- a/source/lac/vector.cc +++ b/source/lac/vector.cc @@ -25,13 +25,13 @@ namespace internal { namespace Vector { - template void copy_vector (const dealii::Vector&, - dealii::Vector&); + template void copy_vector (const dealii::Vector &, + dealii::Vector &); } } template -void Vector::reinit(const Vector&, const bool); +void Vector::reinit(const Vector &, const bool); // do a few functions that currently don't fit the scheme because they have diff --git a/source/numerics/data_out_dof_data.cc b/source/numerics/data_out_dof_data.cc index d16a21731e..c232c21c50 100644 --- a/source/numerics/data_out_dof_data.cc +++ b/source/numerics/data_out_dof_data.cc @@ -565,7 +565,7 @@ namespace internal //FIXME std::vector tmp (patch_values.size()); fe_patch_values.get_function_values (*vector, tmp); - for (unsigned int i = 0; i < tmp.size();i++) + for (unsigned int i = 0; i < tmp.size(); i++) patch_values[i] = tmp[i]; } @@ -579,11 +579,11 @@ namespace internal { //FIXME std::vector > > tmp(patch_gradients_system.size()); - for (unsigned int i = 0; i < tmp.size();i++) + for (unsigned int i = 0; i < tmp.size(); i++) tmp[i].resize(patch_gradients_system.size()); fe_patch_values.get_function_gradients (*vector, tmp); - for (unsigned int i = 0; i < tmp.size();i++) - for (unsigned int j = 0; j < tmp[i].size();j++) + for (unsigned int i = 0; i < tmp.size(); i++) + for (unsigned int j = 0; j < tmp[i].size(); j++) patch_gradients_system[i][j] = tmp[i][j]; } @@ -599,7 +599,7 @@ namespace internal std::vector > tmp; tmp.resize(patch_gradients.size()); fe_patch_values.get_function_gradients (*vector, tmp); - for (unsigned int i = 0; i < tmp.size();i++) + for (unsigned int i = 0; i < tmp.size(); i++) patch_gradients[i] = tmp[i]; } diff --git a/source/numerics/derivative_approximation.cc b/source/numerics/derivative_approximation.cc index 05c97a418a..331296a8d8 100644 --- a/source/numerics/derivative_approximation.cc +++ b/source/numerics/derivative_approximation.cc @@ -256,7 +256,7 @@ namespace DerivativeApproximation else { std::vector> > values - (1, std::vector>(fe_values.get_fe().n_components())); + (1, std::vector>(fe_values.get_fe().n_components())); fe_values.get_function_gradients (solution, values); return ProjectedDerivative(values[0][component]); }; @@ -599,7 +599,7 @@ namespace DerivativeApproximation else { std::vector> > values - (1, std::vector>(fe_values.get_fe().n_components())); + (1, std::vector>(fe_values.get_fe().n_components())); fe_values.get_function_hessians (solution, values); return ProjectedDerivative(values[0][component]); }; diff --git a/source/numerics/error_estimator.cc b/source/numerics/error_estimator.cc index f73a36ead9..37ce002fca 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), -- 2.39.5