From c8daa47c6eff164be57b384609108c31b94f9968 Mon Sep 17 00:00:00 2001 From: Jean-Paul Pelteret Date: Thu, 18 Feb 2016 18:25:16 +0200 Subject: [PATCH] Astyle... finally... --- examples/step-44/step-44.cc | 216 ++++++++++++++++++------------------ 1 file changed, 108 insertions(+), 108 deletions(-) diff --git a/examples/step-44/step-44.cc b/examples/step-44/step-44.cc index 191eca42d3..2ea8c9e128 100644 --- a/examples/step-44/step-44.cc +++ b/examples/step-44/step-44.cc @@ -724,7 +724,7 @@ namespace Step44 void setup_lqp (const Parameters::AllParameters ¶meters) { material.reset(new Material_Compressible_Neo_Hook_Three_Field(parameters.mu, - parameters.nu)); + parameters.nu)); update_values(Tensor<2, dim>(), 0.0, 1.0); } @@ -1534,25 +1534,25 @@ namespace Step44 for (; cell != endc; ++cell) for (unsigned int face = 0; face < GeometryInfo::faces_per_cell; ++face) - { - if (cell->face(face)->at_boundary() == true - && - cell->face(face)->center()[1] == 1.0 * parameters.scale) { - if (dim==3) - { - if (cell->face(face)->center()[0] < 0.5 * parameters.scale - && - cell->face(face)->center()[2] < 0.5 * parameters.scale) - cell->face(face)->set_boundary_id(6); - } - else - { - if (cell->face(face)->center()[0] < 0.5 * parameters.scale) - cell->face(face)->set_boundary_id(6); - } + if (cell->face(face)->at_boundary() == true + && + cell->face(face)->center()[1] == 1.0 * parameters.scale) + { + if (dim==3) + { + if (cell->face(face)->center()[0] < 0.5 * parameters.scale + && + cell->face(face)->center()[2] < 0.5 * parameters.scale) + cell->face(face)->set_boundary_id(6); + } + else + { + if (cell->face(face)->center()[0] < 0.5 * parameters.scale) + cell->face(face)->set_boundary_id(6); + } + } } - } } @@ -2508,102 +2508,102 @@ namespace Step44 } if (dim==3) - { - const FEValuesExtractors::Scalar z_displacement(2); - - { - const int boundary_id = 3; - - if (apply_dirichlet_bc == true) - VectorTools::interpolate_boundary_values(dof_handler_ref, - boundary_id, - ZeroFunction(n_components), - constraints, - (fe.component_mask(x_displacement) - | - fe.component_mask(z_displacement))); - else - VectorTools::interpolate_boundary_values(dof_handler_ref, - boundary_id, - ZeroFunction(n_components), - constraints, - (fe.component_mask(x_displacement) - | - fe.component_mask(z_displacement))); - } { - const int boundary_id = 4; - - if (apply_dirichlet_bc == true) - VectorTools::interpolate_boundary_values(dof_handler_ref, - boundary_id, - ZeroFunction(n_components), - constraints, - fe.component_mask(z_displacement)); - else - VectorTools::interpolate_boundary_values(dof_handler_ref, - boundary_id, - ZeroFunction(n_components), - constraints, - fe.component_mask(z_displacement)); - } + const FEValuesExtractors::Scalar z_displacement(2); - { - const int boundary_id = 6; - - if (apply_dirichlet_bc == true) - VectorTools::interpolate_boundary_values(dof_handler_ref, - boundary_id, - ZeroFunction(n_components), - constraints, - (fe.component_mask(x_displacement) - | - fe.component_mask(z_displacement))); - else - VectorTools::interpolate_boundary_values(dof_handler_ref, - boundary_id, - ZeroFunction(n_components), - constraints, - (fe.component_mask(x_displacement) - | - fe.component_mask(z_displacement))); + { + const int boundary_id = 3; + + if (apply_dirichlet_bc == true) + VectorTools::interpolate_boundary_values(dof_handler_ref, + boundary_id, + ZeroFunction(n_components), + constraints, + (fe.component_mask(x_displacement) + | + fe.component_mask(z_displacement))); + else + VectorTools::interpolate_boundary_values(dof_handler_ref, + boundary_id, + ZeroFunction(n_components), + constraints, + (fe.component_mask(x_displacement) + | + fe.component_mask(z_displacement))); + } + { + const int boundary_id = 4; + + if (apply_dirichlet_bc == true) + VectorTools::interpolate_boundary_values(dof_handler_ref, + boundary_id, + ZeroFunction(n_components), + constraints, + fe.component_mask(z_displacement)); + else + VectorTools::interpolate_boundary_values(dof_handler_ref, + boundary_id, + ZeroFunction(n_components), + constraints, + fe.component_mask(z_displacement)); + } + + { + const int boundary_id = 6; + + if (apply_dirichlet_bc == true) + VectorTools::interpolate_boundary_values(dof_handler_ref, + boundary_id, + ZeroFunction(n_components), + constraints, + (fe.component_mask(x_displacement) + | + fe.component_mask(z_displacement))); + else + VectorTools::interpolate_boundary_values(dof_handler_ref, + boundary_id, + ZeroFunction(n_components), + constraints, + (fe.component_mask(x_displacement) + | + fe.component_mask(z_displacement))); + } } - } else - { { - const int boundary_id = 3; - - if (apply_dirichlet_bc == true) - VectorTools::interpolate_boundary_values(dof_handler_ref, - boundary_id, - ZeroFunction(n_components), - constraints, - (fe.component_mask(x_displacement))); - else - VectorTools::interpolate_boundary_values(dof_handler_ref, - boundary_id, - ZeroFunction(n_components), - constraints, - (fe.component_mask(x_displacement))); - } - { - const int boundary_id = 6; - - if (apply_dirichlet_bc == true) - VectorTools::interpolate_boundary_values(dof_handler_ref, - boundary_id, - ZeroFunction(n_components), - constraints, - (fe.component_mask(x_displacement))); - else - VectorTools::interpolate_boundary_values(dof_handler_ref, - boundary_id, - ZeroFunction(n_components), - constraints, - (fe.component_mask(x_displacement))); + { + const int boundary_id = 3; + + if (apply_dirichlet_bc == true) + VectorTools::interpolate_boundary_values(dof_handler_ref, + boundary_id, + ZeroFunction(n_components), + constraints, + (fe.component_mask(x_displacement))); + else + VectorTools::interpolate_boundary_values(dof_handler_ref, + boundary_id, + ZeroFunction(n_components), + constraints, + (fe.component_mask(x_displacement))); + } + { + const int boundary_id = 6; + + if (apply_dirichlet_bc == true) + VectorTools::interpolate_boundary_values(dof_handler_ref, + boundary_id, + ZeroFunction(n_components), + constraints, + (fe.component_mask(x_displacement))); + else + VectorTools::interpolate_boundary_values(dof_handler_ref, + boundary_id, + ZeroFunction(n_components), + constraints, + (fe.component_mask(x_displacement))); + } } - } constraints.close(); } -- 2.39.5