Skip to content

Commit 409461c

Browse files
jdannbergjdannberg
committed
update tests
1 parent 9c83210 commit 409461c

File tree

26 files changed

+490
-512
lines changed

26 files changed

+490
-512
lines changed

‎doc/modules/changes/20250129_jdannberg‎

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
1-
Changed: ASPECT now re-generates particles in each adaptive
2-
refinement cycle instead of only once after global refinement.
3-
This means that particle locations during adaptive refinement
4-
are chosen according to the generator instead of randomly.
1+
Changed: ASPECT now re-generates particles in each initial
2+
adaptive refinement cycle instead of only once after global
3+
refinement. This means that particle locations during initial
4+
adaptive refinement are chosen according to the generator
5+
instead of randomly.
56
<br>
67
(Juliane Dannberg, 2025/01/29)

‎tests/grain_size_crossed_transition/screen-output‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -29,40 +29,40 @@ Number of degrees of freedom: 5,285 (2,482+321+1,241+1,241)
2929

3030
Postprocessing:
3131
Writing graphical output: output-grain_size_crossed_transition/solution/solution-00001
32-
Compositions min/max/mass: 0.001313/0.002/5.938e+07
32+
Compositions min/max/mass: 0.00135/0.002/5.942e+07
3333
Writing particle output: output-grain_size_crossed_transition/particles/particles-00001
3434

35-
*** Timestep 2: t=6442.31 years, dt=3220.42 years
35+
*** Timestep 2: t=6439.33 years, dt=3217.44 years
3636
Solving temperature system... 0 iterations.
3737
Advecting particles... done.
3838
Rebuilding Stokes preconditioner...
3939
Solving Stokes system (AMG)... 29+0 iterations.
4040

4141
Postprocessing:
4242
Writing graphical output: output-grain_size_crossed_transition/solution/solution-00002
43-
Compositions min/max/mass: 0.001/0.002/5.876e+07
43+
Compositions min/max/mass: 0.001/0.002/5.879e+07
4444
Writing particle output: output-grain_size_crossed_transition/particles/particles-00002
4545

46-
*** Timestep 3: t=9648.75 years, dt=3206.45 years
46+
*** Timestep 3: t=9649.24 years, dt=3209.91 years
4747
Solving temperature system... 0 iterations.
4848
Advecting particles... done.
4949
Rebuilding Stokes preconditioner...
50-
Solving Stokes system (AMG)... 30+0 iterations.
50+
Solving Stokes system (AMG)... 29+0 iterations.
5151

5252
Postprocessing:
5353
Writing graphical output: output-grain_size_crossed_transition/solution/solution-00003
54-
Compositions min/max/mass: 0.001/0.002/5.816e+07
54+
Compositions min/max/mass: 0.001/0.002/5.822e+07
5555
Writing particle output: output-grain_size_crossed_transition/particles/particles-00003
5656

57-
*** Timestep 4: t=10000 years, dt=351.245 years
57+
*** Timestep 4: t=10000 years, dt=350.761 years
5858
Solving temperature system... 0 iterations.
5959
Advecting particles... done.
6060
Rebuilding Stokes preconditioner...
61-
Solving Stokes system (AMG)... 25+0 iterations.
61+
Solving Stokes system (AMG)... 24+0 iterations.
6262

6363
Postprocessing:
6464
Writing graphical output: output-grain_size_crossed_transition/solution/solution-00004
65-
Compositions min/max/mass: 0.001/0.002/5.81e+07
65+
Compositions min/max/mass: 0.001/0.002/5.815e+07
6666
Writing particle output: output-grain_size_crossed_transition/particles/particles-00004
6767

6868
Termination requested by criterion: end time

‎tests/grain_size_crossed_transition/statistics‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
# 16: Number of advected particles
1717
# 17: Particle file name
1818
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
19-
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
20-
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
21-
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
22-
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
19+
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
20+
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
21+
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
22+
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‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -15,8 +15,8 @@ Number of degrees of freedom: 970 (228+34+114+198+198+198)
1515
Solving advection_field system ... 0 iterations.
1616
Solving Stokes system (GMG)... 16+0 iterations.
1717

