From 4891e05eff638de7a51d5bf362716645288fbbc9 Mon Sep 17 00:00:00 2001 From: Daniel Arndt Date: Fri, 5 Jan 2018 15:08:11 +0100 Subject: [PATCH] Use SphericalManifold in mpi/p4est_2d_constraintmatrix_03 --- tests/mpi/p4est_2d_constraintmatrix_03.cc | 13 +-- ...rix_03.with_trilinos=true.mpirun=10.output | 96 ++++++++--------- ...trix_03.with_trilinos=true.mpirun=4.output | 100 +++++++++--------- 3 files changed, 102 insertions(+), 107 deletions(-) diff --git a/tests/mpi/p4est_2d_constraintmatrix_03.cc b/tests/mpi/p4est_2d_constraintmatrix_03.cc index 7fe9d470bd..ff0d86e8ec 100644 --- a/tests/mpi/p4est_2d_constraintmatrix_03.cc +++ b/tests/mpi/p4est_2d_constraintmatrix_03.cc @@ -35,7 +35,6 @@ #include #include #include -#include #include #include #include @@ -64,13 +63,9 @@ void test() 12, true); - static HyperShellBoundary boundary; - tr.set_boundary (0, boundary); - tr.set_boundary (1, boundary); - -/* static SphericalManifold boundary; + static SphericalManifold boundary; tr.set_manifold (0, boundary); - tr.set_manifold (1, boundary);*/ + tr.set_manifold (1, boundary); tr.refine_global (1); for (unsigned int step=0; step<20; ++step) @@ -136,9 +131,9 @@ void test() TrilinosWrappers::MPI::Vector x_dub; x_dub.reinit(complete_index_set(dof_set.size())); x_dub.reinit(x_rel, false, true); - + if (myid==0) - x_dub.print(deallog.get_file_stream(), 8, true, false); + x_dub.print(deallog.get_file_stream(), 8, true, false); tr.set_manifold (0); tr.set_manifold (1); diff --git a/tests/mpi/p4est_2d_constraintmatrix_03.with_trilinos=true.mpirun=10.output b/tests/mpi/p4est_2d_constraintmatrix_03.with_trilinos=true.mpirun=10.output index bdf366028c..44f2ebda68 100644 --- a/tests/mpi/p4est_2d_constraintmatrix_03.with_trilinos=true.mpirun=10.output +++ b/tests/mpi/p4est_2d_constraintmatrix_03.with_trilinos=true.mpirun=10.output @@ -15,7 +15,7 @@ 2.00000000e+00 2.00000000e+00 2.00000000e+00 --2.63304995e-01 +-1.30333082e-01 2.00000000e+00 2.00000000e+00 2.00000000e+00 @@ -53,7 +53,7 @@ 2.00000000e+00 2.00000000e+00 2.00000000e+00 --1.53465398e+00 +-1.33527178e+00 2.00000000e+00 2.00000000e+00 2.00000000e+00 @@ -68,7 +68,7 @@ 2.00000000e+00 2.00000000e+00 2.00000000e+00 --1.53465398e+00 +-1.33527178e+00 2.00000000e+00 2.00000000e+00 2.00000000e+00 @@ -143,7 +143,7 @@ 2.00000000e+00 2.00000000e+00 2.00000000e+00 -9.86290852e-01 +1.06914255e+00 2.00000000e+00 2.00000000e+00 2.00000000e+00 @@ -157,7 +157,7 @@ 2.00000000e+00 2.00000000e+00 2.00000000e+00 -6.78908518e-01 +7.52853500e-01 2.00000000e+00 2.00000000e+00 2.00000000e+00 @@ -190,7 +190,7 @@ 2.00000000e+00 2.00000000e+00 2.00000000e+00 --6.78908518e-01 +-7.52853500e-01 2.00000000e+00 2.00000000e+00 2.00000000e+00 @@ -201,7 +201,7 @@ 2.00000000e+00 8.16987298e-01 2.00000000e+00 --9.86290852e-01 +-1.06914255e+00 2.00000000e+00 2.00000000e+00 2.00000000e+00 @@ -282,7 +282,7 @@ 2.00000000e+00 2.00000000e+00 2.00000000e+00 -3.97824735e-01 +4.66433230e-01 2.00000000e+00 2.00000000e+00 2.00000000e+00 @@ -293,7 +293,7 @@ 2.00000000e+00 1.25000000e+00 2.00000000e+00 -1.31086926e-01 +1.97077264e-01 2.00000000e+00 2.00000000e+00 2.00000000e+00 @@ -496,7 +496,7 @@ 2.00000000e+00 2.00000000e+00 2.00000000e+00 --8.28427125e-01 +-9.87224211e-01 2.00000000e+00 2.00000000e+00 2.00000000e+00 @@ -510,7 +510,7 @@ 2.00000000e+00 2.00000000e+00 2.00000000e+00 --2.63304995e-01 +-3.98605130e-01 2.00000000e+00 2.00000000e+00 2.00000000e+00 @@ -593,7 +593,7 @@ 2.00000000e+00 2.00000000e+00 2.00000000e+00 -6.78908518e-01 +6.06591211e-01 2.00000000e+00 2.00000000e+00 2.00000000e+00 @@ -654,13 +654,13 @@ 2.00000000e+00 2.00000000e+00 2.00000000e+00 -1.31086926e-01 +6.53795718e-02 2.00000000e+00 2.00000000e+00 2.00000000e+00 2.00000000e+00 2.00000000e+00 -3.97824735e-01 +3.30105238e-01 2.00000000e+00 2.00000000e+00 2.00000000e+00 @@ -737,7 +737,7 @@ 2.00000000e+00 2.00000000e+00 2.00000000e+00 -9.06188211e-01 +8.67017967e-01 2.00000000e+00 2.00000000e+00 2.00000000e+00 @@ -751,7 +751,7 @@ 2.00000000e+00 2.00000000e+00 2.00000000e+00 -1.06902227e+00 +1.11148712e+00 2.00000000e+00 2.00000000e+00 2.00000000e+00 @@ -964,13 +964,13 @@ 2.00000000e+00 2.00000000e+00 2.00000000e+00 -1.75395293e+00 +1.87338004e+00 2.00000000e+00 2.00000000e+00 2.00000000e+00 2.00000000e+00 2.00000000e+00 -1.33635728e+00 +1.43332132e+00 2.00000000e+00 2.00000000e+00 2.00000000e+00 @@ -1072,13 +1072,13 @@ 2.00000000e+00 2.00000000e+00 2.00000000e+00 -1.33635728e+00 +1.24355020e+00 2.00000000e+00 2.00000000e+00 2.00000000e+00 2.00000000e+00 2.00000000e+00 -1.75395293e+00 +1.87338004e+00 2.00000000e+00 2.00000000e+00 2.00000000e+00 @@ -1392,7 +1392,7 @@ 2.00000000e+00 2.00000000e+00 2.00000000e+00 -1.75395293e+00 +1.87338004e+00 2.00000000e+00 2.00000000e+00 2.00000000e+00 @@ -1406,7 +1406,7 @@ 2.00000000e+00 2.00000000e+00 2.00000000e+00 -1.33635728e+00 +1.24355020e+00 2.00000000e+00 2.00000000e+00 2.00000000e+00 @@ -1441,7 +1441,7 @@ 2.00000000e+00 2.00000000e+00 2.00000000e+00 -1.24367992e+00 +1.19873798e+00 2.00000000e+00 2.00000000e+00 2.00000000e+00 @@ -1455,7 +1455,7 @@ 2.00000000e+00 2.00000000e+00 2.00000000e+00 -1.43317973e+00 +1.38420293e+00 2.00000000e+00 2.00000000e+00 2.00000000e+00 @@ -1598,7 +1598,7 @@ 2.00000000e+00 2.00000000e+00 2.00000000e+00 -1.64135758e+00 +1.69689373e+00 2.00000000e+00 2.00000000e+00 2.00000000e+00 @@ -1609,7 +1609,7 @@ 2.00000000e+00 2.00000000e+00 2.00000000e+00 -1.87320442e+00 +1.93562081e+00 2.00000000e+00 2.00000000e+00 2.00000000e+00 @@ -1807,7 +1807,7 @@ 2.00000000e+00 2.00000000e+00 2.00000000e+00 -9.86290852e-01 +1.06914255e+00 2.00000000e+00 2.00000000e+00 2.00000000e+00 @@ -1821,7 +1821,7 @@ 2.00000000e+00 2.00000000e+00 2.00000000e+00 -6.78908518e-01 +6.06591211e-01 2.00000000e+00 2.00000000e+00 2.00000000e+00 @@ -1895,7 +1895,7 @@ 2.00000000e+00 2.00000000e+00 2.00000000e+00 -3.97824735e-01 +3.30105238e-01 2.00000000e+00 2.00000000e+00 2.00000000e+00 @@ -1909,7 +1909,7 @@ 2.00000000e+00 2.00000000e+00 2.00000000e+00 -1.31086926e-01 +6.53795718e-02 2.00000000e+00 2.00000000e+00 2.00000000e+00 @@ -2712,7 +2712,7 @@ 2.00000000e+00 2.00000000e+00 2.00000000e+00 --6.78908518e-01 +-6.06591211e-01 2.00000000e+00 2.00000000e+00 2.00000000e+00 @@ -2726,7 +2726,7 @@ 2.00000000e+00 2.00000000e+00 2.00000000e+00 --9.86290852e-01 +-9.06075459e-01 2.00000000e+00 2.00000000e+00 2.00000000e+00 @@ -2816,13 +2816,13 @@ 2.00000000e+00 2.00000000e+00 2.00000000e+00 --1.31086926e-01 +-6.53795718e-02 2.00000000e+00 2.00000000e+00 2.00000000e+00 2.00000000e+00 2.00000000e+00 --3.97824735e-01 +-3.30105238e-01 2.00000000e+00 2.00000000e+00 2.00000000e+00 @@ -2970,7 +2970,7 @@ 2.00000000e+00 2.00000000e+00 2.00000000e+00 --1.24367992e+00 +-1.19873798e+00 2.00000000e+00 2.00000000e+00 2.00000000e+00 @@ -2984,7 +2984,7 @@ 2.00000000e+00 6.74504759e-01 2.00000000e+00 --1.43317973e+00 +-1.48331920e+00 2.00000000e+00 2.00000000e+00 2.00000000e+00 @@ -3145,7 +3145,7 @@ 2.00000000e+00 2.00000000e+00 2.00000000e+00 --1.75395293e+00 +-1.87338004e+00 2.00000000e+00 2.00000000e+00 2.00000000e+00 @@ -3180,7 +3180,7 @@ 2.00000000e+00 2.00000000e+00 2.00000000e+00 --1.75395293e+00 +-1.64120103e+00 2.00000000e+00 2.00000000e+00 2.00000000e+00 @@ -3293,7 +3293,7 @@ 2.00000000e+00 2.00000000e+00 2.00000000e+00 --1.43317973e+00 +-1.48331920e+00 2.00000000e+00 2.00000000e+00 2.00000000e+00 @@ -3307,7 +3307,7 @@ 2.00000000e+00 8.16987298e-01 2.00000000e+00 --1.24367992e+00 +-1.19873798e+00 2.00000000e+00 2.00000000e+00 2.00000000e+00 @@ -3613,7 +3613,7 @@ 2.00000000e+00 2.00000000e+00 2.00000000e+00 --9.86290852e-01 +-1.06914255e+00 2.00000000e+00 2.00000000e+00 2.00000000e+00 @@ -3627,7 +3627,7 @@ 2.00000000e+00 2.00000000e+00 2.00000000e+00 --6.78908518e-01 +-7.52853500e-01 2.00000000e+00 2.00000000e+00 2.00000000e+00 @@ -3659,7 +3659,7 @@ 2.00000000e+00 2.00000000e+00 2.00000000e+00 --3.97824735e-01 +-4.66433230e-01 2.00000000e+00 2.00000000e+00 2.00000000e+00 @@ -3673,7 +3673,7 @@ 2.00000000e+00 2.00000000e+00 2.00000000e+00 --1.31086926e-01 +-1.97077264e-01 2.00000000e+00 2.00000000e+00 2.00000000e+00 @@ -4142,13 +4142,13 @@ 2.00000000e+00 2.00000000e+00 2.00000000e+00 -6.78908518e-01 +7.52853500e-01 2.00000000e+00 2.00000000e+00 2.00000000e+00 2.00000000e+00 2.00000000e+00 -9.86290852e-01 +1.06914255e+00 2.00000000e+00 2.00000000e+00 2.00000000e+00 @@ -4172,13 +4172,13 @@ 2.00000000e+00 2.00000000e+00 2.00000000e+00 -1.31086926e-01 +6.53795718e-02 2.00000000e+00 2.00000000e+00 2.00000000e+00 2.00000000e+00 2.00000000e+00 -3.97824735e-01 +4.66433230e-01 2.00000000e+00 2.00000000e+00 2.00000000e+00 diff --git a/tests/mpi/p4est_2d_constraintmatrix_03.with_trilinos=true.mpirun=4.output b/tests/mpi/p4est_2d_constraintmatrix_03.with_trilinos=true.mpirun=4.output index 39f096534c..84ab164fba 100644 --- a/tests/mpi/p4est_2d_constraintmatrix_03.with_trilinos=true.mpirun=4.output +++ b/tests/mpi/p4est_2d_constraintmatrix_03.with_trilinos=true.mpirun=4.output @@ -156,7 +156,7 @@ 2.00000000e+00 2.00000000e+00 2.00000000e+00 --6.78908518e-01 +-7.52853500e-01 2.00000000e+00 2.00000000e+00 2.00000000e+00 @@ -170,7 +170,7 @@ 2.00000000e+00 2.00000000e+00 2.00000000e+00 --9.86290852e-01 +-1.06914255e+00 2.00000000e+00 2.00000000e+00 2.00000000e+00 @@ -195,7 +195,7 @@ 2.00000000e+00 2.00000000e+00 2.00000000e+00 --1.33635728e+00 +-1.24355020e+00 2.00000000e+00 2.00000000e+00 2.00000000e+00 @@ -209,7 +209,7 @@ 2.00000000e+00 2.00000000e+00 2.00000000e+00 --1.75395293e+00 +-1.64120103e+00 2.00000000e+00 2.00000000e+00 2.00000000e+00 @@ -232,7 +232,7 @@ 2.00000000e+00 2.00000000e+00 2.00000000e+00 --1.75395293e+00 +-1.64120103e+00 2.00000000e+00 2.00000000e+00 2.00000000e+00 @@ -246,7 +246,7 @@ 2.00000000e+00 2.00000000e+00 2.00000000e+00 --1.33635728e+00 +-1.43332132e+00 2.00000000e+00 2.00000000e+00 2.00000000e+00 @@ -604,7 +604,7 @@ 2.00000000e+00 2.00000000e+00 2.00000000e+00 -7.52746698e-01 +7.90355725e-01 2.00000000e+00 2.00000000e+00 2.00000000e+00 @@ -618,7 +618,7 @@ 2.00000000e+00 1.45096189e+00 2.00000000e+00 -6.06693367e-01 +5.71117827e-01 2.00000000e+00 2.00000000e+00 2.00000000e+00 @@ -654,7 +654,7 @@ 2.00000000e+00 2.00000000e+00 2.00000000e+00 --6.54732208e-02 +-9.82654126e-02 2.00000000e+00 2.00000000e+00 2.00000000e+00 @@ -668,7 +668,7 @@ 2.00000000e+00 2.00000000e+00 2.00000000e+00 --1.96982807e-01 +-1.63978894e-01 2.00000000e+00 2.00000000e+00 2.00000000e+00 @@ -705,7 +705,7 @@ 2.00000000e+00 2.00000000e+00 2.00000000e+00 --3.30201336e-01 +-2.96660033e-01 2.00000000e+00 2.00000000e+00 2.00000000e+00 @@ -716,7 +716,7 @@ 2.00000000e+00 1.04903811e+00 2.00000000e+00 --4.66334594e-01 +-4.31946369e-01 2.00000000e+00 2.00000000e+00 2.00000000e+00 @@ -816,13 +816,13 @@ 2.00000000e+00 2.00000000e+00 2.00000000e+00 -1.06902227e+00 +1.11148712e+00 2.00000000e+00 2.00000000e+00 2.00000000e+00 2.00000000e+00 2.00000000e+00 -9.06188211e-01 +9.45943851e-01 2.00000000e+00 2.00000000e+00 2.00000000e+00 @@ -1130,7 +1130,7 @@ 2.00000000e+00 2.00000000e+00 2.00000000e+00 -8.28427125e-01 +9.87224211e-01 2.00000000e+00 2.00000000e+00 2.00000000e+00 @@ -1158,7 +1158,7 @@ 2.00000000e+00 2.00000000e+00 2.00000000e+00 --9.86290852e-01 +-1.06914255e+00 2.00000000e+00 2.00000000e+00 2.00000000e+00 @@ -1172,7 +1172,7 @@ 2.00000000e+00 2.00000000e+00 2.00000000e+00 --6.78908518e-01 +-7.52853500e-01 2.00000000e+00 2.00000000e+00 2.00000000e+00 @@ -1207,7 +1207,7 @@ 2.00000000e+00 2.00000000e+00 2.00000000e+00 -1.75395293e+00 +1.87338004e+00 2.00000000e+00 2.00000000e+00 2.00000000e+00 @@ -1215,7 +1215,7 @@ 2.00000000e+00 2.00000000e+00 2.00000000e+00 -1.33635728e+00 +1.43332132e+00 2.00000000e+00 2.00000000e+00 2.00000000e+00 @@ -1306,7 +1306,7 @@ 2.00000000e+00 2.00000000e+00 2.00000000e+00 -3.97824735e-01 +4.66433230e-01 2.00000000e+00 2.00000000e+00 2.00000000e+00 @@ -1314,7 +1314,7 @@ 2.00000000e+00 2.00000000e+00 2.00000000e+00 -1.31086926e-01 +1.97077264e-01 2.00000000e+00 2.00000000e+00 2.00000000e+00 @@ -1357,13 +1357,13 @@ 2.00000000e+00 2.00000000e+00 2.00000000e+00 -1.33635728e+00 +1.24355020e+00 2.00000000e+00 2.00000000e+00 2.00000000e+00 2.00000000e+00 2.00000000e+00 -1.75395293e+00 +1.87338004e+00 2.00000000e+00 2.00000000e+00 2.00000000e+00 @@ -1391,7 +1391,7 @@ 2.00000000e+00 2.00000000e+00 2.00000000e+00 --3.97824735e-01 +-3.30105238e-01 2.00000000e+00 2.00000000e+00 2.00000000e+00 @@ -1405,7 +1405,7 @@ 2.00000000e+00 2.00000000e+00 2.00000000e+00 --1.31086926e-01 +-6.53795718e-02 2.00000000e+00 2.00000000e+00 2.00000000e+00 @@ -1432,7 +1432,7 @@ 2.00000000e+00 2.00000000e+00 2.00000000e+00 -1.31086926e-01 +6.53795718e-02 2.00000000e+00 2.00000000e+00 2.00000000e+00 @@ -1443,7 +1443,7 @@ 2.00000000e+00 1.45096189e+00 2.00000000e+00 -3.97824735e-01 +3.30105238e-01 2.00000000e+00 2.00000000e+00 2.00000000e+00 @@ -2190,7 +2190,7 @@ 2.00000000e+00 2.00000000e+00 2.00000000e+00 -1.53465398e+00 +1.33527178e+00 2.00000000e+00 2.00000000e+00 2.00000000e+00 @@ -2231,7 +2231,7 @@ 2.00000000e+00 2.00000000e+00 2.00000000e+00 -8.28427125e-01 +6.78071492e-01 2.00000000e+00 2.00000000e+00 2.00000000e+00 @@ -2295,7 +2295,7 @@ 2.00000000e+00 2.00000000e+00 2.00000000e+00 -1.75395293e+00 +1.87338004e+00 2.00000000e+00 2.00000000e+00 2.00000000e+00 @@ -2306,7 +2306,7 @@ 2.00000000e+00 1.68301270e+00 2.00000000e+00 -1.33635728e+00 +1.24355020e+00 2.00000000e+00 2.00000000e+00 2.00000000e+00 @@ -2345,7 +2345,7 @@ 2.00000000e+00 2.00000000e+00 2.00000000e+00 --1.31086926e-01 +-6.53795718e-02 2.00000000e+00 2.00000000e+00 2.00000000e+00 @@ -2375,13 +2375,13 @@ 2.00000000e+00 2.00000000e+00 2.00000000e+00 -3.97824735e-01 +3.30105238e-01 2.00000000e+00 2.00000000e+00 2.00000000e+00 2.00000000e+00 2.00000000e+00 -1.31086926e-01 +6.53795718e-02 2.00000000e+00 2.00000000e+00 2.00000000e+00 @@ -2520,7 +2520,7 @@ 2.00000000e+00 2.00000000e+00 2.00000000e+00 --3.30201336e-01 +-3.63924432e-01 2.00000000e+00 2.00000000e+00 2.00000000e+00 @@ -2534,7 +2534,7 @@ 2.00000000e+00 2.00000000e+00 2.00000000e+00 --4.66334594e-01 +-5.00986338e-01 2.00000000e+00 2.00000000e+00 2.00000000e+00 @@ -2813,7 +2813,7 @@ 2.00000000e+00 2.00000000e+00 2.00000000e+00 --5.71130465e-01 +-5.88870669e-01 2.00000000e+00 2.00000000e+00 2.00000000e+00 @@ -2827,7 +2827,7 @@ 2.00000000e+00 2.00000000e+00 2.00000000e+00 --6.42611095e-01 +-6.60712374e-01 2.00000000e+00 2.00000000e+00 2.00000000e+00 @@ -2852,7 +2852,7 @@ 2.00000000e+00 2.00000000e+00 2.00000000e+00 --7.15611443e-01 +-6.97206003e-01 2.00000000e+00 2.00000000e+00 2.00000000e+00 @@ -2866,7 +2866,7 @@ 2.00000000e+00 9.39339828e-01 2.00000000e+00 --7.90342216e-01 +-7.71483455e-01 2.00000000e+00 2.00000000e+00 2.00000000e+00 @@ -3262,7 +3262,7 @@ 2.00000000e+00 2.00000000e+00 2.00000000e+00 --1.53465398e+00 +-1.75528131e+00 2.00000000e+00 2.00000000e+00 2.00000000e+00 @@ -3290,7 +3290,7 @@ 2.00000000e+00 2.00000000e+00 2.00000000e+00 --8.28427125e-01 +-9.87224211e-01 2.00000000e+00 2.00000000e+00 2.00000000e+00 @@ -3304,7 +3304,7 @@ 2.00000000e+00 2.00000000e+00 2.00000000e+00 --2.63304995e-01 +-1.30333082e-01 2.00000000e+00 2.00000000e+00 2.00000000e+00 @@ -3336,7 +3336,7 @@ 2.00000000e+00 2.00000000e+00 2.00000000e+00 -2.63304995e-01 +1.30333082e-01 2.00000000e+00 2.00000000e+00 2.00000000e+00 @@ -3434,7 +3434,7 @@ 2.00000000e+00 2.00000000e+00 2.00000000e+00 --1.33635728e+00 +-1.43332132e+00 2.00000000e+00 2.00000000e+00 2.00000000e+00 @@ -3445,7 +3445,7 @@ 2.00000000e+00 2.00000000e+00 5.00000000e-01 --1.75395293e+00 +-1.87338004e+00 2.00000000e+00 2.00000000e+00 2.00000000e+00 @@ -3545,13 +3545,13 @@ 2.00000000e+00 2.00000000e+00 2.00000000e+00 -6.78908518e-01 +7.52853500e-01 2.00000000e+00 2.00000000e+00 2.00000000e+00 2.00000000e+00 2.00000000e+00 -9.86290852e-01 +1.06914255e+00 2.00000000e+00 2.00000000e+00 2.00000000e+00 @@ -3574,7 +3574,7 @@ 2.00000000e+00 2.00000000e+00 2.00000000e+00 --9.06188211e-01 +-8.67017967e-01 2.00000000e+00 2.00000000e+00 2.00000000e+00 @@ -3585,7 +3585,7 @@ 2.00000000e+00 8.16987298e-01 2.00000000e+00 --1.06902227e+00 +-1.02729410e+00 2.00000000e+00 2.00000000e+00 2.00000000e+00 -- 2.39.5