.gitignore

@@ -83,11 +83,11 @@
 */MAP-Gantry2/MAP-Gantry2.h5
 */OpalRingTest/OpalRingTest-trackOrbit.dat
 */OpalRingTest/OpalRingTest.h5
-*/OpalRingTest/PROBE1.hist
-*/OpalRingTest/PROBE1.loss
-*/OpalRingTest/PROBE1.loss
-*/OpalRingTest/PROBE1.peaks
-*/OpalRingTest/RINGDEF.loss
+*/OpalRingTest/1.hist
+*/OpalRingTest/OUTPUT1.loss
+*/OpalRingTest/OUTPUT2.loss
+*/OpalRingTest/*.peaks
+*/OpalRingTest/*.hist
 */OpalRingTest/RINGDEF.loss
 */P3MSwissFEL/P3MSwissFEL.h5
 */PROSCAN-1/PROSCAN-1.h5

DisabledTests/OpalRingTest/data/beam.dat

-12
-0.000 0.00 0.000 0.00 0.00 0.00
-0.001 0.00 0.000 0.00 0.00 0.00
-0.010 0.00 0.000 0.00 0.00 0.00
-0.100 0.00 0.000 0.00 0.00 0.00
-0.120 0.00 0.000 0.00 0.00 0.00
-0.150 0.00 0.000 0.00 0.00 0.00
-0.000 0.00 0.00 0.00 0.001 0.00
-0.000 0.00 0.00 0.00 0.010 0.00
-0.000 0.00 0.00 0.00 0.020 0.00
-0.000 0.00 0.00 0.00 0.030 0.00
-0.000 0.00 0.00 0.00 0.040 0.00
-0.000 0.00 0.00 0.00 0.050 0.00

DisabledTests/OpalRingTest/reference/PROBE1.loss.md5

-d804bc2796298f9e223a4eeadd394df5  PROBE1.loss

DisabledTests/OpalRingTest/OpalRingTest.in → RegressionTests/OpalRingTest/OpalRingTest.in

@@ -3,7 +3,6 @@
 //////////////////////////////////////////////////////////////////////////////
 Title,string="ERIT test simulation using OPAL code";
 Option, ASCIIDUMP=TRUE;
-OPTION, PSDUMPFREQ=100000;
 Option, VERSION=10900;
 
 REAL Edes=0.011;
@@ -14,7 +13,7 @@ REAL beta = p_tot/e_tot;
 REAL gambet = gamma*beta;
 REAL P0 = gamma*beta*PMASS;
 REAL brho = (PMASS*1.0e9*gambet) / CLIGHT;
-REAL x_closed_orbit = 2349.008;
+REAL x_closed_orbit = 2.349008;
 
 // print to terminal
 value,{gamma,brho,Edes,beta,gambet,x_closed_orbit};
@@ -23,25 +22,27 @@ REAL n_turns=100.0;
 REAL revolution_period=327;
 
 REAL step_size=0.1; // ns
-REAL max_steps=n_turns*revolution_period/step_size;
 REAL steps_per_turn=revolution_period/step_size;
 REAL frequency=6000/revolution_period;
+REAL max_steps=10*steps_per_turn;
+OPTION, PSDUMPFREQ=steps_per_turn;
 
 value,{n_turns,revolution_period,step_size,frequency};
 
-Probe1: PROBE, xstart=0, xend=+4000., ystart=0, yend=0.;
+output1: PROBE, xstart=0, xend=+4000.0, ystart=0.0, yend=0.0;
+output2: PROBE, xstart=0, xend=+4000.0, ystart=100.0, yend=100.0;
 
-ringdef: RINGDEFINITION, HARMONIC_NUMBER=6, LAT_RINIT=2350.0, LAT_PHIINIT=0.0,
+ringdef: RINGDEFINITION, HARMONIC_NUMBER=6, LAT_RINIT=2.35, LAT_PHIINIT=0.0,
          LAT_THETAINIT=0.0, BEAM_PHIINIT=0.0, BEAM_PRINIT=0.0,
          BEAM_RINIT=x_closed_orbit, SYMMETRY=8.0, RFFREQ=frequency, IS_CLOSED=true;
 
-triplet: SBEND3D, FMAPFN="OpalRingTest.field", LENGTH_UNITS=10., FIELD_UNITS=1e-3;
+triplet: SBEND3D, FMAPFN="OpalRingTest.field", LENGTH_UNITS=10., FIELD_UNITS=-1;
 
-l1: Line = (ringdef, probe1, triplet);
+l1: Line = (ringdef, output1, output2, triplet);
 
 Dist1: DISTRIBUTION, TYPE=fromfile, FNAME="beam.dat", INPUTMOUNITS=NONE;
 
-Fs1:FIELDSOLVER, FSTYPE=FFT, MX=2, MY=2, MT=2,
+Fs1:FIELDSOLVER, FSTYPE=NONE, MX=2, MY=2, MT=2,
 		 PARFFTX=true, PARFFTY=true, PARFFTT=false,
 		 BCFFTX=open, BCFFTY=open, BCFFTT=open,BBOXINCR=2;
 

DisabledTests/OpalRingTest/OpalRingTest.local → RegressionTests/OpalRingTest/OpalRingTest.local

 #!/bin/bash
 
 cd "$(dirname "$(readlink -nf "$0")")"
-timeout 300 mpirun -np 1 "$OPAL_EXE_PATH/opal" OpalRingTest.in "$@" 2>&1
+mpirun -np 1 "${OPAL_EXE_PATH}/opal" OpalRingTest.in --info 2 "$@" 2>&1

DisabledTests/OpalRingTest/OpalRingTest.rt → RegressionTests/OpalRingTest/OpalRingTest.rt

 "One hundred turn RK-4 tracking in ERIT FFAG using SBend3D; no space charge"
-PROBE1.loss "x" all 1E-8
-PROBE1.loss "y" all 1E-8
+OUTPUT1.loss "x" all 1E-8
+OUTPUT1.loss "y" all 1E-8
+OUTPUT2.loss "x" all 1E-8
+OUTPUT2.loss "y" all 1E-8

RegressionTests/OpalRingTest/reference/OUTPUT1.loss.md5

+f891e6db3ceeb997dec9ebf5d863de12  OUTPUT1.loss

RegressionTests/OpalRingTest/reference/OUTPUT2.loss.md5

+344059c298909506816c34b476a0c5b4  OUTPUT2.loss