From: Wolfgang Bangerth Date: Thu, 4 May 2017 22:06:26 +0000 (-0600) Subject: Avoid using deprecated functions in the testsuite. X-Git-Tag: v9.0.0-rc1~1620^2 X-Git-Url: https://gitweb.dealii.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=79e697200be1023ea6c3447457d440f5d6f3c9ad;p=dealii.git Avoid using deprecated functions in the testsuite. --- diff --git a/tests/bits/distorted_mapped_cells_01.cc b/tests/bits/distorted_mapped_cells_01.cc index fae19e0e07..f4140a3814 100644 --- a/tests/bits/distorted_mapped_cells_01.cc +++ b/tests/bits/distorted_mapped_cells_01.cc @@ -63,7 +63,7 @@ void test() // this gives a Cartesian cell but in non-standard orientation (x-coordinate // is gone through backwards) - MappingQEulerian mapping(1,displacements, dof_h); + MappingQEulerian mapping(1, dof_h, displacements); QGauss quad(1); FEValues fe_val (mapping, fe, quad, update_JxW_values); double integral = 0.; diff --git a/tests/codim_one/mapping_q_eulerian.cc b/tests/codim_one/mapping_q_eulerian.cc index c8cff0ba25..2d159810ee 100644 --- a/tests/codim_one/mapping_q_eulerian.cc +++ b/tests/codim_one/mapping_q_eulerian.cc @@ -64,7 +64,7 @@ void test(std::string filename, unsigned int degree) grid_out.write_ucd (tria, logfile); QTrapez quad; - MappingQEulerian,spacedim> mapping(degree, shift, shift_dh); + MappingQEulerian,spacedim> mapping(degree, shift_dh, shift); typename Triangulation::active_cell_iterator cell=tria.begin_active(), endc=tria.end() ; diff --git a/tests/mappings/mapping_q_eulerian.cc b/tests/mappings/mapping_q_eulerian.cc index 9293c283c1..560928bbbd 100644 --- a/tests/mappings/mapping_q_eulerian.cc +++ b/tests/mappings/mapping_q_eulerian.cc @@ -123,7 +123,7 @@ double MappingTest::compute_area () { QGauss quadrature_formula(degree+1); - MappingQEulerian mapping(degree,displacements,dof_handler); + MappingQEulerian mapping(degree, dof_handler, displacements); FEValues fe_values (mapping, fe, quadrature_formula, update_JxW_values); diff --git a/tests/mappings/mapping_q_eulerian_01.cc b/tests/mappings/mapping_q_eulerian_01.cc index 913188f9f4..39fb7ef0d3 100644 --- a/tests/mappings/mapping_q_eulerian_01.cc +++ b/tests/mappings/mapping_q_eulerian_01.cc @@ -99,7 +99,7 @@ void test () Displacement(), displacements); - MappingQEulerian euler(2, displacements, dof_handler); + MappingQEulerian euler(2, dof_handler, displacements); // now the actual test DataOut data_out; data_out.attach_dof_handler(dof_handler); diff --git a/tests/mappings/mapping_q_eulerian_02.cc b/tests/mappings/mapping_q_eulerian_02.cc index 37f6d9d823..31e4cf9c6a 100644 --- a/tests/mappings/mapping_q_eulerian_02.cc +++ b/tests/mappings/mapping_q_eulerian_02.cc @@ -101,7 +101,7 @@ void test () Displacement(), displacements); - MappingQEulerian euler(2, displacements, dof_handler); + MappingQEulerian euler(2, dof_handler, displacements); // now the actual test DataOut data_out; data_out.attach_dof_handler(dof_handler); diff --git a/tests/mappings/mapping_q_eulerian_03.cc b/tests/mappings/mapping_q_eulerian_03.cc index 293bfb2b16..ac00c71cab 100644 --- a/tests/mappings/mapping_q_eulerian_03.cc +++ b/tests/mappings/mapping_q_eulerian_03.cc @@ -102,7 +102,7 @@ void test () Displacement(), displacements); - MappingQEulerian euler(2, displacements, dof_handler); + MappingQEulerian euler(2, dof_handler, displacements); // now the actual test DataOut data_out; data_out.attach_dof_handler(dof_handler); diff --git a/tests/mappings/mapping_q_eulerian_05.cc b/tests/mappings/mapping_q_eulerian_05.cc index 2ca3967110..ecc4aafd8e 100644 --- a/tests/mappings/mapping_q_eulerian_05.cc +++ b/tests/mappings/mapping_q_eulerian_05.cc @@ -60,7 +60,7 @@ void test(unsigned int degree) grid_out.write_ucd (tria, logfile); QTrapez quad; - MappingQEulerian,spacedim> mapping(degree,shift, shift_dh); + MappingQEulerian,spacedim> mapping(degree, shift_dh, shift); typename Triangulation::active_cell_iterator cell=tria.begin_active(), endc=tria.end() ; diff --git a/tests/mappings/mapping_q_eulerian_06.cc b/tests/mappings/mapping_q_eulerian_06.cc index e74498d9ac..128242f699 100644 --- a/tests/mappings/mapping_q_eulerian_06.cc +++ b/tests/mappings/mapping_q_eulerian_06.cc @@ -56,7 +56,7 @@ void test(unsigned int degree) shift(i) = 0.1; QGauss quad(degree+1); - MappingQEulerian,spacedim> mapping(degree,shift, shift_dh); + MappingQEulerian,spacedim> mapping(degree, shift_dh, shift); Triangulation::active_cell_iterator cell=tria.begin_active(), endc=tria.end() ; diff --git a/tests/matrix_free/update_mapping_only.cc b/tests/matrix_free/update_mapping_only.cc index 58c5c0e242..aae52cc47c 100644 --- a/tests/matrix_free/update_mapping_only.cc +++ b/tests/matrix_free/update_mapping_only.cc @@ -76,7 +76,7 @@ void test () shift(0) = 0.121; shift(1) = -0.005; } - MappingQEulerian mapping(2,shift,dofh_eulerian); + MappingQEulerian mapping(2, dofh_eulerian, shift); { const QGauss<1> quad (fe_degree+1); diff --git a/tests/metis/metis_01a.cc b/tests/metis/metis_01a.cc index 98a2a65823..90c3ed2859 100644 --- a/tests/metis/metis_01a.cc +++ b/tests/metis/metis_01a.cc @@ -118,10 +118,12 @@ void test () GridGenerator::hyper_cube (triangulation); triangulation.refine_global (2); - SparsityPattern cell_connectivity; + DynamicSparsityPattern cell_connectivity; GridTools::get_face_connectivity_of_cells (triangulation, cell_connectivity); - partition (cell_connectivity, 5); + SparsityPattern sp_cell_connectivity; + sp_cell_connectivity.copy_from (cell_connectivity); + partition (sp_cell_connectivity, 5); } diff --git a/tests/mpi/fe_field_function_03.cc b/tests/mpi/fe_field_function_03.cc index 0271defde3..6f2510fe3e 100644 --- a/tests/mpi/fe_field_function_03.cc +++ b/tests/mpi/fe_field_function_03.cc @@ -186,7 +186,7 @@ void test() else break; } - catch (const typename Functions::FEFieldFunction,TrilinosWrappers::MPI::Vector>::ExcPointNotAvailableHere &) + catch (const VectorTools::ExcPointNotAvailableHere &) { deallog << " ExcPointNotAvailableHere" << std::endl; } diff --git a/tests/numerics/data_out_curved_cells.cc b/tests/numerics/data_out_curved_cells.cc index 5076857ac5..67e8d72ae9 100644 --- a/tests/numerics/data_out_curved_cells.cc +++ b/tests/numerics/data_out_curved_cells.cc @@ -221,7 +221,7 @@ void curved_grid (std::ofstream &out) combined_cell->set_dof_values (dxy, displacements); } // and create the MappingQEulerian - MappingQEulerian<2> euler(2, displacements, cdh); + MappingQEulerian<2> euler(2, cdh, displacements); // now the actual test DataOut<2> data_out; data_out.attach_dof_handler(cdh);