18-
Number of active cells: 28 (on 4 levels)
19-
Number of degrees of freedom: 1,220 (282+41+141+252+252+252)
18+
Number of active cells: 34 (on 4 levels)
19+
Number of degrees of freedom: 1,470 (336+48+168+306+306+306)
2020

2121
*** Timestep 0: t=0 seconds, dt=0 seconds
2222
Skipping temperature solve because RHS is zero.
@@ -25,19 +25,19 @@ Number of degrees of freedom: 1,220 (282+41+141+252+252+252)
2525
Solving Stokes system (GMG)... 16+0 iterations.
2626

2727
Postprocessing:
28-
RMS, max velocity: 0.000181 m/s, 0.000496 m/s
29-
Compositions min/max/mass: 0/1/0.1817 // 0/1/0.1843 // 0/0/0
28+
RMS, max velocity: 0.000204 m/s, 0.000515 m/s
29+
Compositions min/max/mass: 0/1/0.1839 // 0/1/0.1837 // 0/0/0
3030
Number of advected particles: 100000
3131

3232
*** Timestep 1: t=70 seconds, dt=70 seconds
3333
Skipping temperature solve because RHS is zero.
3434
Advecting particles... done.
35-
Solving advection_field system ... 4 iterations.
36-
Solving Stokes system (GMG)... 14+0 iterations.
35+
Solving advection_field system ... 5 iterations.
36+
Solving Stokes system (GMG)... 15+0 iterations.
3737

3838
Postprocessing:
39-
RMS, max velocity: 0.000224 m/s, 0.000616 m/s
40-
Compositions min/max/mass: -0.114/1.046/0.1769 // 0/1/0.1794 // -0.0003817/0.0001943/-3.557e-07
39+
RMS, max velocity: 0.000299 m/s, 0.000777 m/s
40+
Compositions min/max/mass: -0.114/1.069/0.1808 // 0/1/0.1809 // -0.000424/0.0002772/7.163e-07
4141
Number of advected particles: 100000
4242

4343
Termination requested by criterion: end time

‎tests/particle_interpolator_distance_weighted_average_adaptive/statistics‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,5 +22,5 @@
2222
# 22: Maximal value for composition advection_particle2
2323
# 23: Global mass for composition advection_particle2
2424
# 24: Number of advected particles
25-
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
26-
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
25+
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
26+
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‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,7 @@ end
6565

6666
subsection Mesh refinement
6767
set Initial global refinement = 5
68-
set Initial adaptive refinement = 3
68+
set Initial adaptive refinement = 1
6969
set Run postprocessors on initial refinement = true
7070
end
7171

@@ -93,7 +93,7 @@ subsection Particles
9393

9494
subsection Generator
9595
subsection Random uniform
96-
set Number of particles = 2500
96+
set Number of particles = 3500
9797
end
9898
end
9999
end

‎tests/particle_interpolator_empty_cells/screen-output‎

Lines changed: 9 additions & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -7,51 +7,29 @@ Number of degrees of freedom: 17,989 (8,450+1,089+4,225+4,225)
77
Solving Stokes system (GMG)... 19+0 iterations.
88

99
Postprocessing:
10-
Number of advected particles: 2500
11-
Particle count per cell min/avg/max: 0, 2, 9
10+
Number of advected particles: 3500
11+
Particle count per cell min/avg/max: 0, 3, 11
1212

1313
Number of active cells: 574 (on 7 levels)
1414
Number of degrees of freedom: 10,643 (4,996+651+2,498+2,498)
1515

