Rename tests

tests/checkpoint_08_particles_multiple_worlds.cc → 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;"

tests/checkpoint_08_particles_multiple_worlds.prm → 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

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:

tests/checkpoint_08_particles_multiple_worlds/statistics1 → 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 

tests/checkpoint_08_particles_multiple_worlds/statistics2 → 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 

tests/particle_load_balancing_repartition_multiple_worlds.prm → 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

tests/particle_load_balancing_repartition_multiple_worlds/screen-output → 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)

tests/particle_load_balancing_repartition_multiple_worlds/statistics → 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 

tests/particle_multiple_managers.prm → 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

tests/particle_multiple_managers/screen-output → 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
 

tests/particle_multiple_managers/statistics → 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 

tests/particle_multiple_managers_hdf5.prm → 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.
 

tests/particle_multiple_managers_vtu/screen-output → 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
 

tests/particle_multiple_managers_vtu/statistics → 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 

tests/particle_multiple_managers_interpolation.prm → 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

tests/particle_multiple_managers_interpolation/screen-output → 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
 

tests/particle_multiple_managers_interpolation/statistics → 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 

tests/particle_multiple_managers_interpolation_fail_1.prm → 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.

tests/particle_multiple_managers_interpolation_fail_2.prm → 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.

tests/particle_multiple_managers_vtu.prm → 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.
 

tests/particle_multiple_managers_hdf5/screen-output → 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
 

tests/particle_multiple_managers_hdf5/statistics → 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