From 5deef8d731462b248f0c0c1390f9a4a905872e71 Mon Sep 17 00:00:00 2001 From: David Wells Date: Fri, 21 Apr 2017 15:41:22 -0400 Subject: [PATCH] Rewrite tests that used deprecated PETSc vectors. PETScWrappers::Vector and PETScWrappers::BlockVector were deprecated in favor of PETScWrappers::MPI::Vector and PETScWrappers::MPI::BlockVector. This involves removing all of the PETScWrappers::BlockMatrix tests, since that class takes one of the deprecated vectors as an argument. --- .../distributed_grids/solution_transfer_01.cc | 1 - .../distributed_grids/solution_transfer_02.cc | 1 - .../distributed_grids/solution_transfer_03.cc | 1 - .../distributed_grids/solution_transfer_04.cc | 1 - tests/lac/linear_operator_09.cc | 28 --- ...ator_09.with_cxx11=on.with_petsc=on.output | 2 - ...ith_petsc=on.with_mpi=true.mpirun=2.output | 2 - ...ith_petsc=on.with_mpi=true.mpirun=4.output | 2 - tests/lac/vector_reinit_03.cc | 1 - tests/lac/vector_type_traits_is_serial_03.cc | 18 -- ...al_03.with_petsc=true.with_mpi=true.output | 6 - tests/mpi/fe_tools_extrapolate_02.cc | 3 +- tests/mpi/interpolate_02.cc | 4 +- tests/mpi/petsc_03.cc | 3 - tests/mpi/petsc_bug_ghost_vector_01.cc | 1 - tests/petsc/11.cc | 12 +- tests/petsc/12.cc | 12 +- tests/petsc/13.cc | 12 +- tests/petsc/17.cc | 10 +- tests/petsc/18.cc | 10 +- tests/petsc/19.cc | 10 +- tests/petsc/20.cc | 12 +- tests/petsc/21.cc | 12 +- tests/petsc/22.cc | 16 +- tests/petsc/23.cc | 16 +- tests/petsc/24.cc | 16 +- tests/petsc/26.cc | 12 +- tests/petsc/27.cc | 14 +- tests/petsc/28.cc | 14 +- tests/petsc/29.cc | 14 +- tests/petsc/30.cc | 14 +- tests/petsc/31.cc | 12 +- tests/petsc/32.cc | 12 +- tests/petsc/33.cc | 12 +- tests/petsc/34.cc | 12 +- tests/petsc/35.cc | 16 +- tests/petsc/36.cc | 16 +- tests/petsc/37.cc | 12 +- tests/petsc/38.cc | 16 +- tests/petsc/39.cc | 16 +- tests/petsc/40.cc | 20 ++- tests/petsc/41.cc | 16 +- tests/petsc/42.cc | 16 +- tests/petsc/43.cc | 20 ++- tests/petsc/44.cc | 24 +-- tests/petsc/45.cc | 16 +- tests/petsc/46.cc | 16 +- tests/petsc/47.cc | 20 ++- tests/petsc/48.cc | 20 ++- tests/petsc/49.cc | 12 +- tests/petsc/50.cc | 12 +- tests/petsc/51.cc | 14 +- tests/petsc/55.cc | 12 +- tests/petsc/56.cc | 12 +- tests/petsc/57.cc | 12 +- tests/petsc/58.cc | 12 +- tests/petsc/59.cc | 16 +- tests/petsc/60.cc | 12 +- tests/petsc/61.cc | 16 +- tests/petsc/70.cc | 2 +- tests/petsc/block_vector_iterator_01.cc | 16 +- tests/petsc/block_vector_iterator_02.cc | 16 +- tests/petsc/block_vector_iterator_03.cc | 167 ++++-------------- tests/petsc/block_vector_iterator_03.output | 5 - tests/petsc/deal_solver_01.cc | 14 +- tests/petsc/deal_solver_01.output | 2 +- tests/petsc/deal_solver_02.cc | 14 +- tests/petsc/deal_solver_02.output | 2 +- tests/petsc/deal_solver_03.cc | 14 +- tests/petsc/deal_solver_03.output | 2 +- tests/petsc/deal_solver_04.cc | 14 +- tests/petsc/deal_solver_04.output | 2 +- tests/petsc/deal_solver_05.cc | 14 +- tests/petsc/deal_solver_05.output | 2 +- tests/petsc/full_matrix_vector_01.cc | 12 +- tests/petsc/full_matrix_vector_02.cc | 12 +- tests/petsc/full_matrix_vector_03.cc | 12 +- tests/petsc/full_matrix_vector_04.cc | 12 +- tests/petsc/full_matrix_vector_05.cc | 12 +- tests/petsc/full_matrix_vector_06.cc | 8 +- tests/petsc/full_matrix_vector_07.cc | 16 +- tests/petsc/reinit_preconditioner_02.cc | 10 +- ...nit_preconditioner_02.with_mpi=true.output | 40 ++--- tests/petsc/slowness_02.cc | 7 +- tests/petsc/solver_01.cc | 8 +- tests/petsc/solver_02.cc | 8 +- tests/petsc/solver_03.cc | 8 +- tests/petsc/solver_03_mf.cc | 8 +- .../petsc/solver_03_precondition_boomeramg.cc | 8 +- ...ver_03_precondition_boomeramg_symmetric.cc | 8 +- .../petsc/solver_03_precondition_eisenstat.cc | 8 +- tests/petsc/solver_03_precondition_icc.cc | 8 +- tests/petsc/solver_03_precondition_ilu.cc | 8 +- tests/petsc/solver_03_precondition_lu.cc | 8 +- .../petsc/solver_03_precondition_parasails.cc | 8 +- tests/petsc/solver_03_precondition_sor.cc | 8 +- tests/petsc/solver_03_precondition_ssor.cc | 8 +- tests/petsc/solver_04.cc | 8 +- tests/petsc/solver_05.cc | 8 +- tests/petsc/solver_06.cc | 8 +- tests/petsc/solver_07.cc | 8 +- tests/petsc/solver_08.cc | 8 +- tests/petsc/solver_09.cc | 8 +- tests/petsc/solver_10.cc | 8 +- tests/petsc/solver_11.cc | 8 +- tests/petsc/solver_12.cc | 8 +- tests/petsc/solver_13.cc | 10 +- tests/petsc/sparse_direct_mumps.cc | 11 +- tests/petsc/sparse_matrix_01.cc | 1 - tests/petsc/sparse_matrix_02.cc | 1 - tests/petsc/sparse_matrix_vector_01.cc | 12 +- tests/petsc/sparse_matrix_vector_02.cc | 12 +- tests/petsc/sparse_matrix_vector_03.cc | 12 +- tests/petsc/sparse_matrix_vector_04.cc | 12 +- tests/petsc/sparse_matrix_vector_05.cc | 12 +- tests/petsc/sparse_matrix_vector_06.cc | 8 +- tests/petsc/sparse_matrix_vector_07.cc | 16 +- tests/petsc/vector_assign_01.cc | 14 +- tests/petsc/vector_assign_02.cc | 14 +- tests/petsc/vector_equality_1.cc | 16 +- tests/petsc/vector_equality_2.cc | 18 +- tests/petsc/vector_equality_3.cc | 16 +- tests/petsc/vector_equality_4.cc | 18 +- tests/petsc/vector_print.cc | 6 +- tests/petsc/vector_print.output | 3 +- tests/petsc/vector_wrap_01.cc | 16 +- tests/petsc_complex/11.cc | 8 +- tests/petsc_complex/12.cc | 8 +- tests/petsc_complex/13.cc | 8 +- tests/petsc_complex/17.cc | 8 +- tests/petsc_complex/18.cc | 8 +- tests/petsc_complex/19.cc | 8 +- tests/petsc_complex/20.cc | 12 +- tests/petsc_complex/element_access_00.cc | 8 +- tests/petsc_complex/solver_real_01.cc | 6 +- tests/petsc_complex/solver_real_02.cc | 6 +- tests/petsc_complex/solver_real_03.cc | 7 +- tests/petsc_complex/solver_real_03_mf.cc | 7 +- tests/petsc_complex/solver_real_04.cc | 7 +- tests/petsc_complex/sparse_matrix_01.cc | 1 - tests/petsc_complex/vector_02.cc | 6 +- tests/petsc_complex/vector_assign_01.cc | 10 +- tests/petsc_complex/vector_assign_02.cc | 12 +- tests/petsc_complex/vector_equality_1.cc | 14 +- tests/petsc_complex/vector_equality_2.cc | 14 +- tests/petsc_complex/vector_print.cc | 4 +- tests/petsc_complex/vector_wrap_01.cc | 10 +- tests/quick_tests/step-petsc.cc | 10 +- tests/quick_tests/step-slepc.cc | 14 +- tests/slepc/solve_01.cc | 10 +- tests/slepc/solve_04.cc | 9 +- 151 files changed, 887 insertions(+), 861 deletions(-) diff --git a/tests/distributed_grids/solution_transfer_01.cc b/tests/distributed_grids/solution_transfer_01.cc index ce5348978c..53958b9a6b 100644 --- a/tests/distributed_grids/solution_transfer_01.cc +++ b/tests/distributed_grids/solution_transfer_01.cc @@ -31,7 +31,6 @@ #include #include -#include #include #include diff --git a/tests/distributed_grids/solution_transfer_02.cc b/tests/distributed_grids/solution_transfer_02.cc index 850525812e..dcaef9d4db 100644 --- a/tests/distributed_grids/solution_transfer_02.cc +++ b/tests/distributed_grids/solution_transfer_02.cc @@ -31,7 +31,6 @@ #include #include -#include #include #include diff --git a/tests/distributed_grids/solution_transfer_03.cc b/tests/distributed_grids/solution_transfer_03.cc index 921b6f8d0c..36d211b5a5 100644 --- a/tests/distributed_grids/solution_transfer_03.cc +++ b/tests/distributed_grids/solution_transfer_03.cc @@ -31,7 +31,6 @@ #include #include -#include #include #include diff --git a/tests/distributed_grids/solution_transfer_04.cc b/tests/distributed_grids/solution_transfer_04.cc index 57ea378130..3b5c2ccfaf 100644 --- a/tests/distributed_grids/solution_transfer_04.cc +++ b/tests/distributed_grids/solution_transfer_04.cc @@ -31,7 +31,6 @@ #include #include -#include #include #include diff --git a/tests/lac/linear_operator_09.cc b/tests/lac/linear_operator_09.cc index e1d80fea52..f9b5185c51 100644 --- a/tests/lac/linear_operator_09.cc +++ b/tests/lac/linear_operator_09.cc @@ -23,16 +23,12 @@ #include // Vectors: -#include #include #include #include // Block Matrix and Vectors: -#include -#include - #include #include @@ -48,22 +44,6 @@ int main(int argc, char *argv[]) initlog(); deallog << std::setprecision(10); - { - PETScWrappers::SparseMatrix a(2,2,2); - for (unsigned int i = 0; i<2; ++i) - for (unsigned int j = 0; j<2; ++j) - a.add (i,j, 2); - a.compress (VectorOperation::add); - - PETScWrappers::Vector v(2); - for (unsigned int i = 0; i<2; ++i) - v[i] = 1; - PETScWrappers::Vector u(v); - auto op_a = linear_operator(a); - op_a.vmult(u,v); - deallog << "SparseMatrix -> OK" << std::endl; - } - { unsigned int np = Utilities::MPI::n_mpi_processes(MPI_COMM_WORLD); if (4%np==0 && np<=4) @@ -86,12 +66,6 @@ int main(int argc, char *argv[]) deallog << "SparseMatrix MPI -> OK" << std::endl; } - { - PETScWrappers::BlockSparseMatrix a; - auto op_a = linear_operator(a); - deallog << "BlockSparseMatrix -> OK" << std::endl; - } - { PETScWrappers::MPI::BlockSparseMatrix a; auto op_a = linear_operator(a); @@ -102,5 +76,3 @@ int main(int argc, char *argv[]) return 0; } - - diff --git a/tests/lac/linear_operator_09.with_cxx11=on.with_petsc=on.output b/tests/lac/linear_operator_09.with_cxx11=on.with_petsc=on.output index 441b883d69..08d81f52f2 100644 --- a/tests/lac/linear_operator_09.with_cxx11=on.with_petsc=on.output +++ b/tests/lac/linear_operator_09.with_cxx11=on.with_petsc=on.output @@ -1,6 +1,4 @@ -DEAL::SparseMatrix -> OK DEAL::SparseMatrix MPI -> OK -DEAL::BlockSparseMatrix -> OK DEAL::BlockSparseMatrix MPI -> OK DEAL::OK diff --git a/tests/lac/linear_operator_09.with_cxx11=on.with_petsc=on.with_mpi=true.mpirun=2.output b/tests/lac/linear_operator_09.with_cxx11=on.with_petsc=on.with_mpi=true.mpirun=2.output index 441b883d69..08d81f52f2 100644 --- a/tests/lac/linear_operator_09.with_cxx11=on.with_petsc=on.with_mpi=true.mpirun=2.output +++ b/tests/lac/linear_operator_09.with_cxx11=on.with_petsc=on.with_mpi=true.mpirun=2.output @@ -1,6 +1,4 @@ -DEAL::SparseMatrix -> OK DEAL::SparseMatrix MPI -> OK -DEAL::BlockSparseMatrix -> OK DEAL::BlockSparseMatrix MPI -> OK DEAL::OK diff --git a/tests/lac/linear_operator_09.with_cxx11=on.with_petsc=on.with_mpi=true.mpirun=4.output b/tests/lac/linear_operator_09.with_cxx11=on.with_petsc=on.with_mpi=true.mpirun=4.output index 441b883d69..08d81f52f2 100644 --- a/tests/lac/linear_operator_09.with_cxx11=on.with_petsc=on.with_mpi=true.mpirun=4.output +++ b/tests/lac/linear_operator_09.with_cxx11=on.with_petsc=on.with_mpi=true.mpirun=4.output @@ -1,6 +1,4 @@ -DEAL::SparseMatrix -> OK DEAL::SparseMatrix MPI -> OK -DEAL::BlockSparseMatrix -> OK DEAL::BlockSparseMatrix MPI -> OK DEAL::OK diff --git a/tests/lac/vector_reinit_03.cc b/tests/lac/vector_reinit_03.cc index aa4bf8efe3..207894592d 100644 --- a/tests/lac/vector_reinit_03.cc +++ b/tests/lac/vector_reinit_03.cc @@ -21,7 +21,6 @@ #include "../tests.h" #include -#include #include #include diff --git a/tests/lac/vector_type_traits_is_serial_03.cc b/tests/lac/vector_type_traits_is_serial_03.cc index 5b6536a708..704b8d1317 100644 --- a/tests/lac/vector_type_traits_is_serial_03.cc +++ b/tests/lac/vector_type_traits_is_serial_03.cc @@ -18,8 +18,6 @@ // check is_serial_vector type trait #include "../tests.h" -#include -#include #include #include #include @@ -27,22 +25,6 @@ void test () { - // make sure that is_serial_vector< dealii::PETScWrappers::Vector > is working - Assert (is_serial_vector< dealii::PETScWrappers::Vector >::value == true, - ExcInternalError()); - - deallog << is_serial_vector< dealii::PETScWrappers::Vector >::value << std::endl; - - deallog << "OK" << std::endl << std::endl; - - // make sure that is_serial_vector< dealii::PETScWrappers::BlockVector > is working - Assert (is_serial_vector< dealii::PETScWrappers::BlockVector >::value == true, - ExcInternalError()); - - deallog << is_serial_vector< dealii::PETScWrappers::BlockVector >::value << std::endl; - - deallog << "OK" << std::endl << std::endl; - // make sure that is_serial_vector< dealii::PETScWrappers::MPI::Vector > is working Assert (is_serial_vector< dealii::PETScWrappers::MPI::Vector >::value == false, ExcInternalError()); diff --git a/tests/lac/vector_type_traits_is_serial_03.with_petsc=true.with_mpi=true.output b/tests/lac/vector_type_traits_is_serial_03.with_petsc=true.with_mpi=true.output index dee23be6e7..fcf7cc7bea 100644 --- a/tests/lac/vector_type_traits_is_serial_03.with_petsc=true.with_mpi=true.output +++ b/tests/lac/vector_type_traits_is_serial_03.with_petsc=true.with_mpi=true.output @@ -1,10 +1,4 @@ -DEAL::1 -DEAL::OK -DEAL:: -DEAL::1 -DEAL::OK -DEAL:: DEAL::0 DEAL::OK DEAL:: diff --git a/tests/mpi/fe_tools_extrapolate_02.cc b/tests/mpi/fe_tools_extrapolate_02.cc index 12b64b667b..ca002c45d4 100644 --- a/tests/mpi/fe_tools_extrapolate_02.cc +++ b/tests/mpi/fe_tools_extrapolate_02.cc @@ -14,7 +14,7 @@ // --------------------------------------------------------------------- -#include +#include #include "fe_tools_extrapolate_common.h" // check FETools::extrapolate on distributed triangulations @@ -64,4 +64,3 @@ int main (int argc, char **argv) CHECK_ALL(DGQ,1,DGQ,0); CHECK_ALL(DGQ,1,DGQ,1); } - diff --git a/tests/mpi/interpolate_02.cc b/tests/mpi/interpolate_02.cc index 271ca061fd..d97507bd30 100644 --- a/tests/mpi/interpolate_02.cc +++ b/tests/mpi/interpolate_02.cc @@ -17,8 +17,8 @@ // Like _01 but with PETSc vectors. this program hangs at the time of writing // in much the same way solution_transfer_01 does because one processor has no -// cells and all the others decide that PETScWrappers::Vector::compress is a -// no-op when of course the one who does have cells doesn't think so +// cells and all the others decide that PETScWrappers::MPI::Vector::compress +// is a no-op when of course the one who does have cells doesn't think so #include "../tests.h" diff --git a/tests/mpi/petsc_03.cc b/tests/mpi/petsc_03.cc index 138a703a96..eabe97372d 100644 --- a/tests/mpi/petsc_03.cc +++ b/tests/mpi/petsc_03.cc @@ -22,7 +22,6 @@ #include #include -#include #include #include #include @@ -50,8 +49,6 @@ void test() testit(); testit(); - testit(); - testit(); if (myid==0) deallog << "done" << std::endl; diff --git a/tests/mpi/petsc_bug_ghost_vector_01.cc b/tests/mpi/petsc_bug_ghost_vector_01.cc index c23a46dcb0..80002224d6 100644 --- a/tests/mpi/petsc_bug_ghost_vector_01.cc +++ b/tests/mpi/petsc_bug_ghost_vector_01.cc @@ -63,7 +63,6 @@ #include #include #include -#include #include #include #include diff --git a/tests/petsc/11.cc b/tests/petsc/11.cc index 9512866d81..0c2cd26880 100644 --- a/tests/petsc/11.cc +++ b/tests/petsc/11.cc @@ -15,15 +15,15 @@ -// check PETScWrappers::Vector::size() +// check PETScWrappers::MPI::Vector::size() #include "../tests.h" -#include +#include #include #include -void test (PETScWrappers::Vector &v) +void test (PETScWrappers::MPI::Vector &v) { // set only certain elements of the vector for (unsigned int i=0; i +#include #include #include #include -void test (PETScWrappers::Vector &v) +void test (PETScWrappers::MPI::Vector &v) { // set only certain elements of the // vector. have a bit pattern of where we @@ -61,8 +61,10 @@ int main (int argc,char **argv) { Utilities::MPI::MPI_InitFinalize mpi_initialization (argc, argv, 1); { - PETScWrappers::Vector v (100); - test (v); + IndexSet indices(100); + indices.add_range(0, 100); + PETScWrappers::MPI::Vector v(indices, MPI_COMM_WORLD); + test(v); } } diff --git a/tests/petsc/13.cc b/tests/petsc/13.cc index 8c5e0a163a..cdde6e90e7 100644 --- a/tests/petsc/13.cc +++ b/tests/petsc/13.cc @@ -15,16 +15,16 @@ -// check PETScWrappers::Vector::operator() in add-mode +// check PETScWrappers::MPI::Vector::operator() in add-mode #include "../tests.h" -#include +#include #include #include #include -void test (PETScWrappers::Vector &v) +void test (PETScWrappers::MPI::Vector &v) { // set only certain elements of the // vector. have a bit pattern of where we @@ -61,8 +61,10 @@ int main (int argc,char **argv) { Utilities::MPI::MPI_InitFinalize mpi_initialization (argc, argv, 1); { - PETScWrappers::Vector v (100); - test (v); + IndexSet indices(100); + indices.add_range(0, 100); + PETScWrappers::MPI::Vector v(indices, MPI_COMM_WORLD); + test(v); } } diff --git a/tests/petsc/17.cc b/tests/petsc/17.cc index e6cc1bd636..9c922f0ee7 100644 --- a/tests/petsc/17.cc +++ b/tests/petsc/17.cc @@ -15,16 +15,16 @@ -// check PETScWrappers::Vector::l1_norm() +// check PETScWrappers::MPI::Vector::l1_norm() #include "../tests.h" -#include +#include #include #include #include -void test (PETScWrappers::Vector &v) +void test (PETScWrappers::MPI::Vector &v) { // set some elements of the vector double norm = 0; @@ -53,7 +53,9 @@ int main (int argc,char **argv) { Utilities::MPI::MPI_InitFinalize mpi_initialization (argc, argv, 1); { - PETScWrappers::Vector v (100); + IndexSet indices(100); + indices.add_range(0, 100); + PETScWrappers::MPI::Vector v(indices, MPI_COMM_WORLD); test (v); } diff --git a/tests/petsc/18.cc b/tests/petsc/18.cc index ca2931f112..f4761fb8a0 100644 --- a/tests/petsc/18.cc +++ b/tests/petsc/18.cc @@ -15,16 +15,16 @@ -// check PETScWrappers::Vector::l2_norm() +// check PETScWrappers::MPI::Vector::l2_norm() #include "../tests.h" -#include +#include #include #include #include -void test (PETScWrappers::Vector &v) +void test (PETScWrappers::MPI::Vector &v) { // set some elements of the vector PetscScalar norm = 0; @@ -54,7 +54,9 @@ int main (int argc,char **argv) { Utilities::MPI::MPI_InitFinalize mpi_initialization (argc, argv, 1); { - PETScWrappers::Vector v (100); + IndexSet indices(100); + indices.add_range(0, 100); + PETScWrappers::MPI::Vector v (indices, MPI_COMM_WORLD); test (v); } diff --git a/tests/petsc/19.cc b/tests/petsc/19.cc index a6d9eb5cd6..cab88f5e01 100644 --- a/tests/petsc/19.cc +++ b/tests/petsc/19.cc @@ -15,16 +15,16 @@ -// check PETScWrappers::Vector::linfty_norm() +// check PETScWrappers::MPI::Vector::linfty_norm() #include "../tests.h" -#include +#include #include #include #include -void test (PETScWrappers::Vector &v) +void test (PETScWrappers::MPI::Vector &v) { // set some elements of the vector double norm = 0; @@ -53,7 +53,9 @@ int main (int argc,char **argv) { Utilities::MPI::MPI_InitFinalize mpi_initialization (argc, argv, 1); { - PETScWrappers::Vector v (100); + IndexSet indices(100); + indices.add_range(0, 100); + PETScWrappers::MPI::Vector v(indices, MPI_COMM_WORLD); test (v); } diff --git a/tests/petsc/20.cc b/tests/petsc/20.cc index deb240579e..d29fe6ac3d 100644 --- a/tests/petsc/20.cc +++ b/tests/petsc/20.cc @@ -15,16 +15,16 @@ -// check PETScWrappers::Vector::operator *= +// check PETScWrappers::MPI::Vector::operator *= #include "../tests.h" -#include +#include #include #include #include -void test (PETScWrappers::Vector &v) +void test (PETScWrappers::MPI::Vector &v) { // set only certain elements of the // vector. have a bit pattern of where we @@ -62,8 +62,10 @@ int main (int argc,char **argv) { Utilities::MPI::MPI_InitFinalize mpi_initialization (argc, argv, 1); { - PETScWrappers::Vector v (100); - test (v); + IndexSet indices(100); + indices.add_range(0, 100); + PETScWrappers::MPI::Vector v(indices, MPI_COMM_WORLD); + test(v); } } diff --git a/tests/petsc/21.cc b/tests/petsc/21.cc index 65c567dda1..4074dc89c6 100644 --- a/tests/petsc/21.cc +++ b/tests/petsc/21.cc @@ -15,16 +15,16 @@ -// check PETScWrappers::Vector::operator /= +// check PETScWrappers::MPI::Vector::operator /= #include "../tests.h" -#include +#include #include #include #include -void test (PETScWrappers::Vector &v) +void test (PETScWrappers::MPI::Vector &v) { // set only certain elements of the // vector. have a bit pattern of where we @@ -62,8 +62,10 @@ int main (int argc,char **argv) { Utilities::MPI::MPI_InitFinalize mpi_initialization (argc, argv, 1); { - PETScWrappers::Vector v (100); - test (v); + IndexSet indices(100); + indices.add_range(0, 100); + PETScWrappers::MPI::Vector v(indices, MPI_COMM_WORLD); + test(v); } } diff --git a/tests/petsc/22.cc b/tests/petsc/22.cc index 3073187e04..ec8fdbdf33 100644 --- a/tests/petsc/22.cc +++ b/tests/petsc/22.cc @@ -15,18 +15,18 @@ -// check PETScWrappers::Vector::operator*(Vector) on two vectors that are +// check PETScWrappers::MPI::Vector::operator*(Vector) on two vectors that are // orthogonal #include "../tests.h" -#include +#include #include #include #include -void test (PETScWrappers::Vector &v, - PETScWrappers::Vector &w) +void test (PETScWrappers::MPI::Vector &v, + PETScWrappers::MPI::Vector &w) { // set only certain elements of each // vector, but disjoint sets of elements @@ -56,9 +56,11 @@ int main (int argc,char **argv) { Utilities::MPI::MPI_InitFinalize mpi_initialization (argc, argv, 1); { - PETScWrappers::Vector v (100); - PETScWrappers::Vector w (100); - test (v,w); + IndexSet indices(100); + indices.add_range(0, 100); + PETScWrappers::MPI::Vector v(indices, MPI_COMM_WORLD); + PETScWrappers::MPI::Vector w(indices, MPI_COMM_WORLD); + test(v, w); } } diff --git a/tests/petsc/23.cc b/tests/petsc/23.cc index efb7ed6ee0..e294517ad8 100644 --- a/tests/petsc/23.cc +++ b/tests/petsc/23.cc @@ -15,18 +15,18 @@ -// check PETScWrappers::Vector::operator*(Vector) on two vectors that are +// check PETScWrappers::MPI::Vector::operator*(Vector) on two vectors that are // not orthogonal #include "../tests.h" -#include +#include #include #include #include -void test (PETScWrappers::Vector &v, - PETScWrappers::Vector &w) +void test (PETScWrappers::MPI::Vector &v, + PETScWrappers::MPI::Vector &w) { // set only certain elements of each // vector, and record the expected scalar @@ -63,9 +63,11 @@ int main (int argc,char **argv) { Utilities::MPI::MPI_InitFinalize mpi_initialization (argc, argv, 1); { - PETScWrappers::Vector v (100); - PETScWrappers::Vector w (100); - test (v,w); + IndexSet indices(100); + indices.add_range(0, 100); + PETScWrappers::MPI::Vector v(indices, MPI_COMM_WORLD); + PETScWrappers::MPI::Vector w(indices, MPI_COMM_WORLD); + test(v, w); } } diff --git a/tests/petsc/24.cc b/tests/petsc/24.cc index 323d0b6bc7..7c87402ec4 100644 --- a/tests/petsc/24.cc +++ b/tests/petsc/24.cc @@ -15,18 +15,18 @@ -// this test used to check for PETScWrappers::Vector::clear(). However, this -// function has since been removed, so we test for v=0 instead, although that -// may be covered by one of the other tests +// this test used to check for PETScWrappers::MPI::Vector::clear(). However, +// this function has since been removed, so we test for v=0 instead, although +// that may be covered by one of the other tests #include "../tests.h" -#include +#include #include #include #include -void test (PETScWrappers::Vector &v) +void test (PETScWrappers::MPI::Vector &v) { // set some entries of the vector for (unsigned int i=0; i +#include #include #include #include -void test (PETScWrappers::Vector &v) +void test (PETScWrappers::MPI::Vector &v) { // set some entries of the vector for (unsigned int i=0; i +#include #include #include #include -void test (PETScWrappers::Vector &v) +void test (PETScWrappers::MPI::Vector &v) { // set some entries of the vector for (unsigned int i=0; i +#include #include #include #include -void test (PETScWrappers::Vector &v) +void test (PETScWrappers::MPI::Vector &v) { // set some entries of the vector for (unsigned int i=0; i +#include #include #include #include -void test (PETScWrappers::Vector &v) +void test (PETScWrappers::MPI::Vector &v) { - v.reinit (13, true); + v.reinit (MPI_COMM_WORLD, 13, 13, true); AssertThrow (v.size() == 13, ExcInternalError()); @@ -45,8 +45,10 @@ int main (int argc,char **argv) { Utilities::MPI::MPI_InitFinalize mpi_initialization (argc, argv, 1); { - PETScWrappers::Vector v (100); - test (v); + IndexSet indices(100); + indices.add_range(0, 100); + PETScWrappers::MPI::Vector v(indices, MPI_COMM_WORLD); + test(v); } } diff --git a/tests/petsc/30.cc b/tests/petsc/30.cc index 117a224c2c..10ce6e0df1 100644 --- a/tests/petsc/30.cc +++ b/tests/petsc/30.cc @@ -15,16 +15,16 @@ -// check PETScWrappers::Vector::reinit(!fast) +// check PETScWrappers::MPI::Vector::reinit(!fast) #include "../tests.h" -#include +#include #include #include #include -void test (PETScWrappers::Vector &v) +void test (PETScWrappers::MPI::Vector &v) { // set some entries of the vector for (unsigned int i=0; i +#include #include #include #include -void test (PETScWrappers::Vector &v) +void test (PETScWrappers::MPI::Vector &v) { // set some elements of the vector PetscScalar norm = 0; @@ -55,8 +55,10 @@ int main (int argc,char **argv) { Utilities::MPI::MPI_InitFinalize mpi_initialization (argc, argv, 1); { - PETScWrappers::Vector v (100); - test (v); + IndexSet indices(100); + indices.add_range(0, 100); + PETScWrappers::MPI::Vector v(indices, MPI_COMM_WORLD); + test(v); } } diff --git a/tests/petsc/32.cc b/tests/petsc/32.cc index 7887e08e88..296f347255 100644 --- a/tests/petsc/32.cc +++ b/tests/petsc/32.cc @@ -15,16 +15,16 @@ -// check PETScWrappers::Vector::mean_value() +// check PETScWrappers::MPI::Vector::mean_value() #include "../tests.h" -#include +#include #include #include #include -void test (PETScWrappers::Vector &v) +void test (PETScWrappers::MPI::Vector &v) { // set some elements of the vector PetscScalar sum = 0; @@ -55,8 +55,10 @@ int main (int argc,char **argv) { Utilities::MPI::MPI_InitFinalize mpi_initialization (argc, argv, 1); { - PETScWrappers::Vector v (100); - test (v); + IndexSet indices(100); + indices.add_range(0, 100); + PETScWrappers::MPI::Vector v(indices, MPI_COMM_WORLD); + test(v); } } diff --git a/tests/petsc/33.cc b/tests/petsc/33.cc index bbcf927805..90e81ae0c8 100644 --- a/tests/petsc/33.cc +++ b/tests/petsc/33.cc @@ -15,16 +15,16 @@ -// check PETScWrappers::Vector::lp_norm(3) +// check PETScWrappers::MPI::Vector::lp_norm(3) #include "../tests.h" -#include +#include #include #include #include -void test (PETScWrappers::Vector &v) +void test (PETScWrappers::MPI::Vector &v) { // set some elements of the vector PetscScalar sum = 0; @@ -56,8 +56,10 @@ int main (int argc,char **argv) { Utilities::MPI::MPI_InitFinalize mpi_initialization (argc, argv, 1); { - PETScWrappers::Vector v (100); - test (v); + IndexSet indices(100); + indices.add_range(0, 100); + PETScWrappers::MPI::Vector v(indices, MPI_COMM_WORLD); + test(v); } } diff --git a/tests/petsc/34.cc b/tests/petsc/34.cc index 51dacab4f6..79f0c1a868 100644 --- a/tests/petsc/34.cc +++ b/tests/petsc/34.cc @@ -15,16 +15,16 @@ -// check PETScWrappers::Vector::all_zero +// check PETScWrappers::MPI::Vector::all_zero #include "../tests.h" -#include +#include #include #include #include -void test (PETScWrappers::Vector &v) +void test (PETScWrappers::MPI::Vector &v) { // set some elements of the vector double sum = 0; @@ -56,8 +56,10 @@ int main (int argc,char **argv) { Utilities::MPI::MPI_InitFinalize mpi_initialization (argc, argv, 1); { - PETScWrappers::Vector v (100); - test (v); + IndexSet indices(100); + indices.add_range(0, 100); + PETScWrappers::MPI::Vector v(indices, MPI_COMM_WORLD); + test(v); } } diff --git a/tests/petsc/35.cc b/tests/petsc/35.cc index 1caf99193b..a50dc8be88 100644 --- a/tests/petsc/35.cc +++ b/tests/petsc/35.cc @@ -15,17 +15,17 @@ -// check PETScWrappers::Vector::operator+=(Vector) +// check PETScWrappers::MPI::Vector::operator+=(Vector) #include "../tests.h" -#include +#include #include #include #include -void test (PETScWrappers::Vector &v, - PETScWrappers::Vector &w) +void test (PETScWrappers::MPI::Vector &v, + PETScWrappers::MPI::Vector &w) { // set only certain elements of each // vector @@ -72,9 +72,11 @@ int main (int argc,char **argv) { Utilities::MPI::MPI_InitFinalize mpi_initialization (argc, argv, 1); { - PETScWrappers::Vector v (100); - PETScWrappers::Vector w (100); - test (v,w); + IndexSet indices(100); + indices.add_range(0, 100); + PETScWrappers::MPI::Vector v(indices, MPI_COMM_WORLD); + PETScWrappers::MPI::Vector w(indices, MPI_COMM_WORLD); + test(v, w); } } diff --git a/tests/petsc/36.cc b/tests/petsc/36.cc index 6734086894..93a67ab596 100644 --- a/tests/petsc/36.cc +++ b/tests/petsc/36.cc @@ -15,17 +15,17 @@ -// check PETScWrappers::Vector::operator-=(Vector) +// check PETScWrappers::MPI::Vector::operator-=(Vector) #include "../tests.h" -#include +#include #include #include #include -void test (PETScWrappers::Vector &v, - PETScWrappers::Vector &w) +void test (PETScWrappers::MPI::Vector &v, + PETScWrappers::MPI::Vector &w) { // set only certain elements of each // vector @@ -72,9 +72,11 @@ int main (int argc,char **argv) { Utilities::MPI::MPI_InitFinalize mpi_initialization (argc, argv, 1); { - PETScWrappers::Vector v (100); - PETScWrappers::Vector w (100); - test (v,w); + IndexSet indices(100); + indices.add_range(0, 100); + PETScWrappers::MPI::Vector v(indices, MPI_COMM_WORLD); + PETScWrappers::MPI::Vector w(indices, MPI_COMM_WORLD); + test(v, w); } } diff --git a/tests/petsc/37.cc b/tests/petsc/37.cc index 275f1cf581..d5529e4810 100644 --- a/tests/petsc/37.cc +++ b/tests/petsc/37.cc @@ -15,16 +15,16 @@ -// check PETScWrappers::Vector::add (scalar) +// check PETScWrappers::MPI::Vector::add (scalar) #include "../tests.h" -#include +#include #include #include #include -void test (PETScWrappers::Vector &v) +void test (PETScWrappers::MPI::Vector &v) { for (unsigned int i=0; i +#include #include #include #include -void test (PETScWrappers::Vector &v, - PETScWrappers::Vector &w) +void test (PETScWrappers::MPI::Vector &v, + PETScWrappers::MPI::Vector &w) { for (unsigned int i=0; i +#include #include #include #include -void test (PETScWrappers::Vector &v, - PETScWrappers::Vector &w) +void test (PETScWrappers::MPI::Vector &v, + PETScWrappers::MPI::Vector &w) { for (unsigned int i=0; i +#include #include #include #include -void test (PETScWrappers::Vector &v, - PETScWrappers::Vector &w, - PETScWrappers::Vector &x) +void test (PETScWrappers::MPI::Vector &v, + PETScWrappers::MPI::Vector &w, + PETScWrappers::MPI::Vector &x) { for (unsigned int i=0; i +#include #include #include #include -void test (PETScWrappers::Vector &v, - PETScWrappers::Vector &w) +void test (PETScWrappers::MPI::Vector &v, + PETScWrappers::MPI::Vector &w) { for (unsigned int i=0; i +#include #include #include #include -void test (PETScWrappers::Vector &v, - PETScWrappers::Vector &w) +void test (PETScWrappers::MPI::Vector &v, + PETScWrappers::MPI::Vector &w) { for (unsigned int i=0; i +#include #include #include #include -void test (PETScWrappers::Vector &v, - PETScWrappers::Vector &w, - PETScWrappers::Vector &x) +void test (PETScWrappers::MPI::Vector &v, + PETScWrappers::MPI::Vector &w, + PETScWrappers::MPI::Vector &x) { for (unsigned int i=0; i +#include #include #include #include -void test (PETScWrappers::Vector &v, - PETScWrappers::Vector &w, - PETScWrappers::Vector &x, - PETScWrappers::Vector &y) +void test (PETScWrappers::MPI::Vector &v, + PETScWrappers::MPI::Vector &w, + PETScWrappers::MPI::Vector &x, + PETScWrappers::MPI::Vector &y) { for (unsigned int i=0; i +#include #include #include #include -void test (PETScWrappers::Vector &v, - PETScWrappers::Vector &w) +void test (PETScWrappers::MPI::Vector &v, + PETScWrappers::MPI::Vector &w) { for (unsigned int i=0; i +#include #include #include #include -void test (PETScWrappers::Vector &v, - PETScWrappers::Vector &w) +void test (PETScWrappers::MPI::Vector &v, + PETScWrappers::MPI::Vector &w) { for (unsigned int i=0; i +#include #include #include #include -void test (PETScWrappers::Vector &v, - PETScWrappers::Vector &w, - PETScWrappers::Vector &x) +void test (PETScWrappers::MPI::Vector &v, + PETScWrappers::MPI::Vector &w, + PETScWrappers::MPI::Vector &x) { for (unsigned int i=0; i +#include #include #include #include -void test (PETScWrappers::Vector &v, - PETScWrappers::Vector &w, - PETScWrappers::Vector &x) +void test (PETScWrappers::MPI::Vector &v, + PETScWrappers::MPI::Vector &w, + PETScWrappers::MPI::Vector &x) { for (unsigned int i=0; i) +// check PETScWrappers::MPI::Vector::operator = (Vector) #include "../tests.h" -#include +#include #include #include #include #include -void test (PETScWrappers::Vector &v) +void test (PETScWrappers::MPI::Vector &v) { Vector w (v.size()); @@ -57,8 +57,10 @@ int main (int argc,char **argv) { Utilities::MPI::MPI_InitFinalize mpi_initialization (argc, argv, 1); { - PETScWrappers::Vector v (100); - test (v); + IndexSet indices(100); + indices.add_range(0, 100); + PETScWrappers::MPI::Vector v(indices, MPI_COMM_WORLD); + test(v); } } diff --git a/tests/petsc/50.cc b/tests/petsc/50.cc index a546712768..7ff2956568 100644 --- a/tests/petsc/50.cc +++ b/tests/petsc/50.cc @@ -15,17 +15,17 @@ -// check PETScWrappers::Vector::operator = (Vector) with T!=PetscScalar +// check PETScWrappers::MPI::Vector::operator = (Vector) with T!=PetscScalar #include "../tests.h" -#include +#include #include #include #include #include -void test (PETScWrappers::Vector &v) +void test (PETScWrappers::MPI::Vector &v) { Vector w (v.size()); Vector x (v.size()); @@ -73,8 +73,10 @@ int main (int argc,char **argv) { Utilities::MPI::MPI_InitFinalize mpi_initialization (argc, argv, 1); { - PETScWrappers::Vector v (100); - test (v); + IndexSet indices(100); + indices.add_range(0, 100); + PETScWrappers::MPI::Vector v(indices, MPI_COMM_WORLD); + test(v); } } diff --git a/tests/petsc/51.cc b/tests/petsc/51.cc index cb62d3f06f..fea6331ad7 100644 --- a/tests/petsc/51.cc +++ b/tests/petsc/51.cc @@ -15,16 +15,16 @@ -// check copy constructor PETScWrappers::Vector::Vector(Vector) +// check copy constructor PETScWrappers::MPI::Vector::Vector(Vector) #include "../tests.h" -#include +#include #include #include #include -void test (PETScWrappers::Vector &v) +void test (PETScWrappers::MPI::Vector &v) { // set some entries of the vector for (unsigned int i=0; i +#include #include #include #include -void test (PETScWrappers::Vector &v) +void test (PETScWrappers::MPI::Vector &v) { // set only certain elements of the // vector. have a bit pattern of where we @@ -63,8 +63,10 @@ int main (int argc,char **argv) { Utilities::MPI::MPI_InitFinalize mpi_initialization (argc, argv, 1); { - PETScWrappers::Vector v (100); - test (v); + IndexSet indices(100); + indices.add_range(0, 100); + PETScWrappers::MPI::Vector v(indices, MPI_COMM_WORLD); + test(v); } } diff --git a/tests/petsc/56.cc b/tests/petsc/56.cc index 5a25b56c2f..22d0806e08 100644 --- a/tests/petsc/56.cc +++ b/tests/petsc/56.cc @@ -15,16 +15,16 @@ -// check PETScWrappers::Vector::operator() in set, and later in /= mode +// check PETScWrappers::MPI::Vector::operator() in set, and later in /= mode #include "../tests.h" -#include +#include #include #include #include -void test (PETScWrappers::Vector &v) +void test (PETScWrappers::MPI::Vector &v) { // set only certain elements of the // vector. have a bit pattern of where we @@ -63,8 +63,10 @@ int main (int argc,char **argv) { Utilities::MPI::MPI_InitFinalize mpi_initialization (argc, argv, 1); { - PETScWrappers::Vector v (100); - test (v); + IndexSet indices(100); + indices.add_range(0, 100); + PETScWrappers::MPI::Vector v(indices, MPI_COMM_WORLD); + test(v); } } diff --git a/tests/petsc/57.cc b/tests/petsc/57.cc index 6984580593..81bed3d3ae 100644 --- a/tests/petsc/57.cc +++ b/tests/petsc/57.cc @@ -15,16 +15,16 @@ -// check PETScWrappers::Vector::is_non_zero +// check PETScWrappers::MPI::Vector::is_non_zero #include "../tests.h" -#include +#include #include #include #include -void test (PETScWrappers::Vector &v) +void test (PETScWrappers::MPI::Vector &v) { // set only certain elements of the // vector. they are all positive @@ -61,8 +61,10 @@ int main (int argc,char **argv) { Utilities::MPI::MPI_InitFinalize mpi_initialization (argc, argv, 1); { - PETScWrappers::Vector v (100); - test (v); + IndexSet indices(100); + indices.add_range(0, 100); + PETScWrappers::MPI::Vector v(indices, MPI_COMM_WORLD); + test(v); } } diff --git a/tests/petsc/58.cc b/tests/petsc/58.cc index 59d045f26a..c1b8a09943 100644 --- a/tests/petsc/58.cc +++ b/tests/petsc/58.cc @@ -15,10 +15,10 @@ -// check ::Vector (const PETScWrappers::Vector &) copy constructor +// check ::Vector (const PETScWrappers::MPI::Vector &) copy constructor #include "../tests.h" -#include +#include #include #include @@ -26,7 +26,7 @@ #include -void test (PETScWrappers::Vector &v) +void test (PETScWrappers::MPI::Vector &v) { // set only certain elements of the // vector. @@ -63,8 +63,10 @@ int main (int argc,char **argv) { Utilities::MPI::MPI_InitFinalize mpi_initialization (argc, argv, 1); { - PETScWrappers::Vector v (100); - test (v); + IndexSet indices(100); + indices.add_range(0, 100); + PETScWrappers::MPI::Vector v(indices, MPI_COMM_WORLD); + test(v); } } diff --git a/tests/petsc/59.cc b/tests/petsc/59.cc index e2f4118241..551d65c529 100644 --- a/tests/petsc/59.cc +++ b/tests/petsc/59.cc @@ -15,10 +15,10 @@ -// check PETScWrappers::Vector (const ::Vector &) copy constructor +// check PETScWrappers::MPI::Vector (const ::Vector &) copy constructor #include "../tests.h" -#include +#include #include #include @@ -26,7 +26,7 @@ #include -void test (PETScWrappers::Vector &v) +void test (PETScWrappers::MPI::Vector &v) { // set only certain elements of the // vector. @@ -42,8 +42,8 @@ void test (PETScWrappers::Vector &v) Vector w (v); Vector x (v); - PETScWrappers::Vector w1 (w); - PETScWrappers::Vector x1 (x); + PETScWrappers::MPI::Vector w1 (MPI_COMM_WORLD, w, w.size()); + PETScWrappers::MPI::Vector x1 (MPI_COMM_WORLD, x, w.size()); for (unsigned int i=0; i +#include #include #include @@ -26,7 +26,7 @@ #include -void test (PETScWrappers::Vector &v) +void test (PETScWrappers::MPI::Vector &v) { // set only certain elements of the // vector. @@ -65,8 +65,10 @@ int main (int argc,char **argv) { Utilities::MPI::MPI_InitFinalize mpi_initialization (argc, argv, 1); { - PETScWrappers::Vector v (100); - test (v); + IndexSet indices(100); + indices.add_range(0, 100); + PETScWrappers::MPI::Vector v(indices, MPI_COMM_WORLD); + test(v); } } diff --git a/tests/petsc/61.cc b/tests/petsc/61.cc index f0e1f16662..879ffabf4a 100644 --- a/tests/petsc/61.cc +++ b/tests/petsc/61.cc @@ -15,10 +15,10 @@ -// check PETScWrappers::Vector::operator = (const ::Vector &) +// check PETScWrappers::MPI::Vector::operator = (const ::Vector &) #include "../tests.h" -#include +#include #include #include @@ -26,7 +26,7 @@ #include -void test (PETScWrappers::Vector &v) +void test (PETScWrappers::MPI::Vector &v) { // set only certain elements of the // vector. @@ -44,9 +44,9 @@ void test (PETScWrappers::Vector &v) Vector x; x=v; - PETScWrappers::Vector w1; + PETScWrappers::MPI::Vector w1(MPI_COMM_WORLD, v.size(), v.size()); w1=w; - PETScWrappers::Vector x1; + PETScWrappers::MPI::Vector x1(MPI_COMM_WORLD, v.size(), v.size()); x1=x; for (unsigned int i=0; i -#include +#include #include diff --git a/tests/petsc/block_vector_iterator_01.cc b/tests/petsc/block_vector_iterator_01.cc index 3b64026ea3..1dd6735c94 100644 --- a/tests/petsc/block_vector_iterator_01.cc +++ b/tests/petsc/block_vector_iterator_01.cc @@ -18,21 +18,21 @@ // make sure that block vector iterator allows reading and writing correctly #include "../tests.h" -#include +#include #include #include void test () { - PETScWrappers::BlockVector v(2,1); + PETScWrappers::MPI::BlockVector v(2, MPI_COMM_WORLD, 1, 1); v(0) = 1; v(1) = 2; // first check reading through a const // iterator { - PETScWrappers::BlockVector::const_iterator i=v.begin(); + PETScWrappers::MPI::BlockVector::const_iterator i=v.begin(); AssertThrow (*i == 1, ExcInternalError()); ++i; AssertThrow (*i == 2, ExcInternalError()); @@ -41,8 +41,8 @@ void test () // same, but create iterator in a different // way { - PETScWrappers::BlockVector::const_iterator - i=const_cast(v).begin(); + PETScWrappers::MPI::BlockVector::const_iterator + i=const_cast(v).begin(); AssertThrow (*i == 1, ExcInternalError()); ++i; AssertThrow (*i == 2, ExcInternalError()); @@ -50,7 +50,7 @@ void test () // read through a read-write iterator { - PETScWrappers::BlockVector::iterator i = v.begin(); + PETScWrappers::MPI::BlockVector::iterator i = v.begin(); AssertThrow (*i == 1, ExcInternalError()); ++i; AssertThrow (*i == 2, ExcInternalError()); @@ -58,7 +58,7 @@ void test () // write through a read-write iterator { - PETScWrappers::BlockVector::iterator i = v.begin(); + PETScWrappers::MPI::BlockVector::iterator i = v.begin(); *i = 2; ++i; @@ -67,7 +67,7 @@ void test () // and read again { - PETScWrappers::BlockVector::iterator i = v.begin(); + PETScWrappers::MPI::BlockVector::iterator i = v.begin(); AssertThrow (*i == 2, ExcInternalError()); ++i; AssertThrow (*i == 3, ExcInternalError()); diff --git a/tests/petsc/block_vector_iterator_02.cc b/tests/petsc/block_vector_iterator_02.cc index c0a97d084b..c97f634852 100644 --- a/tests/petsc/block_vector_iterator_02.cc +++ b/tests/petsc/block_vector_iterator_02.cc @@ -18,21 +18,21 @@ // like _01, except that we use operator[] instead of operator* #include "../tests.h" -#include +#include #include #include void test () { - PETScWrappers::BlockVector v(2,1); + PETScWrappers::MPI::BlockVector v(2, MPI_COMM_WORLD, 1, 1); v(0) = 1; v(1) = 2; // first check reading through a const // iterator { - PETScWrappers::BlockVector::const_iterator i=v.begin(); + PETScWrappers::MPI::BlockVector::const_iterator i=v.begin(); AssertThrow (i[0] == 1, ExcInternalError()); AssertThrow (i[1] == 2, ExcInternalError()); } @@ -40,29 +40,29 @@ void test () // same, but create iterator in a different // way { - PETScWrappers::BlockVector::const_iterator - i=const_cast(v).begin(); + PETScWrappers::MPI::BlockVector::const_iterator + i=const_cast(v).begin(); AssertThrow (i[0] == 1, ExcInternalError()); AssertThrow (i[1] == 2, ExcInternalError()); } // read through a read-write iterator { - PETScWrappers::BlockVector::iterator i = v.begin(); + PETScWrappers::MPI::BlockVector::iterator i = v.begin(); AssertThrow (i[0] == 1, ExcInternalError()); AssertThrow (i[1] == 2, ExcInternalError()); } // write through a read-write iterator { - PETScWrappers::BlockVector::iterator i = v.begin(); + PETScWrappers::MPI::BlockVector::iterator i = v.begin(); i[0] = 2; i[1] = 3; } // and read again { - PETScWrappers::BlockVector::iterator i = v.begin(); + PETScWrappers::MPI::BlockVector::iterator i = v.begin(); AssertThrow (i[0] == 2, ExcInternalError()); AssertThrow (i[1] == 3, ExcInternalError()); } diff --git a/tests/petsc/block_vector_iterator_03.cc b/tests/petsc/block_vector_iterator_03.cc index 03b6cfb64b..e7c9fe2e0b 100644 --- a/tests/petsc/block_vector_iterator_03.cc +++ b/tests/petsc/block_vector_iterator_03.cc @@ -19,7 +19,7 @@ #include "../tests.h" #include -#include +#include #include #include #include @@ -29,8 +29,8 @@ #include template -bool operator == (const PETScWrappers::BlockVector &v1, - const PETScWrappers::BlockVector &v2) +bool operator == (const PETScWrappers::MPI::BlockVector &v1, + const PETScWrappers::MPI::BlockVector &v2) { if (v1.size() != v2.size()) return false; @@ -53,8 +53,8 @@ void test () // iterators if (true) { - PETScWrappers::BlockVector v1(ivector); - PETScWrappers::BlockVector v2(ivector); + PETScWrappers::MPI::BlockVector v1(ivector, MPI_COMM_WORLD, ivector); + PETScWrappers::MPI::BlockVector v2(ivector, MPI_COMM_WORLD, ivector); // initialize first vector with // simple loop @@ -62,7 +62,7 @@ void test () v1(i) = i; // initialize other vector // through iterators - PETScWrappers::BlockVector::iterator p2 = v2.begin(); + PETScWrappers::MPI::BlockVector::iterator p2 = v2.begin(); for (unsigned int i=0; i(v1.size()) ? "true" : "false") << std::endl; // check std::copy - PETScWrappers::BlockVector v2(ivector); + PETScWrappers::MPI::BlockVector v2(ivector, MPI_COMM_WORLD, ivector); std::copy (v1.begin(), v1.end(), v2.begin()); - deallog << "Check 6: " << (v1 == v2 ? "true" : "false") << std::endl; + deallog << "Check 5: " << (v1 == v2 ? "true" : "false") << std::endl; // check std::transform std::transform (v1.begin(), v1.end(), v2.begin(), std::bind (std::multiplies(), std::placeholders::_1, 2.0)); + v2.compress(VectorOperation::insert); v2 *= 1./2.; - deallog << "Check 7: " << (v1 == v2 ? "true" : "false") << std::endl; + deallog << "Check 6: " << (v1 == v2 ? "true" : "false") << std::endl; // check operators +/-, +=/-= - deallog << "Check 8: " + deallog << "Check 7: " << (std::distance(v1.begin(), v1.begin()+3) == 3 ? "true" : "false") << std::endl; - deallog << "Check 9: " + deallog << "Check 8: " << (std::distance(v1.end()-6, v1.end()) == 6 ? "true" : "false") << std::endl; - deallog << "Check 10: " + deallog << "Check 9: " << (std::distance(v1.begin(), v1.end()) == (signed)v1.size() ? "true" : "false") << std::endl; - deallog << "Check 11: " + deallog << "Check 10: " << (std::distance(v1.begin(), (v1.begin()+=7)) == 7 ? "true" : "false") << std::endl; - deallog << "Check 12: " + deallog << "Check 11: " << (std::distance((v1.end()-=4), v1.end()) == 4 ? "true" : "false") << std::endl; // check advance - PETScWrappers::BlockVector::iterator p2 = v1.begin(); + PETScWrappers::MPI::BlockVector::iterator p2 = v1.begin(); std::advance (p2, v1.size()); - deallog << "Check 13: " << (p2 == v1.end() ? "true" : "false") << std::endl; + deallog << "Check 12: " << (p2 == v1.end() ? "true" : "false") << std::endl; - PETScWrappers::BlockVector::const_iterator p3 = v1.begin(); + PETScWrappers::MPI::BlockVector::const_iterator p3 = v1.begin(); std::advance (p3, v1.size()); - deallog << "Check 14: " << (p3 == v1.end() ? "true" : "false") << std::endl; - }; - - // Check 15: initialization through - // iterators - if (true) - { - PETScWrappers::BlockVector v1(ivector); - // initialize first vector with - // simple loop - for (unsigned int i=0; i v2(v1.begin(), v1.end()); - - // and reverse way - PETScWrappers::BlockVector v3(ivector, v2.begin(), v2.end()); - deallog << "Check 15: " << (v1==v3 ? "true" : "false") << std::endl; + deallog << "Check 13: " << (p3 == v1.end() ? "true" : "false") << std::endl; }; - // Check 16: initialization through - // iterators. variant with one - // constant object + // Check 14: operator[] if (true) { - PETScWrappers::BlockVector v1(ivector); - // initialize first vector with - // simple loop - for (unsigned int i=0; i v2(v1.begin(), v1.end()); - - // and reverse way - PETScWrappers::BlockVector v3(ivector, v2.begin(), v2.end()); - deallog << "Check 16: " << (v1==v3 ? "true" : "false") << std::endl; - }; - - // Check 17: initialization through - // iterators. variant with two - // constant object - if (true) - { - PETScWrappers::BlockVector v1(ivector); - // initialize first vector with - // simple loop - for (unsigned int i=0; i v2(v1.begin(), v1.end()); - - // and reverse way - const PETScWrappers::BlockVector v3(ivector, v2.begin(), v2.end()); - deallog << "Check 17: " << (v1==v3 ? "true" : "false") << std::endl; - }; - - // Check 18: initialization through - // iterators. variant with three - // constant object - if (true) - { - PETScWrappers::BlockVector v0(ivector); - // initialize first vector with - // simple loop - for (unsigned int i=0; i v2(v1.begin(), v1.end()); - - // and reverse way - const PETScWrappers::BlockVector v3(ivector, v2.begin(), v2.end()); - deallog << "Check 18: " << (v1==v3 ? "true" : "false") << std::endl; - }; - - // Check 19: operator[] - if (true) - { - PETScWrappers::BlockVector v1(ivector); + PETScWrappers::MPI::BlockVector v1(ivector, MPI_COMM_WORLD, ivector); for (unsigned int i=0; i #include #include -#include +#include #include #include #include @@ -86,15 +86,17 @@ int main(int argc, char **argv) testproblem.five_point(A); A.compress (VectorOperation::insert); - PETScWrappers::Vector f(dim); - PETScWrappers::Vector u(dim); + IndexSet indices(dim); + indices.add_range(0, dim); + PETScWrappers::MPI::Vector f(indices, MPI_COMM_WORLD); + PETScWrappers::MPI::Vector u(indices, MPI_COMM_WORLD); f = 1.; - GrowingVectorMemory mem; - SolverCG solver(control,mem); + GrowingVectorMemory mem; + SolverCG solver(control,mem); PreconditionIdentity preconditioner; check_solve (solver, control, A,u,f, preconditioner); } - GrowingVectorMemory::release_unused_memory (); + GrowingVectorMemory::release_unused_memory (); } diff --git a/tests/petsc/deal_solver_01.output b/tests/petsc/deal_solver_01.output index e5e3067846..ec2fa4d957 100644 --- a/tests/petsc/deal_solver_01.output +++ b/tests/petsc/deal_solver_01.output @@ -1,6 +1,6 @@ DEAL::Size 32 Unknowns 961 -DEAL::Solver type: N6dealii8SolverCGINS_13PETScWrappers6VectorEEE +DEAL::Solver type: N6dealii8SolverCGINS_13PETScWrappers3MPI6VectorEEE DEAL:cg::Starting value 31.00 DEAL:cg::Convergence step 43 value 0.0008189 DEAL::Solver stopped after 43 iterations diff --git a/tests/petsc/deal_solver_02.cc b/tests/petsc/deal_solver_02.cc index 30b0118ad3..542fcec35d 100644 --- a/tests/petsc/deal_solver_02.cc +++ b/tests/petsc/deal_solver_02.cc @@ -26,7 +26,7 @@ #include #include #include -#include +#include #include #include #include @@ -87,15 +87,17 @@ int main(int argc, char **argv) testproblem.five_point(A); A.compress (VectorOperation::insert); - PETScWrappers::Vector f(dim); - PETScWrappers::Vector u(dim); + IndexSet indices(dim); + indices.add_range(0, dim); + PETScWrappers::MPI::Vector f(indices, MPI_COMM_WORLD); + PETScWrappers::MPI::Vector u(indices, MPI_COMM_WORLD); f = 1.; - GrowingVectorMemory mem; - SolverBicgstab solver(control,mem); + GrowingVectorMemory mem; + SolverBicgstab solver(control,mem); PreconditionIdentity preconditioner; check_solve (solver, control, A,u,f, preconditioner); } - GrowingVectorMemory::release_unused_memory (); + GrowingVectorMemory::release_unused_memory (); } diff --git a/tests/petsc/deal_solver_02.output b/tests/petsc/deal_solver_02.output index 6df9529eef..a1636f1c50 100644 --- a/tests/petsc/deal_solver_02.output +++ b/tests/petsc/deal_solver_02.output @@ -1,4 +1,4 @@ DEAL::Size 32 Unknowns 961 -DEAL::Solver type: N6dealii14SolverBicgstabINS_13PETScWrappers6VectorEEE +DEAL::Solver type: N6dealii14SolverBicgstabINS_13PETScWrappers3MPI6VectorEEE DEAL::Solver stopped within 48 - 51 iterations diff --git a/tests/petsc/deal_solver_03.cc b/tests/petsc/deal_solver_03.cc index f615572171..cf3d39054d 100644 --- a/tests/petsc/deal_solver_03.cc +++ b/tests/petsc/deal_solver_03.cc @@ -26,7 +26,7 @@ #include #include #include -#include +#include #include #include #include @@ -87,16 +87,18 @@ int main(int argc, char **argv) PETScWrappers::SparseMatrix A(dim, dim, 5); testproblem.five_point(A); - PETScWrappers::Vector f(dim); - PETScWrappers::Vector u(dim); + IndexSet indices(dim); + indices.add_range(0, dim); + PETScWrappers::MPI::Vector f(indices, MPI_COMM_WORLD); + PETScWrappers::MPI::Vector u(indices, MPI_COMM_WORLD); f = 1.; A.compress (VectorOperation::insert); - GrowingVectorMemory mem; - SolverGMRES solver(control,mem); + GrowingVectorMemory mem; + SolverGMRES solver(control,mem); PreconditionIdentity preconditioner; check_solve (solver, control, A,u,f, preconditioner); } - GrowingVectorMemory::release_unused_memory (); + GrowingVectorMemory::release_unused_memory (); } diff --git a/tests/petsc/deal_solver_03.output b/tests/petsc/deal_solver_03.output index eacf26cd01..e2bdb9c6b9 100644 --- a/tests/petsc/deal_solver_03.output +++ b/tests/petsc/deal_solver_03.output @@ -1,6 +1,6 @@ DEAL::Size 32 Unknowns 961 -DEAL::Solver type: N6dealii11SolverGMRESINS_13PETScWrappers6VectorEEE +DEAL::Solver type: N6dealii11SolverGMRESINS_13PETScWrappers3MPI6VectorEEE DEAL:GMRES::Starting value 31.00 DEAL:GMRES::Convergence step 75 value 0.0008096 DEAL::Solver stopped after 75 iterations diff --git a/tests/petsc/deal_solver_04.cc b/tests/petsc/deal_solver_04.cc index edb8d3aa79..5a28f79885 100644 --- a/tests/petsc/deal_solver_04.cc +++ b/tests/petsc/deal_solver_04.cc @@ -25,7 +25,7 @@ #include #include #include -#include +#include #include #include #include @@ -86,16 +86,18 @@ int main(int argc, char **argv) PETScWrappers::SparseMatrix A(dim, dim, 5); testproblem.five_point(A); - PETScWrappers::Vector f(dim); - PETScWrappers::Vector u(dim); + IndexSet indices(dim); + indices.add_range(0, dim); + PETScWrappers::MPI::Vector f(indices, MPI_COMM_WORLD); + PETScWrappers::MPI::Vector u(indices, MPI_COMM_WORLD); f = 1.; A.compress (VectorOperation::insert); - GrowingVectorMemory mem; - SolverMinRes solver(control,mem); + GrowingVectorMemory mem; + SolverMinRes solver(control,mem); PreconditionIdentity preconditioner; check_solve (solver, control, A,u,f, preconditioner); } - GrowingVectorMemory::release_unused_memory (); + GrowingVectorMemory::release_unused_memory (); } diff --git a/tests/petsc/deal_solver_04.output b/tests/petsc/deal_solver_04.output index 64f8f39f24..cf60f86687 100644 --- a/tests/petsc/deal_solver_04.output +++ b/tests/petsc/deal_solver_04.output @@ -1,6 +1,6 @@ DEAL::Size 32 Unknowns 961 -DEAL::Solver type: N6dealii12SolverMinResINS_13PETScWrappers6VectorEEE +DEAL::Solver type: N6dealii12SolverMinResINS_13PETScWrappers3MPI6VectorEEE DEAL:minres::Starting value 31.0000 DEAL:minres::Convergence step 43 value 0.000691560 DEAL::Solver stopped after 43 iterations diff --git a/tests/petsc/deal_solver_05.cc b/tests/petsc/deal_solver_05.cc index 9d2515f271..3da07e9a3b 100644 --- a/tests/petsc/deal_solver_05.cc +++ b/tests/petsc/deal_solver_05.cc @@ -25,7 +25,7 @@ #include #include #include -#include +#include #include #include #include @@ -85,16 +85,18 @@ int main(int argc, char **argv) PETScWrappers::SparseMatrix A(dim, dim, 5); testproblem.five_point(A); - PETScWrappers::Vector f(dim); - PETScWrappers::Vector u(dim); + IndexSet indices(dim); + indices.add_range(0, dim); + PETScWrappers::MPI::Vector f(indices, MPI_COMM_WORLD); + PETScWrappers::MPI::Vector u(indices, MPI_COMM_WORLD); f = 1.; A.compress (VectorOperation::insert); - GrowingVectorMemory mem; - SolverQMRS solver(control,mem); + GrowingVectorMemory mem; + SolverQMRS solver(control,mem); PreconditionIdentity preconditioner; check_solve (solver, control, A,u,f, preconditioner); } - GrowingVectorMemory::release_unused_memory (); + GrowingVectorMemory::release_unused_memory (); } diff --git a/tests/petsc/deal_solver_05.output b/tests/petsc/deal_solver_05.output index f2ac4fc4cb..a662db55b7 100644 --- a/tests/petsc/deal_solver_05.output +++ b/tests/petsc/deal_solver_05.output @@ -1,6 +1,6 @@ DEAL::Size 32 Unknowns 961 -DEAL::Solver type: N6dealii10SolverQMRSINS_13PETScWrappers6VectorEEE +DEAL::Solver type: N6dealii10SolverQMRSINS_13PETScWrappers3MPI6VectorEEE DEAL:QMRS::Starting value 31.0000 DEAL:QMRS::Convergence step 46 value 0.000906349 DEAL::Solver stopped after 46 iterations diff --git a/tests/petsc/full_matrix_vector_01.cc b/tests/petsc/full_matrix_vector_01.cc index 8964a85d7f..ae53be91c2 100644 --- a/tests/petsc/full_matrix_vector_01.cc +++ b/tests/petsc/full_matrix_vector_01.cc @@ -18,15 +18,15 @@ // check FullMatrix::vmult #include "../tests.h" -#include +#include #include #include #include #include -void test (PETScWrappers::Vector &v, - PETScWrappers::Vector &w) +void test (PETScWrappers::MPI::Vector &v, + PETScWrappers::MPI::Vector &w) { PETScWrappers::FullMatrix m(v.size(),v.size()); for (unsigned int i=0; i +#include #include #include #include #include -void test (PETScWrappers::Vector &v, - PETScWrappers::Vector &w) +void test (PETScWrappers::MPI::Vector &v, + PETScWrappers::MPI::Vector &w) { PETScWrappers::FullMatrix m(v.size(),v.size()); for (unsigned int i=0; i +#include #include #include #include #include -void test (PETScWrappers::Vector &v, - PETScWrappers::Vector &w) +void test (PETScWrappers::MPI::Vector &v, + PETScWrappers::MPI::Vector &w) { PETScWrappers::FullMatrix m(v.size(),v.size()); for (unsigned int i=0; i +#include #include #include #include #include -void test (PETScWrappers::Vector &v, - PETScWrappers::Vector &w) +void test (PETScWrappers::MPI::Vector &v, + PETScWrappers::MPI::Vector &w) { PETScWrappers::FullMatrix m(v.size(),v.size()); for (unsigned int i=0; i +#include #include #include #include #include -void test (PETScWrappers::Vector &v, - PETScWrappers::Vector &w) +void test (PETScWrappers::MPI::Vector &v, + PETScWrappers::MPI::Vector &w) { PETScWrappers::FullMatrix m(v.size(),v.size()); for (unsigned int i=0; i +#include #include #include #include #include -void test (PETScWrappers::Vector &v) +void test (PETScWrappers::MPI::Vector &v) { PETScWrappers::FullMatrix m(v.size(),v.size()); for (unsigned int i=0; i +#include #include #include #include #include -void test (PETScWrappers::Vector &v, - PETScWrappers::Vector &w, - PETScWrappers::Vector &x) +void test (PETScWrappers::MPI::Vector &v, + PETScWrappers::MPI::Vector &w, + PETScWrappers::MPI::Vector &x) { PETScWrappers::FullMatrix m(v.size(),v.size()); for (unsigned int i=0; i #include -#include +#include #include #include #include @@ -50,9 +50,11 @@ void test () mat.compress(VectorOperation::insert); { - PETScWrappers::Vector src, dst; - src.reinit(5); - dst.reinit(5); + IndexSet indices(5); + indices.add_range(0, 5); + PETScWrappers::MPI::Vector src, dst; + src.reinit(indices, MPI_COMM_WORLD); + dst.reinit(indices, MPI_COMM_WORLD); src(0) = 1.0; src(1) = 2.0; src.compress(VectorOperation::insert); diff --git a/tests/petsc/reinit_preconditioner_02.with_mpi=true.output b/tests/petsc/reinit_preconditioner_02.with_mpi=true.output index 93db3a6236..7ee36d29de 100644 --- a/tests/petsc/reinit_preconditioner_02.with_mpi=true.output +++ b/tests/petsc/reinit_preconditioner_02.with_mpi=true.output @@ -1,31 +1,31 @@ -1.000e+00 6.667e-01 0.000e+00 0.000e+00 0.000e+00 -5.000e-01 6.667e-01 0.000e+00 0.000e+00 0.000e+00 +[Proc0 0-4] 1.000e+00 6.667e-01 0.000e+00 0.000e+00 0.000e+00 +[Proc0 0-4] 5.000e-01 6.667e-01 0.000e+00 0.000e+00 0.000e+00 DEAL:0::OK -9.365e-01 6.355e-01 0.000e+00 0.000e+00 0.000e+00 -4.674e-01 6.511e-01 0.000e+00 0.000e+00 0.000e+00 +[Proc0 0-4] 9.365e-01 6.355e-01 0.000e+00 0.000e+00 0.000e+00 +[Proc0 0-4] 4.674e-01 6.511e-01 0.000e+00 0.000e+00 0.000e+00 DEAL:0::OK -9.365e-01 6.355e-01 0.000e+00 0.000e+00 0.000e+00 -4.674e-01 6.511e-01 0.000e+00 0.000e+00 0.000e+00 +[Proc0 0-4] 9.365e-01 6.355e-01 0.000e+00 0.000e+00 0.000e+00 +[Proc0 0-4] 4.674e-01 6.511e-01 0.000e+00 0.000e+00 0.000e+00 DEAL:0::OK -9.365e-01 6.355e-01 0.000e+00 0.000e+00 0.000e+00 -4.674e-01 6.511e-01 0.000e+00 0.000e+00 0.000e+00 +[Proc0 0-4] 9.365e-01 6.355e-01 0.000e+00 0.000e+00 0.000e+00 +[Proc0 0-4] 4.674e-01 6.511e-01 0.000e+00 0.000e+00 0.000e+00 DEAL:0::OK -9.365e-01 6.355e-01 0.000e+00 0.000e+00 0.000e+00 -4.674e-01 6.511e-01 0.000e+00 0.000e+00 0.000e+00 +[Proc0 0-4] 9.365e-01 6.355e-01 0.000e+00 0.000e+00 0.000e+00 +[Proc0 0-4] 4.674e-01 6.511e-01 0.000e+00 0.000e+00 0.000e+00 DEAL:0::OK -9.365e-01 6.355e-01 0.000e+00 0.000e+00 0.000e+00 -4.674e-01 6.511e-01 0.000e+00 0.000e+00 0.000e+00 +[Proc0 0-4] 9.365e-01 6.355e-01 0.000e+00 0.000e+00 0.000e+00 +[Proc0 0-4] 4.674e-01 6.511e-01 0.000e+00 0.000e+00 0.000e+00 DEAL:0::OK -9.365e-01 6.355e-01 0.000e+00 0.000e+00 0.000e+00 -4.674e-01 6.511e-01 0.000e+00 0.000e+00 0.000e+00 +[Proc0 0-4] 9.365e-01 6.355e-01 0.000e+00 0.000e+00 0.000e+00 +[Proc0 0-4] 4.674e-01 6.511e-01 0.000e+00 0.000e+00 0.000e+00 DEAL:0::OK -9.367e-01 6.333e-01 0.000e+00 0.000e+00 0.000e+00 -4.675e-01 6.500e-01 0.000e+00 0.000e+00 0.000e+00 +[Proc0 0-4] 9.367e-01 6.333e-01 0.000e+00 0.000e+00 0.000e+00 +[Proc0 0-4] 4.675e-01 6.500e-01 0.000e+00 0.000e+00 0.000e+00 DEAL:0::OK -1.000e+00 6.667e-01 0.000e+00 0.000e+00 0.000e+00 -5.000e-01 6.667e-01 0.000e+00 0.000e+00 0.000e+00 +[Proc0 0-4] 1.000e+00 6.667e-01 0.000e+00 0.000e+00 0.000e+00 +[Proc0 0-4] 5.000e-01 6.667e-01 0.000e+00 0.000e+00 0.000e+00 DEAL:0::OK -1.000e+00 2.000e+00 0.000e+00 0.000e+00 0.000e+00 -1.000e+00 2.000e+00 0.000e+00 0.000e+00 0.000e+00 +[Proc0 0-4] 1.000e+00 2.000e+00 0.000e+00 0.000e+00 0.000e+00 +[Proc0 0-4] 1.000e+00 2.000e+00 0.000e+00 0.000e+00 0.000e+00 DEAL:0::OK diff --git a/tests/petsc/slowness_02.cc b/tests/petsc/slowness_02.cc index 23ae5b6a69..1e561d07ea 100644 --- a/tests/petsc/slowness_02.cc +++ b/tests/petsc/slowness_02.cc @@ -25,7 +25,7 @@ #include "../tests.h" #include #include -#include +#include #include #include @@ -68,7 +68,10 @@ void test () // then do a single matrix-vector // multiplication with subsequent formation // of the matrix norm - PETScWrappers::Vector v1(N*N), v2(N*N); + IndexSet indices(N*N); + indices.add_range(0, N*N); + PETScWrappers::MPI::Vector v1(indices, MPI_COMM_WORLD), + v2(indices, MPI_COMM_WORLD); for (unsigned int i=0; i -#include +#include #include #include @@ -39,8 +39,10 @@ int main(int argc, char **argv) PETScWrappers::SparseMatrix A(dim, dim, 5); testproblem.five_point(A); - PETScWrappers::Vector f(dim); - PETScWrappers::Vector u(dim); + IndexSet indices(dim); + indices.add_range(0, dim); + PETScWrappers::MPI::Vector f(indices, MPI_COMM_WORLD); + PETScWrappers::MPI::Vector u(indices, MPI_COMM_WORLD); f = 1.; u = 0.; diff --git a/tests/petsc/solver_02.cc b/tests/petsc/solver_02.cc index 7c393efd1e..e9526dc8ff 100644 --- a/tests/petsc/solver_02.cc +++ b/tests/petsc/solver_02.cc @@ -19,7 +19,7 @@ #include "../testmatrix.h" #include -#include +#include #include #include @@ -39,8 +39,10 @@ int main(int argc, char **argv) PETScWrappers::SparseMatrix A(dim, dim, 5); testproblem.five_point(A); - PETScWrappers::Vector f(dim); - PETScWrappers::Vector u(dim); + IndexSet indices(dim); + indices.add_range(0, dim); + PETScWrappers::MPI::Vector f(indices, MPI_COMM_WORLD); + PETScWrappers::MPI::Vector u(indices, MPI_COMM_WORLD); f = 1.; u = 0.; diff --git a/tests/petsc/solver_03.cc b/tests/petsc/solver_03.cc index c5689853c8..b8c95eded8 100644 --- a/tests/petsc/solver_03.cc +++ b/tests/petsc/solver_03.cc @@ -25,7 +25,7 @@ #include #include #include -#include +#include #include #include #include @@ -80,8 +80,10 @@ int main(int argc, char **argv) PETScWrappers::SparseMatrix A(dim, dim, 5); testproblem.five_point(A); - PETScWrappers::Vector f(dim); - PETScWrappers::Vector u(dim); + IndexSet indices(dim); + indices.add_range(0, dim); + PETScWrappers::MPI::Vector f(indices, MPI_COMM_WORLD); + PETScWrappers::MPI::Vector u(indices, MPI_COMM_WORLD); f = 1.; A.compress (VectorOperation::insert); diff --git a/tests/petsc/solver_03_mf.cc b/tests/petsc/solver_03_mf.cc index f282cc6820..acaad95256 100644 --- a/tests/petsc/solver_03_mf.cc +++ b/tests/petsc/solver_03_mf.cc @@ -25,7 +25,7 @@ #include #include #include -#include +#include #include #include #include @@ -78,8 +78,10 @@ int main(int argc, char **argv) PetscFDMatrix A(size, dim); - PETScWrappers::Vector f(dim); - PETScWrappers::Vector u(dim); + IndexSet indices(dim); + indices.add_range(0, dim); + PETScWrappers::MPI::Vector f(indices, MPI_COMM_WORLD); + PETScWrappers::MPI::Vector u(indices, MPI_COMM_WORLD); f = 1.; A.compress (VectorOperation::insert); diff --git a/tests/petsc/solver_03_precondition_boomeramg.cc b/tests/petsc/solver_03_precondition_boomeramg.cc index 5891232a54..b9002f6af7 100644 --- a/tests/petsc/solver_03_precondition_boomeramg.cc +++ b/tests/petsc/solver_03_precondition_boomeramg.cc @@ -26,7 +26,7 @@ #include #include #include -#include +#include #include #include #include @@ -81,8 +81,10 @@ int main(int argc, char **argv) PETScWrappers::SparseMatrix A(dim, dim, 5); testproblem.five_point(A); - PETScWrappers::Vector f(dim); - PETScWrappers::Vector u(dim); + IndexSet indices(dim); + indices.add_range(0, dim); + PETScWrappers::MPI::Vector f(indices, MPI_COMM_WORLD); + PETScWrappers::MPI::Vector u(indices, MPI_COMM_WORLD); f = 1.; A.compress (VectorOperation::insert); diff --git a/tests/petsc/solver_03_precondition_boomeramg_symmetric.cc b/tests/petsc/solver_03_precondition_boomeramg_symmetric.cc index 7c978e9bfb..4fd859f533 100644 --- a/tests/petsc/solver_03_precondition_boomeramg_symmetric.cc +++ b/tests/petsc/solver_03_precondition_boomeramg_symmetric.cc @@ -27,7 +27,7 @@ #include #include #include -#include +#include #include #include #include @@ -82,8 +82,10 @@ int main(int argc, char **argv) PETScWrappers::SparseMatrix A(dim, dim, 5); testproblem.five_point(A); - PETScWrappers::Vector f(dim); - PETScWrappers::Vector u(dim); + IndexSet indices(dim); + indices.add_range(0, dim); + PETScWrappers::MPI::Vector f(indices, MPI_COMM_WORLD); + PETScWrappers::MPI::Vector u(indices, MPI_COMM_WORLD); f = 1.; A.compress (VectorOperation::insert); diff --git a/tests/petsc/solver_03_precondition_eisenstat.cc b/tests/petsc/solver_03_precondition_eisenstat.cc index c234939647..7b3fb5c2bf 100644 --- a/tests/petsc/solver_03_precondition_eisenstat.cc +++ b/tests/petsc/solver_03_precondition_eisenstat.cc @@ -25,7 +25,7 @@ #include #include #include -#include +#include #include #include #include @@ -80,8 +80,10 @@ int main(int argc, char **argv) PETScWrappers::SparseMatrix A(dim, dim, 5); testproblem.five_point(A); - PETScWrappers::Vector f(dim); - PETScWrappers::Vector u(dim); + IndexSet indices(dim); + indices.add_range(0, dim); + PETScWrappers::MPI::Vector f(indices, MPI_COMM_WORLD); + PETScWrappers::MPI::Vector u(indices, MPI_COMM_WORLD); f = 1.; A.compress (VectorOperation::insert); diff --git a/tests/petsc/solver_03_precondition_icc.cc b/tests/petsc/solver_03_precondition_icc.cc index ee5c4ff322..90454d6791 100644 --- a/tests/petsc/solver_03_precondition_icc.cc +++ b/tests/petsc/solver_03_precondition_icc.cc @@ -25,7 +25,7 @@ #include #include #include -#include +#include #include #include #include @@ -80,8 +80,10 @@ int main(int argc, char **argv) PETScWrappers::SparseMatrix A(dim, dim, 5); testproblem.five_point(A); - PETScWrappers::Vector f(dim); - PETScWrappers::Vector u(dim); + IndexSet indices(dim); + indices.add_range(0, dim); + PETScWrappers::MPI::Vector f(indices, MPI_COMM_WORLD); + PETScWrappers::MPI::Vector u(indices, MPI_COMM_WORLD); f = 1.; A.compress (VectorOperation::insert); diff --git a/tests/petsc/solver_03_precondition_ilu.cc b/tests/petsc/solver_03_precondition_ilu.cc index 9497ab7a1f..a88f91a59a 100644 --- a/tests/petsc/solver_03_precondition_ilu.cc +++ b/tests/petsc/solver_03_precondition_ilu.cc @@ -25,7 +25,7 @@ #include #include #include -#include +#include #include #include #include @@ -80,8 +80,10 @@ int main(int argc, char **argv) PETScWrappers::SparseMatrix A(dim, dim, 5); testproblem.five_point(A); - PETScWrappers::Vector f(dim); - PETScWrappers::Vector u(dim); + IndexSet indices(dim); + indices.add_range(0, dim); + PETScWrappers::MPI::Vector f(indices, MPI_COMM_WORLD); + PETScWrappers::MPI::Vector u(indices, MPI_COMM_WORLD); f = 1.; A.compress (VectorOperation::insert); f.compress (VectorOperation::insert); diff --git a/tests/petsc/solver_03_precondition_lu.cc b/tests/petsc/solver_03_precondition_lu.cc index 764b6ce78e..65f14b6a9d 100644 --- a/tests/petsc/solver_03_precondition_lu.cc +++ b/tests/petsc/solver_03_precondition_lu.cc @@ -26,7 +26,7 @@ #include #include #include -#include +#include #include #include #include @@ -87,8 +87,10 @@ int main(int argc, char **argv) PETScWrappers::SparseMatrix A(dim, dim, 5); testproblem.five_point(A); - PETScWrappers::Vector f(dim); - PETScWrappers::Vector u(dim); + IndexSet indices(dim); + indices.add_range(0, dim); + PETScWrappers::MPI::Vector f(indices, MPI_COMM_WORLD); + PETScWrappers::MPI::Vector u(indices, MPI_COMM_WORLD); f = 1.; A.compress (VectorOperation::insert); diff --git a/tests/petsc/solver_03_precondition_parasails.cc b/tests/petsc/solver_03_precondition_parasails.cc index 4604acad3f..87b7c5f245 100644 --- a/tests/petsc/solver_03_precondition_parasails.cc +++ b/tests/petsc/solver_03_precondition_parasails.cc @@ -25,7 +25,7 @@ #include #include #include -#include +#include #include #include #include @@ -80,8 +80,10 @@ int main(int argc, char **argv) PETScWrappers::SparseMatrix A(dim, dim, 5); testproblem.five_point(A); - PETScWrappers::Vector f(dim); - PETScWrappers::Vector u(dim); + IndexSet indices(dim); + indices.add_range(0, dim); + PETScWrappers::MPI::Vector f(indices, MPI_COMM_WORLD); + PETScWrappers::MPI::Vector u(indices, MPI_COMM_WORLD); f = 1.; A.compress (VectorOperation::insert); diff --git a/tests/petsc/solver_03_precondition_sor.cc b/tests/petsc/solver_03_precondition_sor.cc index 1ca85af127..843d599dd8 100644 --- a/tests/petsc/solver_03_precondition_sor.cc +++ b/tests/petsc/solver_03_precondition_sor.cc @@ -25,7 +25,7 @@ #include #include #include -#include +#include #include #include #include @@ -80,8 +80,10 @@ int main(int argc, char **argv) PETScWrappers::SparseMatrix A(dim, dim, 5); testproblem.five_point(A); - PETScWrappers::Vector f(dim); - PETScWrappers::Vector u(dim); + IndexSet indices(dim); + indices.add_range(0, dim); + PETScWrappers::MPI::Vector f(indices, MPI_COMM_WORLD); + PETScWrappers::MPI::Vector u(indices, MPI_COMM_WORLD); f = 1.; A.compress (VectorOperation::insert); diff --git a/tests/petsc/solver_03_precondition_ssor.cc b/tests/petsc/solver_03_precondition_ssor.cc index 5a4c8d2685..5b67535996 100644 --- a/tests/petsc/solver_03_precondition_ssor.cc +++ b/tests/petsc/solver_03_precondition_ssor.cc @@ -25,7 +25,7 @@ #include #include #include -#include +#include #include #include #include @@ -80,8 +80,10 @@ int main(int argc, char **argv) PETScWrappers::SparseMatrix A(dim, dim, 5); testproblem.five_point(A); - PETScWrappers::Vector f(dim); - PETScWrappers::Vector u(dim); + IndexSet indices(dim); + indices.add_range(0, dim); + PETScWrappers::MPI::Vector f(indices, MPI_COMM_WORLD); + PETScWrappers::MPI::Vector u(indices, MPI_COMM_WORLD); f = 1.; A.compress (VectorOperation::insert); diff --git a/tests/petsc/solver_04.cc b/tests/petsc/solver_04.cc index 017adc6759..5e380e855a 100644 --- a/tests/petsc/solver_04.cc +++ b/tests/petsc/solver_04.cc @@ -25,7 +25,7 @@ #include #include #include -#include +#include #include #include #include @@ -80,8 +80,10 @@ int main(int argc, char **argv) PETScWrappers::SparseMatrix A(dim, dim, 5); testproblem.five_point(A); - PETScWrappers::Vector f(dim); - PETScWrappers::Vector u(dim); + IndexSet indices(dim); + indices.add_range(0, dim); + PETScWrappers::MPI::Vector f(indices, MPI_COMM_WORLD); + PETScWrappers::MPI::Vector u(indices, MPI_COMM_WORLD); f = 1.; A.compress (VectorOperation::insert); diff --git a/tests/petsc/solver_05.cc b/tests/petsc/solver_05.cc index 8ab29f5e16..a643de0d31 100644 --- a/tests/petsc/solver_05.cc +++ b/tests/petsc/solver_05.cc @@ -25,7 +25,7 @@ #include #include #include -#include +#include #include #include #include @@ -80,8 +80,10 @@ int main(int argc, char **argv) PETScWrappers::SparseMatrix A(dim, dim, 5); testproblem.five_point(A); - PETScWrappers::Vector f(dim); - PETScWrappers::Vector u(dim); + IndexSet indices(dim); + indices.add_range(0, dim); + PETScWrappers::MPI::Vector f(indices, MPI_COMM_WORLD); + PETScWrappers::MPI::Vector u(indices, MPI_COMM_WORLD); f = 1.; A.compress (VectorOperation::insert); diff --git a/tests/petsc/solver_06.cc b/tests/petsc/solver_06.cc index 20aa032485..f885cb6ae9 100644 --- a/tests/petsc/solver_06.cc +++ b/tests/petsc/solver_06.cc @@ -25,7 +25,7 @@ #include #include #include -#include +#include #include #include #include @@ -83,8 +83,10 @@ int main(int argc, char **argv) PETScWrappers::SparseMatrix A(dim, dim, 5); testproblem.five_point(A); - PETScWrappers::Vector f(dim); - PETScWrappers::Vector u(dim); + IndexSet indices(dim); + indices.add_range(0, dim); + PETScWrappers::MPI::Vector f(indices, MPI_COMM_WORLD); + PETScWrappers::MPI::Vector u(indices, MPI_COMM_WORLD); f = 1.; A.compress (VectorOperation::insert); diff --git a/tests/petsc/solver_07.cc b/tests/petsc/solver_07.cc index 93bcfe4c5f..ee69eaa066 100644 --- a/tests/petsc/solver_07.cc +++ b/tests/petsc/solver_07.cc @@ -25,7 +25,7 @@ #include #include #include -#include +#include #include #include #include @@ -80,8 +80,10 @@ int main(int argc, char **argv) PETScWrappers::SparseMatrix A(dim, dim, 5); testproblem.five_point(A); - PETScWrappers::Vector f(dim); - PETScWrappers::Vector u(dim); + IndexSet indices(dim); + indices.add_range(0, dim); + PETScWrappers::MPI::Vector f(indices, MPI_COMM_WORLD); + PETScWrappers::MPI::Vector u(indices, MPI_COMM_WORLD); f = 1.; A.compress (VectorOperation::insert); diff --git a/tests/petsc/solver_08.cc b/tests/petsc/solver_08.cc index da9dece9d3..2ccc0e3025 100644 --- a/tests/petsc/solver_08.cc +++ b/tests/petsc/solver_08.cc @@ -25,7 +25,7 @@ #include #include #include -#include +#include #include #include #include @@ -80,8 +80,10 @@ int main(int argc, char **argv) PETScWrappers::SparseMatrix A(dim, dim, 5); testproblem.five_point(A); - PETScWrappers::Vector f(dim); - PETScWrappers::Vector u(dim); + IndexSet indices(dim); + indices.add_range(0, dim); + PETScWrappers::MPI::Vector f(indices, MPI_COMM_WORLD); + PETScWrappers::MPI::Vector u(indices, MPI_COMM_WORLD); f = 1.; A.compress (VectorOperation::insert); diff --git a/tests/petsc/solver_09.cc b/tests/petsc/solver_09.cc index 5da9fea56c..ce88c68740 100644 --- a/tests/petsc/solver_09.cc +++ b/tests/petsc/solver_09.cc @@ -29,7 +29,7 @@ #include #include #include -#include +#include #include #include #include @@ -84,8 +84,10 @@ int main(int argc, char **argv) PETScWrappers::SparseMatrix A(dim, dim, 5); testproblem.five_point(A); - PETScWrappers::Vector f(dim); - PETScWrappers::Vector u(dim); + IndexSet indices(dim); + indices.add_range(0, dim); + PETScWrappers::MPI::Vector f(indices, MPI_COMM_WORLD); + PETScWrappers::MPI::Vector u(indices, MPI_COMM_WORLD); f = 1.; A.compress (VectorOperation::insert); diff --git a/tests/petsc/solver_10.cc b/tests/petsc/solver_10.cc index c92bf27906..977c01375b 100644 --- a/tests/petsc/solver_10.cc +++ b/tests/petsc/solver_10.cc @@ -25,7 +25,7 @@ #include #include #include -#include +#include #include #include #include @@ -80,8 +80,10 @@ int main(int argc, char **argv) PETScWrappers::SparseMatrix A(dim, dim, 5); testproblem.five_point(A); - PETScWrappers::Vector f(dim); - PETScWrappers::Vector u(dim); + IndexSet indices(dim); + indices.add_range(0, dim); + PETScWrappers::MPI::Vector f(indices, MPI_COMM_WORLD); + PETScWrappers::MPI::Vector u(indices, MPI_COMM_WORLD); f = 1.; A.compress (VectorOperation::insert); diff --git a/tests/petsc/solver_11.cc b/tests/petsc/solver_11.cc index 2554bc781b..9f9bc85701 100644 --- a/tests/petsc/solver_11.cc +++ b/tests/petsc/solver_11.cc @@ -20,7 +20,7 @@ #include #include -#include +#include #include #include @@ -40,8 +40,10 @@ int main(int argc, char **argv) PETScWrappers::SparseMatrix A(dim, dim, 5); testproblem.five_point(A); - PETScWrappers::Vector f(dim); - PETScWrappers::Vector u(dim); + IndexSet indices(dim); + indices.add_range(0, dim); + PETScWrappers::MPI::Vector f(indices, MPI_COMM_WORLD); + PETScWrappers::MPI::Vector u(indices, MPI_COMM_WORLD); f = 1.; u = 0.; diff --git a/tests/petsc/solver_12.cc b/tests/petsc/solver_12.cc index 045d4a6b56..a560ff74f7 100644 --- a/tests/petsc/solver_12.cc +++ b/tests/petsc/solver_12.cc @@ -25,7 +25,7 @@ #include #include #include -#include +#include #include #include #include @@ -73,8 +73,10 @@ int main(int argc, char **argv) PETScWrappers::SparseMatrix A(dim, dim, 5); testproblem.five_point(A); - PETScWrappers::Vector f(dim); - PETScWrappers::Vector u(dim); + IndexSet indices(dim); + indices.add_range(0, dim); + PETScWrappers::MPI::Vector f(indices, MPI_COMM_WORLD); + PETScWrappers::MPI::Vector u(indices, MPI_COMM_WORLD); f = 1.; A.compress (VectorOperation::insert); diff --git a/tests/petsc/solver_13.cc b/tests/petsc/solver_13.cc index 6779b7a89f..947417fab6 100644 --- a/tests/petsc/solver_13.cc +++ b/tests/petsc/solver_13.cc @@ -25,7 +25,7 @@ #include #include #include -#include +#include #include #include #include @@ -70,12 +70,14 @@ int main(int argc, char **argv) PETScWrappers::SparseMatrix A(dim, dim, 5); testproblem.five_point(A); - PETScWrappers::Vector f(dim); - PETScWrappers::Vector u(dim); + IndexSet indices(dim); + indices.add_range(0, dim); + PETScWrappers::MPI::Vector f(indices, MPI_COMM_WORLD); + PETScWrappers::MPI::Vector u(indices, MPI_COMM_WORLD); u = 0.; f = 1.; A.compress (VectorOperation::insert); - PETScWrappers::Vector t=u; + PETScWrappers::MPI::Vector t=u; PETScWrappers::SolverPreOnly solver(control); diff --git a/tests/petsc/sparse_direct_mumps.cc b/tests/petsc/sparse_direct_mumps.cc index f6e2d04d7c..217e4d7291 100644 --- a/tests/petsc/sparse_direct_mumps.cc +++ b/tests/petsc/sparse_direct_mumps.cc @@ -25,7 +25,7 @@ #include #include #include -#include +#include #include #include #include @@ -52,8 +52,10 @@ int main(int argc, char **argv) PETScWrappers::SparseMatrix A(dim, dim, 5); testproblem.five_point(A); - PETScWrappers::Vector f(dim); - PETScWrappers::Vector u(dim); + IndexSet indices(dim); + indices.add_range(0, dim); + PETScWrappers::MPI::Vector f(indices, MPI_COMM_WORLD); + PETScWrappers::MPI::Vector u(indices, MPI_COMM_WORLD); u = 0.; f = 1.; A.compress (VectorOperation::insert); @@ -63,10 +65,9 @@ int main(int argc, char **argv) // solver.set_symmetric_mode(true); solver.solve(A,u,f); - PETScWrappers::Vector tmp(dim); + PETScWrappers::MPI::Vector tmp(dim); deallog << "residual = " << A.residual (tmp, u, f) << std::endl; } } - diff --git a/tests/petsc/sparse_matrix_01.cc b/tests/petsc/sparse_matrix_01.cc index 94d567d13f..e291496a86 100644 --- a/tests/petsc/sparse_matrix_01.cc +++ b/tests/petsc/sparse_matrix_01.cc @@ -18,7 +18,6 @@ // check SparseMatrix::add(other, factor) #include "../tests.h" -#include #include #include #include diff --git a/tests/petsc/sparse_matrix_02.cc b/tests/petsc/sparse_matrix_02.cc index 2054876d80..4b36f9939e 100644 --- a/tests/petsc/sparse_matrix_02.cc +++ b/tests/petsc/sparse_matrix_02.cc @@ -19,7 +19,6 @@ // now forbidden #include "../tests.h" -#include #include #include #include diff --git a/tests/petsc/sparse_matrix_vector_01.cc b/tests/petsc/sparse_matrix_vector_01.cc index 7c69060bb2..64e4843099 100644 --- a/tests/petsc/sparse_matrix_vector_01.cc +++ b/tests/petsc/sparse_matrix_vector_01.cc @@ -18,15 +18,15 @@ // check SparseMatrix::vmult #include "../tests.h" -#include +#include #include #include #include #include -void test (PETScWrappers::Vector &v, - PETScWrappers::Vector &w) +void test (PETScWrappers::MPI::Vector &v, + PETScWrappers::MPI::Vector &w) { PETScWrappers::SparseMatrix m(v.size(),v.size(),v.size()); for (unsigned int i=0; i +#include #include #include #include #include -void test (PETScWrappers::Vector &v, - PETScWrappers::Vector &w) +void test (PETScWrappers::MPI::Vector &v, + PETScWrappers::MPI::Vector &w) { PETScWrappers::SparseMatrix m(v.size(),v.size(),v.size()); for (unsigned int i=0; i +#include #include #include #include #include -void test (PETScWrappers::Vector &v, - PETScWrappers::Vector &w) +void test (PETScWrappers::MPI::Vector &v, + PETScWrappers::MPI::Vector &w) { PETScWrappers::SparseMatrix m(v.size(),v.size(),v.size()); for (unsigned int i=0; i +#include #include #include #include #include -void test (PETScWrappers::Vector &v, - PETScWrappers::Vector &w) +void test (PETScWrappers::MPI::Vector &v, + PETScWrappers::MPI::Vector &w) { PETScWrappers::SparseMatrix m(v.size(),v.size(),v.size()); for (unsigned int i=0; i +#include #include #include #include #include -void test (PETScWrappers::Vector &v, - PETScWrappers::Vector &w) +void test (PETScWrappers::MPI::Vector &v, + PETScWrappers::MPI::Vector &w) { PETScWrappers::SparseMatrix m(v.size(),v.size(),v.size()); for (unsigned int i=0; i +#include #include #include #include #include -void test (PETScWrappers::Vector &v) +void test (PETScWrappers::MPI::Vector &v) { PETScWrappers::SparseMatrix m(v.size(),v.size(),v.size()); for (unsigned int i=0; i +#include #include #include #include #include -void test (PETScWrappers::Vector &v, - PETScWrappers::Vector &w, - PETScWrappers::Vector &x) +void test (PETScWrappers::MPI::Vector &v, + PETScWrappers::MPI::Vector &w, + PETScWrappers::MPI::Vector &x) { PETScWrappers::SparseMatrix m(v.size(),v.size(),v.size()); for (unsigned int i=0; i +#include #include #include #include -void test (PETScWrappers::Vector &v, - PETScWrappers::Vector &w) +void test (PETScWrappers::MPI::Vector &v, + PETScWrappers::MPI::Vector &w) { // set the first vector for (unsigned int i=0; i +#include #include #include #include -void test (PETScWrappers::Vector &v, - PETScWrappers::Vector &w) +void test (PETScWrappers::MPI::Vector &v, + PETScWrappers::MPI::Vector &w) { // set the first vector for (unsigned int i=0; i +#include #include #include #include -void test (PETScWrappers::Vector &v, - PETScWrappers::Vector &w) +void test (PETScWrappers::MPI::Vector &v, + PETScWrappers::MPI::Vector &w) { // set only certain elements of each // vector @@ -54,8 +54,10 @@ int main (int argc, char **argv) { Utilities::MPI::MPI_InitFinalize mpi_initialization (argc, argv, 1); { - PETScWrappers::Vector v (100); - PETScWrappers::Vector w (100); + IndexSet indices(100); + indices.add_range(0, 100); + PETScWrappers::MPI::Vector v (indices, MPI_COMM_WORLD); + PETScWrappers::MPI::Vector w (indices, MPI_COMM_WORLD); test (v,w); } diff --git a/tests/petsc/vector_equality_2.cc b/tests/petsc/vector_equality_2.cc index 1163f4115b..ad10dfff9a 100644 --- a/tests/petsc/vector_equality_2.cc +++ b/tests/petsc/vector_equality_2.cc @@ -15,18 +15,18 @@ -// check PETScWrappers::Vector::operator==(PETScWrappers::Vector) for vectors that are -// equal +// check PETScWrappers::MPI::Vector::operator==(PETScWrappers::MPI::Vector) +// for vectors that are equal #include "../tests.h" -#include +#include #include #include #include -void test (PETScWrappers::Vector &v, - PETScWrappers::Vector &w) +void test (PETScWrappers::MPI::Vector &v, + PETScWrappers::MPI::Vector &w) { // set only certain elements of each // vector @@ -36,6 +36,8 @@ void test (PETScWrappers::Vector &v, if (i%3 == 0) w(i) = i+1.; } + v.compress(VectorOperation::insert); + w.compress(VectorOperation::insert); // but then copy elements and make sure the // vectors are actually equal v = w; @@ -56,8 +58,10 @@ int main (int argc, char **argv) { Utilities::MPI::MPI_InitFinalize mpi_initialization (argc, argv, 1); { - PETScWrappers::Vector v (100); - PETScWrappers::Vector w (100); + IndexSet indices(100); + indices.add_range(0, 100); + PETScWrappers::MPI::Vector v (indices, MPI_COMM_WORLD); + PETScWrappers::MPI::Vector w (indices, MPI_COMM_WORLD); test (v,w); } diff --git a/tests/petsc/vector_equality_3.cc b/tests/petsc/vector_equality_3.cc index 7cf514045e..86077fb962 100644 --- a/tests/petsc/vector_equality_3.cc +++ b/tests/petsc/vector_equality_3.cc @@ -15,18 +15,18 @@ -// check PETScWrappers::Vector::operator!=(PETScWrappers::Vector) for vectors that are not -// equal +// check PETScWrappers::MPI::Vector::operator!=(PETScWrappers::MPI::Vector) +// for vectors that are not equal #include "../tests.h" -#include +#include #include #include #include -void test (PETScWrappers::Vector &v, - PETScWrappers::Vector &w) +void test (PETScWrappers::MPI::Vector &v, + PETScWrappers::MPI::Vector &w) { // set only certain elements of each // vector @@ -54,8 +54,10 @@ int main (int argc, char **argv) { Utilities::MPI::MPI_InitFinalize mpi_initialization (argc, argv, 1); { - PETScWrappers::Vector v (100); - PETScWrappers::Vector w (100); + IndexSet indices(100); + indices.add_range(0, 100); + PETScWrappers::MPI::Vector v (indices, MPI_COMM_WORLD); + PETScWrappers::MPI::Vector w (indices, MPI_COMM_WORLD); test (v,w); } diff --git a/tests/petsc/vector_equality_4.cc b/tests/petsc/vector_equality_4.cc index 8e0f1ff17c..492d4f83ff 100644 --- a/tests/petsc/vector_equality_4.cc +++ b/tests/petsc/vector_equality_4.cc @@ -15,18 +15,18 @@ -// check PETScWrappers::Vector::operator!=(PETScWrappers::Vector) for vectors that are -// equal +// check PETScWrappers::MPI::Vector::operator!=(PETScWrappers::MPI::Vector) +// for vectors that are equal #include "../tests.h" -#include +#include #include #include #include -void test (PETScWrappers::Vector &v, - PETScWrappers::Vector &w) +void test (PETScWrappers::MPI::Vector &v, + PETScWrappers::MPI::Vector &w) { // set only certain elements of each // vector @@ -38,6 +38,8 @@ void test (PETScWrappers::Vector &v, } // but then copy elements and make sure the // vectors are actually equal + v.compress(VectorOperation::insert); + w.compress(VectorOperation::insert); v = w; AssertThrow (! (v!=w), ExcInternalError()); @@ -56,8 +58,10 @@ int main (int argc, char **argv) { Utilities::MPI::MPI_InitFinalize mpi_initialization (argc, argv, 1); { - PETScWrappers::Vector v (100); - PETScWrappers::Vector w (100); + IndexSet indices(100); + indices.add_range(0, 100); + PETScWrappers::MPI::Vector v (indices, MPI_COMM_WORLD); + PETScWrappers::MPI::Vector w (indices, MPI_COMM_WORLD); test (v,w); } diff --git a/tests/petsc/vector_print.cc b/tests/petsc/vector_print.cc index f4d971b837..d7e3e1b9d8 100644 --- a/tests/petsc/vector_print.cc +++ b/tests/petsc/vector_print.cc @@ -19,7 +19,7 @@ // restores the previous value of the stream precision #include "../tests.h" -#include +#include #include #include #include @@ -35,7 +35,9 @@ int main (int argc, char **argv) { Utilities::MPI::MPI_InitFinalize mpi_initialization (argc, argv, 1); { - PETScWrappers::Vector v (5); + IndexSet indices(5); + indices.add_range(0, 5); + PETScWrappers::MPI::Vector v (indices, MPI_COMM_WORLD); for (unsigned int i=0; i +#include #include #include #include -void test (PETScWrappers::Vector &v, - PETScWrappers::Vector &w) +void test (PETScWrappers::MPI::Vector &v, + PETScWrappers::MPI::Vector &w) { // set the first vector for (unsigned int i=0; i +#include #include #include -void test (PETScWrappers::Vector &v) +void test (PETScWrappers::MPI::Vector &v) { // set only certain elements of the vector for (unsigned int k=0; k +#include #include #include #include -void test (PETScWrappers::Vector &v) +void test (PETScWrappers::MPI::Vector &v) { deallog << "Complex test" << std::endl; @@ -65,7 +65,7 @@ int main (int argc,char **argv) { Utilities::MPI::MPI_InitFinalize mpi_initialization(argc, argv, 1); { - PETScWrappers::Vector v(100); + PETScWrappers::MPI::Vector v(MPI_COMM_WORLD, 100, 100); test (v); } } diff --git a/tests/petsc_complex/13.cc b/tests/petsc_complex/13.cc index 514a3c624a..69fdc2fc09 100644 --- a/tests/petsc_complex/13.cc +++ b/tests/petsc_complex/13.cc @@ -15,16 +15,16 @@ -// check PETScWrappers::Vector::operator() in add-mode +// check PETScWrappers::MPI::Vector::operator() in add-mode #include "../tests.h" -#include +#include #include #include #include -void test (PETScWrappers::Vector &v) +void test (PETScWrappers::MPI::Vector &v) { // set only certain elements of the vector. have a bit pattern of // where we actually wrote elements to @@ -60,7 +60,7 @@ int main (int argc,char **argv) { Utilities::MPI::MPI_InitFinalize mpi_initialization(argc, argv, 1); { - PETScWrappers::Vector v (100); + PETScWrappers::MPI::Vector v (MPI_COMM_WORLD, 100, 100); test (v); } diff --git a/tests/petsc_complex/17.cc b/tests/petsc_complex/17.cc index b7313f0559..dba4c2e523 100644 --- a/tests/petsc_complex/17.cc +++ b/tests/petsc_complex/17.cc @@ -15,16 +15,16 @@ -// check PETScWrappers::Vector::l1_norm() +// check PETScWrappers::MPI::Vector::l1_norm() #include "../tests.h" -#include +#include #include #include #include -void test (PETScWrappers::Vector &v) +void test (PETScWrappers::MPI::Vector &v) { // set some elements of the vector double norm = 0; @@ -58,7 +58,7 @@ int main (int argc,char **argv) { Utilities::MPI::MPI_InitFinalize mpi_initialization(argc, argv, 1); { - PETScWrappers::Vector v (100); + PETScWrappers::MPI::Vector v (MPI_COMM_WORLD, 100, 100); test (v); } } diff --git a/tests/petsc_complex/18.cc b/tests/petsc_complex/18.cc index a8388f34a1..73931dc364 100644 --- a/tests/petsc_complex/18.cc +++ b/tests/petsc_complex/18.cc @@ -15,16 +15,16 @@ -// check PETScWrappers::Vector::l2_norm() +// check PETScWrappers::MPI::Vector::l2_norm() #include "../tests.h" -#include +#include #include #include #include -void test (PETScWrappers::Vector &v) +void test (PETScWrappers::MPI::Vector &v) { // set some elements of the vector double norm = 0; @@ -59,7 +59,7 @@ int main (int argc,char **argv) { Utilities::MPI::MPI_InitFinalize mpi_initialization(argc, argv, 1); { - PETScWrappers::Vector v (100); + PETScWrappers::MPI::Vector v (MPI_COMM_WORLD, 100, 100); test (v); } } diff --git a/tests/petsc_complex/19.cc b/tests/petsc_complex/19.cc index dfa1a9487d..082d7fb567 100644 --- a/tests/petsc_complex/19.cc +++ b/tests/petsc_complex/19.cc @@ -15,16 +15,16 @@ -// check PETScWrappers::Vector::linfty_norm() +// check PETScWrappers::MPI::Vector::linfty_norm() #include "../tests.h" -#include +#include #include #include #include -void test (PETScWrappers::Vector &v) +void test (PETScWrappers::MPI::Vector &v) { // set some elements of the vector double norm = 0; @@ -55,7 +55,7 @@ int main (int argc,char **argv) { Utilities::MPI::MPI_InitFinalize mpi_initialization(argc, argv, 1); { - PETScWrappers::Vector v (100); + PETScWrappers::MPI::Vector v (MPI_COMM_WORLD, 100, 100); test (v); } diff --git a/tests/petsc_complex/20.cc b/tests/petsc_complex/20.cc index 697194861c..0082418787 100644 --- a/tests/petsc_complex/20.cc +++ b/tests/petsc_complex/20.cc @@ -15,18 +15,18 @@ -// check PETScWrappers::Vector::operator*(Vector) on two vectors that are +// check PETScWrappers::MPI::Vector::operator*(Vector) on two vectors that are // not orthogonal #include "../tests.h" -#include +#include #include #include #include -void test (PETScWrappers::Vector &v, - PETScWrappers::Vector &w) +void test (PETScWrappers::MPI::Vector &v, + PETScWrappers::MPI::Vector &w) { // set only certain elements of each // vector, and record the expected scalar @@ -66,8 +66,8 @@ int main (int argc,char **argv) { Utilities::MPI::MPI_InitFinalize mpi_initialization(argc, argv, 1); { - PETScWrappers::Vector v (100); - PETScWrappers::Vector w (100); + PETScWrappers::MPI::Vector v (MPI_COMM_WORLD, 100, 100); + PETScWrappers::MPI::Vector w (MPI_COMM_WORLD, 100, 100); test (v,w); } diff --git a/tests/petsc_complex/element_access_00.cc b/tests/petsc_complex/element_access_00.cc index 738a1d37fe..71ad3d2837 100644 --- a/tests/petsc_complex/element_access_00.cc +++ b/tests/petsc_complex/element_access_00.cc @@ -16,7 +16,7 @@ // deal.II includes #include "../tests.h" -#include +#include #include #include @@ -29,7 +29,7 @@ // on vector // vector elements -void test_vector (PETScWrappers::Vector &v) +void test_vector (PETScWrappers::MPI::Vector &v) { deallog << "Check vector access" << std::endl; @@ -67,7 +67,7 @@ int main (int argc, char **argv) { Utilities::MPI::MPI_InitFinalize mpi_initialization(argc, argv, 1); { - PETScWrappers::Vector v (5); + PETScWrappers::MPI::Vector v (MPI_COMM_WORLD, 5, 5); test_vector (v); deallog << "vector:" << std::endl; @@ -105,5 +105,3 @@ int main (int argc, char **argv) return 0; } - - diff --git a/tests/petsc_complex/solver_real_01.cc b/tests/petsc_complex/solver_real_01.cc index 89aea7028e..88357f3e49 100644 --- a/tests/petsc_complex/solver_real_01.cc +++ b/tests/petsc_complex/solver_real_01.cc @@ -24,7 +24,7 @@ #include #include #include -#include +#include int main(int argc, char **argv) { @@ -42,8 +42,8 @@ int main(int argc, char **argv) PETScWrappers::SparseMatrix A(dim, dim, 5); testproblem.five_point(A); - PETScWrappers::Vector f(dim); - PETScWrappers::Vector u(dim); + PETScWrappers::MPI::Vector f(MPI_COMM_WORLD, dim, dim); + PETScWrappers::MPI::Vector u(MPI_COMM_WORLD, dim, dim); f = 1.; u = 0.; diff --git a/tests/petsc_complex/solver_real_02.cc b/tests/petsc_complex/solver_real_02.cc index 91f932dc2a..40df1cc489 100644 --- a/tests/petsc_complex/solver_real_02.cc +++ b/tests/petsc_complex/solver_real_02.cc @@ -24,7 +24,7 @@ #include #include #include -#include +#include int main(int argc, char **argv) { @@ -42,8 +42,8 @@ int main(int argc, char **argv) PETScWrappers::SparseMatrix A(dim, dim, 5); testproblem.five_point(A); - PETScWrappers::Vector f(dim); - PETScWrappers::Vector u(dim); + PETScWrappers::MPI::Vector f(MPI_COMM_WORLD, dim, dim); + PETScWrappers::MPI::Vector u(MPI_COMM_WORLD, dim, dim); f = 1.; u = 0.; diff --git a/tests/petsc_complex/solver_real_03.cc b/tests/petsc_complex/solver_real_03.cc index 026a7fa2c7..ba5fac2e85 100644 --- a/tests/petsc_complex/solver_real_03.cc +++ b/tests/petsc_complex/solver_real_03.cc @@ -26,7 +26,7 @@ #include #include #include -#include +#include #include #include #include @@ -78,8 +78,8 @@ int main(int argc, char **argv) PETScWrappers::SparseMatrix A(dim, dim, 5); testproblem.five_point(A); - PETScWrappers::Vector f(dim); - PETScWrappers::Vector u(dim); + PETScWrappers::MPI::Vector f(MPI_COMM_WORLD, dim, dim); + PETScWrappers::MPI::Vector u(MPI_COMM_WORLD, dim, dim); f = 1.; A.compress (VectorOperation::insert); f.compress (VectorOperation::insert); @@ -91,4 +91,3 @@ int main(int argc, char **argv) } } - diff --git a/tests/petsc_complex/solver_real_03_mf.cc b/tests/petsc_complex/solver_real_03_mf.cc index 1bea00f78f..72ae42e3f4 100644 --- a/tests/petsc_complex/solver_real_03_mf.cc +++ b/tests/petsc_complex/solver_real_03_mf.cc @@ -38,7 +38,7 @@ #include #include #include -#include +#include #include #include #include @@ -88,8 +88,8 @@ int main(int argc, char **argv) PetscFDMatrix A(size, dim); - PETScWrappers::Vector f(dim); - PETScWrappers::Vector u(dim); + PETScWrappers::MPI::Vector f(MPI_COMM_WORLD, dim, dim); + PETScWrappers::MPI::Vector u(MPI_COMM_WORLD, dim, dim); f = 1.; A.compress (VectorOperation::insert); f.compress (VectorOperation::insert); @@ -101,4 +101,3 @@ int main(int argc, char **argv) } } - diff --git a/tests/petsc_complex/solver_real_04.cc b/tests/petsc_complex/solver_real_04.cc index 0f6b6c9db5..4040f017e5 100644 --- a/tests/petsc_complex/solver_real_04.cc +++ b/tests/petsc_complex/solver_real_04.cc @@ -26,7 +26,7 @@ #include #include #include -#include +#include #include #include #include @@ -78,8 +78,8 @@ int main(int argc, char **argv) PETScWrappers::SparseMatrix A(dim, dim, 5); testproblem.five_point(A); - PETScWrappers::Vector f(dim); - PETScWrappers::Vector u(dim); + PETScWrappers::MPI::Vector f(MPI_COMM_WORLD, dim, dim); + PETScWrappers::MPI::Vector u(MPI_COMM_WORLD, dim, dim); f = 1.; A.compress (VectorOperation::insert); f.compress (VectorOperation::insert); @@ -91,4 +91,3 @@ int main(int argc, char **argv) } } - diff --git a/tests/petsc_complex/sparse_matrix_01.cc b/tests/petsc_complex/sparse_matrix_01.cc index 46f783f61d..e88671259a 100644 --- a/tests/petsc_complex/sparse_matrix_01.cc +++ b/tests/petsc_complex/sparse_matrix_01.cc @@ -17,7 +17,6 @@ // check SparseMatrix::add(other, factor) #include "../tests.h" -#include #include #include #include diff --git a/tests/petsc_complex/vector_02.cc b/tests/petsc_complex/vector_02.cc index 58289afa03..91327212a3 100644 --- a/tests/petsc_complex/vector_02.cc +++ b/tests/petsc_complex/vector_02.cc @@ -18,7 +18,7 @@ // check assignment of elements in Vector #include "../tests.h" -#include +#include #include #include #include @@ -28,13 +28,13 @@ void test () { const unsigned int s = 10; - PETScWrappers::Vector v(s); + PETScWrappers::MPI::Vector v(MPI_COMM_WORLD, s, s); for (unsigned int k=0; k +#include #include #include #include -void test (PETScWrappers::Vector &v, - PETScWrappers::Vector &w) +void test (PETScWrappers::MPI::Vector &v, + PETScWrappers::MPI::Vector &w) { // set the first vector for (unsigned int k=0; k +#include #include #include #include -void test (PETScWrappers::Vector &v, - PETScWrappers::Vector &w) +void test (PETScWrappers::MPI::Vector &v, + PETScWrappers::MPI::Vector &w) { // set the first vector for (unsigned int k=0; k +#include #include #include #include -void test (PETScWrappers::Vector &v, - PETScWrappers::Vector &w) +void test (PETScWrappers::MPI::Vector &v, + PETScWrappers::MPI::Vector &w) { // set only certain elements of each vector for (unsigned int k=0; k +#include #include #include #include -void test (PETScWrappers::Vector &v, - PETScWrappers::Vector &w) +void test (PETScWrappers::MPI::Vector &v, + PETScWrappers::MPI::Vector &w) { // set only certain elements of each vector for (unsigned int k=0; k +#include #include #include #include @@ -36,7 +36,7 @@ int main (int argc, char **argv) { Utilities::MPI::MPI_InitFinalize mpi_initialization(argc, argv, 1); { - PETScWrappers::Vector v (5); + PETScWrappers::MPI::Vector v (MPI_COMM_WORLD, 5, 5); for (unsigned int k=0; k +#include #include #include #include -void test (PETScWrappers::Vector &v, - PETScWrappers::Vector &w) +void test (PETScWrappers::MPI::Vector &v, + PETScWrappers::MPI::Vector &w) { // set the first vector for (unsigned int k=0; k #include #include -#include +#include #include #include @@ -60,7 +60,7 @@ private: DoFHandler<2> dof_handler; PETScWrappers::SparseMatrix A; - PETScWrappers::Vector b, x; + PETScWrappers::MPI::Vector b, x; ConstraintMatrix constraints; TableHandler output_table; @@ -82,8 +82,8 @@ void LaplaceProblem::setup_system () A.reinit (dof_handler.n_dofs(), dof_handler.n_dofs(), dof_handler.max_couplings_between_dofs()); - b.reinit (dof_handler.n_dofs()); - x.reinit (dof_handler.n_dofs()); + b.reinit (MPI_COMM_WORLD, dof_handler.n_dofs(), dof_handler.n_dofs()); + x.reinit (MPI_COMM_WORLD, dof_handler.n_dofs(), dof_handler.n_dofs()); // some output output_table.add_value ("cells", triangulation.n_active_cells()); @@ -155,7 +155,7 @@ void LaplaceProblem::solve () PETScWrappers::PreconditionBlockJacobi preconditioner (A); cg_solver.solve (A, x, b, preconditioner); - PETScWrappers::Vector res(x); + PETScWrappers::MPI::Vector res(x); A.residual(res,x,b); AssertThrow(res.l2_norm()<1e-3, ExcInternalError()); diff --git a/tests/quick_tests/step-slepc.cc b/tests/quick_tests/step-slepc.cc index 4d74cea00e..376379ff26 100644 --- a/tests/quick_tests/step-slepc.cc +++ b/tests/quick_tests/step-slepc.cc @@ -33,7 +33,7 @@ #include #include #include -#include +#include #include #include @@ -58,10 +58,10 @@ private: FE_Q<2> fe; DoFHandler<2> dof_handler; - PETScWrappers::SparseMatrix A, B; - std::vector x; - std::vector lambda; - ConstraintMatrix constraints; + PETScWrappers::SparseMatrix A, B; + std::vector x; + std::vector lambda; + ConstraintMatrix constraints; TableHandler output_table; }; @@ -86,7 +86,7 @@ void LaplaceEigenspectrumProblem::setup_system () dof_handler.max_couplings_between_dofs()); x.resize (1); - x[0].reinit (dof_handler.n_dofs ()); + x[0].reinit (MPI_COMM_WORLD, dof_handler.n_dofs(), dof_handler.n_dofs()); lambda.resize (1); lambda[0] = 0.; @@ -161,7 +161,7 @@ void LaplaceEigenspectrumProblem::solve () { const double precision = 1e-7; - PETScWrappers::Vector Ax(x[0]), Bx(x[0]); + PETScWrappers::MPI::Vector Ax(x[0]), Bx(x[0]); for (unsigned int i=0; i < x.size(); ++i) { B.vmult(Bx,x[i]); diff --git a/tests/slepc/solve_01.cc b/tests/slepc/solve_01.cc index 11fd8294ab..75d5fcc589 100644 --- a/tests/slepc/solve_01.cc +++ b/tests/slepc/solve_01.cc @@ -29,7 +29,7 @@ #include #include #include -#include +#include #include #include #include @@ -54,6 +54,9 @@ check_solve( SolverType &solver, for (unsigned int j=0; j(Testing::rand())/static_cast(RAND_MAX); + for (auto &vector : u) + vector.compress(VectorOperation::insert); + solver.set_initial_space(u); solver.solve(A,B,v,u,v.size()); @@ -107,8 +110,8 @@ int main(int argc, char **argv) diagonal.diag(B); B.compress (VectorOperation::insert); - std::vector u(n_eigenvalues, - PETScWrappers::Vector(dim)); + std::vector + u(n_eigenvalues, PETScWrappers::MPI::Vector(MPI_COMM_WORLD, dim, dim)); std::vector v(n_eigenvalues); PETScWrappers::set_option_value("-st_ksp_type","cg"); @@ -151,4 +154,3 @@ int main(int argc, char **argv) } } - diff --git a/tests/slepc/solve_04.cc b/tests/slepc/solve_04.cc index 542a3389ad..03c27a416a 100644 --- a/tests/slepc/solve_04.cc +++ b/tests/slepc/solve_04.cc @@ -29,7 +29,7 @@ #include #include #include -#include +#include #include #include #include @@ -55,6 +55,9 @@ check_solve( SolverType &solver, for (unsigned int j=0; j(Testing::rand())/static_cast(RAND_MAX); + for (auto &vector : u) + vector.compress(VectorOperation::insert); + solver.set_initial_space(u); // solve solver.solve(A,v,u,v.size()); @@ -136,8 +139,8 @@ int main(int argc, char **argv) testproblem.three_point(A); A.compress (VectorOperation::insert); - std::vector u(n_eigenvalues, - PETScWrappers::Vector(dim)); + std::vector + u(n_eigenvalues, PETScWrappers::MPI::Vector(MPI_COMM_WORLD, dim, dim)); std::vector v(n_eigenvalues); { -- 2.39.5