Code indexing in gitaly is broken and leads to code not being visible to the user. We work on the issue with highest priority.

Skip to content
Snippets Groups Projects
Commit e4278128 authored by kraus's avatar kraus
Browse files

Merge branch... 

Merge branch '94-fix-size-of-time-steps-such-that-each-element-is-at-least-10-time-steps-long' into 'master'

Resolve "Fix size of time steps such that each element is at least 10 time steps long"

Closes #94

See merge request !23
parents 769bd453 d71e8551
No related branches found
No related tags found
1 merge request!23Resolve "Fix size of time steps such that each element is at least 10 time steps long"
Expand all Hide whitespace changes
Inline Side-by-side
Showing
with 4920 additions and 3742 deletions
RegressionTests/BeamLine-1/BeamLine-1.in
+ 4
− 3
View file @ e4278128
OPTION, ECHO=FALSE; OPTION, ECHO=FALSE;
OPTION, PSDUMPFREQ=1000000; OPTION, PSDUMPFREQ=1000000;
OPTION, STATDUMPFREQ= 10 * 75;
OPTION, TELL=TRUE; OPTION, TELL=TRUE;
Option, VERSION=10900; Option, VERSION=10900;
REAL DT = 1.0E-10; REAL DT = 1.0E-10 / 75;
REAL Edes = 0.102715; REAL Edes = 0.102715;
REAL gamma = (Edes+PMASS)/PMASS; REAL gamma = (Edes+PMASS)/PMASS;
REAL beta = sqrt(1-(1/gamma^2)); REAL beta = sqrt(1-(1/gamma^2));
REAL gambet = gamma*beta; REAL gambet = gamma*beta;
REAL P0 = gamma*beta*PMASS; REAL P0 = gamma*beta*PMASS;
REAL brho = (PMASS*1.0e9*gambet) / CLIGHT; REAL brho = (PMASS*1.0e9*gambet) / CLIGHT;
REAL NStep = 16.144190/(beta*CLIGHT*DT); REAL NStep = 16.144190/(beta*CLIGHT*DT) * 75;
REAL rf = 50.6328e6; //need to be confirmed REAL rf = 50.6328e6; //need to be confirmed
REAL Qtot = 3562*1.6e-19; REAL Qtot = 3562*1.6e-19;
...@@ -30,7 +31,7 @@ BEAM_4: BEAM, PARTICLE=PROTON, PC=P0, NPART=3520, BCURRENT=Qtot*rf, BFREQ = rf * ...@@ -30,7 +31,7 @@ BEAM_4: BEAM, PARTICLE=PROTON, PC=P0, NPART=3520, BCURRENT=Qtot*rf, BFREQ = rf *
SELECT, LINE=BEAMLINE_4; SELECT, LINE=BEAMLINE_4;
TRACK, LINE=BEAMLINE_4, BEAM=BEAM_4, MAXSTEPS= NSTEP, DT=DT, ZSTART=36.426950, ZSTOP=45.0; TRACK, LINE=BEAMLINE_4, BEAM=BEAM_4, MAXSTEPS= NSTEP, DT=DT, ZSTART=36.426950, ZSTOP=44.997;
RUN, METHOD = "PARALLEL-T", BEAM=BEAM_4, FIELDSOLVER=FS1, DISTRIBUTION=DISTRIB2; RUN, METHOD = "PARALLEL-T", BEAM=BEAM_4, FIELDSOLVER=FS1, DISTRIBUTION=DISTRIB2;
......
RegressionTests/BeamLine-1/BeamLine-1.local
+ 1
− 1
View file @ e4278128
#!/bin/bash #!/bin/bash
timeout 300 mpirun -np 1 $OPAL_EXE_PATH/opal BeamLine-1.in --commlib mpi --info 2 --warn 0 "$@" 2>&1 timeout 300 mpirun -np 4 $OPAL_EXE_PATH/opal BeamLine-1.in --commlib mpi --info 2 --warn 0 "$@" 2>&1
\ No newline at end of file
RegressionTests/BeamLine-1/reference/BeamLine-1.lbal
+ 87
− 69
View file @ e4278128
SDDS1 SDDS1
&description &description
text="Processor statistics 'BeamLine-1.in' 26/11/201912:56:03", text="Processor statistics 'BeamLine-1.in' 13/08/202023:51:46",
contents="lbal parameters" contents="lbal parameters"
&end &end
&parameter &parameter
...@@ -30,76 +30,94 @@ SDDS1 ...@@ -30,76 +30,94 @@ SDDS1
units=1, units=1,
description="2 Number of particles of processor 0" description="2 Number of particles of processor 0"
&end &end
&column
name="processor-1",
type=long,
units=1,
description="3 Number of particles of processor 1"
&end
&column
name="processor-2",
type=long,
units=1,
description="4 Number of particles of processor 2"
&end
&column
name="processor-3",
type=long,
units=1,
description="5 Number of particles of processor 3"
&end
&data &data
mode=ascii, mode=ascii,
no_row_counts=1 no_row_counts=1
&end &end
1 4
OPAL 2.1.0 git rev. #1c35e1a4d7bfca97e8eecfe4b4904caac394952d OPAL 2.3.0 git rev. #7c1f8233a53e6c2f527d3e47bd53af635c650652
opal-t opal-t
2.815299153654543e+02 3520 2.815299153674202e+02 880 880 880 880
2.825299153654543e+02 3520 2.825299153674081e+02 880 880 880 880
2.835299153654544e+02 3520 2.835299153673960e+02 880 880 880 880
2.845299153654545e+02 3520 2.845299153673839e+02 880 880 880 880
2.855299153654545e+02 3520 2.855299153673718e+02 880 880 880 880
2.865299153654546e+02 3520 2.865299153673597e+02 880 880 880 880
2.875299153654547e+02 3520 2.875299153673476e+02 880 880 880 880
2.885299153654548e+02 3520 2.885299153673355e+02 880 880 880 880
2.895299153654548e+02 3520 2.895299153673234e+02 880 880 880 880
2.905299153654549e+02 3520 2.905299153673113e+02 880 880 880 880
2.915299153654550e+02 3520 2.915299153672992e+02 880 880 880 880
2.925299153654551e+02 3520 2.925299153672871e+02 880 880 880 880
2.935299153654551e+02 3520 2.935299153672750e+02 880 880 880 880
2.945299153654552e+02 3520 2.945299153672629e+02 880 880 880 880
2.955299153654553e+02 3520 2.955299153672508e+02 880 880 880 880
2.965299153654553e+02 3520 2.965299153672387e+02 880 880 880 880
2.975299153654555e+02 3520 2.975299153672266e+02 880 880 880 880
2.985299153654555e+02 3520 2.985299153672145e+02 880 880 880 880
2.995299153654556e+02 3520 2.995299153672024e+02 880 880 880 880
3.005299153654557e+02 3520 3.005299153671903e+02 880 880 880 880
3.015299153654557e+02 3520 3.015299153671782e+02 880 880 880 880
3.025299153654558e+02 3520 3.025299153671661e+02 880 880 880 880
3.035299153654559e+02 3520 3.035299153671540e+02 880 880 880 880
3.045299153654560e+02 3519 3.045299153671419e+02 880 880 880 880
3.055299153654560e+02 3513 3.055299153671298e+02 880 880 879 880
3.065299153654561e+02 3506 3.065299153671177e+02 877 878 877 878
3.075299153654562e+02 3488 3.075299153671056e+02 874 874 874 875
3.085299153654562e+02 3458 3.085299153670935e+02 867 867 866 867
3.095299153654564e+02 3412 3.095299153670813e+02 856 856 856 856
3.105299153654564e+02 3371 3.105299153670693e+02 845 846 845 846
3.115299153654565e+02 3318 3.115299153670572e+02 832 832 832 832
3.125299153654566e+02 3265 3.125299153670451e+02 817 817 818 818
3.135299153654566e+02 3207 3.135299153670330e+02 805 805 805 805
3.145299153654567e+02 3185 3.145299153670209e+02 799 798 799 799
3.155299153654568e+02 3178 3.155299153670088e+02 797 797 796 797
3.165299153654569e+02 3178 3.165299153669966e+02 796 797 796 797
3.175299153654569e+02 3178 3.175299153669845e+02 796 797 796 797
3.185299153654570e+02 3178 3.185299153669725e+02 796 797 796 797
3.195299153654571e+02 3178 3.195299153669604e+02 796 797 796 797
3.205299153654572e+02 3178 3.205299153669483e+02 796 797 796 797
3.215299153654572e+02 3178 3.215299153669362e+02 796 797 796 797
3.225299153654573e+02 3178 3.225299153669241e+02 796 797 796 797
3.235299153654574e+02 3178 3.235299153669120e+02 796 797 796 797
3.245299153654574e+02 3178 3.245299153668998e+02 796 797 796 797
3.255299153654576e+02 3178 3.255299153668877e+02 796 797 796 797
3.265299153654576e+02 3160 3.265299153668756e+02 792 792 792 793
3.275299153654577e+02 3158 3.275299153668636e+02 791 791 792 792
3.285299153654578e+02 3158 3.285299153668515e+02 791 791 792 792
3.295299153654578e+02 3158 3.295299153668394e+02 791 791 792 792
3.305299153654579e+02 3158 3.305299153668273e+02 791 791 792 792
3.315299153654580e+02 3158 3.315299153668151e+02 791 791 792 792
3.325299153654581e+02 3158 3.325299153668030e+02 791 791 792 792
3.335299153654581e+02 3158 3.335299153667909e+02 791 791 792 792
3.345299153654582e+02 3158 3.345299153667788e+02 791 791 792 792
3.355299153654583e+02 3158 3.355299153667668e+02 791 791 792 792
3.365299153654584e+02 3158 3.365299153667547e+02 791 791 792 792
3.375299153654585e+02 3158 3.375299153667426e+02 791 791 792 792
3.385299153654585e+02 3158 3.385299153667304e+02 791 791 792 792
3.395299153654586e+02 3158 3.395299153667183e+02 791 791 792 792
3.405299153654587e+02 3158 3.405299153667062e+02 791 791 792 792
3.415299153654587e+02 3158 3.415299153666941e+02 791 791 792 792
3.425299153654588e+02 3158 3.425299153666820e+02 791 791 792 792
3.435299153654589e+02 3158 3.435299153666699e+02 791 791 792 792
3.445299153654590e+02 3158 3.445299153666579e+02 791 791 792 792
3.455299153654590e+02 3158 3.455299153666458e+02 791 791 792 792
3.465299153654591e+02 3158 3.465299153666336e+02 791 791 792 792
RegressionTests/BeamLine-1/reference/BeamLine-1.lbal.md5
+ 1
− 1
View file @ e4278128
39d5794932ffe0bc71528488f0aa48be BeamLine-1.lbal 7db9838ad45eb0710f0014e0859a2b47 BeamLine-1.lbal
RegressionTests/BeamLine-1/reference/BeamLine-1.out
+ 1632
− 855
View file @ e4278128
This diff is collapsed.
RegressionTests/BeamLine-1/reference/BeamLine-1.out.md5
+ 1
− 1
View file @ e4278128
529434ff197d2263580680356560c2a0 BeamLine-1.out 491e9eb63fd08f1e4534860e37b5f057 BeamLine-1.out
RegressionTests/BeamLine-1/reference/BeamLine-1.stat
+ 69
− 69
View file @ e4278128
This diff is collapsed.
RegressionTests/BeamLine-1/reference/BeamLine-1.stat.md5
+ 1
− 1
View file @ e4278128
c824d2fd40b79bbf7cb2ba82b450e39d BeamLine-1.stat 43f946d87ee710469577d09629c089bd BeamLine-1.stat
RegressionTests/BeamLine-2/BeamLine-2.in
+ 4
− 3
View file @ e4278128
OPTION, ECHO=FALSE; OPTION, ECHO=FALSE;
OPTION, PSDUMPFREQ=1000000; OPTION, PSDUMPFREQ=1000000;
OPTION, STATDUMPFREQ=10*75;
OPTION, TELL=TRUE; OPTION, TELL=TRUE;
Option, VERSION=10900; Option, VERSION=10900;
REAL DT = 1.0E-10; REAL DT = 1.0E-10 / 75;
REAL Edes = 0.102715; REAL Edes = 0.102715;
REAL gamma = (Edes+PMASS)/PMASS; REAL gamma = (Edes+PMASS)/PMASS;
REAL beta = sqrt(1-(1/gamma^2)); REAL beta = sqrt(1-(1/gamma^2));
REAL gambet = gamma*beta; REAL gambet = gamma*beta;
REAL P0 = gamma*beta*PMASS; REAL P0 = gamma*beta*PMASS;
REAL brho = (PMASS*1.0e9*gambet) / CLIGHT; REAL brho = (PMASS*1.0e9*gambet) / CLIGHT;
REAL NStep = 16.144190/(beta*CLIGHT*DT); REAL NStep = 16.144190/(beta*CLIGHT*DT) * 75;
REAL rf = 50.6328e6; //need to be confirmed REAL rf = 50.6328e6; //need to be confirmed
REAL Qtot = 3562*1.6e-19; REAL Qtot = 3562*1.6e-19;
...@@ -30,7 +31,7 @@ BEAM_4: BEAM, PARTICLE=PROTON, PC=P0, NPART=1e4, BCURRENT=Qtot*rf, BFREQ = rf * ...@@ -30,7 +31,7 @@ BEAM_4: BEAM, PARTICLE=PROTON, PC=P0, NPART=1e4, BCURRENT=Qtot*rf, BFREQ = rf *
SELECT, LINE=BEAMLINE_4; SELECT, LINE=BEAMLINE_4;
TRACK, LINE=BEAMLINE_4, BEAM=BEAM_4, MAXSTEPS= NSTEP, DT=DT, ZSTART=36.426950, ZSTOP=45.0; TRACK, LINE=BEAMLINE_4, BEAM=BEAM_4, MAXSTEPS= NSTEP, DT=DT, ZSTART=36.426950, ZSTOP=44.997;
RUN, METHOD = "PARALLEL-T", BEAM=BEAM_4, FIELDSOLVER=FS1, DISTRIBUTION=DISTRIB1; RUN, METHOD = "PARALLEL-T", BEAM=BEAM_4, FIELDSOLVER=FS1, DISTRIBUTION=DISTRIB1;
......
RegressionTests/BeamLine-2/BeamLine-2.local
+ 1
− 1
View file @ e4278128
#!/bin/bash #!/bin/bash
timeout 300 mpirun -np 1 $OPAL_EXE_PATH/opal BeamLine-2.in --commlib mpi --info 3 --warn 0 "$@" 2>&1 timeout 300 mpirun -np 4 $OPAL_EXE_PATH/opal BeamLine-2.in --commlib mpi --info 2 --warn 0 "$@" 2>&1
\ No newline at end of file
RegressionTests/BeamLine-2/reference/BeamLine-2.lbal
+ 87
− 69
View file @ e4278128
SDDS1 SDDS1
&description &description
text="Processor statistics 'BeamLine-2.in' 01/09/201921:49:29", text="Processor statistics 'BeamLine-2.in' 13/08/202023:53:23",
contents="lbal parameters" contents="lbal parameters"
&end &end
&parameter &parameter
...@@ -30,76 +30,94 @@ SDDS1 ...@@ -30,76 +30,94 @@ SDDS1
units=1, units=1,
description="2 Number of particles of processor 0" description="2 Number of particles of processor 0"
&end &end
&column
name="processor-1",
type=long,
units=1,
description="3 Number of particles of processor 1"
&end
&column
name="processor-2",
type=long,
units=1,
description="4 Number of particles of processor 2"
&end
&column
name="processor-3",
type=long,
units=1,
description="5 Number of particles of processor 3"
&end
&data &data
mode=ascii, mode=ascii,
no_row_counts=1 no_row_counts=1
&end &end
1 4
OPAL 2.1.0 git rev. #e1d32631ec9adfa980fcbe181f893e552dc4bd9d OPAL 2.3.0 git rev. #7c1f8233a53e6c2f527d3e47bd53af635c650652
opal-t opal-t
2.815299092130085e+02 10000 2.815299153674202e+02 2487 2487 2487 2486
2.825299092130085e+02 10000 2.825299153674081e+02 2481 2481 2481 2481
2.835299092130086e+02 10000 2.835299153673960e+02 2479 2479 2479 2479
2.845299092130087e+02 10000 2.845299153673839e+02 2479 2479 2479 2479
2.855299092130088e+02 10000 2.855299153673718e+02 2479 2479 2479 2479
2.865299092130088e+02 10000 2.865299153673597e+02 2479 2479 2479 2479
2.875299092130089e+02 10000 2.875299153673476e+02 2479 2479 2479 2479
2.885299092130090e+02 10000 2.885299153673355e+02 2479 2479 2479 2479
2.895299092130090e+02 10000 2.895299153673234e+02 2479 2479 2479 2479
2.905299092130091e+02 10000 2.905299153673113e+02 2479 2479 2479 2479
2.915299092130092e+02 10000 2.915299153672992e+02 2479 2479 2479 2479
2.925299092130093e+02 10000 2.925299153672871e+02 2479 2479 2479 2479
2.935299092130094e+02 10000 2.935299153672750e+02 2479 2479 2479 2479
2.945299092130094e+02 10000 2.945299153672629e+02 2479 2479 2479 2479
2.955299092130095e+02 10000 2.955299153672508e+02 2479 2479 2479 2479
2.965299092130096e+02 9994 2.965299153672387e+02 2478 2478 2477 2477
2.975299092130097e+02 9978 2.975299153672266e+02 2473 2474 2474 2474
2.985299092130097e+02 9971 2.985299153672145e+02 2471 2472 2472 2472
2.995299092130098e+02 9966 2.995299153672024e+02 2470 2471 2471 2471
3.005299092130099e+02 9958 3.005299153671903e+02 2468 2469 2468 2469
3.015299092130099e+02 9940 3.015299153671782e+02 2464 2464 2464 2464
3.025299092130101e+02 9892 3.025299153671661e+02 2452 2453 2453 2453
3.035299092130101e+02 9837 3.035299153671540e+02 2441 2440 2441 2440
3.045299092130102e+02 9791 3.045299153671419e+02 2427 2427 2427 2427
3.055299092130102e+02 9738 3.055299153671298e+02 2414 2413 2414 2414
3.065299092130103e+02 9676 3.065299153671177e+02 2396 2396 2397 2397
3.075299092130104e+02 9586 3.075299153671056e+02 2376 2376 2377 2377
3.085299092130105e+02 9489 3.085299153670935e+02 2354 2355 2355 2354
3.095299092130106e+02 9401 3.095299153670813e+02 2333 2333 2333 2333
3.105299092130106e+02 9289 3.105299153670693e+02 2307 2307 2307 2308
3.115299092130107e+02 9184 3.115299153670572e+02 2284 2284 2285 2284
3.125299092130108e+02 9102 3.125299153670451e+02 2261 2261 2261 2262
3.135299092130109e+02 9017 3.135299153670330e+02 2239 2240 2240 2240
3.145299092130109e+02 8967 3.145299153670209e+02 2228 2229 2229 2228
3.155299092130110e+02 8957 3.155299153670088e+02 2227 2227 2226 2227
3.165299092130111e+02 8957 3.165299153669966e+02 2227 2226 2226 2227
3.175299092130111e+02 8957 3.175299153669845e+02 2227 2226 2226 2227
3.185299092130113e+02 8957 3.185299153669725e+02 2227 2226 2226 2227
3.195299092130113e+02 8957 3.195299153669604e+02 2227 2226 2226 2227
3.205299092130114e+02 8957 3.205299153669483e+02 2227 2226 2226 2227
3.215299092130115e+02 8957 3.215299153669362e+02 2227 2226 2226 2227
3.225299092130115e+02 8957 3.225299153669241e+02 2226 2226 2226 2227
3.235299092130116e+02 8948 3.235299153669120e+02 2224 2225 2224 2224
3.245299092130117e+02 8923 3.245299153668998e+02 2215 2215 2215 2216
3.255299092130118e+02 8881 3.255299153668877e+02 2207 2207 2207 2208
3.265299092130118e+02 8866 3.265299153668756e+02 2203 2203 2204 2204
3.275299092130119e+02 8864 3.275299153668636e+02 2203 2202 2203 2203
3.285299092130120e+02 8864 3.285299153668515e+02 2203 2202 2203 2203
3.295299092130120e+02 8864 3.295299153668394e+02 2203 2202 2203 2203
3.305299092130122e+02 8864 3.305299153668273e+02 2203 2202 2203 2203
3.315299092130122e+02 8864 3.315299153668151e+02 2203 2202 2203 2203
3.325299092130123e+02 8864 3.325299153668030e+02 2203 2202 2203 2203
3.335299092130123e+02 8864 3.335299153667909e+02 2203 2202 2203 2203
3.345299092130124e+02 8864 3.345299153667788e+02 2203 2202 2203 2203
3.355299092130125e+02 8864 3.355299153667668e+02 2203 2202 2203 2203
3.365299092130126e+02 8864 3.365299153667547e+02 2203 2202 2203 2203
3.375299092130127e+02 8864 3.375299153667426e+02 2203 2202 2203 2203
3.385299092130127e+02 8864 3.385299153667304e+02 2203 2202 2203 2203
3.395299092130128e+02 8864 3.395299153667183e+02 2203 2202 2203 2203
3.405299092130129e+02 8864 3.405299153667062e+02 2203 2202 2203 2203
3.415299092130130e+02 8864 3.415299153666941e+02 2203 2202 2203 2203
3.425299092130130e+02 8864 3.425299153666820e+02 2203 2202 2203 2203
3.435299092130131e+02 8864 3.435299153666699e+02 2203 2202 2203 2203
3.445299092130132e+02 8864 3.445299153666579e+02 2203 2202 2203 2203
3.455299092130132e+02 8863 3.455299153666458e+02 2202 2202 2203 2203
3.465299092130134e+02 8857 3.465299153666336e+02 2201 2200 2201 2201
RegressionTests/BeamLine-2/reference/BeamLine-2.lbal.md5
+ 1
− 1
View file @ e4278128
30e47d2698556adb9b0cdca10829dfd6 BeamLine-2.lbal ea3a35b834039a406462e1656dc403ee BeamLine-2.lbal
RegressionTests/BeamLine-2/reference/BeamLine-2.out
+ 2480
− 2118
View file @ e4278128
This diff is collapsed.
RegressionTests/BeamLine-2/reference/BeamLine-2.out.md5
+ 1
− 1
View file @ e4278128
159def4458b511a9d8ba10eb8803fc62 BeamLine-2.out 5242913df75cfe904bd4df46fb16b1f0 BeamLine-2.out
RegressionTests/BeamLine-2/reference/BeamLine-2.stat
+ 69
− 69
View file @ e4278128
This diff is collapsed.
RegressionTests/BeamLine-2/reference/BeamLine-2.stat.md5
+ 1
− 1
View file @ e4278128
da6363e633895c7a10810b2ac18fae6e BeamLine-2.stat 1cea7212ca6b37b73355cd5387c8e1e6 BeamLine-2.stat
RegressionTests/Mask-1/Mask-1.in
+ 3
− 3
View file @ e4278128
OPTION, ECHO=FALSE; OPTION, ECHO=FALSE;
OPTION, INFO=TRUE; OPTION, INFO=TRUE;
OPTION, VERSION=10900; OPTION, VERSION=10900;
OPTION, STATDUMPFREQ=2; OPTION, STATDUMPFREQ=4;
OPTION, PSDUMPFREQ=1000000; OPTION, PSDUMPFREQ=1000000;
REAL NProt = 100000; REAL NProt = 100000;
REAL DT_ = 1e-11; REAL DT_ = 0.5e-11;
REAL Edes = 0.07381; REAL Edes = 0.07381;
REAL gamma = (Edes+PMASS)/PMASS; REAL gamma = (Edes+PMASS)/PMASS;
...@@ -72,7 +72,7 @@ FS1:FIELDSOLVER, FSTYPE=NONE, ...@@ -72,7 +72,7 @@ FS1:FIELDSOLVER, FSTYPE=NONE,
BEAM_: BEAM, PARTICLE=PROTON, PC=P0, NPART=NProt, BCURRENT=NProt*1.6e-19*rf, BFREQ=rf, CHARGE=1; BEAM_: BEAM, PARTICLE=PROTON, PC=P0, NPART=NProt, BCURRENT=NProt*1.6e-19*rf, BFREQ=rf, CHARGE=1;
REAL STEP02= 100./(beta*CLIGHT*DT_); REAL STEP02= 200./(beta*CLIGHT*DT_);
SELECT, LINE=BEAMLINE_; SELECT, LINE=BEAMLINE_;
TRACK, LINE=BEAMLINE_, BEAM=BEAM_, MAXSTEPS= STEP02, DT=DT_, ZSTART=32.0, ZSTOP=32.562; TRACK, LINE=BEAMLINE_, BEAM=BEAM_, MAXSTEPS= STEP02, DT=DT_, ZSTART=32.0, ZSTOP=32.562;
......
RegressionTests/PROSCAN-1/PROSCAN-1.in
+ 4
− 3
View file @ e4278128
OPTION, ECHO=FALSE; OPTION, ECHO=FALSE;
OPTION, PSDUMPFREQ=50000; OPTION, PSDUMPFREQ=50000;
OPTION, STATDUMPFREQ=30;
OPTION, TELL=TRUE; OPTION, TELL=TRUE;
//OPTION, INFO=FALSE; //OPTION, INFO=FALSE;
Option, VERSION=10900; Option, VERSION=10900;
// OPAL Input forLA2line // OPAL Input forLA2line
REAL TFast = 5e-11; REAL TFast = 5e-11;
REAL TSlow = 5e-12; REAL TSlow = 5e-12 / 3;
REAL Edes = 0.074283; REAL Edes = 0.074283;
REAL gamma = Edes/PMASS + 1; REAL gamma = Edes/PMASS + 1;
REAL gambet = sqrt(gamma^2 - 1); REAL gambet = sqrt(gamma^2 - 1);
...@@ -205,8 +206,8 @@ BEAMLINE_A2: LINE=(D16,KMA3i,D17,KMA3o,D18,KMA4i,D19,KMA4o,D20,SMA2,D21,MMAP9X,M ...@@ -205,8 +206,8 @@ BEAMLINE_A2: LINE=(D16,KMA3i,D17,KMA3o,D18,KMA4i,D19,KMA4o,D20,SMA2,D21,MMAP9X,M
FS1:FIELDSOLVER, FSTYPE=NONE, MX=64, MY=64, MT=64, PARFFTX=true, PARFFTY=true, PARFFTT=true, BCFFTX=open, BCFFTY=open, BCFFTT=open, BBOXINCR=1, GREENSF=STANDARD; FS1:FIELDSOLVER, FSTYPE=NONE, MX=64, MY=64, MT=64, PARFFTX=true, PARFFTY=true, PARFFTT=true, BCFFTX=open, BCFFTY=open, BCFFTT=open, BBOXINCR=1, GREENSF=STANDARD;
BEAM_A2: BEAM, PARTICLE=PROTON, PC=P0, NPART=NProt, BCURRENT=NProt*1.6e-19*rf, BFREQ=rf * 1e-6, CHARGE=1; BEAM_A2: BEAM, PARTICLE=PROTON, PC=P0, NPART=NProt, BCURRENT=NProt*1.6e-19*rf, BFREQ=rf * 1e-6, CHARGE=1;
REAL STEP0= 2531; REAL STEP0= 2531*3;
REAL STEP1= 2154; REAL STEP1= 2154*3;
REAL STEP2= STEP0 + STEP1; REAL STEP2= STEP0 + STEP1;
SELECT, LINE=BEAMLINE_A2; SELECT, LINE=BEAMLINE_A2;
......
RegressionTests/PROSCAN-1/reference/PROSCAN-1.lbal
+ 472
− 472
View file @ e4278128
This diff is collapsed.
RegressionTests/PROSCAN-1/reference/PROSCAN-1.lbal.md5
+ 1
− 1
View file @ e4278128
2186763a9a8df6c3291827e3b4a5ab0a PROSCAN-1.lbal 74d7a07ec88f41622467b14553480066 PROSCAN-1.lbal
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