From 088aad2a5e8a555542ba8d42732ca7f312bea8d4 Mon Sep 17 00:00:00 2001 From: Martin Kronbichler Date: Fri, 5 Nov 2021 10:37:57 +0100 Subject: [PATCH] Adjust test cases --- tests/particles/data_out_02.output | 16 +-- tests/particles/data_out_03.output | 22 ++-- tests/particles/data_out_04.output | 16 +-- tests/particles/step-19.output | 112 +++++++++--------- .../step-68.with_p4est=true.mpirun=1.output | 16 +-- .../step-68.with_p4est=true.mpirun=2.output | 16 +-- tests/simplex/step-68.mpirun=1.output | 28 ++--- tests/simplex/step-68.mpirun=4.output | 28 ++--- 8 files changed, 127 insertions(+), 127 deletions(-) diff --git a/tests/particles/data_out_02.output b/tests/particles/data_out_02.output index 27e7f2288b..c721f85bf5 100644 --- a/tests/particles/data_out_02.output +++ b/tests/particles/data_out_02.output @@ -8,10 +8,10 @@ # 0.00000 0.00000 0.00000 0.00000 0.00000 -1.00000 0.00000 2.00000 1.00000 0.00000 - 0.00000 1.00000 1.00000 0.00000 1.00000 +1.00000 0.00000 2.00000 1.00000 0.00000 + 1.00000 1.00000 3.00000 1.00000 1.00000 DEAL:2d/2d::OK @@ -24,10 +24,10 @@ DEAL:2d/2d::OK # 0.00000 0.00000 0.00000 0.00000 0.00000 0.00000 0.00000 -1.00000 0.00000 0.00000 2.00000 1.00000 0.00000 0.00000 - 0.00000 1.00000 0.00000 1.00000 0.00000 1.00000 0.00000 +1.00000 0.00000 0.00000 2.00000 1.00000 0.00000 0.00000 + 1.00000 1.00000 0.00000 3.00000 1.00000 1.00000 0.00000 DEAL:2d/3d::OK @@ -42,14 +42,14 @@ DEAL:2d/3d::OK 0.00000 0.00000 0.00000 1.00000 0.00000 0.00000 0.00000 -1.00000 0.00000 0.00000 4.00000 1.00000 0.00000 0.00000 - -1.00000 0.00000 0.00000 5.00000 1.00000 0.00000 0.00000 - 0.00000 1.00000 1.00000 2.00000 0.00000 1.00000 1.00000 0.00000 1.00000 1.00000 3.00000 0.00000 1.00000 1.00000 +1.00000 0.00000 0.00000 4.00000 1.00000 0.00000 0.00000 + +1.00000 0.00000 0.00000 5.00000 1.00000 0.00000 0.00000 + 1.00000 1.00000 1.00000 6.00000 1.00000 1.00000 1.00000 1.00000 1.00000 1.00000 7.00000 1.00000 1.00000 1.00000 diff --git a/tests/particles/data_out_03.output b/tests/particles/data_out_03.output index 25107a6db6..c5d5f1fe70 100644 --- a/tests/particles/data_out_03.output +++ b/tests/particles/data_out_03.output @@ -6,8 +6,8 @@ DATASET UNSTRUCTURED_GRID POINTS 4 double 0.00000 0.00000 0 -1.00000 0.00000 0 0.00000 1.00000 0 +1.00000 0.00000 0 1.00000 1.00000 0 CELLS 4 8 @@ -21,12 +21,12 @@ CELL_TYPES 4 POINT_DATA 4 VECTORS property_coord_0__property_coord_1 double 0.00000 0.00000 0 -1.00000 0.00000 0 0.00000 1.00000 0 +1.00000 0.00000 0 1.00000 1.00000 0 SCALARS id double 1 LOOKUP_TABLE default -0.00000 2.00000 1.00000 3.00000 +0.00000 1.00000 2.00000 3.00000 DEAL:2d/2d::OK # vtk DataFile Version 3.0 #This file was generated @@ -35,8 +35,8 @@ DATASET UNSTRUCTURED_GRID POINTS 4 double 0.00000 0.00000 0.00000 -1.00000 0.00000 0.00000 0.00000 1.00000 0.00000 +1.00000 0.00000 0.00000 1.00000 1.00000 0.00000 CELLS 4 8 @@ -50,12 +50,12 @@ CELL_TYPES 4 POINT_DATA 4 VECTORS property_coord_0__property_coord_1__property_coord_2 double 0.00000 0.00000 0.00000 -1.00000 0.00000 0.00000 0.00000 1.00000 0.00000 +1.00000 0.00000 0.00000 1.00000 1.00000 0.00000 SCALARS id double 1 LOOKUP_TABLE default -0.00000 2.00000 1.00000 3.00000 +0.00000 1.00000 2.00000 3.00000 DEAL:2d/3d::OK # vtk DataFile Version 3.0 #This file was generated @@ -65,10 +65,10 @@ DATASET UNSTRUCTURED_GRID POINTS 8 double 0.00000 0.00000 0.00000 0.00000 0.00000 0.00000 -1.00000 0.00000 0.00000 -1.00000 0.00000 0.00000 0.00000 1.00000 1.00000 0.00000 1.00000 1.00000 +1.00000 0.00000 0.00000 +1.00000 0.00000 0.00000 1.00000 1.00000 1.00000 1.00000 1.00000 1.00000 @@ -88,13 +88,13 @@ POINT_DATA 8 VECTORS property_coord_0__property_coord_1__property_coord_2 double 0.00000 0.00000 0.00000 0.00000 0.00000 0.00000 -1.00000 0.00000 0.00000 -1.00000 0.00000 0.00000 0.00000 1.00000 1.00000 0.00000 1.00000 1.00000 +1.00000 0.00000 0.00000 +1.00000 0.00000 0.00000 1.00000 1.00000 1.00000 1.00000 1.00000 1.00000 SCALARS id double 1 LOOKUP_TABLE default -0.00000 1.00000 4.00000 5.00000 2.00000 3.00000 6.00000 7.00000 +0.00000 1.00000 2.00000 3.00000 4.00000 5.00000 6.00000 7.00000 DEAL:3d/3d::OK diff --git a/tests/particles/data_out_04.output b/tests/particles/data_out_04.output index 8a69758b56..8738ba9d0a 100644 --- a/tests/particles/data_out_04.output +++ b/tests/particles/data_out_04.output @@ -8,10 +8,10 @@ # 0.00000 0.00000 0.00000 0.00000 0.00000 0.00000 0.00000 -1.00000 0.00000 2.00000 1.00000 0.00000 1.00000 0.00000 - 0.00000 1.00000 1.00000 0.00000 1.00000 0.00000 1.00000 +1.00000 0.00000 2.00000 1.00000 0.00000 1.00000 0.00000 + 1.00000 1.00000 3.00000 1.00000 1.00000 1.00000 1.00000 @@ -40,10 +40,10 @@ DEAL:2d/2d::OK # 0.00000 0.00000 0.00000 0.00000 0.00000 0.00000 0.00000 0.00000 0.00000 0.00000 0.00000 0.00000 0.00000 -1.00000 0.00000 0.00000 2.00000 1.00000 0.00000 0.00000 1.00000 0.00000 0.00000 1.00000 0.00000 0.00000 - 0.00000 1.00000 0.00000 1.00000 0.00000 1.00000 0.00000 0.00000 1.00000 0.00000 0.00000 1.00000 0.00000 +1.00000 0.00000 0.00000 2.00000 1.00000 0.00000 0.00000 1.00000 0.00000 0.00000 1.00000 0.00000 0.00000 + 1.00000 1.00000 0.00000 3.00000 1.00000 1.00000 0.00000 1.00000 1.00000 0.00000 1.00000 1.00000 0.00000 @@ -74,14 +74,14 @@ DEAL:2d/3d::OK 0.00000 0.00000 0.00000 1.00000 0.00000 0.00000 0.00000 0.00000 0.00000 0.00000 0.00000 0.00000 0.00000 -1.00000 0.00000 0.00000 4.00000 1.00000 0.00000 0.00000 0.00000 0.00000 0.00000 0.00000 0.00000 0.00000 - -1.00000 0.00000 0.00000 5.00000 1.00000 0.00000 0.00000 0.00000 0.00000 0.00000 0.00000 0.00000 0.00000 - 0.00000 1.00000 1.00000 2.00000 0.00000 1.00000 1.00000 0.00000 0.00000 0.00000 0.00000 0.00000 0.00000 0.00000 1.00000 1.00000 3.00000 0.00000 1.00000 1.00000 0.00000 0.00000 0.00000 0.00000 0.00000 0.00000 +1.00000 0.00000 0.00000 4.00000 1.00000 0.00000 0.00000 0.00000 0.00000 0.00000 0.00000 0.00000 0.00000 + +1.00000 0.00000 0.00000 5.00000 1.00000 0.00000 0.00000 0.00000 0.00000 0.00000 0.00000 0.00000 0.00000 + 1.00000 1.00000 1.00000 6.00000 1.00000 1.00000 1.00000 0.00000 0.00000 0.00000 0.00000 0.00000 0.00000 1.00000 1.00000 1.00000 7.00000 1.00000 1.00000 1.00000 0.00000 0.00000 0.00000 0.00000 0.00000 0.00000 diff --git a/tests/particles/step-19.output b/tests/particles/step-19.output index 456913ff10..7be629c49e 100644 --- a/tests/particles/step-19.output +++ b/tests/particles/step-19.output @@ -295,11 +295,11 @@ DEAL::Particle 17, at 0.345449 0.686650/0.0258771 0.493203 with properties 4403. DEAL::Particle 2, at 0.447774 0.792478/0.682855 0.339828 with properties 32337.8 -15118.1 DEAL::Particle 10, at 0.422635 0.804389/0.273538 0.435110 with properties 18670.5 -9125.04 DEAL::Particle 18, at 0.408616 0.811317/0.0398137 0.490535 with properties 6132.28 -3066.14 -DEAL::Particle 11, at 0.492409 0.926055/0.437732 0.408441 with properties 27041.8 -12524.3 DEAL::Particle 19, at 0.472222 0.935764/0.0652483 0.486112 with properties 8997.66 -4498.83 +DEAL::Particle 11, at 0.492409 0.926055/0.437732 0.408441 with properties 27041.8 -12524.3 DEAL::Particle 3, at 0.528827 0.910579/0.0800265 0.284635 with properties 47184.5 -19464.8 -DEAL::Particle 12, at 0.492409 1.07394/0.437732 0.591559 with properties 27041.8 12524.3 DEAL::Particle 20, at 0.472222 1.06424/0.0652483 0.513888 with properties 8997.66 4498.83 +DEAL::Particle 12, at 0.492409 1.07394/0.437732 0.591559 with properties 27041.8 12524.3 DEAL::Particle 4, at 0.528827 1.08942/0.0800265 0.715365 with properties 47184.5 19464.8 DEAL::Particle 5, at 0.447774 1.20752/0.682855 0.660172 with properties 32337.8 15118.1 DEAL::Particle 13, at 0.422635 1.19561/0.273538 0.564890 with properties 18670.5 9125.04 @@ -319,11 +319,11 @@ DEAL::Evaluating particle 17 at 0.345449 0.686650 with reference location 0.0258 DEAL::Evaluating particle 2 at 0.447774 0.792478 with reference location 0.682855 0.339828 DEAL::Evaluating particle 10 at 0.422635 0.804389 with reference location 0.273538 0.435110 DEAL::Evaluating particle 18 at 0.408616 0.811317 with reference location 0.0398137 0.490535 -DEAL::Evaluating particle 11 at 0.492409 0.926055 with reference location 0.437732 0.408441 DEAL::Evaluating particle 19 at 0.472222 0.935764 with reference location 0.0652483 0.486112 +DEAL::Evaluating particle 11 at 0.492409 0.926055 with reference location 0.437732 0.408441 DEAL::Evaluating particle 3 at 0.528827 0.910579 with reference location 0.0800265 0.284635 -DEAL::Evaluating particle 12 at 0.492409 1.07394 with reference location 0.437732 0.591559 DEAL::Evaluating particle 20 at 0.472222 1.06424 with reference location 0.0652483 0.513888 +DEAL::Evaluating particle 12 at 0.492409 1.07394 with reference location 0.437732 0.591559 DEAL::Evaluating particle 4 at 0.528827 1.08942 with reference location 0.0800265 0.715365 DEAL::Evaluating particle 5 at 0.447774 1.20752 with reference location 0.682855 0.660172 DEAL::Evaluating particle 13 at 0.422635 1.19561 with reference location 0.273538 0.564890 @@ -385,14 +385,14 @@ DEAL::Evaluating E for particle 25: 0.0885622 -0.0442811 DEAL::Getting old velocity of particle 25: 0.00000 0.00000 DEAL::Setting new velocity of particle 25: 4768.32 -2384.16 DEAL::Setting location of particle 25: 0.407710 0.811770 -DEAL::Evaluating E for particle 11: 0.139283 -0.0479918 -DEAL::Getting old velocity of particle 11: 27041.8 -12524.3 -DEAL::Setting new velocity of particle 11: 34541.0 -15108.3 -DEAL::Setting location of particle 11: 0.502983 0.921430 DEAL::Evaluating E for particle 19: 0.132600 -0.0616857 DEAL::Getting old velocity of particle 19: 8997.66 -4498.83 DEAL::Setting new velocity of particle 19: 16137.0 -7820.07 DEAL::Setting location of particle 19: 0.477162 0.933370 +DEAL::Evaluating E for particle 11: 0.139283 -0.0479918 +DEAL::Getting old velocity of particle 11: 27041.8 -12524.3 +DEAL::Setting new velocity of particle 11: 34541.0 -15108.3 +DEAL::Setting location of particle 11: 0.502983 0.921430 DEAL::Evaluating E for particle 26: 0.132137 -0.0660685 DEAL::Getting old velocity of particle 26: 0.00000 0.00000 DEAL::Setting new velocity of particle 26: 7114.44 -3557.22 @@ -401,14 +401,14 @@ DEAL::Evaluating E for particle 3: 0.149064 -0.0359764 DEAL::Getting old velocity of particle 3: 47184.5 -19464.8 DEAL::Setting new velocity of particle 3: 55210.3 -21401.8 DEAL::Setting location of particle 3: 0.545728 0.904028 -DEAL::Evaluating E for particle 12: 0.139283 0.0479918 -DEAL::Getting old velocity of particle 12: 27041.8 12524.3 -DEAL::Setting new velocity of particle 12: 34541.0 15108.3 -DEAL::Setting location of particle 12: 0.502983 1.07857 DEAL::Evaluating E for particle 20: 0.132600 0.0616857 DEAL::Getting old velocity of particle 20: 8997.66 4498.83 DEAL::Setting new velocity of particle 20: 16137.0 7820.07 DEAL::Setting location of particle 20: 0.477162 1.06663 +DEAL::Evaluating E for particle 12: 0.139283 0.0479918 +DEAL::Getting old velocity of particle 12: 27041.8 12524.3 +DEAL::Setting new velocity of particle 12: 34541.0 15108.3 +DEAL::Setting location of particle 12: 0.502983 1.07857 DEAL::Evaluating E for particle 27: 0.132137 0.0660685 DEAL::Getting old velocity of particle 27: 0.00000 0.00000 DEAL::Setting new velocity of particle 27: 7114.44 3557.22 @@ -478,12 +478,12 @@ DEAL::Particle 2, at 0.459339 0.787219/0.867158 0.297754 with properties 37778.2 DEAL::Particle 10, at 0.429891 0.800912/0.392764 0.407294 with properties 23703.3 -11358.4 DEAL::Particle 18, at 0.411965 0.809657/0.0959204 0.477254 with properties 10937.6 -5422.89 DEAL::Particle 25, at 0.407710 0.811770/0.0245691 0.494161 with properties 4768.32 -2384.16 -DEAL::Particle 11, at 0.502983 0.921430/0.627015 0.371441 with properties 34541.0 -15108.3 DEAL::Particle 19, at 0.477162 0.933370/0.157158 0.466961 with properties 16137.0 -7820.07 +DEAL::Particle 11, at 0.502983 0.921430/0.627015 0.371441 with properties 34541.0 -15108.3 DEAL::Particle 26, at 0.470928 0.936411/0.0409536 0.491288 with properties 7114.44 -3557.22 DEAL::Particle 3, at 0.545728 0.904028/0.368131 0.232222 with properties 55210.3 -21401.8 -DEAL::Particle 12, at 0.502983 1.07857/0.627015 0.628559 with properties 34541.0 15108.3 DEAL::Particle 20, at 0.477162 1.06663/0.157158 0.533039 with properties 16137.0 7820.07 +DEAL::Particle 12, at 0.502983 1.07857/0.627015 0.628559 with properties 34541.0 15108.3 DEAL::Particle 27, at 0.470928 1.06359/0.0409536 0.508712 with properties 7114.44 3557.22 DEAL::Particle 4, at 0.545728 1.09597/0.368131 0.767778 with properties 55210.3 21401.8 DEAL::Particle 5, at 0.459339 1.21278/0.867158 0.702246 with properties 37778.2 17180.0 @@ -508,12 +508,12 @@ DEAL::Evaluating particle 2 at 0.459339 0.787219 with reference location 0.86715 DEAL::Evaluating particle 10 at 0.429891 0.800912 with reference location 0.392764 0.407294 DEAL::Evaluating particle 18 at 0.411965 0.809657 with reference location 0.0959204 0.477254 DEAL::Evaluating particle 25 at 0.407710 0.811770 with reference location 0.0245691 0.494161 -DEAL::Evaluating particle 11 at 0.502983 0.921430 with reference location 0.627015 0.371441 DEAL::Evaluating particle 19 at 0.477162 0.933370 with reference location 0.157158 0.466961 +DEAL::Evaluating particle 11 at 0.502983 0.921430 with reference location 0.627015 0.371441 DEAL::Evaluating particle 26 at 0.470928 0.936411 with reference location 0.0409536 0.491288 DEAL::Evaluating particle 3 at 0.545728 0.904028 with reference location 0.368131 0.232222 -DEAL::Evaluating particle 12 at 0.502983 1.07857 with reference location 0.627015 0.628559 DEAL::Evaluating particle 20 at 0.477162 1.06663 with reference location 0.157158 0.533039 +DEAL::Evaluating particle 12 at 0.502983 1.07857 with reference location 0.627015 0.628559 DEAL::Evaluating particle 27 at 0.470928 1.06359 with reference location 0.0409536 0.508712 DEAL::Evaluating particle 4 at 0.545728 1.09597 with reference location 0.368131 0.767778 DEAL::Evaluating particle 5 at 0.459339 1.21278 with reference location 0.867158 0.702246 @@ -586,14 +586,14 @@ DEAL::Evaluating E for particle 31: 0.0874558 -0.0437279 DEAL::Getting old velocity of particle 31: 0.00000 0.00000 DEAL::Setting new velocity of particle 31: 4058.92 -2029.46 DEAL::Setting location of particle 31: 0.407321 0.811964 -DEAL::Evaluating E for particle 11: 0.144224 -0.0452117 -DEAL::Getting old velocity of particle 11: 34541.0 -15108.3 -DEAL::Setting new velocity of particle 11: 41234.6 -17206.6 -DEAL::Setting location of particle 11: 0.513863 0.916890 DEAL::Evaluating E for particle 19: 0.132228 -0.0559541 DEAL::Getting old velocity of particle 19: 16137.0 -7820.07 DEAL::Setting new velocity of particle 19: 22273.9 -10417.0 DEAL::Setting location of particle 19: 0.483039 0.930621 +DEAL::Evaluating E for particle 11: 0.144224 -0.0452117 +DEAL::Getting old velocity of particle 11: 34541.0 -15108.3 +DEAL::Setting new velocity of particle 11: 41234.6 -17206.6 +DEAL::Setting location of particle 11: 0.513863 0.916890 DEAL::Evaluating E for particle 26: 0.130607 -0.0623235 DEAL::Getting old velocity of particle 26: 7114.44 -3557.22 DEAL::Setting new velocity of particle 26: 13176.1 -6449.73 @@ -606,14 +606,14 @@ DEAL::Evaluating E for particle 3: 0.145062 -0.0290379 DEAL::Getting old velocity of particle 3: 55210.3 -21401.8 DEAL::Setting new velocity of particle 3: 61942.8 -22749.5 DEAL::Setting location of particle 3: 0.562074 0.898025 -DEAL::Evaluating E for particle 12: 0.144224 0.0452117 -DEAL::Getting old velocity of particle 12: 34541.0 15108.3 -DEAL::Setting new velocity of particle 12: 41234.6 17206.6 -DEAL::Setting location of particle 12: 0.513863 1.08311 DEAL::Evaluating E for particle 20: 0.132228 0.0559541 DEAL::Getting old velocity of particle 20: 16137.0 7820.07 DEAL::Setting new velocity of particle 20: 22273.9 10417.0 DEAL::Setting location of particle 20: 0.483039 1.06938 +DEAL::Evaluating E for particle 12: 0.144224 0.0452117 +DEAL::Getting old velocity of particle 12: 34541.0 15108.3 +DEAL::Setting new velocity of particle 12: 41234.6 17206.6 +DEAL::Setting location of particle 12: 0.513863 1.08311 DEAL::Evaluating E for particle 27: 0.130607 0.0623235 DEAL::Getting old velocity of particle 27: 7114.44 3557.22 DEAL::Setting new velocity of particle 27: 13176.1 6449.73 @@ -692,25 +692,25 @@ DEAL::Particle 9, at 0.366055 0.676569/0.335738 0.412551 with properties 20044.8 DEAL::Particle 17, at 0.350664 0.684066/0.104939 0.472530 with properties 10700.7 -5286.44 DEAL::Particle 24, at 0.346430 0.686163/0.0407857 0.489302 with properties 6232.86 -3105.33 DEAL::Particle 30, at 0.344498 0.687126/0.0113987 0.497007 with properties 2835.62 -1417.81 +DEAL::Particle 31, at 0.407321 0.811964/0.0180307 0.495716 with properties 4058.92 -2029.46 DEAL::Particle 10, at 0.437304 0.797423/0.513463 0.379385 with properties 28093.4 -13220.5 DEAL::Particle 18, at 0.415942 0.807704/0.162247 0.461632 with properties 15074.6 -7400.43 DEAL::Particle 25, at 0.410044 0.810609/0.0637577 0.484874 with properties 8846.96 -4399.30 -DEAL::Particle 31, at 0.407321 0.811964/0.0180307 0.495716 with properties 4058.92 -2029.46 DEAL::Particle 2, at 0.470569 0.782247/0.0438302 0.257979 with properties 42557.5 -18842.1 -DEAL::Particle 11, at 0.513863 0.916890/0.818657 0.335118 with properties 41234.6 -17206.6 DEAL::Particle 19, at 0.483039 0.930621/0.265257 0.444971 with properties 22273.9 -10417.0 +DEAL::Particle 11, at 0.513863 0.916890/0.818657 0.335118 with properties 41234.6 -17206.6 DEAL::Particle 26, at 0.474405 0.934709/0.105889 0.477673 with properties 13176.1 -6449.73 DEAL::Particle 32, at 0.470345 0.936702/0.0300014 0.493620 with properties 6044.58 -3022.29 DEAL::Particle 3, at 0.562074 0.898025/0.641581 0.184198 with properties 61942.8 -22749.5 -DEAL::Particle 12, at 0.513863 1.08311/0.818657 0.664882 with properties 41234.6 17206.6 DEAL::Particle 20, at 0.483039 1.06938/0.265257 0.555029 with properties 22273.9 10417.0 +DEAL::Particle 12, at 0.513863 1.08311/0.818657 0.664882 with properties 41234.6 17206.6 DEAL::Particle 27, at 0.474405 1.06529/0.105889 0.522327 with properties 13176.1 6449.73 DEAL::Particle 33, at 0.470345 1.06330/0.0300014 0.506380 with properties 6044.58 3022.29 DEAL::Particle 4, at 0.562074 1.10198/0.641581 0.815802 with properties 61942.8 22749.5 +DEAL::Particle 34, at 0.407321 1.18804/0.0180307 0.504284 with properties 4058.92 2029.46 DEAL::Particle 13, at 0.437304 1.20258/0.513463 0.620615 with properties 28093.4 13220.5 DEAL::Particle 21, at 0.415942 1.19230/0.162247 0.538368 with properties 15074.6 7400.43 DEAL::Particle 28, at 0.410044 1.18939/0.0637577 0.515126 with properties 8846.96 4399.30 -DEAL::Particle 34, at 0.407321 1.18804/0.0180307 0.504284 with properties 4058.92 2029.46 DEAL::Particle 5, at 0.470569 1.21775/0.0438302 0.742021 with properties 42557.5 18842.1 DEAL::Particle 6, at 0.389895 1.33461/0.685717 0.676849 with properties 30314.9 13918.3 DEAL::Particle 14, at 0.366055 1.32343/0.335738 0.587449 with properties 20044.8 9613.83 @@ -728,25 +728,25 @@ DEAL::Evaluating particle 9 at 0.366055 0.676569 with reference location 0.33573 DEAL::Evaluating particle 17 at 0.350664 0.684066 with reference location 0.104939 0.472530 DEAL::Evaluating particle 24 at 0.346430 0.686163 with reference location 0.0407857 0.489302 DEAL::Evaluating particle 30 at 0.344498 0.687126 with reference location 0.0113987 0.497007 +DEAL::Evaluating particle 31 at 0.407321 0.811964 with reference location 0.0180307 0.495716 DEAL::Evaluating particle 10 at 0.437304 0.797423 with reference location 0.513463 0.379385 DEAL::Evaluating particle 18 at 0.415942 0.807704 with reference location 0.162247 0.461632 DEAL::Evaluating particle 25 at 0.410044 0.810609 with reference location 0.0637577 0.484874 -DEAL::Evaluating particle 31 at 0.407321 0.811964 with reference location 0.0180307 0.495716 DEAL::Evaluating particle 2 at 0.470569 0.782247 with reference location 0.0438302 0.257979 -DEAL::Evaluating particle 11 at 0.513863 0.916890 with reference location 0.818657 0.335118 DEAL::Evaluating particle 19 at 0.483039 0.930621 with reference location 0.265257 0.444971 +DEAL::Evaluating particle 11 at 0.513863 0.916890 with reference location 0.818657 0.335118 DEAL::Evaluating particle 26 at 0.474405 0.934709 with reference location 0.105889 0.477673 DEAL::Evaluating particle 32 at 0.470345 0.936702 with reference location 0.0300014 0.493620 DEAL::Evaluating particle 3 at 0.562074 0.898025 with reference location 0.641581 0.184198 -DEAL::Evaluating particle 12 at 0.513863 1.08311 with reference location 0.818657 0.664882 DEAL::Evaluating particle 20 at 0.483039 1.06938 with reference location 0.265257 0.555029 +DEAL::Evaluating particle 12 at 0.513863 1.08311 with reference location 0.818657 0.664882 DEAL::Evaluating particle 27 at 0.474405 1.06529 with reference location 0.105889 0.522327 DEAL::Evaluating particle 33 at 0.470345 1.06330 with reference location 0.0300014 0.506380 DEAL::Evaluating particle 4 at 0.562074 1.10198 with reference location 0.641581 0.815802 +DEAL::Evaluating particle 34 at 0.407321 1.18804 with reference location 0.0180307 0.504284 DEAL::Evaluating particle 13 at 0.437304 1.20258 with reference location 0.513463 0.620615 DEAL::Evaluating particle 21 at 0.415942 1.19230 with reference location 0.162247 0.538368 DEAL::Evaluating particle 28 at 0.410044 1.18939 with reference location 0.0637577 0.515126 -DEAL::Evaluating particle 34 at 0.407321 1.18804 with reference location 0.0180307 0.504284 DEAL::Evaluating particle 5 at 0.470569 1.21775 with reference location 0.0438302 0.742021 DEAL::Evaluating particle 6 at 0.389895 1.33461 with reference location 0.685717 0.676849 DEAL::Evaluating particle 14 at 0.366055 1.32343 with reference location 0.335738 0.587449 @@ -799,6 +799,10 @@ DEAL::Evaluating E for particle 36: 0.0595417 -0.0297709 DEAL::Getting old velocity of particle 36: 0.00000 0.00000 DEAL::Setting new velocity of particle 36: 2479.68 -1239.84 DEAL::Setting location of particle 36: 0.344337 0.687206 +DEAL::Evaluating E for particle 31: 0.0866775 -0.0429638 +DEAL::Getting old velocity of particle 31: 4058.92 -2029.46 +DEAL::Setting new velocity of particle 31: 7668.71 -3818.74 +DEAL::Setting location of particle 31: 0.409137 0.811060 DEAL::Evaluating E for particle 10: 0.0958050 -0.0389023 DEAL::Getting old velocity of particle 10: 28093.4 -13220.5 DEAL::Setting new velocity of particle 10: 32083.3 -14840.6 @@ -811,10 +815,6 @@ DEAL::Evaluating E for particle 25: 0.0874934 -0.0424524 DEAL::Getting old velocity of particle 25: 8846.96 -4399.30 DEAL::Setting new velocity of particle 25: 12490.7 -6167.28 DEAL::Setting location of particle 25: 0.413002 0.809149 -DEAL::Evaluating E for particle 31: 0.0866775 -0.0429638 -DEAL::Getting old velocity of particle 31: 4058.92 -2029.46 -DEAL::Setting new velocity of particle 31: 7668.71 -3818.74 -DEAL::Setting location of particle 31: 0.409137 0.811060 DEAL::Evaluating E for particle 37: 0.0863596 -0.0431798 DEAL::Getting old velocity of particle 37: 0.00000 0.00000 DEAL::Setting new velocity of particle 37: 3596.54 -1798.27 @@ -823,14 +823,14 @@ DEAL::Evaluating E for particle 2: 0.104034 -0.0326066 DEAL::Getting old velocity of particle 2: 42557.5 -18842.1 DEAL::Setting new velocity of particle 2: 46890.1 -20200.0 DEAL::Setting location of particle 2: 0.481672 0.777464 -DEAL::Evaluating E for particle 11: 0.149787 -0.0431100 -DEAL::Getting old velocity of particle 11: 41234.6 -17206.6 -DEAL::Setting new velocity of particle 11: 47472.6 -19001.9 -DEAL::Setting location of particle 11: 0.525104 0.912390 DEAL::Evaluating E for particle 19: 0.133130 -0.0511823 DEAL::Getting old velocity of particle 19: 22273.9 -10417.0 DEAL::Setting new velocity of particle 19: 27818.2 -12548.5 DEAL::Setting location of particle 19: 0.489626 0.927650 +DEAL::Evaluating E for particle 11: 0.149787 -0.0431100 +DEAL::Getting old velocity of particle 11: 41234.6 -17206.6 +DEAL::Setting new velocity of particle 11: 47472.6 -19001.9 +DEAL::Setting location of particle 11: 0.525104 0.912390 DEAL::Evaluating E for particle 26: 0.129913 -0.0577635 DEAL::Getting old velocity of particle 26: 13176.1 -6449.73 DEAL::Setting new velocity of particle 26: 18586.4 -8855.35 @@ -847,14 +847,14 @@ DEAL::Evaluating E for particle 3: 0.143825 -0.0237167 DEAL::Getting old velocity of particle 3: 61942.8 -22749.5 DEAL::Setting new velocity of particle 3: 67932.5 -23737.2 DEAL::Setting location of particle 3: 0.578159 0.892404 -DEAL::Evaluating E for particle 12: 0.149787 0.0431100 -DEAL::Getting old velocity of particle 12: 41234.6 17206.6 -DEAL::Setting new velocity of particle 12: 47472.6 19001.9 -DEAL::Setting location of particle 12: 0.525104 1.08761 DEAL::Evaluating E for particle 20: 0.133130 0.0511823 DEAL::Getting old velocity of particle 20: 22273.9 10417.0 DEAL::Setting new velocity of particle 20: 27818.2 12548.5 DEAL::Setting location of particle 20: 0.489626 1.07235 +DEAL::Evaluating E for particle 12: 0.149787 0.0431100 +DEAL::Getting old velocity of particle 12: 41234.6 17206.6 +DEAL::Setting new velocity of particle 12: 47472.6 19001.9 +DEAL::Setting location of particle 12: 0.525104 1.08761 DEAL::Evaluating E for particle 27: 0.129913 0.0577635 DEAL::Getting old velocity of particle 27: 13176.1 6449.73 DEAL::Setting new velocity of particle 27: 18586.4 8855.35 @@ -871,6 +871,10 @@ DEAL::Evaluating E for particle 4: 0.143825 0.0237167 DEAL::Getting old velocity of particle 4: 61942.8 22749.5 DEAL::Setting new velocity of particle 4: 67932.5 23737.2 DEAL::Setting location of particle 4: 0.578159 1.10760 +DEAL::Evaluating E for particle 34: 0.0866775 0.0429638 +DEAL::Getting old velocity of particle 34: 4058.92 2029.46 +DEAL::Setting new velocity of particle 34: 7668.71 3818.74 +DEAL::Setting location of particle 34: 0.409137 1.18894 DEAL::Evaluating E for particle 13: 0.0958050 0.0389023 DEAL::Getting old velocity of particle 13: 28093.4 13220.5 DEAL::Setting new velocity of particle 13: 32083.3 14840.6 @@ -883,10 +887,6 @@ DEAL::Evaluating E for particle 28: 0.0874934 0.0424524 DEAL::Getting old velocity of particle 28: 8846.96 4399.30 DEAL::Setting new velocity of particle 28: 12490.7 6167.28 DEAL::Setting location of particle 28: 0.413002 1.19085 -DEAL::Evaluating E for particle 34: 0.0866775 0.0429638 -DEAL::Getting old velocity of particle 34: 4058.92 2029.46 -DEAL::Setting new velocity of particle 34: 7668.71 3818.74 -DEAL::Setting location of particle 34: 0.409137 1.18894 DEAL::Evaluating E for particle 40: 0.0863596 0.0431798 DEAL::Getting old velocity of particle 40: 0.00000 0.00000 DEAL::Setting new velocity of particle 40: 3596.54 1798.27 @@ -953,50 +953,50 @@ DEAL::30 0.345759 0.686497 0.0305811 0.491977 DEAL::30 properties: 5324.92 -2655.15 DEAL::36 0.344337 0.687206 0.00894506 0.497651 DEAL::36 properties: 2479.68 -1239.84 +DEAL::31 0.409137 0.811060 0.0485375 0.488482 +DEAL::31 properties: 7668.71 -3818.74 DEAL::10 0.444901 0.793909 0.636055 0.351273 DEAL::10 properties: 32083.3 -14840.6 DEAL::18 0.420392 0.805542 0.236038 0.444339 DEAL::18 properties: 18793.1 -9128.81 DEAL::25 0.413002 0.809149 0.113228 0.473192 DEAL::25 properties: 12490.7 -6167.28 -DEAL::31 0.409137 0.811060 0.0485375 0.488482 -DEAL::31 properties: 7668.71 -3818.74 DEAL::37 0.407102 0.812074 0.0143377 0.496594 DEAL::37 properties: 3596.54 -1798.27 DEAL::2 0.481672 0.777464 0.216355 0.219714 DEAL::2 properties: 46890.1 -20200.0 DEAL::19 0.489626 0.927650 0.384969 0.421200 DEAL::19 properties: 27818.2 -12548.5 +DEAL::38 0.470018 0.936866 0.0238510 0.494929 +DEAL::38 properties: 5354.40 -2677.20 DEAL::26 0.478806 0.932612 0.187367 0.460899 DEAL::26 properties: 18586.4 -8855.35 DEAL::32 0.473047 0.935373 0.0805624 0.482985 DEAL::32 properties: 11411.7 -5614.09 -DEAL::38 0.470018 0.936866 0.0238510 0.494929 -DEAL::38 properties: 5354.40 -2677.20 DEAL::3 0.578159 0.892404 0.906212 0.139233 DEAL::3 properties: 67932.5 -23737.2 DEAL::11 0.525104 0.912390 0.0137312 0.299123 DEAL::11 properties: 47472.6 -19001.9 DEAL::20 0.489626 1.07235 0.384969 0.578800 DEAL::20 properties: 27818.2 12548.5 +DEAL::39 0.470018 1.06313 0.0238510 0.505071 +DEAL::39 properties: 5354.40 2677.20 DEAL::27 0.478806 1.06739 0.187367 0.539101 DEAL::27 properties: 18586.4 8855.35 DEAL::33 0.473047 1.06463 0.0805624 0.517015 DEAL::33 properties: 11411.7 5614.09 -DEAL::39 0.470018 1.06313 0.0238510 0.505071 -DEAL::39 properties: 5354.40 2677.20 DEAL::4 0.578159 1.10760 0.906212 0.860767 DEAL::4 properties: 67932.5 23737.2 DEAL::12 0.525104 1.08761 0.0137312 0.700877 DEAL::12 properties: 47472.6 19001.9 +DEAL::34 0.409137 1.18894 0.0485375 0.511518 +DEAL::34 properties: 7668.71 3818.74 DEAL::13 0.444901 1.20609 0.636055 0.648727 DEAL::13 properties: 32083.3 14840.6 DEAL::21 0.420392 1.19446 0.236038 0.555661 DEAL::21 properties: 18793.1 9128.81 DEAL::28 0.413002 1.19085 0.113228 0.526808 DEAL::28 properties: 12490.7 6167.28 -DEAL::34 0.409137 1.18894 0.0485375 0.511518 -DEAL::34 properties: 7668.71 3818.74 DEAL::40 0.407102 1.18793 0.0143377 0.503406 DEAL::40 properties: 3596.54 1798.27 DEAL::5 0.481672 1.22254 0.216355 0.780286 diff --git a/tests/particles/step-68.with_p4est=true.mpirun=1.output b/tests/particles/step-68.with_p4est=true.mpirun=1.output index 7438c2a803..a8c854752d 100644 --- a/tests/particles/step-68.with_p4est=true.mpirun=1.output +++ b/tests/particles/step-68.with_p4est=true.mpirun=1.output @@ -15,19 +15,19 @@ DEAL:0::0.433208 0.833310 DEAL:0::0.480928 0.859777 DEAL:0::0.475771 0.769133 DEAL:0::0.486655 0.787079 -DEAL:0::0.505864 0.716196 DEAL:0::0.529232 0.714603 DEAL:0::0.549978 0.724169 DEAL:0::0.540635 0.648620 DEAL:0::0.561942 0.742488 DEAL:0::0.595944 0.672859 +DEAL:0::0.505864 0.716196 DEAL:0::0.627051 0.720283 -DEAL:0::0.505916 0.796997 -DEAL:0::0.538993 0.858949 DEAL:0::0.528847 0.796079 DEAL:0::0.549447 0.784270 DEAL:0::0.561753 0.764590 +DEAL:0::0.538993 0.858949 DEAL:0::0.592056 0.829624 +DEAL:0::0.505916 0.796997 DEAL:0::0.624984 0.778592 DEAL:0::Number of particles inserted: 24 DEAL:0::Repartitioning triangulation after particle generation @@ -48,17 +48,17 @@ DEAL:0::0.430296 0.832760 DEAL:0::0.478813 0.859498 DEAL:0::0.474379 0.768388 DEAL:0::0.484713 0.786526 -DEAL:0::0.501301 0.714975 DEAL:0::0.524473 0.713858 DEAL:0::0.544304 0.724010 +DEAL:0::0.592865 0.672731 DEAL:0::0.555643 0.742845 +DEAL:0::0.501301 0.714975 DEAL:0::0.541116 0.647681 -DEAL:0::0.592865 0.672731 DEAL:0::0.621474 0.721859 -DEAL:0::0.503905 0.796598 -DEAL:0::0.536869 0.858844 DEAL:0::0.526482 0.795790 DEAL:0::0.547001 0.784040 -DEAL:0::0.559416 0.764401 DEAL:0::0.589307 0.829611 +DEAL:0::0.536869 0.858844 +DEAL:0::0.559416 0.764401 +DEAL:0::0.503905 0.796598 DEAL:0::0.622637 0.778386 diff --git a/tests/particles/step-68.with_p4est=true.mpirun=2.output b/tests/particles/step-68.with_p4est=true.mpirun=2.output index 54b835a239..40b3a4fe58 100644 --- a/tests/particles/step-68.with_p4est=true.mpirun=2.output +++ b/tests/particles/step-68.with_p4est=true.mpirun=2.output @@ -10,12 +10,12 @@ DEAL:0::0.431983 0.684517 DEAL:0::0.475595 0.747746 DEAL:0::0.479874 0.652444 DEAL:0::0.486369 0.728375 -DEAL:0::0.505864 0.716196 DEAL:0::0.529232 0.714603 DEAL:0::0.549978 0.724169 DEAL:0::0.540635 0.648620 DEAL:0::0.561942 0.742488 DEAL:0::0.595944 0.672859 +DEAL:0::0.505864 0.716196 DEAL:0::0.627051 0.720283 DEAL:0::0.406474 0.787612 DEAL:0::0.433208 0.833310 @@ -36,12 +36,12 @@ DEAL:0::0.429540 0.682369 DEAL:0::0.469064 0.746158 DEAL:0::0.481181 0.651665 DEAL:0::0.480772 0.726826 -DEAL:0::0.501301 0.714975 DEAL:0::0.524473 0.713858 DEAL:0::0.544304 0.724010 +DEAL:0::0.592865 0.672731 DEAL:0::0.555643 0.742845 +DEAL:0::0.501301 0.714975 DEAL:0::0.541116 0.647681 -DEAL:0::0.592865 0.672731 DEAL:0::0.621474 0.721859 DEAL:0::0.405024 0.786934 DEAL:0::0.430296 0.832760 @@ -49,18 +49,18 @@ DEAL:0::0.478813 0.859498 DEAL:0::0.474379 0.768388 DEAL:0::0.484713 0.786526 -DEAL:1::0.505916 0.796997 -DEAL:1::0.538993 0.858949 DEAL:1::0.528847 0.796079 DEAL:1::0.549447 0.784270 DEAL:1::0.561753 0.764590 +DEAL:1::0.538993 0.858949 DEAL:1::0.592056 0.829624 +DEAL:1::0.505916 0.796997 DEAL:1::0.624984 0.778592 -DEAL:1::0.503905 0.796598 -DEAL:1::0.536869 0.858844 DEAL:1::0.526482 0.795790 DEAL:1::0.547001 0.784040 -DEAL:1::0.559416 0.764401 DEAL:1::0.589307 0.829611 +DEAL:1::0.536869 0.858844 +DEAL:1::0.559416 0.764401 +DEAL:1::0.503905 0.796598 DEAL:1::0.622637 0.778386 diff --git a/tests/simplex/step-68.mpirun=1.output b/tests/simplex/step-68.mpirun=1.output index 427bb9e901..ba89050e09 100644 --- a/tests/simplex/step-68.mpirun=1.output +++ b/tests/simplex/step-68.mpirun=1.output @@ -2,6 +2,7 @@ DEAL::Number of particles inserted: 48 DEAL::Particles location DEAL::0.366577 0.681804 +DEAL::0.484716 0.715907 DEAL::0.398361 0.691931 DEAL::0.408783 0.708456 DEAL::0.423868 0.706937 @@ -11,19 +12,18 @@ DEAL::0.454362 0.697548 DEAL::0.453680 0.706030 DEAL::0.464383 0.709034 DEAL::0.469644 0.709187 -DEAL::0.484716 0.715907 DEAL::0.499111 0.711062 DEAL::0.498868 0.710828 DEAL::0.517719 0.673900 -DEAL::0.503282 0.705982 -DEAL::0.520884 0.707622 -DEAL::0.524944 0.701767 +DEAL::0.618983 0.657786 DEAL::0.535494 0.683627 DEAL::0.532509 0.716124 -DEAL::0.549286 0.705238 DEAL::0.563363 0.673326 +DEAL::0.549286 0.705238 DEAL::0.573466 0.689253 -DEAL::0.618983 0.657786 +DEAL::0.520884 0.707622 +DEAL::0.524944 0.701767 +DEAL::0.503282 0.705982 DEAL::0.628548 0.625331 DEAL::0.691290 0.744340 DEAL::0.379293 0.831136 @@ -32,20 +32,20 @@ DEAL::0.409176 0.839420 DEAL::0.448930 0.832650 DEAL::0.465573 0.816761 DEAL::0.476410 0.833958 -DEAL::0.494476 0.826914 DEAL::0.493642 0.819960 +DEAL::0.494476 0.826914 +DEAL::0.607814 0.783764 DEAL::0.518139 0.836076 +DEAL::0.613584 0.807264 +DEAL::0.571248 0.776918 +DEAL::0.591050 0.794375 +DEAL::0.591790 0.794930 DEAL::0.559598 0.806751 DEAL::0.568815 0.811801 -DEAL::0.571248 0.776918 DEAL::0.586805 0.806620 -DEAL::0.591790 0.794930 -DEAL::0.591050 0.794375 -DEAL::0.607814 0.783764 -DEAL::0.613584 0.807264 -DEAL::0.629515 0.787985 DEAL::0.647557 0.779179 DEAL::0.660445 0.781133 DEAL::0.655199 0.775754 -DEAL::0.698558 0.758550 DEAL::0.631046 0.755799 +DEAL::0.629515 0.787985 +DEAL::0.698558 0.758550 diff --git a/tests/simplex/step-68.mpirun=4.output b/tests/simplex/step-68.mpirun=4.output index 427bb9e901..ba89050e09 100644 --- a/tests/simplex/step-68.mpirun=4.output +++ b/tests/simplex/step-68.mpirun=4.output @@ -2,6 +2,7 @@ DEAL::Number of particles inserted: 48 DEAL::Particles location DEAL::0.366577 0.681804 +DEAL::0.484716 0.715907 DEAL::0.398361 0.691931 DEAL::0.408783 0.708456 DEAL::0.423868 0.706937 @@ -11,19 +12,18 @@ DEAL::0.454362 0.697548 DEAL::0.453680 0.706030 DEAL::0.464383 0.709034 DEAL::0.469644 0.709187 -DEAL::0.484716 0.715907 DEAL::0.499111 0.711062 DEAL::0.498868 0.710828 DEAL::0.517719 0.673900 -DEAL::0.503282 0.705982 -DEAL::0.520884 0.707622 -DEAL::0.524944 0.701767 +DEAL::0.618983 0.657786 DEAL::0.535494 0.683627 DEAL::0.532509 0.716124 -DEAL::0.549286 0.705238 DEAL::0.563363 0.673326 +DEAL::0.549286 0.705238 DEAL::0.573466 0.689253 -DEAL::0.618983 0.657786 +DEAL::0.520884 0.707622 +DEAL::0.524944 0.701767 +DEAL::0.503282 0.705982 DEAL::0.628548 0.625331 DEAL::0.691290 0.744340 DEAL::0.379293 0.831136 @@ -32,20 +32,20 @@ DEAL::0.409176 0.839420 DEAL::0.448930 0.832650 DEAL::0.465573 0.816761 DEAL::0.476410 0.833958 -DEAL::0.494476 0.826914 DEAL::0.493642 0.819960 +DEAL::0.494476 0.826914 +DEAL::0.607814 0.783764 DEAL::0.518139 0.836076 +DEAL::0.613584 0.807264 +DEAL::0.571248 0.776918 +DEAL::0.591050 0.794375 +DEAL::0.591790 0.794930 DEAL::0.559598 0.806751 DEAL::0.568815 0.811801 -DEAL::0.571248 0.776918 DEAL::0.586805 0.806620 -DEAL::0.591790 0.794930 -DEAL::0.591050 0.794375 -DEAL::0.607814 0.783764 -DEAL::0.613584 0.807264 -DEAL::0.629515 0.787985 DEAL::0.647557 0.779179 DEAL::0.660445 0.781133 DEAL::0.655199 0.775754 -DEAL::0.698558 0.758550 DEAL::0.631046 0.755799 +DEAL::0.629515 0.787985 +DEAL::0.698558 0.758550 -- 2.39.5