update tests

Author: jdannberg

doc/modules/changes/20250129_jdannberg

@@ -1,6 +1,7 @@
-Changed: ASPECT now re-generates particles in each adaptive
-refinement cycle instead of only once after global refinement.
-This means that particle locations during adaptive refinement
-are chosen according to the generator instead of randomly.
+Changed: ASPECT now re-generates particles in each initial
+adaptive refinement cycle instead of only once after global
+refinement. This means that particle locations during initial
+adaptive refinement are chosen according to the generator
+instead of randomly.
 <br>
 (Juliane Dannberg, 2025/01/29)

tests/grain_size_crossed_transition/screen-output

@@ -29,40 +29,40 @@ Number of degrees of freedom: 5,285 (2,482+321+1,241+1,241)
 
    Postprocessing:
      Writing graphical output:  output-grain_size_crossed_transition/solution/solution-00001
-     Compositions min/max/mass: 0.001313/0.002/5.938e+07
+     Compositions min/max/mass: 0.00135/0.002/5.942e+07
      Writing particle output:   output-grain_size_crossed_transition/particles/particles-00001
 
-*** Timestep 2:  t=6442.31 years, dt=3220.42 years
+*** Timestep 2:  t=6439.33 years, dt=3217.44 years
    Solving temperature system... 0 iterations.
    Advecting particles...  done.
    Rebuilding Stokes preconditioner...
    Solving Stokes system (AMG)... 29+0 iterations.
 
    Postprocessing:
      Writing graphical output:  output-grain_size_crossed_transition/solution/solution-00002
-     Compositions min/max/mass: 0.001/0.002/5.876e+07
+     Compositions min/max/mass: 0.001/0.002/5.879e+07
      Writing particle output:   output-grain_size_crossed_transition/particles/particles-00002
 
-*** Timestep 3:  t=9648.75 years, dt=3206.45 years
+*** Timestep 3:  t=9649.24 years, dt=3209.91 years
    Solving temperature system... 0 iterations.
    Advecting particles...  done.
    Rebuilding Stokes preconditioner...
-   Solving Stokes system (AMG)... 30+0 iterations.
+   Solving Stokes system (AMG)... 29+0 iterations.
 
    Postprocessing:
      Writing graphical output:  output-grain_size_crossed_transition/solution/solution-00003
-     Compositions min/max/mass: 0.001/0.002/5.816e+07
+     Compositions min/max/mass: 0.001/0.002/5.822e+07
      Writing particle output:   output-grain_size_crossed_transition/particles/particles-00003
 
-*** Timestep 4:  t=10000 years, dt=351.245 years
+*** Timestep 4:  t=10000 years, dt=350.761 years
    Solving temperature system... 0 iterations.
    Advecting particles...  done.
    Rebuilding Stokes preconditioner...
-   Solving Stokes system (AMG)... 25+0 iterations.
+   Solving Stokes system (AMG)... 24+0 iterations.
 
    Postprocessing:
      Writing graphical output:  output-grain_size_crossed_transition/solution/solution-00004
-     Compositions min/max/mass: 0.001/0.002/5.81e+07
+     Compositions min/max/mass: 0.001/0.002/5.815e+07
      Writing particle output:   output-grain_size_crossed_transition/particles/particles-00004
 
 Termination requested by criterion: end time

tests/grain_size_crossed_transition/statistics

@@ -16,7 +16,7 @@
 # 16: Number of advected particles
 # 17: Particle file name
 0 0.000000000000e+00 0.000000000000e+00 264 2803 1241 1241 0 30 32 160 output-grain_size_crossed_transition/solution/solution-00000 2.00000000e-03 2.00000000e-03 6.00000000e+07 10000 output-grain_size_crossed_transition/particles/particles-00000 
