From 93a7a0a3993fe1a91fdaa494aa1d1a8316e30268 Mon Sep 17 00:00:00 2001 From: heister Date: Fri, 1 Mar 2013 16:44:29 +0000 Subject: [PATCH] remove some deprecated stuff git-svn-id: https://svn.dealii.org/trunk@28696 0785d39b-7218-0410-832d-ea1e28bc413d --- tests/mpi/interpolate_03.cc | 1 - tests/mpi/petsc_01.cc | 6 ++---- tests/mpi/trilinos_ghost_01.cc | 2 +- tests/mpi/trilinos_ghost_02.cc | 2 +- tests/mpi/trilinos_ghost_03.cc | 2 +- tests/mpi/trilinos_ghost_03_linfty.cc | 2 +- tests/mpi/trilinos_ghost_05.cc | 2 +- 7 files changed, 7 insertions(+), 10 deletions(-) diff --git a/tests/mpi/interpolate_03.cc b/tests/mpi/interpolate_03.cc index 423bfcf7b9..b8f0298ef7 100644 --- a/tests/mpi/interpolate_03.cc +++ b/tests/mpi/interpolate_03.cc @@ -71,7 +71,6 @@ void test() VectorTools::interpolate (dofh, LinearFunction(), interpolated); - interpolated.compress(); double norm = interpolated.l2_norm(); if (Utilities::MPI::this_mpi_process (MPI_COMM_WORLD) == 0) diff --git a/tests/mpi/petsc_01.cc b/tests/mpi/petsc_01.cc index daa7fec5f3..ecbb3706ff 100644 --- a/tests/mpi/petsc_01.cc +++ b/tests/mpi/petsc_01.cc @@ -80,8 +80,8 @@ void test() int main(int argc, char *argv[]) { - PetscInitialize(&argc,&argv,0,0); - + Utilities::MPI::MPI_InitFinalize mpi_initialization(argc, argv); + if (Utilities::MPI::this_mpi_process (MPI_COMM_WORLD) == 0) { std::ofstream logfile(output_file_for_mpi("petsc_01").c_str()); @@ -93,6 +93,4 @@ int main(int argc, char *argv[]) } else test(); - - PetscFinalize(); } diff --git a/tests/mpi/trilinos_ghost_01.cc b/tests/mpi/trilinos_ghost_01.cc index 6458d55a9f..92ed49f057 100644 --- a/tests/mpi/trilinos_ghost_01.cc +++ b/tests/mpi/trilinos_ghost_01.cc @@ -47,7 +47,7 @@ void test () v(myid*2)=myid*2.0; v(myid*2+1)=myid*2.0+1.0; - v.compress(); + v.compress(VectorOperation::insert); v*=2.0; if (Utilities::MPI::this_mpi_process (MPI_COMM_WORLD) == 0) diff --git a/tests/mpi/trilinos_ghost_02.cc b/tests/mpi/trilinos_ghost_02.cc index cddbf6d610..f875a65916 100644 --- a/tests/mpi/trilinos_ghost_02.cc +++ b/tests/mpi/trilinos_ghost_02.cc @@ -48,7 +48,7 @@ void test () v(myid*2)=myid*2.0; v(myid*2+1)=myid*2.0+1.0; - v.compress(); + v.compress(VectorOperation::insert); // assignment with transfer to ghost v_tmp = v; diff --git a/tests/mpi/trilinos_ghost_03.cc b/tests/mpi/trilinos_ghost_03.cc index 1a092634a3..007a77d848 100644 --- a/tests/mpi/trilinos_ghost_03.cc +++ b/tests/mpi/trilinos_ghost_03.cc @@ -48,7 +48,7 @@ void test () v(myid*2)=1.0; v(myid*2+1)=1.0; - v.compress(); + v.compress(VectorOperation::insert); v_tmp.reinit(v,false,true); diff --git a/tests/mpi/trilinos_ghost_03_linfty.cc b/tests/mpi/trilinos_ghost_03_linfty.cc index d553a18cbc..08eb65c424 100644 --- a/tests/mpi/trilinos_ghost_03_linfty.cc +++ b/tests/mpi/trilinos_ghost_03_linfty.cc @@ -48,7 +48,7 @@ void test () v(myid*2)=myid*2; v(myid*2+1)=myid*2+1; - v.compress(); + v.compress(VectorOperation::insert); v_tmp.reinit(v,false,true); diff --git a/tests/mpi/trilinos_ghost_05.cc b/tests/mpi/trilinos_ghost_05.cc index 6fde269be7..470c700eb3 100644 --- a/tests/mpi/trilinos_ghost_05.cc +++ b/tests/mpi/trilinos_ghost_05.cc @@ -50,7 +50,7 @@ void test () x(myid*2+1)=myid*2.0+1.0; // transfer to ghosted vector v and check - x.compress(); + x.compress(VectorOperation::insert); v=x; Assert(v(myid*2) == myid*2.0, ExcInternalError()); -- 2.39.5