From 5664648fa6fa6a75231fdaf376bb9dab3e56f2fb Mon Sep 17 00:00:00 2001 From: heister Date: Wed, 13 Feb 2013 15:19:38 +0000 Subject: [PATCH] avoid deprecated functions/headers in steps git-svn-id: https://svn.dealii.org/trunk@28376 0785d39b-7218-0410-832d-ea1e28bc413d --- deal.II/examples/step-32/step-32.cc | 6 +++--- deal.II/examples/step-34/step-34.cc | 6 +++--- deal.II/examples/step-35/step-35.cc | 2 +- deal.II/examples/step-44/step-44.cc | 2 +- 4 files changed, 8 insertions(+), 8 deletions(-) diff --git a/deal.II/examples/step-32/step-32.cc b/deal.II/examples/step-32/step-32.cc index 1d369237b1..e67bc9f1d8 100644 --- a/deal.II/examples/step-32/step-32.cc +++ b/deal.II/examples/step-32/step-32.cc @@ -1738,7 +1738,7 @@ namespace Step32 matrix_for_bc); } - rhs.compress (Add); + rhs.compress (VectorOperation::add); // Now that we have the right linear system, we solve it using the CG // method with a simple Jacobi preconditioner: @@ -2433,7 +2433,7 @@ namespace Step32 StokesSystem (stokes_fe)); stokes_matrix.compress(); - stokes_rhs.compress(Add); + stokes_rhs.compress(VectorOperation::add); rebuild_stokes_matrix = false; @@ -2843,7 +2843,7 @@ namespace Step32 Assembly::CopyData:: TemperatureRHS (temperature_fe)); - temperature_rhs.compress(Add); + temperature_rhs.compress(VectorOperation::add); } diff --git a/deal.II/examples/step-34/step-34.cc b/deal.II/examples/step-34/step-34.cc index 11aee7ff27..e5b9c78bb2 100644 --- a/deal.II/examples/step-34/step-34.cc +++ b/deal.II/examples/step-34/step-34.cc @@ -591,7 +591,7 @@ namespace Step34 cell->get_dof_indices(local_dof_indices); const std::vector > &q_points = fe_v.get_quadrature_points(); - const std::vector > &normals = fe_v.get_cell_normal_vectors(); + const std::vector > &normals = fe_v.get_normal_vectors(); wind.vector_value_list(q_points, cell_wind); // We then form the integral over the current cell for all degrees of @@ -676,7 +676,7 @@ namespace Step34 std::vector > singular_cell_wind( singular_quadrature.size(), Vector(dim) ); - const std::vector > &singular_normals = fe_v_singular.get_cell_normal_vectors(); + const std::vector > &singular_normals = fe_v_singular.get_normal_vectors(); const std::vector > &singular_q_points = fe_v_singular.get_quadrature_points(); wind.vector_value_list(singular_q_points, singular_cell_wind); @@ -947,7 +947,7 @@ namespace Step34 fe_v.reinit(cell); const std::vector > &q_points = fe_v.get_quadrature_points(); - const std::vector > &normals = fe_v.get_cell_normal_vectors(); + const std::vector > &normals = fe_v.get_normal_vectors(); cell->get_dof_indices(dofs); fe_v.get_function_values(phi, local_phi); diff --git a/deal.II/examples/step-35/step-35.cc b/deal.II/examples/step-35/step-35.cc index b618ff35b9..a85eaa45d9 100644 --- a/deal.II/examples/step-35/step-35.cc +++ b/deal.II/examples/step-35/step-35.cc @@ -33,6 +33,7 @@ #include #include #include +#include #include #include @@ -46,7 +47,6 @@ #include #include #include -#include #include #include diff --git a/deal.II/examples/step-44/step-44.cc b/deal.II/examples/step-44/step-44.cc index 68678b7b4b..fb1014185e 100644 --- a/deal.II/examples/step-44/step-44.cc +++ b/deal.II/examples/step-44/step-44.cc @@ -21,7 +21,6 @@ #include #include -#include #include #include @@ -45,6 +44,7 @@ #include #include #include +#include #include #include -- 2.39.5