Skip to content

GitLab

Commit b8fe2962 authored by adelmann's avatar adelmann 🎗
Browse files

because of new collimator implementation we habe tiny changes in the number of surviving particles

parent abfaa091
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 3309 additions and 3498 deletions
RegressionTests/BeamLine-1/reference/BeamLine-1.lbal
View file @ b8fe2962
SDDS1
&description
text="Processor statistics 'BeamLine-1.in' 27/03/201821:08:00",
text="Processor statistics 'BeamLine-1.in' 12/04/201807:01:12",
contents="stat parameters"
&end
&parameter
......@@ -35,7 +35,7 @@ SDDS1
no_row_counts=1
&end
1
OPAL 1.9.0 git rev. #3808b8e7f372bc9f187ddd83ed3297e578f18f7b
OPAL 1.9.0 git rev. #71c06feb25db05a429869be47c26f8322b211204
opal-t
2.814700907870098e+02 3520
2.824700907870099e+02 3520
......@@ -63,43 +63,43 @@ opal-t
3.044700907870115e+02 3520
3.054700907870116e+02 3519
3.064700907870117e+02 3511
3.074700907870118e+02 3490
3.074700907870118e+02 3491
3.084700907870118e+02 3462
3.094700907870119e+02 3423
3.104700907870120e+02 3381
3.114700907870121e+02 3332
3.124700907870122e+02 3290
3.134700907870122e+02 3249
3.144700907870123e+02 3222
3.154700907870123e+02 3214
3.164700907870125e+02 3214
3.174700907870125e+02 3214
3.184700907870126e+02 3214
3.194700907870127e+02 3214
3.204700907870127e+02 3214
3.214700907870128e+02 3214
3.224700907870129e+02 3214
3.234700907870130e+02 3214
3.244700907870130e+02 3214
3.254700907870131e+02 3214
3.264700907870132e+02 3192
3.274700907870132e+02 3190
3.284700907870134e+02 3190
3.294700907870134e+02 3190
3.304700907870135e+02 3190
3.314700907870136e+02 3190
3.324700907870136e+02 3190
3.334700907870137e+02 3190
3.344700907870138e+02 3190
3.354700907870139e+02 3190
3.364700907870139e+02 3190
3.374700907870140e+02 3190
3.384700907870141e+02 3190
3.394700907870142e+02 3190
3.404700907870143e+02 3190
3.414700907870143e+02 3190
3.424700907870144e+02 3190
3.434700907870144e+02 3190
3.444700907870146e+02 3190
3.454700907870146e+02 3190
3.464700907870147e+02 3190
3.124700907870122e+02 3289
3.134700907870122e+02 3246
3.144700907870123e+02 3219
3.154700907870123e+02 3209
3.164700907870125e+02 3209
3.174700907870125e+02 3209
3.184700907870126e+02 3209
3.194700907870127e+02 3209
3.204700907870127e+02 3209
3.214700907870128e+02 3209
3.224700907870129e+02 3209
3.234700907870130e+02 3209
3.244700907870130e+02 3209
3.254700907870131e+02 3209
3.264700907870132e+02 3187
3.274700907870132e+02 3185
3.284700907870134e+02 3185
3.294700907870134e+02 3185
3.304700907870135e+02 3185
3.314700907870136e+02 3185
3.324700907870136e+02 3185
3.334700907870137e+02 3185
3.344700907870138e+02 3185
3.354700907870139e+02 3185
3.364700907870139e+02 3185
3.374700907870140e+02 3185
3.384700907870141e+02 3185
3.394700907870142e+02 3185
3.404700907870143e+02 3185
3.414700907870143e+02 3185
3.424700907870144e+02 3185
3.434700907870144e+02 3185
3.444700907870146e+02 3185
3.454700907870146e+02 3185
3.464700907870147e+02 3185
RegressionTests/BeamLine-1/reference/BeamLine-1.lbal.md5
View file @ b8fe2962
18c0a164908241b66ecd27fbfb32157b BeamLine-1.lbal
0c08027cd09b566f78d13d24fdc9899c BeamLine-1.lbal
RegressionTests/BeamLine-1/reference/BeamLine-1.out
View file @ b8fe2962
......@@ -15,7 +15,7 @@ OPAL>
OPAL> Please send cookies, goodies or other motivations (wine and beer ... )
OPAL> to the OPAL developers opal@lists.psi.ch
OPAL>
OPAL> Time: 21:08:00 date: 27/03/2018
OPAL> Time: 07:01:11 date: 12/04/2018
OPAL>
OPAL> Couldn't find startup file "/gpfs/home/adelmann/init.opal".
OPAL> Note: this is not mandatory for an OPAL simulation!
......@@ -305,8 +305,8 @@ OPAL> Key: ( 39.231721- 39.283660) number of overlapping elements 2
OPAL> AMF1
OPAL> AMF1_R1
OPAL> Key: ( 39.283660- 39.335600) number of overlapping elements 2
OPAL> AMF1
OPAL> AMF1_R2
OPAL> AMF1
OPAL> Key: ( 39.335600- 39.387540) number of overlapping elements 2
OPAL> AMF1
OPAL> AMF1_R3
......@@ -582,13 +582,13 @@ OPAL> * t = 280.470 [ns] dT = 100.000 [ps]
OPAL> * spos = 36.427 [m]
OPAL> * **********************************************************************************
OPAL>
OPAL> Track start at: 21:08:00, t= 280.470 [ns]; zstart at: 36.427 [m]
OPAL> Track start at: 07:01:12, t= 280.470 [ns]; zstart at: 36.427 [m]
OPAL> Executing ParallelTTracker, initial dt= 100.000 [ps];
OPAL> max integration steps 1243, next step= 0
ParallelTTracker [2]> MINBINEMITTED 10
ParallelTTracker [2]> MINSTEPFORREBIN 200
ParallelTTracker [2]> 21:08:00 Step 99 at 37.725 [m], t= 290.470 [ns], E=102.716 [MeV]
ParallelTTracker [2]> 21:08:00 Step 199 at 39.024 [m], t= 300.470 [ns], E=102.716 [MeV]
ParallelTTracker [2]> 07:01:12 Step 99 at 37.725 [m], t= 290.470 [ns], E=102.716 [MeV]
ParallelTTracker [2]> 07:01:12 Step 199 at 39.024 [m], t= 300.470 [ns], E=102.716 [MeV]
ParallelTTracker > * Deleted 1 particles, remaining 3519 particles
ParallelTTracker > * Deleted 1 particles, remaining 3518 particles
ParallelTTracker > * Deleted 1 particles, remaining 3517 particles
......@@ -603,8 +603,8 @@ ParallelTTracker > * Deleted 2 particles, remaining 3499 particles
ParallelTTracker > * Deleted 2 particles, remaining 3497 particles
ParallelTTracker > * Deleted 1 particles, remaining 3496 particles
ParallelTTracker > * Deleted 1 particles, remaining 3495 particles
ParallelTTracker > * Deleted 5 particles, remaining 3490 particles
ParallelTTracker > * Deleted 2 particles, remaining 3488 particles
ParallelTTracker > * Deleted 4 particles, remaining 3491 particles
ParallelTTracker > * Deleted 3 particles, remaining 3488 particles
ParallelTTracker > * Deleted 5 particles, remaining 3483 particles
ParallelTTracker > * Deleted 2 particles, remaining 3481 particles
ParallelTTracker > * Deleted 4 particles, remaining 3477 particles
......@@ -616,25 +616,25 @@ ParallelTTracker > * Deleted 3 particles, remaining 3465 particles
ParallelTTracker > * Deleted 3 particles, remaining 3462 particles
ParallelTTracker > * Deleted 3 particles, remaining 3459 particles
ParallelTTracker > * Deleted 1 particles, remaining 3458 particles
ParallelTTracker > * Deleted 3 particles, remaining 3455 particles
ParallelTTracker > * Deleted 2 particles, remaining 3453 particles
ParallelTTracker > * Deleted 5 particles, remaining 3448 particles
ParallelTTracker > * Deleted 4 particles, remaining 3454 particles
ParallelTTracker > * Deleted 2 particles, remaining 3452 particles
ParallelTTracker > * Deleted 4 particles, remaining 3448 particles
ParallelTTracker > * Deleted 5 particles, remaining 3443 particles
ParallelTTracker > * Deleted 1 particles, remaining 3442 particles
ParallelTTracker > * Deleted 5 particles, remaining 3437 particles
ParallelTTracker > * Deleted 4 particles, remaining 3433 particles
ParallelTTracker > * Deleted 10 particles, remaining 3423 particles
ParallelTTracker > * Deleted 4 particles, remaining 3438 particles
ParallelTTracker > * Deleted 6 particles, remaining 3432 particles
ParallelTTracker > * Deleted 9 particles, remaining 3423 particles
ParallelTTracker > * Deleted 4 particles, remaining 3419 particles
ParallelTTracker > * Deleted 5 particles, remaining 3414 particles
ParallelTTracker > * Deleted 7 particles, remaining 3407 particles
ParallelTTracker > * Deleted 4 particles, remaining 3403 particles
ParallelTTracker > * Deleted 5 particles, remaining 3398 particles
ParallelTTracker > * Deleted 2 particles, remaining 3396 particles
ParallelTTracker > * Deleted 3 particles, remaining 3404 particles
ParallelTTracker > * Deleted 7 particles, remaining 3397 particles
ParallelTTracker > * Deleted 1 particles, remaining 3396 particles
ParallelTTracker > * Deleted 5 particles, remaining 3391 particles
ParallelTTracker > * Deleted 3 particles, remaining 3388 particles
ParallelTTracker > * Deleted 3 particles, remaining 3385 particles
ParallelTTracker > * Deleted 4 particles, remaining 3381 particles
ParallelTTracker [2]> 21:08:01 Step 299 at 40.322 [m], t= 310.470 [ns], E=102.694 [MeV]
ParallelTTracker [2]> 07:01:12 Step 299 at 40.322 [m], t= 310.470 [ns], E=102.694 [MeV]
ParallelTTracker > * Deleted 4 particles, remaining 3377 particles
ParallelTTracker > * Deleted 6 particles, remaining 3371 particles
ParallelTTracker > * Deleted 6 particles, remaining 3365 particles
......@@ -646,66 +646,65 @@ ParallelTTracker > * Deleted 7 particles, remaining 3338 particles
ParallelTTracker > * Deleted 6 particles, remaining 3332 particles
ParallelTTracker > * Deleted 6 particles, remaining 3326 particles
ParallelTTracker > * Deleted 4 particles, remaining 3322 particles
ParallelTTracker > * Deleted 5 particles, remaining 3317 particles
ParallelTTracker > * Deleted 4 particles, remaining 3313 particles
ParallelTTracker > * Deleted 3 particles, remaining 3319 particles
ParallelTTracker > * Deleted 6 particles, remaining 3313 particles
ParallelTTracker > * Deleted 1 particles, remaining 3312 particles
ParallelTTracker > * Deleted 5 particles, remaining 3307 particles
ParallelTTracker > * Deleted 5 particles, remaining 3302 particles
ParallelTTracker > * Deleted 5 particles, remaining 3297 particles
ParallelTTracker > * Deleted 4 particles, remaining 3293 particles
ParallelTTracker > * Deleted 3 particles, remaining 3290 particles
ParallelTTracker > * Deleted 6 particles, remaining 3284 particles
ParallelTTracker > * Deleted 5 particles, remaining 3279 particles
ParallelTTracker > * Deleted 6 particles, remaining 3273 particles
ParallelTTracker > * Deleted 2 particles, remaining 3271 particles
ParallelTTracker > * Deleted 4 particles, remaining 3267 particles
ParallelTTracker > * Deleted 6 particles, remaining 3261 particles
ParallelTTracker > * Deleted 1 particles, remaining 3260 particles
ParallelTTracker > * Deleted 5 particles, remaining 3255 particles
ParallelTTracker > * Deleted 3 particles, remaining 3252 particles
ParallelTTracker > * Deleted 3 particles, remaining 3249 particles
ParallelTTracker > * Deleted 2 particles, remaining 3247 particles
ParallelTTracker > * Deleted 2 particles, remaining 3245 particles
ParallelTTracker > * Deleted 3 particles, remaining 3242 particles
ParallelTTracker > * Deleted 4 particles, remaining 3238 particles
ParallelTTracker > * Deleted 5 particles, remaining 3233 particles
ParallelTTracker > * Deleted 1 particles, remaining 3232 particles
ParallelTTracker > * Deleted 1 particles, remaining 3231 particles
ParallelTTracker > * Deleted 5 particles, remaining 3226 particles
ParallelTTracker > * Deleted 3 particles, remaining 3223 particles
ParallelTTracker > * Deleted 1 particles, remaining 3222 particles
ParallelTTracker > * Deleted 1 particles, remaining 3221 particles
ParallelTTracker > * Deleted 4 particles, remaining 3217 particles
ParallelTTracker > * Deleted 1 particles, remaining 3216 particles
ParallelTTracker > * Deleted 1 particles, remaining 3215 particles
ParallelTTracker > * Deleted 1 particles, remaining 3214 particles
ParallelTTracker [2]> 21:08:01 Step 399 at 41.621 [m], t= 320.470 [ns], E=102.692 [MeV]
ParallelTTracker > * Deleted 1 particles, remaining 3213 particles
ParallelTTracker > * Deleted 4 particles, remaining 3209 particles
ParallelTTracker > * Deleted 3 particles, remaining 3206 particles
ParallelTTracker > * Deleted 1 particles, remaining 3205 particles
ParallelTTracker > * Deleted 4 particles, remaining 3201 particles
ParallelTTracker > * Deleted 3 particles, remaining 3198 particles
ParallelTTracker > * Deleted 4 particles, remaining 3194 particles
ParallelTTracker > * Deleted 1 particles, remaining 3193 particles
ParallelTTracker > * Deleted 1 particles, remaining 3192 particles
ParallelTTracker > * Deleted 1 particles, remaining 3191 particles
ParallelTTracker > * Deleted 1 particles, remaining 3190 particles
ParallelTTracker [2]> 21:08:01 Step 499 at 42.919 [m], t= 330.470 [ns], E=102.701 [MeV]
ParallelTTracker [2]> 21:08:01 Step 599 at 44.218 [m], t= 340.470 [ns], E=102.701 [MeV]
ParallelTTracker > * Deleted 5 particles, remaining 3292 particles
ParallelTTracker > * Deleted 3 particles, remaining 3289 particles
ParallelTTracker > * Deleted 5 particles, remaining 3284 particles
ParallelTTracker > * Deleted 6 particles, remaining 3278 particles
ParallelTTracker > * Deleted 5 particles, remaining 3273 particles
ParallelTTracker > * Deleted 4 particles, remaining 3269 particles
ParallelTTracker > * Deleted 4 particles, remaining 3265 particles
ParallelTTracker > * Deleted 6 particles, remaining 3259 particles
ParallelTTracker > * Deleted 2 particles, remaining 3257 particles
ParallelTTracker > * Deleted 5 particles, remaining 3252 particles
ParallelTTracker > * Deleted 4 particles, remaining 3248 particles
ParallelTTracker > * Deleted 2 particles, remaining 3246 particles
ParallelTTracker > * Deleted 2 particles, remaining 3244 particles
ParallelTTracker > * Deleted 2 particles, remaining 3242 particles
ParallelTTracker > * Deleted 3 particles, remaining 3239 particles
ParallelTTracker > * Deleted 4 particles, remaining 3235 particles
ParallelTTracker > * Deleted 5 particles, remaining 3230 particles
ParallelTTracker > * Deleted 2 particles, remaining 3228 particles
ParallelTTracker > * Deleted 4 particles, remaining 3224 particles
ParallelTTracker > * Deleted 4 particles, remaining 3220 particles
ParallelTTracker > * Deleted 1 particles, remaining 3219 particles
ParallelTTracker > * Deleted 1 particles, remaining 3218 particles
ParallelTTracker > * Deleted 4 particles, remaining 3214 particles
ParallelTTracker > * Deleted 2 particles, remaining 3212 particles
ParallelTTracker > * Deleted 1 particles, remaining 3211 particles
ParallelTTracker > * Deleted 1 particles, remaining 3210 particles
ParallelTTracker > * Deleted 1 particles, remaining 3209 particles
ParallelTTracker [2]> 07:01:13 Step 399 at 41.621 [m], t= 320.470 [ns], E=102.691 [MeV]
ParallelTTracker > * Deleted 2 particles, remaining 3207 particles
ParallelTTracker > * Deleted 4 particles, remaining 3203 particles
ParallelTTracker > * Deleted 3 particles, remaining 3200 particles
ParallelTTracker > * Deleted 4 particles, remaining 3196 particles
ParallelTTracker > * Deleted 3 particles, remaining 3193 particles
ParallelTTracker > * Deleted 4 particles, remaining 3189 particles
ParallelTTracker > * Deleted 1 particles, remaining 3188 particles
ParallelTTracker > * Deleted 1 particles, remaining 3187 particles
ParallelTTracker > * Deleted 1 particles, remaining 3186 particles
ParallelTTracker > * Deleted 1 particles, remaining 3185 particles
ParallelTTracker [2]> 07:01:13 Step 499 at 42.919 [m], t= 330.470 [ns], E=102.701 [MeV]
ParallelTTracker [2]> 07:01:13 Step 599 at 44.218 [m], t= 340.470 [ns], E=102.701 [MeV]
OPAL >
OPAL > * ************** B U N C H *********************************************************
OPAL > * NP = 3190
OPAL > * NP = 3185
OPAL > * Qtot = 0.516 [fC] Qi = 0.000 [fC]
OPAL > * Ekin = 102.701 [MeV] dEkin = 804.590 [keV]
OPAL > * Ekin = 102.701 [MeV] dEkin = 804.171 [keV]
OPAL > * rmax = ( 22.09376 , 15.37073 , 288.67648 ) [mm]
OPAL > * rmin = ( -32.74590 , -15.09747 , -302.82765 ) [mm]
OPAL > * rms beam size = ( 13.91955 , 5.52275 , 135.87745 ) [mm]
OPAL > * rms momenta = ( 6.21992e-03 , 1.99635e-03 , 1.97992e-03 ) [beta gamma]
OPAL > * mean position = ( -0.95904 , -0.07853 , -2.80862 ) [mm]
OPAL > * mean momenta = ( 2.14664e-04 , -1.52099e-05 , 4.80470e-01 ) [beta gamma]
OPAL > * rms emittance = ( 6.38151e-05 , 9.64693e-06 , 5.89743e-05 ) (not normalized)
OPAL > * rms correlation = ( 9.35178e-01 , 9.07320e-01 , 9.94437e-01 )
OPAL > * rms beam size = ( 13.90864 , 5.52053 , 135.81135 ) [mm]
OPAL > * rms momenta = ( 6.21808e-03 , 1.99380e-03 , 1.97889e-03 ) [beta gamma]
OPAL > * mean position = ( -0.94831 , -0.07969 , -2.91041 ) [mm]
OPAL > * mean momenta = ( 2.19562e-04 , -1.78455e-05 , 4.80468e-01 ) [beta gamma]
OPAL > * rms emittance = ( 6.37642e-05 , 9.61020e-06 , 5.89109e-05 ) (not normalized)
OPAL > * rms correlation = ( 9.35140e-01 , 9.07735e-01 , 9.94437e-01 )
OPAL > * hr = ( 0.11946 , 0.10054 , 6.99752 ) [mm]
OPAL > * dh = 1.00000e-10 [%]
OPAL > * t = 346.470 [ns] dT = 100.000 [ps]
......@@ -742,40 +741,40 @@ Ippl[2]> Save QMF4_R1.h5
Ippl[2]> Save QMF4_R2.h5
Ippl[2]> Save MMFP5X.h5
Ippl[2]> Save MMFP6Y.h5
OPAL> done executing ParallelTTracker at 21:08:02
OPAL> done executing ParallelTTracker at 07:01:14
OPAL> * End of input stream "BeamLine-1.in".
Timings> -----------------------------------------------------------------
Timings> Timing results for 1 nodes:
Timings> -----------------------------------------------------------------
Timings> mainTimer........... Wall tot = 2.51707, CPU tot = 1.98
Timings> mainTimer........... Wall tot = 2.76846, CPU tot = 2.03
Timings>
Timings> Binaryrepart........ Wall max = 0, CPU max = 0
Timings> Wall avg = 0, CPU avg = 0
Timings> Wall min = 0, CPU min = 0
Timings>
Timings> Boundingbox......... Wall max = 7.9e-05, CPU max = 0
Timings> Wall avg = 7.9e-05, CPU avg = 0
Timings> Wall min = 7.9e-05, CPU min = 0
Timings> Boundingbox......... Wall max = 0.000232, CPU max = 0
Timings> Wall avg = 0.000232, CPU avg = 0
Timings> Wall min = 0.000232, CPU min = 0
Timings>
Timings> Boundingbox-bounds.. Wall max = 1.5e-05, CPU max = 0
Timings> Wall avg = 1.5e-05, CPU avg = 0
Timings> Wall min = 1.5e-05, CPU min = 0
Timings> Boundingbox-bounds.. Wall max = 4.7e-05, CPU max = 0
Timings> Wall avg = 4.7e-05, CPU avg = 0
Timings> Wall min = 4.7e-05, CPU min = 0
Timings>
Timings> Boundingbox-update.. Wall max = 2.7e-05, CPU max = 0
Timings> Wall avg = 2.7e-05, CPU avg = 0
Timings> Wall min = 2.7e-05, CPU min = 0
Timings> Boundingbox-update.. Wall max = 5e-05, CPU max = 0
Timings> Wall avg = 5e-05, CPU avg = 0
Timings> Wall min = 5e-05, CPU min = 0
Timings>
Timings> Compute Statistics.. Wall max = 0.013436, CPU max = 0
Timings> Wall avg = 0.013436, CPU avg = 0
Timings> Wall min = 0.013436, CPU min = 0
Timings> Compute Statistics.. Wall max = 0.017678, CPU max = 0.06
Timings> Wall avg = 0.017678, CPU avg = 0.06
Timings> Wall min = 0.017678, CPU min = 0.06
Timings>
Timings> Create Distr........ Wall max = 0.008897, CPU max = 0
Timings> Wall avg = 0.008897, CPU avg = 0
Timings> Wall min = 0.008897, CPU min = 0
Timings> Create Distr........ Wall max = 0.050447, CPU max = 0.01
Timings> Wall avg = 0.050447, CPU avg = 0.01
Timings> Wall min = 0.050447, CPU min = 0.01
Timings>
Timings> External field eval. Wall max = 1.45973, CPU max = 1.48
Timings> Wall avg = 1.45973, CPU avg = 1.48
Timings> Wall min = 1.45973, CPU min = 1.48
Timings> External field eval. Wall max = 1.29192, CPU max = 1.31
Timings> Wall avg = 1.29192, CPU avg = 1.31
Timings> Wall min = 1.29192, CPU min = 1.31
Timings>
Timings> Fast inside test.... Wall max = 0, CPU max = 0
Timings> Wall avg = 0, CPU avg = 0
......@@ -813,24 +812,24 @@ Timings> SelfField total..... Wall max = 0, CPU max = 0
Timings> Wall avg = 0, CPU avg = 0
Timings> Wall min = 0, CPU min = 0
Timings>
Timings> TIntegration1....... Wall max = 0.033847, CPU max = 0.01
Timings> Wall avg = 0.033847, CPU avg = 0.01
Timings> Wall min = 0.033847, CPU min = 0.01
Timings> TIntegration1....... Wall max = 0.034642, CPU max = 0.01
Timings> Wall avg = 0.034642, CPU avg = 0.01
Timings> Wall min = 0.034642, CPU min = 0.01
Timings>
Timings> TIntegration2....... Wall max = 0.105216, CPU max = 0.13
Timings> Wall avg = 0.105216, CPU avg = 0.13
Timings> Wall min = 0.105216, CPU min = 0.13
Timings> TIntegration2....... Wall max = 0.102763, CPU max = 0.08
Timings> Wall avg = 0.102763, CPU avg = 0.08
Timings> Wall min = 0.102763, CPU min = 0.08
Timings>
Timings> WakeField........... Wall max = 0, CPU max = 0
Timings> Wall avg = 0, CPU avg = 0
Timings> Wall min = 0, CPU min = 0
Timings>
Timings> Write H5-File....... Wall max = 0.035678, CPU max = 0.01
Timings> Wall avg = 0.035678, CPU avg = 0.01
Timings> Wall min = 0.035678, CPU min = 0.01
Timings> Write H5-File....... Wall max = 0.036528, CPU max = 0
Timings> Wall avg = 0.036528, CPU avg = 0
Timings> Wall min = 0.036528, CPU min = 0
Timings>
Timings> Write Stat.......... Wall max = 0.023762, CPU max = 0.01
Timings> Wall avg = 0.023762, CPU avg = 0.01
Timings> Wall min = 0.023762, CPU min = 0.01
Timings> Write Stat.......... Wall max = 0.037018, CPU max = 0.02
Timings> Wall avg = 0.037018, CPU avg = 0.02
Timings> Wall min = 0.037018, CPU min = 0.02
Timings>
Timings> -----------------------------------------------------------------
RegressionTests/BeamLine-1/reference/BeamLine-1.out.md5
View file @ b8fe2962
fbbbb5424a3fa9342a5df12909d754d8 BeamLine-1.out
8fd9e5accea552874b3130890e4221a5 BeamLine-1.out
RegressionTests/BeamLine-1/reference/BeamLine-1.stat
View file @ b8fe2962
This source diff could not be displayed because it is too large. You can view the blob instead.
RegressionTests/BeamLine-1/reference/BeamLine-1.stat.md5
View file @ b8fe2962
766a9ec90abbaddd30e9c671a68abd52 BeamLine-1.stat
967b98afd92108bcd3ca3a9a13ede101 BeamLine-1.stat
RegressionTests/BeamLine-2/reference/BeamLine-2.lbal
View file @ b8fe2962
SDDS1
&description
text="Processor statistics 'BeamLine-2.in' 27/03/201821:05:15",
text="Processor statistics 'BeamLine-2.in' 12/04/201807:03:54",
contents="stat parameters"
&end
&parameter
......@@ -35,7 +35,7 @@ SDDS1
no_row_counts=1
&end
1
OPAL 1.9.0 git rev. #3808b8e7f372bc9f187ddd83ed3297e578f18f7b
OPAL 1.9.0 git rev. #71c06feb25db05a429869be47c26f8322b211204
opal-t
2.814700907870098e+02 10000
2.824700907870099e+02 10000
......@@ -56,10 +56,10 @@ opal-t
2.974700907870110e+02 9981
2.984700907870111e+02 9970
2.994700907870111e+02 9966
3.004700907870113e+02 9958
3.014700907870113e+02 9941
3.004700907870113e+02 9959
3.014700907870113e+02 9944
3.024700907870114e+02 9899
3.034700907870115e+02 9847
3.034700907870115e+02 9849
3.044700907870115e+02 9789
3.054700907870116e+02 9723
3.064700907870117e+02 9651
......@@ -69,37 +69,37 @@ opal-t
3.104700907870120e+02 9321
3.114700907870121e+02 9206
3.124700907870122e+02 9115
3.134700907870122e+02 9035
3.144700907870123e+02 8985
3.154700907870123e+02 8974
3.164700907870125e+02 8974
3.174700907870125e+02 8974
3.184700907870126e+02 8974
3.194700907870127e+02 8974
3.204700907870127e+02 8974
3.214700907870128e+02 8974
3.224700907870129e+02 8974
3.234700907870130e+02 8964
3.244700907870130e+02 8921
3.254700907870131e+02 8882
3.264700907870132e+02 8868
3.274700907870132e+02 8863
3.284700907870134e+02 8863
3.294700907870134e+02 8863
3.304700907870135e+02 8863
3.314700907870136e+02 8863
3.324700907870136e+02 8863
3.334700907870137e+02 8863
3.344700907870138e+02 8863
3.354700907870139e+02 8863
3.364700907870139e+02 8863
3.374700907870140e+02 8863
3.384700907870141e+02 8863
3.394700907870142e+02 8863
3.404700907870143e+02 8863
3.414700907870143e+02 8863
3.424700907870144e+02 8863
3.434700907870144e+02 8863
3.444700907870146e+02 8863
3.454700907870146e+02 8863
3.464700907870147e+02 8857
3.134700907870122e+02 9036
3.144700907870123e+02 8983
3.154700907870123e+02 8971
3.164700907870125e+02 8971
3.174700907870125e+02 8971
3.184700907870126e+02 8971
3.194700907870127e+02 8971
3.204700907870127e+02 8971
3.214700907870128e+02 8971
3.224700907870129e+02 8971
3.234700907870130e+02 8961
3.244700907870130e+02 8920
3.254700907870131e+02 8880
3.264700907870132e+02 8865
3.274700907870132e+02 8860
3.284700907870134e+02 8860
3.294700907870134e+02 8860
3.304700907870135e+02 8860
3.314700907870136e+02 8860
3.324700907870136e+02 8860
3.334700907870137e+02 8860
3.344700907870138e+02 8860
3.354700907870139e+02 8860
3.364700907870139e+02 8860
3.374700907870140e+02 8860
3.384700907870141e+02 8860
3.394700907870142e+02 8860
3.404700907870143e+02 8860
3.414700907870143e+02 8860
3.424700907870144e+02 8860
3.434700907870144e+02 8860
3.444700907870146e+02 8860
3.454700907870146e+02 8860
3.464700907870147e+02 8855
RegressionTests/BeamLine-2/reference/BeamLine-2.lbal.md5
View file @ b8fe2962
f39fbd8c1f5167e65582e0fdc2ef30a6 BeamLine-2.lbal
cdcce8564024a59cb833916031f8f330 BeamLine-2.lbal
RegressionTests/BeamLine-2/reference/BeamLine-2.out.md5
View file @ b8fe2962
48ec6531d2ce30a7886cf42d9c28ddaf BeamLine-2.out
cc5646523b916a0abda2d70010fb5f08 BeamLine-2.out
RegressionTests/BeamLine-2/reference/BeamLine-2.stat.md5
View file @ b8fe2962
acb24483d2e946cf9489eca4fdc2cad8 BeamLine-2.stat
87fd495fef7217d8bda0fbab47ffe302 BeamLine-2.stat
RegressionTests/PROSCAN-1/reference/PROSCAN-1.lbal.md5
View file @ b8fe2962
cc97d3cb31b912a955bf8f2e2d9b69e5 PROSCAN-1.lbal
eaaf107bd92400fd26af1f5371fc7f74 PROSCAN-1.lbal
RegressionTests/PROSCAN-1/reference/PROSCAN-1.out.md5
View file @ b8fe2962
036b76183baefda3c8b58d02e25308e9 PROSCAN-1.out
9da0b849629162ed92a092b08e158056 PROSCAN-1.out
RegressionTests/PROSCAN-1/reference/PROSCAN-1.stat.md5
View file @ b8fe2962
eada49891aae4235dab048638e69dba1 PROSCAN-1.stat
7a4537ce431e76ffe41d4e3eb720d0a0 PROSCAN-1.stat
RegressionTests/PROSCAN-2/reference/PROSCAN-2.lbal.md5
View file @ b8fe2962
36536e044252f7169a09fd87d5538088 PROSCAN-2.lbal
e6e7c53d3523ca22c8acb6f0cb8d81f6 PROSCAN-2.lbal
  • kraus @kraus ·
    Developer

    In the old implementation it was tested whether the particle is inside at R_i + \Delta t \cdot \beta_i \cdot c whereas in the new implementation we test at R_i. This could explain the difference in the results.

    Edited by kraus
  • kraus @kraus ·
    Developer

    I have to correct the above statement. R_i + \Delta t \cdot \beta_i \cdot c is used only to determine whether a particle is inside the element:

    const double z = R(2) + P(2) * recpgamma;

if ((z > 0.0) && (z <= getElementLength())) {

    I don't know what the motivation was to implement it this way. It's not comprehensible to me.

  • kraus @kraus ·
    Developer

    If I again use z = R(2) + P(2) * recpgamma then the results match again. This suggests that the difference is only caused by the difference of the above check.diff_num_particles

  • adelmann 🎗 @adelmann ·
    Owner

    Ok I am lost (sorry way too many things going on): what are we doing now? Will we there be an update in 1.6.x and 2.0.0 or everything finde now?

  • kraus @kraus ·
    Developer

    I just explained where the differences in the results stem from and that it was justified to update the reference.

    We could discuss whether it makes sense to use z = R(2) + P(2) + recpgamma to test z > 0 && z <= getElementLength() or, as we do now, z = R(2). I don't see any reason to use the former.

  • adelmann 🎗 @adelmann ·
    Owner

    Ok I understand and agree with the assessment.

Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment