Commit aaa608ed authored by snuverink_j's avatar snuverink_j

Merge branch 'OPAL-maps' into 'master'

Opal maps

See merge request !2
parents b71af7bb 9fbeeabf
......@@ -16,6 +16,9 @@
*_Monitors.stat
*_3D.opal
# For OPAL-maps
*.dispersion
*.map
RegressionTests/*/*-RT.o
RegressionTests/*/*.lbal
......@@ -59,6 +62,10 @@ RegressionTests/HKick-Test-1/HKick-Test-1.h5
RegressionTests/HKick-Test-2/HKick-Test-2.h5
RegressionTests/Kick-Test-1/Kick-Test-1.h5
RegressionTests/LaserEmission-1/LaserEmission-1.h5
RegressionTests/MAP-Circular/MAP-Circular.h5
RegressionTests/MAP-FODO/MAP-FODO.h5
RegressionTests/MAP-FODODipole/MAP-FODODipole.h5
RegressionTests/MAP-Gantry2/MAP-Gantry2.h5
RegressionTests/OpalRingTest/OpalRingTest-trackOrbit.dat
RegressionTests/OpalRingTest/OpalRingTest.h5
RegressionTests/OpalRingTest/PROBE1.hist
......
This diff is collapsed.
#!/bin/bash
timeout 300 mpirun -np 1 $OPAL_EXE_PATH/opal MAP-Circular.in --warn 0 2>&1
"MAP test with FODO lattice"
stat "mean_x" last 1E-9
stat "mean_y" last 1E-9
stat "mean_s" last 1E-9
#!/bin/bash
#$ -cwd
#$ -j y
#$ -pe orte 4
#$ -N MAP-Circular-RT
#$ -v LD_LIBRARY_PATH,OPAL_EXE_PATH,OPENMPI,REG_TEST_DIR
MACHINE_FILE=$TMPDIR/machinefile
awk '/^merlin/ {print $1" slots="$2}' $PE_HOSTFILE > $MACHINE_FILE
cp $MACHINE_FILE machinefile.last
cd $REG_TEST_DIR
OPAL="$OPAL_EXE_PATH/opal MAP-Circular.in --commlib mpi --info 3 --warn 0 2>&1"
CMD="$OPENMPI/bin/mpirun -x LD_LIBRARY_PATH -machinefile $MACHINE_FILE -np $NSLOTS $OPAL "
$CMD
This diff is collapsed.
This diff is collapsed.
646b4f56f4922e3e9968440aa437ce74 MAP-Circular.lbal
This diff is collapsed.
42d3d7b378b36ffe4e06d4d0d5d74d2a MAP-Circular.out
This diff is collapsed.
5377cd8b81dc4638e6913687b8b36860 MAP-Circular.stat
OPTION, ECHO=FALSE;
OPTION, INFO=TRUE;
Option, PSDUMPFREQ=1;
Option, SPTDUMPFREQ = 50;
Option, STATDUMPFREQ=1;
OPTION, VERSION=10900;
TITLE, STRING="FODO Test";
REAL Edes = 0.10;
REAL gamma = (Edes+PMASS)/PMASS;
REAL beta = sqrt(1-(1/gamma^2));
REAL gambet = gamma*beta;
REAL P0 = gamma*beta*PMASS;
REAL brho = (PMASS*1.0e9*gambet) / CLIGHT;
REAL rf = 50.6328e6; //need to be confirmed
VALUE,{gamma,brho,Edes,beta,gambet};
D1: DRIFT, L=1., ELEMEDGE=0.000, NSLICES=10;
QP1: QUADRUPOLE, L=0.3, K1= 8.64195, ELEMEDGE=1.000, NSLICES=15;
DG1: DRIFT, L=0.3, ELEMEDGE=1.300, NSLICES=10;
QP2: QUADRUPOLE, L=0.3, K1=-11.57456,ELEMEDGE=1.600, NSLICES=15;
DG2: DRIFT, L=0.3, ELEMEDGE=1.900, NSLICES=10;
QP3: QUADRUPOLE, L=0.3, K1= 8.64195, ELEMEDGE=2.200, NSLICES=15;
D3: DRIFT, L=.9, ELEMEDGE=2.500, NSLICES=5;
D4: DRIFT, L=.3, ELEMEDGE=3.400, NSLICES=20;
QUADTEST: LINE=( D1, QP1 , DG1, QP2, DG2, QP3, D3, D4);
DIST1: DISTRIBUTION, TYPE=GAUSS,
SIGMAX = 0, SIGMAPX = 1.0e06, CORRX = 0.0,
SIGMAY = 0, SIGMAPY = 1.0e06, CORRY = 0.0,
OFFSETZ = 0.005, SIGMAT = 0.0005,
SIGMAPT= 0.0, CORRT= 0.0, R61= 0.0,
INPUTMOUNITS=EV, WRITETOFILE= TRUE;
DIST: DISTRIBUTION, TYPE = FROMFILE, FNAME="data/FODO_DIST.dat"; //FNAME="PartDatabase.dat";
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;
BEAM1: BEAM, PARTICLE=PROTON, PC=P0, NPART=200, BCURRENT=2.0e-03, BFREQ=rf, CHARGE=1;
SELECT, LINE=QUADTEST;
TRACK, LINE= QUADTEST, BEAM=BEAM1, MAXSTEPS=10000, DT=1.0e-10, ZSTOP=4.0, MAP_ORDER=2;
RUN, METHOD = "THICK", BEAM=BEAM1, FIELDSOLVER=FS1, DISTRIBUTION=DIST;
ENDTRACK;
STOP;
#!/bin/bash
timeout 300 mpirun -np 1 $OPAL_EXE_PATH/opal MAP-FODO.in --warn 0 2>&1
"MAP test with FODO lattice"
stat "mean_x" last 1E-9
stat "mean_y" last 1E-9
stat "mean_s" last 1E-9
#!/bin/bash
#$ -cwd
#$ -j y
#$ -pe orte 4
#$ -N MAP-FODO-RT
#$ -v LD_LIBRARY_PATH,OPAL_EXE_PATH,OPENMPI,REG_TEST_DIR
MACHINE_FILE=$TMPDIR/machinefile
awk '/^merlin/ {print $1" slots="$2}' $PE_HOSTFILE > $MACHINE_FILE
cp $MACHINE_FILE machinefile.last
cd $REG_TEST_DIR
OPAL="$OPAL_EXE_PATH/opal MAP-FODO.in --commlib mpi --info 3 --warn 0 2>&1"
CMD="$OPENMPI/bin/mpirun -x LD_LIBRARY_PATH -machinefile $MACHINE_FILE -np $NSLOTS $OPAL "
$CMD
This diff is collapsed.
SDDS1
&description
text="Processor statistics 'MAP-FODO.in' 19/09/201814:08:22",
contents="stat parameters"
&end
&parameter
name=processors,
type=long,
description="Number of Cores used"
&end
&parameter
name=revision,
type=string,
description="git revision of opal"
&end
&parameter
name=flavor,
type=string,
description="OPAL flavor that wrote file"
&end
&column
name=t,
type=double,
units=ns,
description="1 Time"
&end
&column
name=processor-0,
type=long,
units=1,
description="2 Number of particles of processor 0"
&end
&data
mode=ascii,
no_row_counts=1
&end
1
OPAL 2.0.0 git rev. #9e63da24f252b4259ec9217a276216e63f2af8f4
opal-env
0.000000000000000e+00 200
7.789834549705712e-01 200
1.557966909941142e+00 200
2.336950364911714e+00 200
3.115933819882285e+00 200
3.894917274852855e+00 200
4.673900729823426e+00 200
5.452884184793997e+00 200
6.231867639764568e+00 200
7.010851094735139e+00 200
7.789834549705710e+00 200
7.945631240699824e+00 200
8.101427931693937e+00 200
8.257224622688051e+00 200
8.413021313682165e+00 200
8.568818004676279e+00 200
8.724614695670393e+00 200
8.880411386664507e+00 200
9.036208077658619e+00 200
9.192004768652733e+00 200
9.347801459646847e+00 200
9.503598150640961e+00 200
9.659394841635075e+00 200
9.815191532629189e+00 200
9.970988223623301e+00 200
1.012678491461742e+01 200
1.036047995110859e+01 200
1.059417498759976e+01 200
1.082787002409093e+01 200
1.106156506058210e+01 200
1.129526009707327e+01 200
1.152895513356444e+01 200
1.176265017005561e+01 200
1.199634520654679e+01 200
1.223004024303796e+01 200
1.246373527952913e+01 200
1.261953197052324e+01 200
1.277532866151736e+01 200
1.293112535251147e+01 200
1.308692204350558e+01 200
1.324271873449970e+01 200
1.339851542549381e+01 200
1.355431211648792e+01 200
1.371010880748204e+01 200
1.386590549847615e+01 200
1.402170218947027e+01 200
1.417749888046438e+01 200
1.433329557145849e+01 200
1.448909226245261e+01 200
1.464488895344672e+01 200
1.480068564444083e+01 200
1.503438068093201e+01 200
1.526807571742318e+01 200
1.550177075391435e+01 200
1.573546579040552e+01 200
1.596916082689669e+01 200
1.620285586338786e+01 200
1.643655089987903e+01 200
1.667024593637020e+01 200
1.690394097286138e+01 200
1.713763600935255e+01 200
1.729343270034666e+01 200
1.744922939134078e+01 200
1.760502608233489e+01 200
1.776082277332901e+01 200
1.791661946432313e+01 200
1.807241615531724e+01 200
1.822821284631135e+01 200
1.838400953730547e+01 200
1.853980622829959e+01 200
1.869560291929370e+01 200
1.885139961028782e+01 200
1.900719630128193e+01 200
1.916299299227605e+01 200
1.931878968327016e+01 200
1.947458637426428e+01 200
2.087675659321131e+01 200
2.227892681215834e+01 200
2.368109703110536e+01 200
2.508326725005239e+01 200
2.648543746899942e+01 200
2.660228498724500e+01 200
2.671913250549059e+01 200
2.683598002373618e+01 200
2.695282754198176e+01 200
2.706967506022735e+01 200
2.718652257847293e+01 200
2.730337009671852e+01 200
2.742021761496411e+01 200
2.753706513320969e+01 200
2.765391265145528e+01 200
2.777076016970086e+01 200
2.788760768794645e+01 200
2.800445520619203e+01 200
2.812130272443762e+01 200
2.823815024268320e+01 200
2.835499776092879e+01 200
2.847184527917437e+01 200
2.858869279741996e+01 200
2.870554031566555e+01 200
2.882238783391113e+01 200
3.115933819882285e+01 200
b6829a8c29f3e67d39e08b46f0c55612 MAP-FODO.lbal
This source diff could not be displayed because it is too large. You can view the blob instead.
8a0d79ed01c03a5fa6edec4e0ddc5504 MAP-FODO.out
This source diff could not be displayed because it is too large. You can view the blob instead.
8398f12819178d49ed3b6432530f153f MAP-FODO.stat
OPTION, ECHO=FALSE;
OPTION, INFO=TRUE;
Option, PSDUMPFREQ=1;
Option, SPTDUMPFREQ = 50;
Option, STATDUMPFREQ=1;
OPTION, VERSION=10900;
TITLE, STRING="MAP Test";
REAL Edes = 1.-EMASS;
REAL gamma = (Edes+EMASS)/EMASS;
REAL beta = sqrt(1-(1/gamma^2));
REAL gambet = gamma*beta;
REAL P0 = gamma*beta*EMASS;
REAL brho = -(EMASS*1.0e9*gambet) / CLIGHT;
REAL rf = 50.6328e6; //need to be confirmed
VALUE,{gamma,brho,Edes,beta,gambet};
Qf: QUADRUPOLE, L=0.2, K1= -10.940900894055508, ELEMEDGE=0.0, NSLICES=10;
D1: DRIFT, L=0.5, ELEMEDGE=0.2, NSLICES=5 ;
Sb1: SBEND, K0= -2.3287040424894165, L=0.9798157487421315, ELEMEDGE=0.7,
//0.99968272,
FMAPFN="data/HardEdge.t7",
DESIGNENERGY=Edes*1e3, GAP=75*2/1000, NSLICES=20;
D2: DRIFT, L=0.5, ELEMEDGE=1.7, NSLICES=5 ;
Qd: QUADRUPOLE, L=0.2, K1= 11.040970109549919, ELEMEDGE=2.2, NSLICES=10;
D3: DRIFT, L=0.5, ELEMEDGE=2.4, NSLICES=20 ;
Sb2: SBEND, K0= -2.3287040424894165, L=0.9798157487421315, ELEMEDGE=2.9,
FMAPFN="data/HardEdge.t7",
DESIGNENERGY=Edes*1e3, GAP=75*2/1000, NSLICES=20;
D4: DRIFT, L=.5, ELEMEDGE=3.9, NSLICES=5 ;
//beamline = [Qf, D, Sb, D, Qd, D, Sb, D]
FODOCELL: LINE=(Qf, D1,Sb1, D2, Qd, D3, Sb2, D4);
REAL emit = 2*1e-3;
DIST1: DISTRIBUTION, TYPE=GAUSS,
SIGMAX= 7.112474638*emit, SIGMAPX= 0.9137370817117192*emit, CORRX= -2.344980132*emit,
SIGMAY= 1.3592143*emit, SIGMAPY= 0.9320892051315421*emit, CORRY= 0.5166323417*emit,
OFFSETZ = 0.005, SIGMAT= 0.0005,
SIGMAPT= 0.0, CORRT= 0.0, R61= 0.0, INPUTMOUNITS=EV, WRITETOFILE=TRUE;
DIST: DISTRIBUTION, TYPE = FROMFILE, FNAME= "data/FODODipole_DIST.dat";
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;
BEAM1: BEAM, PARTICLE=ELECTRON, PC=P0, NPART=200, BCURRENT=2.0e-03, BFREQ=rf, CHARGE=-1;
SELECT, LINE=FODOCELL;
TRACK, LINE= FODOCELL, BEAM=BEAM1, MAXSTEPS=10000, DT=1.0e-10, ZSTOP=4.4, MAP_ORDER=2;
RUN, METHOD = "THICK", BEAM=BEAM1, FIELDSOLVER=FS1, DISTRIBUTION=DIST;
ENDTRACK;
STOP;
#!/bin/bash
timeout 300 mpirun -np 1 $OPAL_EXE_PATH/opal MAP-FODODipole.in --warn 0 2>&1
"MAP test with FODO and Dipole lattice"
stat "mean_x" last 1E-9
stat "mean_y" last 1E-9
stat "mean_s" last 1E-9
#!/bin/bash
#$ -cwd
#$ -j y
#$ -pe orte 4
#$ -N MAP-FODODipole-RT
#$ -v LD_LIBRARY_PATH,OPAL_EXE_PATH,OPENMPI,REG_TEST_DIR
MACHINE_FILE=$TMPDIR/machinefile
awk '/^merlin/ {print $1" slots="$2}' $PE_HOSTFILE > $MACHINE_FILE
cp $MACHINE_FILE machinefile.last
cd $REG_TEST_DIR
OPAL="$OPAL_EXE_PATH/opal MAP-FODODipole.in --commlib mpi --info 3 --warn 0 2>&1"
CMD="$OPENMPI/bin/mpirun -x LD_LIBRARY_PATH -machinefile $MACHINE_FILE -np $NSLOTS $OPAL "
$CMD
This diff is collapsed.
1DProfile1 0 0 0.02
0.0 -0.000000005 0.00000001 3
0.0 -0.000000005 0.00000001 3
-99.9
-99.9
SDDS1
&description
text="Processor statistics 'MAP-FODODipole.in' 19/09/201814:19:46",
contents="stat parameters"
&end
&parameter
name=processors,
type=long,
description="Number of Cores used"
&end
&parameter
name=revision,
type=string,
description="git revision of opal"
&end
&parameter
name=flavor,
type=string,
description="OPAL flavor that wrote file"
&end
&column
name=t,
type=double,
units=ns,
description="1 Time"
&end
&column
name=processor-0,
type=long,
units=1,
description="2 Number of particles of processor 0"
&end
&data
mode=ascii,
no_row_counts=1
&end
1
OPAL 2.0.0 git rev. #9e63da24f252b4259ec9217a276216e63f2af8f4
opal-env
0.000000000000000e+00 200
6.671282774965431e-02 200
1.334256554993086e-01 200
2.001384832489629e-01 200
2.668513109986173e-01 200
3.335641387482716e-01 200
4.002769664979259e-01 200
4.669897942475802e-01 200
5.337026219972345e-01 200
6.004154497468888e-01 200
6.671282774965431e-01 200
1.000692416244815e+00 200
1.334256554993086e+00 200
1.667820693741358e+00 200
2.001384832489630e+00 200
2.334948971237901e+00 200
2.501731040612037e+00 200
2.668513109986173e+00 200
2.835295179360308e+00 200
3.002077248734444e+00 200
3.168859318108580e+00 200
3.335641387482716e+00 200
3.502423456856851e+00 200
3.669205526230987e+00 200
3.835987595605123e+00 200
4.002769664979259e+00 200
4.169551734353394e+00 200
4.336333803727531e+00 200
4.503115873101666e+00 200
4.669897942475802e+00 200
4.836680011849937e+00 200
5.003462081224074e+00 200
5.170244150598209e+00 200
5.337026219972345e+00 200
5.503808289346480e+00 200
5.670590358720617e+00 200
6.004154497468888e+00 200
6.337718636217160e+00 200
6.671282774965430e+00 200
7.004846913713702e+00 200
7.338411052461973e+00 200
7.405123880211627e+00 200
7.471836707961280e+00 200
7.538549535710935e+00 200
7.605262363460588e+00 200
7.671975191210243e+00 200
7.738688018959897e+00 200
7.805400846709551e+00 200
7.872113674459205e+00 200
7.938826502208858e+00 200
8.005539329958513e+00 200
8.088930364645581e+00 200
8.172321399332649e+00 200
8.255712434019717e+00 200
8.339103468706785e+00 200
8.422494503393853e+00 200
8.505885538080923e+00 200
8.589276572767991e+00 200
8.672667607455059e+00 200
8.756058642142127e+00 200
8.839449676829195e+00 200
8.922840711516264e+00 200
9.006231746203332e+00 200
9.089622780890400e+00 200
9.173013815577468e+00 200
9.256404850264536e+00 200
9.339795884951606e+00 200
9.423186919638674e+00 200
9.506577954325742e+00 200
9.589968989012810e+00 200
9.673360023699878e+00 200
9.840142093074013e+00 200
1.000692416244815e+01 200
1.017370623182228e+01 200
1.034048830119642e+01 200
1.050727037057055e+01 200
1.067405243994469e+01 200
1.084083450931882e+01 200
1.100761657869296e+01 200
1.117439864806709e+01 200
1.134118071744123e+01 200
1.150796278681536e+01 200
1.167474485618950e+01 200
1.184152692556363e+01 200
1.200830899493777e+01 200
1.217509106431190e+01 200
1.234187313368604e+01 200
1.250865520306017e+01 200
1.267543727243431e+01 200
1.284221934180844e+01 200
1.300900141118258e+01 200
1.334256554993085e+01 200
1.367612968867912e+01 200
1.400969382742739e+01 200
1.434325796617566e+01 200
1.467682210492393e+01 200
82af9fc71a688e0192a086bf93c47f0e MAP-FODODipole.lbal
This source diff could not be displayed because it is too large. You can view the blob instead.
f03cb3e64815a25be02ad29516e6fbd6 MAP-FODODipole.out
This source diff could not be displayed because it is too large. You can view the blob instead.
92ced6b50cfbbbecc7614842d4e0cc00 MAP-FODODipole.stat
This diff is collapsed.
#!/bin/bash
timeout 300 mpirun -np 1 $OPAL_EXE_PATH/opal MAP-Gantry2.in --warn 0 2>&1
"MAP test with Gantry 2 lattice"
stat "mean_x" last 1E-9
stat "mean_y" last 1E-9
stat "mean_s" last 1E-9
#!/bin/bash
#$ -cwd
#$ -j y
#$ -pe orte 4
#$ -N MAP-Gantry2-RT
#$ -v LD_LIBRARY_PATH,OPAL_EXE_PATH,OPENMPI,REG_TEST_DIR
MACHINE_FILE=$TMPDIR/machinefile
awk '/^merlin/ {print $1" slots="$2}' $PE_HOSTFILE > $MACHINE_FILE
cp $MACHINE_FILE machinefile.last
cd $REG_TEST_DIR
OPAL="$OPAL_EXE_PATH/opal MAP-Gantry2.in --commlib mpi --info 3 --warn 0 2>&1"
CMD="$OPENMPI/bin/mpirun -x LD_LIBRARY_PATH -machinefile $MACHINE_FILE -np $NSLOTS $OPAL "
$CMD
This source diff could not be displayed because it is too large. You can view the blob instead.
1DProfile1 0 0 0.02
0.0 -0.000000005 0.00000001 3
0.0 -0.000000005 0.00000001 3
-99.9
-99.9
This diff is collapsed.
39e05f3cbafc6ae389892f0a316a138b MAP-Gantry2.lbal
This diff is collapsed.
5917a7b43d71fa19509aad569a88fa70 MAP-Gantry2.out
This diff is collapsed.
9ce8b53b8538b709b5f167adaba6fb83 MAP-Gantry2.stat
......@@ -19,6 +19,10 @@ tests+=('Elliptic-1')
tests+=('ExternalFieldTest')
tests+=('HKick-Test-1')
tests+=('Kick-Test-1')
tests+=('MAP-Circular')
tests+=('MAP-FODO')
tests+=('MAP-FODODipole')
tests+=('MAP-Gantry2')
#tests+=('OpalRingTest')
tests+=('PROSCAN-1')
tests+=('PROSCAN-2')
......
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