From d512e44e92c9a4d79f9af81ba0c1971a3c047f34 Mon Sep 17 00:00:00 2001 From: Wolfgang Bangerth Date: Fri, 2 Jun 2017 10:32:36 -0600 Subject: [PATCH] Change some indentation oddities. The majority of these are related to space before comma. I did all of this by first running astyle 3.0.1 to see what it changes, and then running astyle 2.04 as usual again. 3.0.1 fixes up a few oddities that 2.04 doesn't undo, and most of these are probably worthwhile keeping. There are some corner cases where we had purposefully aligned commas with leading spaces, and one could consider not making this change, or updating it by hand. But I don't feel strongly enough about this to really go to lengths here. --- examples/step-24/step-24.cc | 2 +- examples/step-45/step-45.cc | 2 +- examples/step-47/step-47.cc | 2 +- include/deal.II/base/tensor_deprecated.h | 8 +- include/deal.II/dofs/dof_accessor.templates.h | 8 +- include/deal.II/fe/fe_poly_face.templates.h | 2 +- include/deal.II/grid/tria.h | 2 +- .../deal.II/grid/tria_accessor.templates.h | 4 +- include/deal.II/lac/block_sparsity_pattern.h | 10 +-- include/deal.II/lac/diagonal_matrix.h | 2 +- include/deal.II/lac/la_vector.templates.h | 2 +- include/deal.II/lac/solver_gmres.h | 2 +- .../deal.II/matrix_free/evaluation_kernels.h | 2 +- include/deal.II/matrix_free/matrix_free.h | 40 +++++----- include/deal.II/meshworker/assembler.h | 4 +- .../deal.II/numerics/vector_tools.templates.h | 6 +- include/deal.II/physics/transformations.h | 4 +- source/base/tensor_product_polynomials.cc | 6 +- .../tensor_product_polynomials_bubbles.cc | 2 +- .../base/tensor_product_polynomials_const.cc | 2 +- source/dofs/dof_tools_constraints.inst.in | 4 +- source/fe/fe.cc | 2 +- source/fe/fe_dgp.cc | 2 +- source/fe/fe_dgp_monomial.cc | 2 +- source/fe/fe_dgp_nonparametric.cc | 10 +-- source/fe/fe_dgq.cc | 2 +- source/fe/fe_face.cc | 8 +- source/fe/fe_nothing.cc | 8 +- source/fe/fe_p1nc.cc | 2 +- source/fe/fe_poly_tensor.cc | 2 +- source/fe/fe_q_base.cc | 2 +- source/fe/fe_system.cc | 4 +- source/fe/fe_tools.inst.in | 6 +- source/fe/fe_values.cc | 2 +- source/fe/mapping_fe_field.cc | 4 +- source/fe/mapping_q.cc | 4 +- source/fe/mapping_q1_eulerian.cc | 2 +- source/fe/mapping_q_eulerian.cc | 2 +- source/grid/grid_generator.cc | 74 +++++++++---------- source/grid/grid_tools.cc | 20 ++--- source/grid/grid_tools.inst.in | 2 +- source/grid/tria.cc | 10 +-- source/lac/constraint_matrix.cc | 2 +- source/lac/petsc_parallel_sparse_matrix.cc | 4 +- source/lac/petsc_precondition.cc | 4 +- source/lac/sparsity_pattern.cc | 2 +- source/lac/trilinos_sparse_matrix.cc | 2 +- source/numerics/error_estimator.inst.in | 16 ++-- source/numerics/error_estimator_1d.inst.in | 16 ++-- source/opencascade/utilities.cc | 2 +- tests/base/product_type_04.cc | 4 +- tests/base/product_type_04_symmetric.cc | 2 +- tests/dofs/interpolate_q_system_02.cc | 2 +- tests/dofs/interpolate_q_system_mask_02.cc | 2 +- tests/fe/fe_enriched_compare_to_fe_system.cc | 2 +- .../fe/fe_enriched_compare_to_fe_system_2.cc | 6 +- tests/full_matrix/full_matrix_56.cc | 2 +- tests/gla/vec_03.cc | 2 +- .../grid/build_triangulation_from_patch_01.cc | 2 +- .../grid/build_triangulation_from_patch_02.cc | 2 +- .../grid/build_triangulation_from_patch_03.cc | 2 +- .../grid/build_triangulation_from_patch_04.cc | 2 +- .../get_cells_at_coarsest_common_level_02.cc | 2 +- tests/grid/grid_test.cc | 2 +- tests/hp/fe_nothing_18.cc | 4 +- tests/integrators/advection_01.cc | 4 +- tests/lac/constraints.cc | 2 +- tests/lac/schur_complement_05.cc | 2 +- tests/matrix_free/create_mesh.h | 4 +- tests/matrix_free/matrix_vector_stokes.cc | 2 +- .../matrix_free/matrix_vector_stokes_qdg0.cc | 2 +- tests/mpi/muelu_periodicity.cc | 2 +- tests/mpi/periodic_neighbor_01.cc | 2 +- tests/mpi/periodicity_02.cc | 2 +- tests/mpi/periodicity_03.cc | 2 +- .../trilinos/trilinos_sparsity_pattern_02.cc | 2 +- 76 files changed, 199 insertions(+), 199 deletions(-) diff --git a/examples/step-24/step-24.cc b/examples/step-24/step-24.cc index 4ac23f64bf..c97e9dd8f2 100644 --- a/examples/step-24/step-24.cc +++ b/examples/step-24/step-24.cc @@ -518,7 +518,7 @@ namespace Step24 G2.add (wave_speed, tmp); system_rhs_p = G1; - system_rhs_p.add(time_step * theta , G2); + system_rhs_p.add(time_step * theta, G2); solve_p (); diff --git a/examples/step-45/step-45.cc b/examples/step-45/step-45.cc index e54b220b57..a14ff40b1c 100644 --- a/examples/step-45/step-45.cc +++ b/examples/step-45/step-45.cc @@ -294,7 +294,7 @@ namespace Step45 mpi_communicator (MPI_COMM_WORLD), triangulation (mpi_communicator), fe (FE_Q(degree+1), dim, - FE_Q(degree) , 1), + FE_Q(degree), 1), dof_handler (triangulation), pcout (std::cout, Utilities::MPI::this_mpi_process(mpi_communicator) == 0), diff --git a/examples/step-47/step-47.cc b/examples/step-47/step-47.cc index 18d23d13fd..62712a3536 100644 --- a/examples/step-47/step-47.cc +++ b/examples/step-47/step-47.cc @@ -86,7 +86,7 @@ namespace Step47 bool interface_intersects_cell (const typename Triangulation::cell_iterator &cell) const; std::pair > compute_quadrature(const Quadrature &plain_quadrature, const typename hp::DoFHandler::active_cell_iterator &cell, const std::vector &level_set_values); void append_quadrature(const Quadrature &plain_quadrature, - const std::vector > &v , + const std::vector > &v, std::vector > &xfem_points, std::vector &xfem_weights); diff --git a/include/deal.II/base/tensor_deprecated.h b/include/deal.II/base/tensor_deprecated.h index 6f3ac96ac9..3e55e37591 100644 --- a/include/deal.II/base/tensor_deprecated.h +++ b/include/deal.II/base/tensor_deprecated.h @@ -132,8 +132,8 @@ void contract (Tensor<3,dim,Number> &dest, template inline void contract (Tensor &dest, - const Tensor &src1, - const Tensor &src2) DEAL_II_DEPRECATED; + const Tensor &src1, + const Tensor &src2) DEAL_II_DEPRECATED; /** * Contract a tensor of rank 1 with a tensor of rank 1 and return the result. @@ -433,8 +433,8 @@ void contract (Tensor<3,dim,Number> &dest, template inline void contract (Tensor &dest, - const Tensor &src1, - const Tensor &src2) + const Tensor &src1, + const Tensor &src2) { TensorAccessors::internal::ReorderedIndexView<0, rank_2, const Tensor > reordered = TensorAccessors::reordered_index_view<0, rank_2>(src2); diff --git a/include/deal.II/dofs/dof_accessor.templates.h b/include/deal.II/dofs/dof_accessor.templates.h index 5a082e200c..ea91aa3caf 100644 --- a/include/deal.II/dofs/dof_accessor.templates.h +++ b/include/deal.II/dofs/dof_accessor.templates.h @@ -867,7 +867,7 @@ namespace internal static unsigned int n_active_fe_indices (const dealii::hp::DoFHandler<2,spacedim> &dof_handler, - const unsigned int , + const unsigned int, const unsigned int obj_index, const dealii::internal::int2type<1> &) { @@ -1017,7 +1017,7 @@ namespace internal static unsigned int n_active_fe_indices (const dealii::hp::DoFHandler<3,spacedim> &dof_handler, - const unsigned int , + const unsigned int, const unsigned int obj_index, const dealii::internal::int2type<2> &) { @@ -2302,8 +2302,8 @@ template