16-
*** Timestep 0: t=0 years, dt=0 years
17-
Solving temperature system... 0 iterations.
18-
Solving Stokes system (GMG)... 22+0 iterations.
19-
20-
Postprocessing:
21-
Number of advected particles: 2855
22-
Particle count per cell min/avg/max: 2, 4, 19
23-
24-
Number of active cells: 667 (on 7 levels)
25-
Number of degrees of freedom: 12,463 (5,852+759+2,926+2,926)
26-
27-
*** Timestep 0: t=0 years, dt=0 years
28-
Solving temperature system... 0 iterations.
29-
Solving Stokes system (GMG)... 21+0 iterations.
30-
31-
Postprocessing:
32-
Number of advected particles: 3222
33-
Particle count per cell min/avg/max: 2, 4, 48
34-
35-
Number of active cells: 976 (on 8 levels)
36-
Number of degrees of freedom: 17,794 (8,360+1,074+4,180+4,180)
37-
3816
*** Timestep 0: t=0 years, dt=0 years
3917
Solving temperature system... 0 iterations.
4018
Advecting particles... done.
41-
Solving Stokes system (GMG)... 20+0 iterations.
19+
Solving Stokes system (GMG)... 22+0 iterations.
4220

4321
Postprocessing:
44-
Number of advected particles: 3389
45-
Particle count per cell min/avg/max: 2, 3, 100
22+
Number of advected particles: 3764
23+
Particle count per cell min/avg/max: 2, 6, 27
4624

4725
*** Timestep 1: t=7e+09 years, dt=7e+09 years
48-
Solving temperature system... 230 iterations.
26+
Solving temperature system... 149 iterations.
4927
Advecting particles... done.
50-
Solving Stokes system (GMG)... 21+0 iterations.
28+
Solving Stokes system (GMG)... 22+0 iterations.
5129

5230
Postprocessing:
53-
Number of advected particles: 3508
54-
Particle count per cell min/avg/max: 2, 3, 100
31+
Number of advected particles: 3790
32+
Particle count per cell min/avg/max: 2, 6, 27
5533

5634
Termination requested by criterion: end time
5735

‎tests/particle_interpolator_empty_cells/statistics‎

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -13,8 +13,6 @@
1313
# 13: Minimal particles per cell:
1414
# 14: Average particles per cell:
1515
# 15: Maximal particles per cell:
16-
0 0.000000000000e+00 0.000000000000e+00 1024 9539 4225 4225 0 18 20 20 2500 0 2 9
17-
0 0.000000000000e+00 0.000000000000e+00 574 5647 2498 2498 0 21 23 23 2855 2 4 19
18-
0 0.000000000000e+00 0.000000000000e+00 667 6611 2926 2926 0 20 22 22 3222 2 4 48
19-
0 0.000000000000e+00 0.000000000000e+00 976 9434 4180 4180 0 19 21 21 3389 2 3 100
20-
1 7.000000000000e+09 7.000000000000e+09 976 9434 4180 4180 230 20 22 22 3508 2 3 100
16+
0 0.000000000000e+00 0.000000000000e+00 1024 9539 4225 4225 0 18 20 20 3500 0 3 11
17+
0 0.000000000000e+00 0.000000000000e+00 574 5647 2498 2498 0 21 23 23 3764 2 6 27
18+
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‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ Number of degrees of freedom: 23,743 (5,112+658+2,556+5,139+5,139+5,139)
4141
Postprocessing:
4242
RMS, max velocity: 0.000265 m/s, 0.000437 m/s
4343
Compositions min/max/mass: -0.3062/1.234/0.602 // 0/0/0 // 0/0/0
44-
Number of advected particles: 6151
44+
Number of advected particles: 6163
4545

4646
Number of active cells: 550 (on 7 levels)
4747
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)
5555
Postprocessing:
5656
RMS, max velocity: 0.000174 m/s, 0.000287 m/s
5757
Compositions min/max/mass: -0.4488/1.353/0.602 // 0/0/0 // 0/0/0
58-
Number of advected particles: 6460
58+
Number of advected particles: 6471
5959

6060
Number of active cells: 541 (on 7 levels)
6161
Number of degrees of freedom: 22,546 (4,874+628+2,437+4,869+4,869+4,869)

‎tests/particle_interpolator_nearest_neighbor/statistics‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,5 +23,5 @@
2323
# 23: Global mass for composition advection_particle2
2424
# 24: Number of advected particles
2525
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
26-
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
27-
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
26+
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
27+
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

0 commit comments

Comments
 (0)