Commit 2cd5ccb8 authored by adelmann's avatar adelmann

prepare for 1.3.0

parent 97d6254f
* text=auto !eol
RegressionTests/BC1-1_fixme/BC1-1.in -text
RegressionTests/BC1-1_fixme/BC1-1.local -text
RegressionTests/BC1-1_fixme/BC1-1.rt -text
RegressionTests/BC1-1_fixme/BC1-1.sge -text
RegressionTests/BC1-1_fixme/F10BC-MB01.T7 -text
RegressionTests/BC1-1_fixme/reference/BC1-1.lbal -text
RegressionTests/BC1-1_fixme/reference/BC1-1.lbal.md5 -text
RegressionTests/BC1-1_fixme/reference/BC1-1.out -text
RegressionTests/BC1-1_fixme/reference/BC1-1.out.md5 -text
RegressionTests/BC1-1_fixme/reference/BC1-1.stat -text
RegressionTests/BC1-1_fixme/reference/BC1-1.stat.md5 -text
RegressionTests/CSRBendDrift/CSRBendDrift.in -text
RegressionTests/CSRBendDrift/CSRBendDrift.local -text
RegressionTests/CSRBendDrift/CSRBendDrift.rt -text
......@@ -420,18 +431,18 @@ RegressionTests/Scan-1/reference/Scan-1.out -text
RegressionTests/Scan-1/reference/Scan-1.out.md5 -text
RegressionTests/Scan-1/reference/Scan-1.stat -text
RegressionTests/Scan-1/reference/Scan-1.stat.md5 -text
RegressionTests/Transfer-Line/FAXA.T7 -text
RegressionTests/Transfer-Line/FSM4.T7 -text
RegressionTests/Transfer-Line/Transfer-Line.in -text
RegressionTests/Transfer-Line/Transfer-Line.local -text
RegressionTests/Transfer-Line/Transfer-Line.rt -text
RegressionTests/Transfer-Line/Transfer-Line.sge -text
RegressionTests/Transfer-Line/reference/Transfer-Line.lbal -text
RegressionTests/Transfer-Line/reference/Transfer-Line.lbal.md5 -text
RegressionTests/Transfer-Line/reference/Transfer-Line.out -text
RegressionTests/Transfer-Line/reference/Transfer-Line.out.md5 -text
RegressionTests/Transfer-Line/reference/Transfer-Line.stat -text
RegressionTests/Transfer-Line/reference/Transfer-Line.stat.md5 -text
RegressionTests/Transfer-Line-fixme/FAXA.T7 -text
RegressionTests/Transfer-Line-fixme/FSM4.T7 -text
RegressionTests/Transfer-Line-fixme/Transfer-Line.in -text
RegressionTests/Transfer-Line-fixme/Transfer-Line.local -text
RegressionTests/Transfer-Line-fixme/Transfer-Line.rt -text
RegressionTests/Transfer-Line-fixme/Transfer-Line.sge -text
RegressionTests/Transfer-Line-fixme/reference/Transfer-Line.lbal -text
RegressionTests/Transfer-Line-fixme/reference/Transfer-Line.lbal.md5 -text
RegressionTests/Transfer-Line-fixme/reference/Transfer-Line.out -text
RegressionTests/Transfer-Line-fixme/reference/Transfer-Line.out.md5 -text
RegressionTests/Transfer-Line-fixme/reference/Transfer-Line.stat -text
RegressionTests/Transfer-Line-fixme/reference/Transfer-Line.stat.md5 -text
RegressionTests/run/README -text
RegressionTests/run/builder.py -text
RegressionTests/run/documentation.py -text
......
OPTION, ECHO=FALSE;
OPTION, PSDUMPFREQ=50;
OPTION, CSRDUMP=TRUE;
TITLE,string="OPAL Bunch Compressor 1 test, no space charge";
Edes=0.2479;
gamma=(Edes+EMASS)/EMASS;
beta=sqrt(1-(1/gamma^2));
gambet=gamma*beta;
P0 = gamma*beta*EMASS;
brho = (EMASS*1.0e9*gambet) / CLIGHT;
value,{gamma,brho,Edes,beta,gambet};
dt1 = 3.3355e-12;
dt2 = 5.0e-12;
cdt = dt2;
// L: physical element lenght (real)
// KS: field scaling factor (real)
// FMAPFN: field file name (string)
// ELEMEDGE: physical start of the element on the floor (real)
f1: Filter, TYPE="FixedFFTLowPass", NFREQ=9;
f2: Filter, TYPE="Savitzky-Golay", NLEFT=64, NRIGHT=64, POLYORDER=1;
CSRWAKE: Wake, TYPE="1D-CSR", FILTERS={f2, f1};
F10BC_MB01: RBend, K0=0.1585,
FMAPFN="F10BC-MB01.T7",
ELEMEDGE=29.9640000000,
E1=3.035 * Pi / 180.0,
DESIGNENERGY=247.6E6,
WAKEF=CSRWAKE;
F10BC_MB02: RBend, K0=-0.1585,
FMAPFN="F10BC-MB01.T7",
ELEMEDGE=34.4644203647,
E1=-3.035 * Pi / 180.0,
DESIGNENERGY=247.6E6,
WAKEF=CSRWAKE;
F10BC_MB03: RBend, K0=-0.1585,
FMAPFN="F10BC-MB01.T7",
ELEMEDGE=35.2144203647,
E1=-3.035 * Pi / 180.0,
DESIGNENERGY=247.6E6,
WAKEF=CSRWAKE;
F10BC_MB04: RBend, K0=0.1585,
FMAPFN="F10BC-MB01.T7",
ELEMEDGE=39.7338407293,
E1=3.035 * Pi / 180.0,
DESIGNENERGY=247.6E6,
WAKEF=CSRWAKE;
l1: Line = (F10BC_MB01, F10BC_MB02, F10BC_MB03, F10BC_MB04);
qb=0.20e-9;
rf=1498.956e6;
v0=beta*CLIGHT;
T1s = 36.6e-12;
lz = T1s*v0;
value,{v0,lz,qb,rf};
sigpx = sqrt((0.0028*1.0e-9/EMASS + 1.0)^2 - 1.0);
sigpy = sqrt((0.0028*1.0e-9/EMASS + 1.0)^2 - 1.0);
sigpz = sqrt((2.78803e-3/EMASS + 1.0)^2 - 1.0);
pzave = sqrt((248.14e-3/EMASS + 1.0)^2 - 1.0);
Dist1:DISTRIBUTION, DISTRIBUTION = gauss,
sigmax = 0.00018,
sigmapx = 0.0028,
corrx = 0.0,
sigmay = 0.00018,
sigmapy = 0.0028,
corry = 0.0,
OFFSETZ = 29.90000,
sigmapt = 0.00040,
INPUTMOUNITS = EV;
/*
We can specity ONE field solver object
*/
Fs1:FIELDSOLVER, FSTYPE=FFT, MX=32, MY=32, MT=256,
PARFFTX=TRUE, PARFFTY=TRUE, PARFFTT=TRUE,
BCFFTX=open, BCFFTY=open, BCFFTT=open,
BBOXINCR=1, GREENSF=INTEGRATED;
beam1: BEAM, PARTICLE=ELECTRON, pc=P0, NPART=1e4, BCURRENT=qb*rf, BFREQ=rf, CHARGE=-1;
SELECT, Line=l1;
N1 = 402*dt1/cdt;
N2 = N1 + (400*dt1/cdt);
//TRACK,LINE=l1, BEAM=beam1, MAXSTEPS=N1+N1, DT=cdt;
TRACK,LINE=l1, BEAM=beam1, MAXSTEPS=N1+N2, DT=cdt;
RUN, METHOD = "PARALLEL-T", BEAM=beam1, FIELDSOLVER=Fs1, DISTRIBUTION=Dist1;
ENDTRACK;
//TRACK,LINE=l1, BEAM=beam1, MAXSTEPS=N2, DT=cdt;
// RUN, METHOD = "PARALLEL-T", BEAM=beam1, FIELDSOLVER=Fs1, DISTRIBUTION=Dist1;
//ENDTRACK;
STOP;
#!/bin/bash
cd $REG_TEST_DIR
mpirun -np 1 $OPAL_EXE_PATH/opal BC1-1.in --commlib mpi --info 0 --warn 0 2>&1
"One dipole with 1D csr, no space charge is considered"
stat "rms_x" last 2E-8 #this is a comment
stat "rms_y" last 2E-8 #this is a comment
stat "rms_s" last 2E-8 #this is a comment
out "rms emittance" last 2E-8
#!/bin/bash
#$ -cwd
#$ -j y
#$ -pe orte 1
#$ -N BC1-1-RT
#$ -v LD_LIBRARY_PATH,OPAL_EXE_PATH,OPENMPI,REG_TEST_DIR
MACHINE_FILE=$TMPDIR/machinefile
awk '/^felsim/ {print $1" slots="$2}' $PE_HOSTFILE > $MACHINE_FILE
cp $MACHINE_FILE machinefile.last
cd $REG_TEST_DIR
OPAL="$OPAL_EXE_PATH/opal BC1-1.in --commlib mpi --info 9 --warn 0 2>&1"
CMD="$OPENMPI/bin/mpirun -x LD_LIBRARY_PATH -machinefile $MACHINE_FILE -np $NSLOTS $OPAL "
$CMD
1DProfile1 5 5 1.50
-6.1 -1.6 2.9 1
22.1000 26.6000 31.1000 1
-0.0170
1.8055
-0.2819
0.5680
0.3817
0.0966
-0.017
1.8055
-0.2819
0.5680
0.3817
0.0966
# 1
10000
10000
10000
10000
10000
10000
10000
10000
10000
10000
10000
10000
10000
10000
10000
10000
10000
10000
10000
10000
10000
10000
10000
10000
10000
10000
10000
10000
10000
10000
10000
10000
10000
10000
10000
10000
10000
10000
10000
10000
10000
10000
10000
10000
10000
10000
10000
10000
10000
10000
10000
10000
10000
10000
10000
10000
10000
10000
10000
10000
10000
10000
10000
10000
10000
10000
10000
10000
10000
10000
10000
10000
10000
10000
10000
10000
10000
10000
10000
10000
10000
10000
10000
10000
10000
10000
10000
10000
10000
10000
10000
10000
10000
10000
10000
10000
10000
10000
10000
10000
10000
10000
10000
10000
10000
10000
10000
10000
10000
10000
10000
10000
10000
10000
10000
10000
10000
10000
10000
10000
10000
10000
10000
10000
10000
10000
10000
10000
10000
10000
10000
10000
10000
10000
10000
10000
10000
10000
10000
10000
10000
10000
10000
10000
10000
10000
10000
10000
10000
10000
10000
10000
10000
10000
10000
10000
10000
10000
10000
10000
10000
10000
10000
10000
10000
10000
10000
10000
10000
10000
10000
10000
10000
10000
10000
10000
10000
10000
10000
10000
10000
10000
10000
10000
10000
10000
10000
10000
10000
10000
10000
10000
10000
10000
10000
10000
10000
10000
10000
10000
10000
10000
10000
10000
10000
10000
10000
10000
10000
10000
10000
10000
10000
10000
10000
10000
10000
10000
10000
10000
10000
10000
10000
10000
10000
10000
10000
10000
10000
10000
10000
10000
10000
10000
10000
10000
10000
10000
10000
10000
10000
10000
10000
10000
10000
10000
10000
10000
10000
10000
10000
10000
10000
10000
10000
10000
10000
10000
10000
10000
10000
10000
10000
10000
10000
10000
10000
10000
10000
10000
fee4d5acdd98eaa7387005425047c380 BC1-1.lbal
This source diff could not be displayed because it is too large. You can view the blob instead.
c7827efff2c71e174089af3789dd152d BC1-1.out
This source diff could not be displayed because it is too large. You can view the blob instead.
e5943ce64191e1452a13a97bdd9fb449 BC1-1.stat
......@@ -115,13 +115,13 @@ value, {drift_before_bend,
// First space charge field solver.
FS_SC1: Fieldsolver, FSTYPE = NONE,
FS_SC1: Fieldsolver, FSTYPE = FFT,
MX = FS_SC1_X_BINS,
MY = FS_SC1_Y_BINS,
MT = FS_SC1_Z_BINS,
PARFFTX = true,
PARFFTY = true,
PARFFTT = false,
PARFFTT = true,
BCFFTX = open,
BCFFTY = open,
BCFFTT = open,
......
41cee52f8a858cc17c7c47b1d7cf238d DCGun-Cornell-1.out
e11eeff196599a3676c3aea21ef60028 DCGun-Cornell-1.out
3b48f532fb5871a9f2d58e4eda1ba374 DCGun-Cornell-1.stat
6dc7f832f1e5ccf366d1b7e141456a8c DCGun-Cornell-1.stat
aa81495c51603b1db4ed2c8fb9d309ad DCGun-Cornell-2.out
0c21b6f748d64fc257f887c5470fe3a4 DCGun-Cornell-2.out
0550a9c551734515149a1d8cb69816f9 DCGun-Cornell-2.stat
93110c57241c9c6b00dfe0f8a189a118 DCGun-Cornell-2.stat
......@@ -39,7 +39,7 @@ triplet: SBEND3D, FMAPFN="data/OpalRingTest.field", LENGTH_UNITS=10., FIELD_UNIT
l1: Line = (ringdef, probe1, probe2, triplet);
Dist1: DISTRIBUTION, DISTRIBUTION=fromfile, FNAME="data/beam.dat";
Dist1: DISTRIBUTION, DISTRIBUTION=fromfile, FNAME="data/beam.dat", INPUTMOUNITS=NONE;
Fs1:FIELDSOLVER, FSTYPE=FFT, MX=32, MY=32, MT=32,
PARFFTX=true, PARFFTY=true, PARFFTT=false,
......
c17f09034cd7878fcf18bd4240f1a770 Quad-Simple-Test-1.out
949bc7dbea91b93f2c727bb9cacf10e8 Quad-Simple-Test-1.out
aced7058daabe9db65d978159ee3a49a Quad-Simple-Test-1.stat
dddaa533c8a65fff2ccd7606f9872148 Quad-Simple-Test-1.stat
# 1
1000
1000
1000
1000
1000
1000
1000
1000
1000
1000
1000
1000
1000
1000
# 4
250 215 263 272
261 512 205 22
546 155 294 5
582 98 250 70
249 311 324 116
499 144 256 101
449 219 159 173
616 160 174 50
582 93 283 42
580 154 235 31
463 177 269 91
446 190 266 98
508 63 349 80
496 239 122 143
463 288 195 54
# 1
1000
1000
1000
1000
1000
1000
1000
1000
1000
1000
1000
1000
1000
1000
542 176 259 26
609 96 158 140
223 336 296 148
450 200 256 97
378 296 218 111
530 269 183 21
549 132 293 29
# 4
250 215 263 272
261 512 205 22
546 155 294 5
582 98 250 70
249 311 324 116
499 144 256 101
449 219 159 173
616 160 174 50
582 93 283 42
580 154 235 31
463 177 269 91
446 190 266 98
508 63 349 80
496 239 122 143
463 288 195 54
541 175 258 26
613 94 154 139
221 336 293 150
448 201 257 94
374 299 215 112
526 273 181 20
542 135 295 28
7214e55ee67696bf25910e55f5bc743e RestartTest-2.lbal
dd970ac026322f45b9aed82840760e98 RestartTest-2.lbal
6841e2aa6838d7e095e772fa4140e3a3 RestartTest-2.out
57c4ab6bdc9b6c5e4a4145d86f3c73cf RestartTest-2.out
c5afb2cbd42d6605fb5587107f8814ea RestartTest-2.stat
2a1e005dd0bd3d252854f989462b4466 RestartTest-2.stat
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