-1 3.221888105682e+03 3.221888105682e+03 264 2803 1241 1241 0 24 26 130 output-grain_size_crossed_transition/solution/solution-00001 1.31250000e-03 2.00000000e-03 5.93820271e+07  9956 output-grain_size_crossed_transition/particles/particles-00001 
-2 6.442308952690e+03 3.220420847008e+03 264 2803 1241 1241 0 28 30 150 output-grain_size_crossed_transition/solution/solution-00002 1.00000000e-03 2.00000000e-03 5.87617466e+07  9890 output-grain_size_crossed_transition/particles/particles-00002 
-3 9.648754753904e+03 3.206445801214e+03 264 2803 1241 1241 0 29 31 155 output-grain_size_crossed_transition/solution/solution-00003 1.00000000e-03 2.00000000e-03 5.81631659e+07  9815 output-grain_size_crossed_transition/particles/particles-00003 
-4 1.000000000000e+04 3.512452460959e+02 264 2803 1241 1241 0 24 26 130 output-grain_size_crossed_transition/solution/solution-00004 1.00000000e-03 2.00000000e-03 5.81049139e+07  9811 output-grain_size_crossed_transition/particles/particles-00004 
+1 3.221888105682e+03 3.221888105682e+03 264 2803 1241 1241 0 24 26 130 output-grain_size_crossed_transition/solution/solution-00001 1.35000000e-03 2.00000000e-03 5.94221251e+07  9877 output-grain_size_crossed_transition/particles/particles-00001 
+2 6.439327373120e+03 3.217439267438e+03 264 2803 1241 1241 0 28 30 150 output-grain_size_crossed_transition/solution/solution-00002 1.00000000e-03 2.00000000e-03 5.87878710e+07  9750 output-grain_size_crossed_transition/particles/particles-00002 
+3 9.649238592234e+03 3.209911219114e+03 264 2803 1241 1241 0 28 30 150 output-grain_size_crossed_transition/solution/solution-00003 1.00000000e-03 2.00000000e-03 5.82190312e+07  9604 output-grain_size_crossed_transition/particles/particles-00003 
+4 1.000000000000e+04 3.507614077663e+02 264 2803 1241 1241 0 23 25 125 output-grain_size_crossed_transition/solution/solution-00004 1.00000000e-03 2.00000000e-03 5.81477550e+07  9593 output-grain_size_crossed_transition/particles/particles-00004 

tests/particle_interpolator_distance_weighted_average_adaptive/screen-output

@@ -15,8 +15,8 @@ Number of degrees of freedom: 970 (228+34+114+198+198+198)
    Solving advection_field system ... 0 iterations.
    Solving Stokes system (GMG)... 16+0 iterations.
 
-Number of active cells: 28 (on 4 levels)
-Number of degrees of freedom: 1,220 (282+41+141+252+252+252)
+Number of active cells: 34 (on 4 levels)
+Number of degrees of freedom: 1,470 (336+48+168+306+306+306)
 
 *** Timestep 0:  t=0 seconds, dt=0 seconds
    Skipping temperature solve because RHS is zero.
@@ -25,19 +25,19 @@ Number of degrees of freedom: 1,220 (282+41+141+252+252+252)
    Solving Stokes system (GMG)... 16+0 iterations.
 
    Postprocessing:
-     RMS, max velocity:            0.000181 m/s, 0.000496 m/s
-     Compositions min/max/mass:    0/1/0.1817 // 0/1/0.1843 // 0/0/0
+     RMS, max velocity:            0.000204 m/s, 0.000515 m/s
+     Compositions min/max/mass:    0/1/0.1839 // 0/1/0.1837 // 0/0/0
      Number of advected particles: 100000
 
 *** Timestep 1:  t=70 seconds, dt=70 seconds
    Skipping temperature solve because RHS is zero.
    Advecting particles...  done.
-   Solving advection_field system ... 4 iterations.
-   Solving Stokes system (GMG)... 14+0 iterations.
+   Solving advection_field system ... 5 iterations.
+   Solving Stokes system (GMG)... 15+0 iterations.
 
    Postprocessing:
-     RMS, max velocity:            0.000224 m/s, 0.000616 m/s
-     Compositions min/max/mass:    -0.114/1.046/0.1769 // 0/1/0.1794 // -0.0003817/0.0001943/-3.557e-07
+     RMS, max velocity:            0.000299 m/s, 0.000777 m/s
+     Compositions min/max/mass:    -0.114/1.069/0.1808 // 0/1/0.1809 // -0.000424/0.0002772/7.163e-07
      Number of advected particles: 100000
 
 Termination requested by criterion: end time

tests/particle_interpolator_distance_weighted_average_adaptive/statistics

@@ -22,5 +22,5 @@
 # 22: Maximal value for composition advection_particle2
 # 23: Global mass for composition advection_particle2
 # 24: Number of advected particles
