From: Wolfgang Bangerth Date: Wed, 25 Sep 2013 22:59:03 +0000 (+0000) Subject: Merge from mainline. X-Git-Tag: v8.1.0~570^2~201 X-Git-Url: https://gitweb.dealii.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=cd5b3fbe440ea659118b2cc41ae81653c967a27a;p=dealii.git Merge from mainline. git-svn-id: https://svn.dealii.org/branches/branch_port_the_testsuite@30936 0785d39b-7218-0410-832d-ea1e28bc413d --- cd5b3fbe440ea659118b2cc41ae81653c967a27a diff --cc deal.II/examples/step-42/step-42.cc index 2613a848b2,2613a848b2..a9139efc1a --- a/deal.II/examples/step-42/step-42.cc +++ b/deal.II/examples/step-42/step-42.cc @@@ -943,7 -943,7 +943,7 @@@ namespace Step4 FullMatrix cell_matrix(dofs_per_cell, dofs_per_cell); Vector cell_rhs(dofs_per_cell); -- std::vector local_dof_indices(dofs_per_cell); ++ std::vector local_dof_indices(dofs_per_cell); typename DoFHandler::active_cell_iterator cell = dof_handler.begin_active(), endc = dof_handler.end(); @@@ -1069,7 -1069,7 +1069,7 @@@ Vector cell_rhs(dofs_per_cell); -- std::vector local_dof_indices(dofs_per_cell); ++ std::vector local_dof_indices(dofs_per_cell); const FEValuesExtractors::Vector displacement(0); @@@ -1198,7 -1198,7 +1198,7 @@@ for (unsigned i = 0; i < dim; i++) ones[i] = 1.0; -- std::vector local_dof_indices(dofs_per_cell); ++ std::vector local_dof_indices(dofs_per_cell); const FEValuesExtractors::Vector displacement(0); diff --cc deal.II/examples/step-50/step-50.cc index 8d30f71d4a,8d30f71d4a..797d5bac73 --- a/deal.II/examples/step-50/step-50.cc +++ b/deal.II/examples/step-50/step-50.cc @@@ -486,7 -486,7 +486,7 @@@ namespace Step5 FullMatrix cell_matrix (dofs_per_cell, dofs_per_cell); Vector cell_rhs (dofs_per_cell); -- std::vector local_dof_indices (dofs_per_cell); ++ std::vector local_dof_indices (dofs_per_cell); const Coefficient coefficient; std::vector coefficient_values (n_q_points); @@@ -561,7 -561,7 +561,7 @@@ FullMatrix cell_matrix (dofs_per_cell, dofs_per_cell); -- std::vector local_dof_indices (dofs_per_cell); ++ std::vector local_dof_indices (dofs_per_cell); const Coefficient coefficient; std::vector coefficient_values (n_q_points);