From d3ce4330f5a2b766ee13785c46582adb9a2ae1e1 Mon Sep 17 00:00:00 2001 From: Rene Gassmoeller Date: Thu, 17 Oct 2024 14:00:43 +0200 Subject: [PATCH] Rename tests --- ...c => checkpoint_08_particles_multiple_systems.cc} | 12 ++++++------ ... => checkpoint_08_particles_multiple_systems.prm} | 6 +++--- .../log.txt1 | 0 .../log.txt2 | 0 .../particles-00009.0000.gnuplot1 | 0 .../particles-00009.0000.gnuplot2 | 0 .../particles-2-00009.0000.gnuplot1 | 0 .../particles-2-00009.0000.gnuplot2 | 0 .../screen-output | 11 +++++++++++ .../statistics1 | 2 +- .../statistics2 | 2 +- .../screen-output | 11 ----------- ..._load_balancing_repartition_multiple_systems.prm} | 2 +- .../particles-2/particles-2-00000.0000.gnuplot | 0 .../particles-2/particles-2-00000.0001.gnuplot | 0 .../particles/particles-00000.0000.gnuplot | 0 .../particles/particles-00000.0001.gnuplot | 0 .../screen-output | 4 ++-- .../solution/solution-00000.0000.gnuplot | 0 .../solution/solution-00000.0001.gnuplot | 0 .../statistics | 4 ++-- ...le_managers.prm => particle_multiple_systems.prm} | 2 +- .../particles-2/particles-2-00000.0000.gnuplot | 0 .../particles-2/particles-2-00000.0001.gnuplot | 0 .../particles-2/particles-2-00001.0000.gnuplot | 0 .../particles-2/particles-2-00001.0001.gnuplot | 0 .../particles/particles-00000.0000.gnuplot | 0 .../particles/particles-00000.0001.gnuplot | 0 .../particles/particles-00001.0000.gnuplot | 0 .../particles/particles-00001.0001.gnuplot | 0 .../screen-output | 4 ++-- .../statistics | 4 ++-- ...s_hdf5.prm => particle_multiple_systems_hdf5.prm} | 2 +- .../particles-2.xdmf | 0 .../particles.xdmf | 0 .../screen-output | 4 ++-- .../statistics | 4 ++-- ...m => particle_multiple_systems_interpolation.prm} | 4 ++-- .../screen-output | 8 ++++---- .../solution/solution-00000.0000.gnuplot | 0 .../statistics | 2 +- ...rticle_multiple_systems_interpolation_fail_1.prm} | 4 ++-- .../screen-output | 0 ...rticle_multiple_systems_interpolation_fail_2.prm} | 4 ++-- .../screen-output | 0 ...ers_vtu.prm => particle_multiple_systems_vtu.prm} | 2 +- .../particles-2.pvd | 0 .../particles-2.visit | 0 .../particles-2/particles-2-00000.0000.vtu | 0 .../particles-2/particles-2-00000.0001.vtu | 0 .../particles-2/particles-2-00000.pvtu | 0 .../particles-2/particles-2-00000.visit | 0 .../particles-2/particles-2-00001.0000.vtu | 0 .../particles-2/particles-2-00001.0001.vtu | 0 .../particles-2/particles-2-00001.pvtu | 0 .../particles-2/particles-2-00001.visit | 0 .../particles.pvd | 0 .../particles.visit | 0 .../particles/particles-00000.0000.vtu | 0 .../particles/particles-00000.0001.vtu | 0 .../particles/particles-00000.pvtu | 0 .../particles/particles-00000.visit | 0 .../particles/particles-00001.0000.vtu | 0 .../particles/particles-00001.0001.vtu | 0 .../particles/particles-00001.pvtu | 0 .../particles/particles-00001.visit | 0 .../screen-output | 4 ++-- .../statistics | 4 ++-- 68 files changed, 53 insertions(+), 53 deletions(-) rename tests/{checkpoint_08_particles_multiple_worlds.cc => checkpoint_08_particles_multiple_systems.cc} (90%) rename tests/{checkpoint_08_particles_multiple_worlds.prm => checkpoint_08_particles_multiple_systems.prm} (97%) rename tests/{checkpoint_08_particles_multiple_worlds => checkpoint_08_particles_multiple_systems}/log.txt1 (100%) rename tests/{checkpoint_08_particles_multiple_worlds => checkpoint_08_particles_multiple_systems}/log.txt2 (100%) rename tests/{checkpoint_08_particles_multiple_worlds => checkpoint_08_particles_multiple_systems}/particles-00009.0000.gnuplot1 (100%) rename tests/{checkpoint_08_particles_multiple_worlds => checkpoint_08_particles_multiple_systems}/particles-00009.0000.gnuplot2 (100%) rename tests/{checkpoint_08_particles_multiple_worlds => checkpoint_08_particles_multiple_systems}/particles-2-00009.0000.gnuplot1 (100%) rename tests/{checkpoint_08_particles_multiple_worlds => checkpoint_08_particles_multiple_systems}/particles-2-00009.0000.gnuplot2 (100%) create mode 100644 tests/checkpoint_08_particles_multiple_systems/screen-output rename tests/{checkpoint_08_particles_multiple_worlds => checkpoint_08_particles_multiple_systems}/statistics1 (97%) rename tests/{checkpoint_08_particles_multiple_worlds => checkpoint_08_particles_multiple_systems}/statistics2 (97%) delete mode 100644 tests/checkpoint_08_particles_multiple_worlds/screen-output rename tests/{particle_load_balancing_repartition_multiple_worlds.prm => particle_load_balancing_repartition_multiple_systems.prm} (99%) rename tests/{particle_load_balancing_repartition_multiple_worlds => particle_load_balancing_repartition_multiple_systems}/particles-2/particles-2-00000.0000.gnuplot (100%) rename tests/{particle_load_balancing_repartition_multiple_worlds => particle_load_balancing_repartition_multiple_systems}/particles-2/particles-2-00000.0001.gnuplot (100%) rename tests/{particle_load_balancing_repartition_multiple_worlds => particle_load_balancing_repartition_multiple_systems}/particles/particles-00000.0000.gnuplot (100%) rename tests/{particle_load_balancing_repartition_multiple_worlds => particle_load_balancing_repartition_multiple_systems}/particles/particles-00000.0001.gnuplot (100%) rename tests/{particle_load_balancing_repartition_multiple_worlds => particle_load_balancing_repartition_multiple_systems}/screen-output (88%) rename tests/{particle_load_balancing_repartition_multiple_worlds => particle_load_balancing_repartition_multiple_systems}/solution/solution-00000.0000.gnuplot (100%) rename tests/{particle_load_balancing_repartition_multiple_worlds => particle_load_balancing_repartition_multiple_systems}/solution/solution-00000.0001.gnuplot (100%) rename tests/{particle_load_balancing_repartition_multiple_worlds => particle_load_balancing_repartition_multiple_systems}/statistics (74%) rename tests/{particle_multiple_managers.prm => particle_multiple_systems.prm} (97%) rename tests/{particle_multiple_managers => particle_multiple_systems}/particles-2/particles-2-00000.0000.gnuplot (100%) rename tests/{particle_multiple_managers => particle_multiple_systems}/particles-2/particles-2-00000.0001.gnuplot (100%) rename tests/{particle_multiple_managers => particle_multiple_systems}/particles-2/particles-2-00001.0000.gnuplot (100%) rename tests/{particle_multiple_managers => particle_multiple_systems}/particles-2/particles-2-00001.0001.gnuplot (100%) rename tests/{particle_multiple_managers => particle_multiple_systems}/particles/particles-00000.0000.gnuplot (100%) rename tests/{particle_multiple_managers => particle_multiple_systems}/particles/particles-00000.0001.gnuplot (100%) rename tests/{particle_multiple_managers => particle_multiple_systems}/particles/particles-00001.0000.gnuplot (100%) rename tests/{particle_multiple_managers => particle_multiple_systems}/particles/particles-00001.0001.gnuplot (100%) rename tests/{particle_multiple_managers => particle_multiple_systems}/screen-output (83%) rename tests/{particle_multiple_managers => particle_multiple_systems}/statistics (77%) rename tests/{particle_multiple_managers_hdf5.prm => particle_multiple_systems_hdf5.prm} (98%) rename tests/{particle_multiple_managers_hdf5 => particle_multiple_systems_hdf5}/particles-2.xdmf (100%) rename tests/{particle_multiple_managers_hdf5 => particle_multiple_systems_hdf5}/particles.xdmf (100%) rename tests/{particle_multiple_managers_vtu => particle_multiple_systems_hdf5}/screen-output (82%) rename tests/{particle_multiple_managers_vtu => particle_multiple_systems_hdf5}/statistics (81%) rename tests/{particle_multiple_managers_interpolation.prm => particle_multiple_systems_interpolation.prm} (95%) rename tests/{particle_multiple_managers_interpolation => particle_multiple_systems_interpolation}/screen-output (56%) rename tests/{particle_multiple_managers_interpolation => particle_multiple_systems_interpolation}/solution/solution-00000.0000.gnuplot (100%) rename tests/{particle_multiple_managers_interpolation => particle_multiple_systems_interpolation}/statistics (93%) rename tests/{particle_multiple_managers_interpolation_fail_1.prm => particle_multiple_systems_interpolation_fail_1.prm} (96%) rename tests/{particle_multiple_managers_interpolation_fail_1 => particle_multiple_systems_interpolation_fail_1}/screen-output (100%) rename tests/{particle_multiple_managers_interpolation_fail_2.prm => particle_multiple_systems_interpolation_fail_2.prm} (96%) rename tests/{particle_multiple_managers_interpolation_fail_2 => particle_multiple_systems_interpolation_fail_2}/screen-output (100%) rename tests/{particle_multiple_managers_vtu.prm => particle_multiple_systems_vtu.prm} (98%) rename tests/{particle_multiple_managers_vtu => particle_multiple_systems_vtu}/particles-2.pvd (100%) rename tests/{particle_multiple_managers_vtu => particle_multiple_systems_vtu}/particles-2.visit (100%) rename tests/{particle_multiple_managers_vtu => particle_multiple_systems_vtu}/particles-2/particles-2-00000.0000.vtu (100%) rename tests/{particle_multiple_managers_vtu => particle_multiple_systems_vtu}/particles-2/particles-2-00000.0001.vtu (100%) rename tests/{particle_multiple_managers_vtu => particle_multiple_systems_vtu}/particles-2/particles-2-00000.pvtu (100%) rename tests/{particle_multiple_managers_vtu => particle_multiple_systems_vtu}/particles-2/particles-2-00000.visit (100%) rename tests/{particle_multiple_managers_vtu => particle_multiple_systems_vtu}/particles-2/particles-2-00001.0000.vtu (100%) rename tests/{particle_multiple_managers_vtu => particle_multiple_systems_vtu}/particles-2/particles-2-00001.0001.vtu (100%) rename tests/{particle_multiple_managers_vtu => particle_multiple_systems_vtu}/particles-2/particles-2-00001.pvtu (100%) rename tests/{particle_multiple_managers_vtu => particle_multiple_systems_vtu}/particles-2/particles-2-00001.visit (100%) rename tests/{particle_multiple_managers_vtu => particle_multiple_systems_vtu}/particles.pvd (100%) rename tests/{particle_multiple_managers_vtu => particle_multiple_systems_vtu}/particles.visit (100%) rename tests/{particle_multiple_managers_vtu => particle_multiple_systems_vtu}/particles/particles-00000.0000.vtu (100%) rename tests/{particle_multiple_managers_vtu => particle_multiple_systems_vtu}/particles/particles-00000.0001.vtu (100%) rename tests/{particle_multiple_managers_vtu => particle_multiple_systems_vtu}/particles/particles-00000.pvtu (100%) rename tests/{particle_multiple_managers_vtu => particle_multiple_systems_vtu}/particles/particles-00000.visit (100%) rename tests/{particle_multiple_managers_vtu => particle_multiple_systems_vtu}/particles/particles-00001.0000.vtu (100%) rename tests/{particle_multiple_managers_vtu => particle_multiple_systems_vtu}/particles/particles-00001.0001.vtu (100%) rename tests/{particle_multiple_managers_vtu => particle_multiple_systems_vtu}/particles/particles-00001.pvtu (100%) rename tests/{particle_multiple_managers_vtu => particle_multiple_systems_vtu}/particles/particles-00001.visit (100%) rename tests/{particle_multiple_managers_hdf5 => particle_multiple_systems_vtu}/screen-output (82%) rename tests/{particle_multiple_managers_hdf5 => particle_multiple_systems_vtu}/statistics (76%) diff --git a/tests/checkpoint_08_particles_multiple_worlds.cc b/tests/checkpoint_08_particles_multiple_systems.cc similarity index 90% rename from tests/checkpoint_08_particles_multiple_worlds.cc rename to tests/checkpoint_08_particles_multiple_systems.cc index 27fc7cc11b3..41c462490a6 100644 --- a/tests/checkpoint_08_particles_multiple_worlds.cc +++ b/tests/checkpoint_08_particles_multiple_systems.cc @@ -33,8 +33,8 @@ int f() int ret; std::string command; - command = ("cd output-checkpoint_08_particles_multiple_worlds ; " - "(cat " ASPECT_SOURCE_DIR "/tests/checkpoint_08_particles_multiple_worlds.prm " + command = ("cd output-checkpoint_08_particles_multiple_systems ; " + "(cat " ASPECT_SOURCE_DIR "/tests/checkpoint_08_particles_multiple_systems.prm " " ; " " echo 'set Output directory = output1.tmp' " " ; " @@ -48,7 +48,7 @@ int f() if (ret!=0) std::cout << "system() returned error " << ret << std::endl; - command = ("cd output-checkpoint_08_particles_multiple_worlds ; " + command = ("cd output-checkpoint_08_particles_multiple_systems ; " " rm -rf output2.tmp ; mkdir output2.tmp ; " " cp output1.tmp/restart* output2.tmp/"); std::cout << "Executing the following command:\n" @@ -60,8 +60,8 @@ int f() std::cout << "* now resuming:" << std::endl; - command = ("cd output-checkpoint_08_particles_multiple_worlds ; " - "(cat " ASPECT_SOURCE_DIR "/tests/checkpoint_08_particles_multiple_worlds.prm " + command = ("cd output-checkpoint_08_particles_multiple_systems ; " + "(cat " ASPECT_SOURCE_DIR "/tests/checkpoint_08_particles_multiple_systems.prm " " ; " " echo 'set Output directory = output2.tmp' " " ; " @@ -77,7 +77,7 @@ int f() std::cout << "* now comparing:" << std::endl; - ret = system ("cd output-checkpoint_08_particles_multiple_worlds; " + ret = system ("cd output-checkpoint_08_particles_multiple_systems; " "cp output1.tmp/particles/particles-00009.0000.gnuplot particles-00009.0000.gnuplot1;" "cp output2.tmp/particles/particles-00009.0000.gnuplot particles-00009.0000.gnuplot2;" "cp output1.tmp/particles-2/particles-2-00009.0000.gnuplot particles-2-00009.0000.gnuplot1;" diff --git a/tests/checkpoint_08_particles_multiple_worlds.prm b/tests/checkpoint_08_particles_multiple_systems.prm similarity index 97% rename from tests/checkpoint_08_particles_multiple_worlds.prm rename to tests/checkpoint_08_particles_multiple_systems.prm index cea93d673c1..457e5b77560 100644 --- a/tests/checkpoint_08_particles_multiple_worlds.prm +++ b/tests/checkpoint_08_particles_multiple_systems.prm @@ -1,12 +1,12 @@ # test checkpoint/resume. -# This test is controlled via the plugin in checkpoint_08_particles_multiple_worlds.cc. +# This test is controlled via the plugin in checkpoint_08_particles_multiple_systems.cc. # The plugin will first execute ASPECT with this .prm and write the output into # output1.tmp/. This will generate a snapshot that is then resumed from. The # output for this second run will be written into output2.tmp/. Finally, # output files will be copied into the main output folder for comparison. -# based on checkpoint_03.prm, but extended for multiple particle worlds. +# based on checkpoint_03.prm, but extended for multiple particle systems. set Dimension = 2 set CFL number = 1.0 @@ -16,7 +16,6 @@ set Adiabatic surface temperature = 0 set Surface pressure = 0 set Use years in output instead of seconds = false set Nonlinear solver scheme = single Advection, single Stokes -set Number of particle worlds = 2 subsection Checkpointing set Steps between checkpoint = 4 @@ -83,6 +82,7 @@ subsection Solver parameters end subsection Particles + set Number of particle systems = 2 set List of particle properties = function, initial position, position, velocity subsection Function diff --git a/tests/checkpoint_08_particles_multiple_worlds/log.txt1 b/tests/checkpoint_08_particles_multiple_systems/log.txt1 similarity index 100% rename from tests/checkpoint_08_particles_multiple_worlds/log.txt1 rename to tests/checkpoint_08_particles_multiple_systems/log.txt1 diff --git a/tests/checkpoint_08_particles_multiple_worlds/log.txt2 b/tests/checkpoint_08_particles_multiple_systems/log.txt2 similarity index 100% rename from tests/checkpoint_08_particles_multiple_worlds/log.txt2 rename to tests/checkpoint_08_particles_multiple_systems/log.txt2 diff --git a/tests/checkpoint_08_particles_multiple_worlds/particles-00009.0000.gnuplot1 b/tests/checkpoint_08_particles_multiple_systems/particles-00009.0000.gnuplot1 similarity index 100% rename from tests/checkpoint_08_particles_multiple_worlds/particles-00009.0000.gnuplot1 rename to tests/checkpoint_08_particles_multiple_systems/particles-00009.0000.gnuplot1 diff --git a/tests/checkpoint_08_particles_multiple_worlds/particles-00009.0000.gnuplot2 b/tests/checkpoint_08_particles_multiple_systems/particles-00009.0000.gnuplot2 similarity index 100% rename from tests/checkpoint_08_particles_multiple_worlds/particles-00009.0000.gnuplot2 rename to tests/checkpoint_08_particles_multiple_systems/particles-00009.0000.gnuplot2 diff --git a/tests/checkpoint_08_particles_multiple_worlds/particles-2-00009.0000.gnuplot1 b/tests/checkpoint_08_particles_multiple_systems/particles-2-00009.0000.gnuplot1 similarity index 100% rename from tests/checkpoint_08_particles_multiple_worlds/particles-2-00009.0000.gnuplot1 rename to tests/checkpoint_08_particles_multiple_systems/particles-2-00009.0000.gnuplot1 diff --git a/tests/checkpoint_08_particles_multiple_worlds/particles-2-00009.0000.gnuplot2 b/tests/checkpoint_08_particles_multiple_systems/particles-2-00009.0000.gnuplot2 similarity index 100% rename from tests/checkpoint_08_particles_multiple_worlds/particles-2-00009.0000.gnuplot2 rename to tests/checkpoint_08_particles_multiple_systems/particles-2-00009.0000.gnuplot2 diff --git a/tests/checkpoint_08_particles_multiple_systems/screen-output b/tests/checkpoint_08_particles_multiple_systems/screen-output new file mode 100644 index 00000000000..fe1edbe0051 --- /dev/null +++ b/tests/checkpoint_08_particles_multiple_systems/screen-output @@ -0,0 +1,11 @@ + +Loading shared library <./libcheckpoint_08_particles_multiple_systems.debug.so> +* starting from beginning: +Executing the following command: +cd output-checkpoint_08_particles_multiple_systems ; (cat ASPECT_DIR/tests/checkpoint_08_particles_multiple_systems.prm ; echo 'set Output directory = output1.tmp' ; rm -rf output1.tmp ; mkdir output1.tmp ) | ../../aspect -- > /dev/null +Executing the following command: +cd output-checkpoint_08_particles_multiple_systems ; rm -rf output2.tmp ; mkdir output2.tmp ; cp output1.tmp/restart* output2.tmp/ +* now resuming: +Executing the following command: +cd output-checkpoint_08_particles_multiple_systems ; (cat ASPECT_DIR/tests/checkpoint_08_particles_multiple_systems.prm ; echo 'set Output directory = output2.tmp' ; echo 'set Resume computation = true' ) | ../../aspect -- > /dev/null +* now comparing: diff --git a/tests/checkpoint_08_particles_multiple_worlds/statistics1 b/tests/checkpoint_08_particles_multiple_systems/statistics1 similarity index 97% rename from tests/checkpoint_08_particles_multiple_worlds/statistics1 rename to tests/checkpoint_08_particles_multiple_systems/statistics1 index a6024aaa09f..90a83293df7 100644 --- a/tests/checkpoint_08_particles_multiple_worlds/statistics1 +++ b/tests/checkpoint_08_particles_multiple_systems/statistics1 @@ -11,7 +11,7 @@ # 11: RMS velocity (m/s) # 12: Max. velocity (m/s) # 13: Number of advected particles -# 14: Number of advected particles (World 2) +# 14: Number of advected particles (Particle system 2) # 15: Particle file name # 16: Particle file name (2) 0 0.000000000000e+00 0.000000000000e+00 1024 9539 4225 0 1.00000000e+00 1.04052848e+00 1.10000000e+00 5.91984042e-09 1.51937630e-08 100 100 output1.tmp/particles/particles-00000 output1.tmp/particles-2/particles-2-00000 diff --git a/tests/checkpoint_08_particles_multiple_worlds/statistics2 b/tests/checkpoint_08_particles_multiple_systems/statistics2 similarity index 97% rename from tests/checkpoint_08_particles_multiple_worlds/statistics2 rename to tests/checkpoint_08_particles_multiple_systems/statistics2 index 40ee7d4c5d8..13fe888823c 100644 --- a/tests/checkpoint_08_particles_multiple_worlds/statistics2 +++ b/tests/checkpoint_08_particles_multiple_systems/statistics2 @@ -11,7 +11,7 @@ # 11: RMS velocity (m/s) # 12: Max. velocity (m/s) # 13: Number of advected particles -# 14: Number of advected particles (World 2) +# 14: Number of advected particles (Particle system 2) # 15: Particle file name # 16: Particle file name (2) 0 0.000000000000e+00 0.000000000000e+00 1024 9539 4225 0 1.00000000e+00 1.04052848e+00 1.10000000e+00 5.91984042e-09 1.51937630e-08 100 100 output1.tmp/particles/particles-00000 output1.tmp/particles-2/particles-2-00000 diff --git a/tests/checkpoint_08_particles_multiple_worlds/screen-output b/tests/checkpoint_08_particles_multiple_worlds/screen-output deleted file mode 100644 index 4da5214ceef..00000000000 --- a/tests/checkpoint_08_particles_multiple_worlds/screen-output +++ /dev/null @@ -1,11 +0,0 @@ - -Loading shared library <./libcheckpoint_08_particles_multiple_worlds.debug.so> -* starting from beginning: -Executing the following command: -cd output-checkpoint_08_particles_multiple_worlds ; (cat ASPECT_DIR/tests/checkpoint_08_particles_multiple_worlds.prm ; echo 'set Output directory = output1.tmp' ; rm -rf output1.tmp ; mkdir output1.tmp ) | ../../aspect -- > /dev/null -Executing the following command: -cd output-checkpoint_08_particles_multiple_worlds ; rm -rf output2.tmp ; mkdir output2.tmp ; cp output1.tmp/restart* output2.tmp/ -* now resuming: -Executing the following command: -cd output-checkpoint_08_particles_multiple_worlds ; (cat ASPECT_DIR/tests/checkpoint_08_particles_multiple_worlds.prm ; echo 'set Output directory = output2.tmp' ; echo 'set Resume computation = true' ) | ../../aspect -- > /dev/null -* now comparing: diff --git a/tests/particle_load_balancing_repartition_multiple_worlds.prm b/tests/particle_load_balancing_repartition_multiple_systems.prm similarity index 99% rename from tests/particle_load_balancing_repartition_multiple_worlds.prm rename to tests/particle_load_balancing_repartition_multiple_systems.prm index dff74fe2d64..577ac06a10c 100644 --- a/tests/particle_load_balancing_repartition_multiple_worlds.prm +++ b/tests/particle_load_balancing_repartition_multiple_systems.prm @@ -17,7 +17,6 @@ set Dimension = 2 set End time = 0 set Use years in output instead of seconds = false -set Number of particle worlds = 2 subsection Geometry model set Model name = box @@ -117,6 +116,7 @@ subsection Postprocess end subsection Particles + set Number of particle systems = 2 set Load balancing strategy = repartition set Integration scheme = euler set Particle weight = 5000 diff --git a/tests/particle_load_balancing_repartition_multiple_worlds/particles-2/particles-2-00000.0000.gnuplot b/tests/particle_load_balancing_repartition_multiple_systems/particles-2/particles-2-00000.0000.gnuplot similarity index 100% rename from tests/particle_load_balancing_repartition_multiple_worlds/particles-2/particles-2-00000.0000.gnuplot rename to tests/particle_load_balancing_repartition_multiple_systems/particles-2/particles-2-00000.0000.gnuplot diff --git a/tests/particle_load_balancing_repartition_multiple_worlds/particles-2/particles-2-00000.0001.gnuplot b/tests/particle_load_balancing_repartition_multiple_systems/particles-2/particles-2-00000.0001.gnuplot similarity index 100% rename from tests/particle_load_balancing_repartition_multiple_worlds/particles-2/particles-2-00000.0001.gnuplot rename to tests/particle_load_balancing_repartition_multiple_systems/particles-2/particles-2-00000.0001.gnuplot diff --git a/tests/particle_load_balancing_repartition_multiple_worlds/particles/particles-00000.0000.gnuplot b/tests/particle_load_balancing_repartition_multiple_systems/particles/particles-00000.0000.gnuplot similarity index 100% rename from tests/particle_load_balancing_repartition_multiple_worlds/particles/particles-00000.0000.gnuplot rename to tests/particle_load_balancing_repartition_multiple_systems/particles/particles-00000.0000.gnuplot diff --git a/tests/particle_load_balancing_repartition_multiple_worlds/particles/particles-00000.0001.gnuplot b/tests/particle_load_balancing_repartition_multiple_systems/particles/particles-00000.0001.gnuplot similarity index 100% rename from tests/particle_load_balancing_repartition_multiple_worlds/particles/particles-00000.0001.gnuplot rename to tests/particle_load_balancing_repartition_multiple_systems/particles/particles-00000.0001.gnuplot diff --git a/tests/particle_load_balancing_repartition_multiple_worlds/screen-output b/tests/particle_load_balancing_repartition_multiple_systems/screen-output similarity index 88% rename from tests/particle_load_balancing_repartition_multiple_worlds/screen-output rename to tests/particle_load_balancing_repartition_multiple_systems/screen-output index 0100e74779d..7a4594c59cc 100644 --- a/tests/particle_load_balancing_repartition_multiple_worlds/screen-output +++ b/tests/particle_load_balancing_repartition_multiple_systems/screen-output @@ -18,10 +18,10 @@ Number of degrees of freedom: 1,237 (578+81+289+289) Solving Stokes system (GMG)... 12+0 iterations. Postprocessing: - Writing particle output: output-particle_load_balancing_repartition_multiple_worlds/particles/particles-00000 + Writing particle output: output-particle_load_balancing_repartition_multiple_systems/particles/particles-00000 Particle count per cell min/avg/max: 0, 1, 3 Cells per process min/max/avg: 16/48/32 - Writing graphical output: output-particle_load_balancing_repartition_multiple_worlds/solution/solution-00000 + Writing graphical output: output-particle_load_balancing_repartition_multiple_systems/solution/solution-00000 Number of active cells: 64 (on 4 levels) Number of degrees of freedom: 1,237 (578+81+289+289) diff --git a/tests/particle_load_balancing_repartition_multiple_worlds/solution/solution-00000.0000.gnuplot b/tests/particle_load_balancing_repartition_multiple_systems/solution/solution-00000.0000.gnuplot similarity index 100% rename from tests/particle_load_balancing_repartition_multiple_worlds/solution/solution-00000.0000.gnuplot rename to tests/particle_load_balancing_repartition_multiple_systems/solution/solution-00000.0000.gnuplot diff --git a/tests/particle_load_balancing_repartition_multiple_worlds/solution/solution-00000.0001.gnuplot b/tests/particle_load_balancing_repartition_multiple_systems/solution/solution-00000.0001.gnuplot similarity index 100% rename from tests/particle_load_balancing_repartition_multiple_worlds/solution/solution-00000.0001.gnuplot rename to tests/particle_load_balancing_repartition_multiple_systems/solution/solution-00000.0001.gnuplot diff --git a/tests/particle_load_balancing_repartition_multiple_worlds/statistics b/tests/particle_load_balancing_repartition_multiple_systems/statistics similarity index 74% rename from tests/particle_load_balancing_repartition_multiple_worlds/statistics rename to tests/particle_load_balancing_repartition_multiple_systems/statistics index 27aedb5f5aa..cefbf06fa30 100644 --- a/tests/particle_load_balancing_repartition_multiple_worlds/statistics +++ b/tests/particle_load_balancing_repartition_multiple_systems/statistics @@ -11,7 +11,7 @@ # 11: Velocity iterations in Stokes preconditioner # 12: Schur complement iterations in Stokes preconditioner # 13: Number of advected particles -# 14: Number of advected particles (World 2) +# 14: Number of advected particles (Particle system 2) # 15: Particle file name # 16: Particle file name (2) # 17: Minimal particles per cell: @@ -27,4 +27,4 @@ # 27: Maximal local particle to cell ratio # 28: Average local particle to cell ratio # 29: Visualization file name -0 0.000000000000e+00 0.000000000000e+00 64 659 289 289 0 0 11 13 13 16 48 output-particle_load_balancing_repartition_multiple_worlds/particles/particles-00000 output-particle_load_balancing_repartition_multiple_worlds/particles-2/particles-2-00000 0 1 3 16 48 32.0000 16 48 32.0000 1.0000 1.0000 1.0000 output-particle_load_balancing_repartition_multiple_worlds/solution/solution-00000 +0 0.000000000000e+00 0.000000000000e+00 64 659 289 289 0 0 11 13 13 16 48 output-particle_load_balancing_repartition_multiple_systems/particles/particles-00000 output-particle_load_balancing_repartition_multiple_systems/particles-2/particles-2-00000 0 1 3 16 48 32.0000 16 48 32.0000 1.0000 1.0000 1.0000 output-particle_load_balancing_repartition_multiple_systems/solution/solution-00000 diff --git a/tests/particle_multiple_managers.prm b/tests/particle_multiple_systems.prm similarity index 97% rename from tests/particle_multiple_managers.prm rename to tests/particle_multiple_systems.prm index 269d5729955..b6126936f2b 100644 --- a/tests/particle_multiple_managers.prm +++ b/tests/particle_multiple_systems.prm @@ -1,4 +1,4 @@ -# Test that we can activate multiple particle managers with +# Test that we can activate multiple particle systems with # different particle properties and output directories. # MPI: 2 diff --git a/tests/particle_multiple_managers/particles-2/particles-2-00000.0000.gnuplot b/tests/particle_multiple_systems/particles-2/particles-2-00000.0000.gnuplot similarity index 100% rename from tests/particle_multiple_managers/particles-2/particles-2-00000.0000.gnuplot rename to tests/particle_multiple_systems/particles-2/particles-2-00000.0000.gnuplot diff --git a/tests/particle_multiple_managers/particles-2/particles-2-00000.0001.gnuplot b/tests/particle_multiple_systems/particles-2/particles-2-00000.0001.gnuplot similarity index 100% rename from tests/particle_multiple_managers/particles-2/particles-2-00000.0001.gnuplot rename to tests/particle_multiple_systems/particles-2/particles-2-00000.0001.gnuplot diff --git a/tests/particle_multiple_managers/particles-2/particles-2-00001.0000.gnuplot b/tests/particle_multiple_systems/particles-2/particles-2-00001.0000.gnuplot similarity index 100% rename from tests/particle_multiple_managers/particles-2/particles-2-00001.0000.gnuplot rename to tests/particle_multiple_systems/particles-2/particles-2-00001.0000.gnuplot diff --git a/tests/particle_multiple_managers/particles-2/particles-2-00001.0001.gnuplot b/tests/particle_multiple_systems/particles-2/particles-2-00001.0001.gnuplot similarity index 100% rename from tests/particle_multiple_managers/particles-2/particles-2-00001.0001.gnuplot rename to tests/particle_multiple_systems/particles-2/particles-2-00001.0001.gnuplot diff --git a/tests/particle_multiple_managers/particles/particles-00000.0000.gnuplot b/tests/particle_multiple_systems/particles/particles-00000.0000.gnuplot similarity index 100% rename from tests/particle_multiple_managers/particles/particles-00000.0000.gnuplot rename to tests/particle_multiple_systems/particles/particles-00000.0000.gnuplot diff --git a/tests/particle_multiple_managers/particles/particles-00000.0001.gnuplot b/tests/particle_multiple_systems/particles/particles-00000.0001.gnuplot similarity index 100% rename from tests/particle_multiple_managers/particles/particles-00000.0001.gnuplot rename to tests/particle_multiple_systems/particles/particles-00000.0001.gnuplot diff --git a/tests/particle_multiple_managers/particles/particles-00001.0000.gnuplot b/tests/particle_multiple_systems/particles/particles-00001.0000.gnuplot similarity index 100% rename from tests/particle_multiple_managers/particles/particles-00001.0000.gnuplot rename to tests/particle_multiple_systems/particles/particles-00001.0000.gnuplot diff --git a/tests/particle_multiple_managers/particles/particles-00001.0001.gnuplot b/tests/particle_multiple_systems/particles/particles-00001.0001.gnuplot similarity index 100% rename from tests/particle_multiple_managers/particles/particles-00001.0001.gnuplot rename to tests/particle_multiple_systems/particles/particles-00001.0001.gnuplot diff --git a/tests/particle_multiple_managers/screen-output b/tests/particle_multiple_systems/screen-output similarity index 83% rename from tests/particle_multiple_managers/screen-output rename to tests/particle_multiple_systems/screen-output index 3d759624906..840e5da364e 100644 --- a/tests/particle_multiple_managers/screen-output +++ b/tests/particle_multiple_systems/screen-output @@ -12,7 +12,7 @@ Number of degrees of freedom: 4,645 (2,178+289+1,089+1,089) Postprocessing: RMS, max velocity: 0.000181 m/s, 0.000404 m/s Compositions min/max/mass: 0/1/0.1825 - Writing particle output: output-particle_multiple_managers/particles/particles-00000 + Writing particle output: output-particle_multiple_systems/particles/particles-00000 *** Timestep 1: t=70 seconds, dt=70 seconds Skipping temperature solve because RHS is zero. @@ -24,7 +24,7 @@ Number of degrees of freedom: 4,645 (2,178+289+1,089+1,089) Postprocessing: RMS, max velocity: 0.000327 m/s, 0.000727 m/s Compositions min/max/mass: -0.001642/1.001/0.1825 - Writing particle output: output-particle_multiple_managers/particles/particles-00001 + Writing particle output: output-particle_multiple_systems/particles/particles-00001 Termination requested by criterion: end time diff --git a/tests/particle_multiple_managers/statistics b/tests/particle_multiple_systems/statistics similarity index 77% rename from tests/particle_multiple_managers/statistics rename to tests/particle_multiple_systems/statistics index 46fd8a00a22..32ed04eb614 100644 --- a/tests/particle_multiple_managers/statistics +++ b/tests/particle_multiple_systems/statistics @@ -19,5 +19,5 @@ # 19: Number of advected particles (Particle system 2) # 20: Particle file name # 21: Particle file name (2) -0 0.000000000000e+00 0.000000000000e+00 256 2467 1089 1089 0 0 11 13 13 1.81487741e-04 4.04466706e-04 0.00000000e+00 1.00000000e+00 1.82454287e-01 10 10 output-particle_multiple_managers/particles/particles-00000 output-particle_multiple_managers/particles-2/particles-2-00000 -1 7.000000000000e+01 7.000000000000e+01 256 2467 1089 1089 0 15 11 13 13 3.27408209e-04 7.26750666e-04 -1.64211363e-03 1.00068146e+00 1.82473068e-01 10 10 output-particle_multiple_managers/particles/particles-00001 output-particle_multiple_managers/particles-2/particles-2-00001 +0 0.000000000000e+00 0.000000000000e+00 256 2467 1089 1089 0 0 11 13 13 1.81487741e-04 4.04466706e-04 0.00000000e+00 1.00000000e+00 1.82454287e-01 10 10 output-particle_multiple_systems/particles/particles-00000 output-particle_multiple_systems/particles-2/particles-2-00000 +1 7.000000000000e+01 7.000000000000e+01 256 2467 1089 1089 0 15 11 13 13 3.27408209e-04 7.26750666e-04 -1.64211363e-03 1.00068146e+00 1.82473068e-01 10 10 output-particle_multiple_systems/particles/particles-00001 output-particle_multiple_systems/particles-2/particles-2-00001 diff --git a/tests/particle_multiple_managers_hdf5.prm b/tests/particle_multiple_systems_hdf5.prm similarity index 98% rename from tests/particle_multiple_managers_hdf5.prm rename to tests/particle_multiple_systems_hdf5.prm index 90cf13eb9b5..105b847c7ae 100644 --- a/tests/particle_multiple_managers_hdf5.prm +++ b/tests/particle_multiple_systems_hdf5.prm @@ -1,4 +1,4 @@ -# Like particle_multiple_managers, but tests that +# Like particle_multiple_systems, but tests that # the HDF5 output (in particular the summary files # .xdmf) are written correctly. diff --git a/tests/particle_multiple_managers_hdf5/particles-2.xdmf b/tests/particle_multiple_systems_hdf5/particles-2.xdmf similarity index 100% rename from tests/particle_multiple_managers_hdf5/particles-2.xdmf rename to tests/particle_multiple_systems_hdf5/particles-2.xdmf diff --git a/tests/particle_multiple_managers_hdf5/particles.xdmf b/tests/particle_multiple_systems_hdf5/particles.xdmf similarity index 100% rename from tests/particle_multiple_managers_hdf5/particles.xdmf rename to tests/particle_multiple_systems_hdf5/particles.xdmf diff --git a/tests/particle_multiple_managers_vtu/screen-output b/tests/particle_multiple_systems_hdf5/screen-output similarity index 82% rename from tests/particle_multiple_managers_vtu/screen-output rename to tests/particle_multiple_systems_hdf5/screen-output index 6569b95ae9a..ac7e3d04ae9 100644 --- a/tests/particle_multiple_managers_vtu/screen-output +++ b/tests/particle_multiple_systems_hdf5/screen-output @@ -12,7 +12,7 @@ Number of degrees of freedom: 4,645 (2,178+289+1,089+1,089) Postprocessing: RMS, max velocity: 0.000181 m/s, 0.000404 m/s Compositions min/max/mass: 0/1/0.1825 - Writing particle output: output-particle_multiple_managers_vtu/particles/particles-00000 + Writing particle output: output-particle_multiple_systems_hdf5/particles/particles-00000 *** Timestep 1: t=70 seconds, dt=70 seconds Skipping temperature solve because RHS is zero. @@ -24,7 +24,7 @@ Number of degrees of freedom: 4,645 (2,178+289+1,089+1,089) Postprocessing: RMS, max velocity: 0.000327 m/s, 0.000727 m/s Compositions min/max/mass: -0.001642/1.001/0.1825 - Writing particle output: output-particle_multiple_managers_vtu/particles/particles-00001 + Writing particle output: output-particle_multiple_systems_hdf5/particles/particles-00001 Termination requested by criterion: end time diff --git a/tests/particle_multiple_managers_vtu/statistics b/tests/particle_multiple_systems_hdf5/statistics similarity index 81% rename from tests/particle_multiple_managers_vtu/statistics rename to tests/particle_multiple_systems_hdf5/statistics index 7ff145f071e..efaef4d5a5e 100644 --- a/tests/particle_multiple_managers_vtu/statistics +++ b/tests/particle_multiple_systems_hdf5/statistics @@ -19,5 +19,5 @@ # 19: Number of advected particles (Particle system 2) # 20: Particle file name # 21: Particle file name (2) -0 0.000000000000e+00 0.000000000000e+00 256 2467 1089 1089 0 0 11 13 13 1.81487741e-04 4.04466706e-04 0.00000000e+00 1.00000000e+00 1.82454287e-01 10 10 output-particle_multiple_managers_vtu/particles/particles-00000 output-particle_multiple_managers_vtu/particles-2/particles-2-00000 -1 7.000000000000e+01 7.000000000000e+01 256 2467 1089 1089 0 15 11 13 13 3.27408209e-04 7.26750666e-04 -1.64211363e-03 1.00068146e+00 1.82473068e-01 10 10 output-particle_multiple_managers_vtu/particles/particles-00001 output-particle_multiple_managers_vtu/particles-2/particles-2-00001 +0 0.000000000000e+00 0.000000000000e+00 256 2467 1089 1089 0 0 11 13 13 1.81487741e-04 4.04466706e-04 0.00000000e+00 1.00000000e+00 1.82454287e-01 10 10 output-particle_multiple_systems_hdf5/particles/particles-00000 output-particle_multiple_systems_hdf5/particles-2/particles-2-00000 +1 7.000000000000e+01 7.000000000000e+01 256 2467 1089 1089 0 15 11 13 13 3.27408209e-04 7.26750666e-04 -1.64211363e-03 1.00068146e+00 1.82473068e-01 10 10 output-particle_multiple_systems_hdf5/particles/particles-00001 output-particle_multiple_systems_hdf5/particles-2/particles-2-00001 diff --git a/tests/particle_multiple_managers_interpolation.prm b/tests/particle_multiple_systems_interpolation.prm similarity index 95% rename from tests/particle_multiple_managers_interpolation.prm rename to tests/particle_multiple_systems_interpolation.prm index e3768651207..1394fe3760c 100644 --- a/tests/particle_multiple_managers_interpolation.prm +++ b/tests/particle_multiple_systems_interpolation.prm @@ -1,5 +1,5 @@ -# Test that we can activate multiple particle managers and -# interpolate properties from different particle managers into +# Test that we can activate multiple particle systems and +# interpolate properties from different particle systems into # the compositional fields. set Dimension = 2 diff --git a/tests/particle_multiple_managers_interpolation/screen-output b/tests/particle_multiple_systems_interpolation/screen-output similarity index 56% rename from tests/particle_multiple_managers_interpolation/screen-output rename to tests/particle_multiple_systems_interpolation/screen-output index 60b7e156e9a..13a489deccb 100644 --- a/tests/particle_multiple_managers_interpolation/screen-output +++ b/tests/particle_multiple_systems_interpolation/screen-output @@ -9,10 +9,10 @@ Number of degrees of freedom: 134 (50+9+25+25+25) Solving Stokes system (GMG)... 9+0 iterations. Postprocessing: - RMS, max velocity: 0.00308 m/s, 0.00465 m/s - Compositions min/max/mass: 0.2285/0.6856/0.4527 // 0/0.4999/0.1902 - Number of advected particles 16, 16 - Writing graphical output: output-particle_multiple_managers_interpolation/solution/solution-00000 + RMS, max velocity: 0.00308 m/s, 0.00465 m/s + Compositions min/max/mass: 0.2285/0.6856/0.4527 // 0/0.4999/0.1902 + Number of advected particles: 16, 16 + Writing graphical output: output-particle_multiple_systems_interpolation/solution/solution-00000 Termination requested by criterion: end time diff --git a/tests/particle_multiple_managers_interpolation/solution/solution-00000.0000.gnuplot b/tests/particle_multiple_systems_interpolation/solution/solution-00000.0000.gnuplot similarity index 100% rename from tests/particle_multiple_managers_interpolation/solution/solution-00000.0000.gnuplot rename to tests/particle_multiple_systems_interpolation/solution/solution-00000.0000.gnuplot diff --git a/tests/particle_multiple_managers_interpolation/statistics b/tests/particle_multiple_systems_interpolation/statistics similarity index 93% rename from tests/particle_multiple_managers_interpolation/statistics rename to tests/particle_multiple_systems_interpolation/statistics index 672d1eab969..b70d0d0fd26 100644 --- a/tests/particle_multiple_managers_interpolation/statistics +++ b/tests/particle_multiple_systems_interpolation/statistics @@ -20,4 +20,4 @@ # 20: Number of advected particles # 21: Number of advected particles (Particle system 2) # 22: Visualization file name -0 0.000000000000e+00 0.000000000000e+00 4 59 25 50 0 8 10 10 3.07552704e-03 4.65482045e-03 2.28550000e-01 6.85650000e-01 4.52704222e-01 0.00000000e+00 4.99913963e-01 1.90184427e-01 16 16 output-particle_multiple_managers_interpolation/solution/solution-00000 +0 0.000000000000e+00 0.000000000000e+00 4 59 25 50 0 8 10 10 3.07552704e-03 4.65482045e-03 2.28550000e-01 6.85650000e-01 4.52704222e-01 0.00000000e+00 4.99913963e-01 1.90184427e-01 16 16 output-particle_multiple_systems_interpolation/solution/solution-00000 diff --git a/tests/particle_multiple_managers_interpolation_fail_1.prm b/tests/particle_multiple_systems_interpolation_fail_1.prm similarity index 96% rename from tests/particle_multiple_managers_interpolation_fail_1.prm rename to tests/particle_multiple_systems_interpolation_fail_1.prm index b9e0174cd75..02ba72b56a2 100644 --- a/tests/particle_multiple_managers_interpolation_fail_1.prm +++ b/tests/particle_multiple_systems_interpolation_fail_1.prm @@ -1,5 +1,5 @@ -# Test that we can activate multiple particle managers and -# interpolate properties from different particle managers into +# Test that we can activate multiple particle systems and +# interpolate properties from different particle systems into # the compositional fields. This test is supposed to fail # because one of the necessary particle properties does not # exist in any particle manager. diff --git a/tests/particle_multiple_managers_interpolation_fail_1/screen-output b/tests/particle_multiple_systems_interpolation_fail_1/screen-output similarity index 100% rename from tests/particle_multiple_managers_interpolation_fail_1/screen-output rename to tests/particle_multiple_systems_interpolation_fail_1/screen-output diff --git a/tests/particle_multiple_managers_interpolation_fail_2.prm b/tests/particle_multiple_systems_interpolation_fail_2.prm similarity index 96% rename from tests/particle_multiple_managers_interpolation_fail_2.prm rename to tests/particle_multiple_systems_interpolation_fail_2.prm index 365e28ccaab..4c9a7f9463c 100644 --- a/tests/particle_multiple_managers_interpolation_fail_2.prm +++ b/tests/particle_multiple_systems_interpolation_fail_2.prm @@ -1,5 +1,5 @@ -# Test that we can activate multiple particle managers and -# interpolate properties from different particle managers into +# Test that we can activate multiple particle systems and +# interpolate properties from different particle systems into # the compositional fields. This test is supposed to fail # because one of the necessary particle properties exists # in more than one particle manager. diff --git a/tests/particle_multiple_managers_interpolation_fail_2/screen-output b/tests/particle_multiple_systems_interpolation_fail_2/screen-output similarity index 100% rename from tests/particle_multiple_managers_interpolation_fail_2/screen-output rename to tests/particle_multiple_systems_interpolation_fail_2/screen-output diff --git a/tests/particle_multiple_managers_vtu.prm b/tests/particle_multiple_systems_vtu.prm similarity index 98% rename from tests/particle_multiple_managers_vtu.prm rename to tests/particle_multiple_systems_vtu.prm index 4161ecad606..12da18c0b74 100644 --- a/tests/particle_multiple_managers_vtu.prm +++ b/tests/particle_multiple_systems_vtu.prm @@ -1,4 +1,4 @@ -# Like particle_multiple_managers, but tests that +# Like particle_multiple_systems, but tests that # the .vtu output (in particular the summary files # .pvtu and .pvd) are written correctly. diff --git a/tests/particle_multiple_managers_vtu/particles-2.pvd b/tests/particle_multiple_systems_vtu/particles-2.pvd similarity index 100% rename from tests/particle_multiple_managers_vtu/particles-2.pvd rename to tests/particle_multiple_systems_vtu/particles-2.pvd diff --git a/tests/particle_multiple_managers_vtu/particles-2.visit b/tests/particle_multiple_systems_vtu/particles-2.visit similarity index 100% rename from tests/particle_multiple_managers_vtu/particles-2.visit rename to tests/particle_multiple_systems_vtu/particles-2.visit diff --git a/tests/particle_multiple_managers_vtu/particles-2/particles-2-00000.0000.vtu b/tests/particle_multiple_systems_vtu/particles-2/particles-2-00000.0000.vtu similarity index 100% rename from tests/particle_multiple_managers_vtu/particles-2/particles-2-00000.0000.vtu rename to tests/particle_multiple_systems_vtu/particles-2/particles-2-00000.0000.vtu diff --git a/tests/particle_multiple_managers_vtu/particles-2/particles-2-00000.0001.vtu b/tests/particle_multiple_systems_vtu/particles-2/particles-2-00000.0001.vtu similarity index 100% rename from tests/particle_multiple_managers_vtu/particles-2/particles-2-00000.0001.vtu rename to tests/particle_multiple_systems_vtu/particles-2/particles-2-00000.0001.vtu diff --git a/tests/particle_multiple_managers_vtu/particles-2/particles-2-00000.pvtu b/tests/particle_multiple_systems_vtu/particles-2/particles-2-00000.pvtu similarity index 100% rename from tests/particle_multiple_managers_vtu/particles-2/particles-2-00000.pvtu rename to tests/particle_multiple_systems_vtu/particles-2/particles-2-00000.pvtu diff --git a/tests/particle_multiple_managers_vtu/particles-2/particles-2-00000.visit b/tests/particle_multiple_systems_vtu/particles-2/particles-2-00000.visit similarity index 100% rename from tests/particle_multiple_managers_vtu/particles-2/particles-2-00000.visit rename to tests/particle_multiple_systems_vtu/particles-2/particles-2-00000.visit diff --git a/tests/particle_multiple_managers_vtu/particles-2/particles-2-00001.0000.vtu b/tests/particle_multiple_systems_vtu/particles-2/particles-2-00001.0000.vtu similarity index 100% rename from tests/particle_multiple_managers_vtu/particles-2/particles-2-00001.0000.vtu rename to tests/particle_multiple_systems_vtu/particles-2/particles-2-00001.0000.vtu diff --git a/tests/particle_multiple_managers_vtu/particles-2/particles-2-00001.0001.vtu b/tests/particle_multiple_systems_vtu/particles-2/particles-2-00001.0001.vtu similarity index 100% rename from tests/particle_multiple_managers_vtu/particles-2/particles-2-00001.0001.vtu rename to tests/particle_multiple_systems_vtu/particles-2/particles-2-00001.0001.vtu diff --git a/tests/particle_multiple_managers_vtu/particles-2/particles-2-00001.pvtu b/tests/particle_multiple_systems_vtu/particles-2/particles-2-00001.pvtu similarity index 100% rename from tests/particle_multiple_managers_vtu/particles-2/particles-2-00001.pvtu rename to tests/particle_multiple_systems_vtu/particles-2/particles-2-00001.pvtu diff --git a/tests/particle_multiple_managers_vtu/particles-2/particles-2-00001.visit b/tests/particle_multiple_systems_vtu/particles-2/particles-2-00001.visit similarity index 100% rename from tests/particle_multiple_managers_vtu/particles-2/particles-2-00001.visit rename to tests/particle_multiple_systems_vtu/particles-2/particles-2-00001.visit diff --git a/tests/particle_multiple_managers_vtu/particles.pvd b/tests/particle_multiple_systems_vtu/particles.pvd similarity index 100% rename from tests/particle_multiple_managers_vtu/particles.pvd rename to tests/particle_multiple_systems_vtu/particles.pvd diff --git a/tests/particle_multiple_managers_vtu/particles.visit b/tests/particle_multiple_systems_vtu/particles.visit similarity index 100% rename from tests/particle_multiple_managers_vtu/particles.visit rename to tests/particle_multiple_systems_vtu/particles.visit diff --git a/tests/particle_multiple_managers_vtu/particles/particles-00000.0000.vtu b/tests/particle_multiple_systems_vtu/particles/particles-00000.0000.vtu similarity index 100% rename from tests/particle_multiple_managers_vtu/particles/particles-00000.0000.vtu rename to tests/particle_multiple_systems_vtu/particles/particles-00000.0000.vtu diff --git a/tests/particle_multiple_managers_vtu/particles/particles-00000.0001.vtu b/tests/particle_multiple_systems_vtu/particles/particles-00000.0001.vtu similarity index 100% rename from tests/particle_multiple_managers_vtu/particles/particles-00000.0001.vtu rename to tests/particle_multiple_systems_vtu/particles/particles-00000.0001.vtu diff --git a/tests/particle_multiple_managers_vtu/particles/particles-00000.pvtu b/tests/particle_multiple_systems_vtu/particles/particles-00000.pvtu similarity index 100% rename from tests/particle_multiple_managers_vtu/particles/particles-00000.pvtu rename to tests/particle_multiple_systems_vtu/particles/particles-00000.pvtu diff --git a/tests/particle_multiple_managers_vtu/particles/particles-00000.visit b/tests/particle_multiple_systems_vtu/particles/particles-00000.visit similarity index 100% rename from tests/particle_multiple_managers_vtu/particles/particles-00000.visit rename to tests/particle_multiple_systems_vtu/particles/particles-00000.visit diff --git a/tests/particle_multiple_managers_vtu/particles/particles-00001.0000.vtu b/tests/particle_multiple_systems_vtu/particles/particles-00001.0000.vtu similarity index 100% rename from tests/particle_multiple_managers_vtu/particles/particles-00001.0000.vtu rename to tests/particle_multiple_systems_vtu/particles/particles-00001.0000.vtu diff --git a/tests/particle_multiple_managers_vtu/particles/particles-00001.0001.vtu b/tests/particle_multiple_systems_vtu/particles/particles-00001.0001.vtu similarity index 100% rename from tests/particle_multiple_managers_vtu/particles/particles-00001.0001.vtu rename to tests/particle_multiple_systems_vtu/particles/particles-00001.0001.vtu diff --git a/tests/particle_multiple_managers_vtu/particles/particles-00001.pvtu b/tests/particle_multiple_systems_vtu/particles/particles-00001.pvtu similarity index 100% rename from tests/particle_multiple_managers_vtu/particles/particles-00001.pvtu rename to tests/particle_multiple_systems_vtu/particles/particles-00001.pvtu diff --git a/tests/particle_multiple_managers_vtu/particles/particles-00001.visit b/tests/particle_multiple_systems_vtu/particles/particles-00001.visit similarity index 100% rename from tests/particle_multiple_managers_vtu/particles/particles-00001.visit rename to tests/particle_multiple_systems_vtu/particles/particles-00001.visit diff --git a/tests/particle_multiple_managers_hdf5/screen-output b/tests/particle_multiple_systems_vtu/screen-output similarity index 82% rename from tests/particle_multiple_managers_hdf5/screen-output rename to tests/particle_multiple_systems_vtu/screen-output index 73e494852e8..5fd90b4a75e 100644 --- a/tests/particle_multiple_managers_hdf5/screen-output +++ b/tests/particle_multiple_systems_vtu/screen-output @@ -12,7 +12,7 @@ Number of degrees of freedom: 4,645 (2,178+289+1,089+1,089) Postprocessing: RMS, max velocity: 0.000181 m/s, 0.000404 m/s Compositions min/max/mass: 0/1/0.1825 - Writing particle output: output-particle_multiple_managers_hdf5/particles/particles-00000 + Writing particle output: output-particle_multiple_systems_vtu/particles/particles-00000 *** Timestep 1: t=70 seconds, dt=70 seconds Skipping temperature solve because RHS is zero. @@ -24,7 +24,7 @@ Number of degrees of freedom: 4,645 (2,178+289+1,089+1,089) Postprocessing: RMS, max velocity: 0.000327 m/s, 0.000727 m/s Compositions min/max/mass: -0.001642/1.001/0.1825 - Writing particle output: output-particle_multiple_managers_hdf5/particles/particles-00001 + Writing particle output: output-particle_multiple_systems_vtu/particles/particles-00001 Termination requested by criterion: end time diff --git a/tests/particle_multiple_managers_hdf5/statistics b/tests/particle_multiple_systems_vtu/statistics similarity index 76% rename from tests/particle_multiple_managers_hdf5/statistics rename to tests/particle_multiple_systems_vtu/statistics index 6445029d828..86cdd59f288 100644 --- a/tests/particle_multiple_managers_hdf5/statistics +++ b/tests/particle_multiple_systems_vtu/statistics @@ -19,5 +19,5 @@ # 19: Number of advected particles (Particle system 2) # 20: Particle file name # 21: Particle file name (2) -0 0.000000000000e+00 0.000000000000e+00 256 2467 1089 1089 0 0 11 13 13 1.81487741e-04 4.04466706e-04 0.00000000e+00 1.00000000e+00 1.82454287e-01 10 10 output-particle_multiple_managers_hdf5/particles/particles-00000 output-particle_multiple_managers_hdf5/particles-2/particles-2-00000 -1 7.000000000000e+01 7.000000000000e+01 256 2467 1089 1089 0 15 11 13 13 3.27408209e-04 7.26750666e-04 -1.64211363e-03 1.00068146e+00 1.82473068e-01 10 10 output-particle_multiple_managers_hdf5/particles/particles-00001 output-particle_multiple_managers_hdf5/particles-2/particles-2-00001 +0 0.000000000000e+00 0.000000000000e+00 256 2467 1089 1089 0 0 11 13 13 1.81487741e-04 4.04466706e-04 0.00000000e+00 1.00000000e+00 1.82454287e-01 10 10 output-particle_multiple_systems_vtu/particles/particles-00000 output-particle_multiple_systems_vtu/particles-2/particles-2-00000 +1 7.000000000000e+01 7.000000000000e+01 256 2467 1089 1089 0 15 11 13 13 3.27408209e-04 7.26750666e-04 -1.64211363e-03 1.00068146e+00 1.82473068e-01 10 10 output-particle_multiple_systems_vtu/particles/particles-00001 output-particle_multiple_systems_vtu/particles-2/particles-2-00001