-0 0.000000000000e+00 0.000000000000e+00 28 323 141 756 0 0 15 17 17 1.81488111e-04 4.96004522e-04  0.00000000e+00 1.00000000e+00 1.81683752e-01 0.00000000e+00 9.99999792e-01 1.84273374e-01  0.00000000e+00 0.00000000e+00  0.00000000e+00 100000 
-1 7.000000000000e+01 7.000000000000e+01 28 323 141 756 0 4 13 15 15 2.23981571e-04 6.15559291e-04 -1.13972554e-01 1.04631617e+00 1.76881740e-01 0.00000000e+00 9.99999912e-01 1.79414063e-01 -3.81681750e-04 1.94318757e-04 -3.55664526e-07 100000 
+0 0.000000000000e+00 0.000000000000e+00 34 384 168 918 0 0 15 17 17 2.04210282e-04 5.15332849e-04  0.00000000e+00 1.00000000e+00 1.83901597e-01 0.00000000e+00 9.99999950e-01 1.83718481e-01  0.00000000e+00 0.00000000e+00 0.00000000e+00 100000 
+1 7.000000000000e+01 7.000000000000e+01 34 384 168 918 0 5 14 16 16 2.98669512e-04 7.77226090e-04 -1.14047460e-01 1.06932695e+00 1.80782037e-01 0.00000000e+00 9.99999981e-01 1.80883057e-01 -4.23957618e-04 2.77200504e-04 7.16263932e-07 100000 

tests/particle_interpolator_empty_cells.prm

@@ -65,7 +65,7 @@ end
 
 subsection Mesh refinement
   set Initial global refinement                 = 5
-  set Initial adaptive refinement               = 3
+  set Initial adaptive refinement               = 1
   set Run postprocessors on initial refinement  = true
 end
 
@@ -93,7 +93,7 @@ subsection Particles
 
   subsection Generator
     subsection Random uniform
-      set Number of particles = 2500
+      set Number of particles = 3500
     end
   end
 end

tests/particle_interpolator_empty_cells/screen-output

@@ -7,51 +7,29 @@ Number of degrees of freedom: 17,989 (8,450+1,089+4,225+4,225)
    Solving Stokes system (GMG)... 19+0 iterations.
 
    Postprocessing:
-     Number of advected particles:        2500
-     Particle count per cell min/avg/max: 0, 2, 9
+     Number of advected particles:        3500
+     Particle count per cell min/avg/max: 0, 3, 11
 
 Number of active cells: 574 (on 7 levels)
 Number of degrees of freedom: 10,643 (4,996+651+2,498+2,498)
 
-*** Timestep 0:  t=0 years, dt=0 years
-   Solving temperature system... 0 iterations.
-   Solving Stokes system (GMG)... 22+0 iterations.
-
-   Postprocessing:
-     Number of advected particles:        2855
-     Particle count per cell min/avg/max: 2, 4, 19
-
-Number of active cells: 667 (on 7 levels)
-Number of degrees of freedom: 12,463 (5,852+759+2,926+2,926)
-
-*** Timestep 0:  t=0 years, dt=0 years
-   Solving temperature system... 0 iterations.
-   Solving Stokes system (GMG)... 21+0 iterations.
-
-   Postprocessing:
-     Number of advected particles:        3222
-     Particle count per cell min/avg/max: 2, 4, 48
-
-Number of active cells: 976 (on 8 levels)
-Number of degrees of freedom: 17,794 (8,360+1,074+4,180+4,180)
-
 *** Timestep 0:  t=0 years, dt=0 years
    Solving temperature system... 0 iterations.
    Advecting particles...  done.
-   Solving Stokes system (GMG)... 20+0 iterations.
+   Solving Stokes system (GMG)... 22+0 iterations.
 
    Postprocessing:
-     Number of advected particles:        3389
-     Particle count per cell min/avg/max: 2, 3, 100
+     Number of advected particles:        3764
+     Particle count per cell min/avg/max: 2, 6, 27
 
 *** Timestep 1:  t=7e+09 years, dt=7e+09 years
-   Solving temperature system... 230 iterations.
+   Solving temperature system... 149 iterations.
    Advecting particles...  done.
-   Solving Stokes system (GMG)... 21+0 iterations.
+   Solving Stokes system (GMG)... 22+0 iterations.
 
    Postprocessing:
-     Number of advected particles:        3508
-     Particle count per cell min/avg/max: 2, 3, 100
+     Number of advected particles:        3790
+     Particle count per cell min/avg/max: 2, 6, 27
 
 Termination requested by criterion: end time
 

tests/particle_interpolator_empty_cells/statistics

@@ -13,8 +13,6 @@
 # 13: Minimal particles per cell: 
 # 14: Average particles per cell: 
 # 15: Maximal particles per cell: 
-0 0.000000000000e+00 0.000000000000e+00 1024 9539 4225 4225   0 18 20 20 2500 0 2   9 
-0 0.000000000000e+00 0.000000000000e+00  574 5647 2498 2498   0 21 23 23 2855 2 4  19 
-0 0.000000000000e+00 0.000000000000e+00  667 6611 2926 2926   0 20 22 22 3222 2 4  48 
-0 0.000000000000e+00 0.000000000000e+00  976 9434 4180 4180   0 19 21 21 3389 2 3 100 
-1 7.000000000000e+09 7.000000000000e+09  976 9434 4180 4180 230 20 22 22 3508 2 3 100 
+0 0.000000000000e+00 0.000000000000e+00 1024 9539 4225 4225   0 18 20 20 3500 0 3 11 
+0 0.000000000000e+00 0.000000000000e+00  574 5647 2498 2498   0 21 23 23 3764 2 6 27 
+1 7.000000000000e+09 7.000000000000e+09  574 5647 2498 2498 149 21 23 23 3790 2 6 27 

tests/particle_interpolator_nearest_neighbor/screen-output

@@ -41,7 +41,7 @@ Number of degrees of freedom: 23,743 (5,112+658+2,556+5,139+5,139+5,139)
    Postprocessing:
      RMS, max velocity:            0.000265 m/s, 0.000437 m/s
      Compositions min/max/mass:    -0.3062/1.234/0.602 // 0/0/0 // 0/0/0
-     Number of advected particles: 6151
+     Number of advected particles: 6163
 
 Number of active cells: 550 (on 7 levels)
 Number of degrees of freedom: 22,909 (4,948+637+2,474+4,950+4,950+4,950)
@@ -55,7 +55,7 @@ Number of degrees of freedom: 22,909 (4,948+637+2,474+4,950+4,950+4,950)
    Postprocessing:
      RMS, max velocity:            0.000174 m/s, 0.000287 m/s
      Compositions min/max/mass:    -0.4488/1.353/0.602 // 0/0/0 // 0/0/0
-     Number of advected particles: 6460
+     Number of advected particles: 6471
 
 Number of active cells: 541 (on 7 levels)
 Number of degrees of freedom: 22,546 (4,874+628+2,437+4,869+4,869+4,869)

tests/particle_interpolator_nearest_neighbor/statistics

@@ -23,5 +23,5 @@
 # 23: Global mass for composition advection_particle2
 # 24: Number of advected particles
 0 0.000000000000e+00 0.000000000000e+00 571 5770 2556 15417 0 0 16 18 18 3.98992584e-04 6.58746035e-04  0.00000000e+00 1.00000000e+00 6.02023655e-01 0.00000000e+00 0.00000000e+00 0.00000000e+00 0.00000000e+00 0.00000000e+00 0.00000000e+00 5710 
-1 1.253330616537e+01 1.253330616537e+01 571 5770 2556 15417 0 6 15 17 17 2.64757637e-04 4.36866012e-04 -3.06173767e-01 1.23387625e+00 6.02023347e-01 0.00000000e+00 0.00000000e+00 0.00000000e+00 0.00000000e+00 0.00000000e+00 0.00000000e+00 6151 
-2 3.000000000000e+01 1.746669383463e+01 550 5585 2474 14850 0 4 16 18 18 1.73797728e-04 2.86806212e-04 -4.48788663e-01 1.35338412e+00 6.02024585e-01 0.00000000e+00 0.00000000e+00 0.00000000e+00 0.00000000e+00 0.00000000e+00 0.00000000e+00 6460 
+1 1.253330616537e+01 1.253330616537e+01 571 5770 2556 15417 0 6 15 17 17 2.64757637e-04 4.36866012e-04 -3.06173767e-01 1.23387625e+00 6.02023347e-01 0.00000000e+00 0.00000000e+00 0.00000000e+00 0.00000000e+00 0.00000000e+00 0.00000000e+00 6163 
+2 3.000000000000e+01 1.746669383463e+01 550 5585 2474 14850 0 4 16 18 18 1.73797728e-04 2.86806212e-04 -4.48788663e-01 1.35338412e+00 6.02024585e-01 0.00000000e+00 0.00000000e+00 0.00000000e+00 0.00000000e+00 0.00000000e+00 0.00000000e+00 6471