From 54ab82121c4e141798b93dec10b91679bc70126e Mon Sep 17 00:00:00 2001
From: Christof Kraus <christof.j.kraus@gmail.com>
Date: Mon, 14 Jun 2021 13:57:33 +0200
Subject: [PATCH] fix input files after implementing issue OPAL/src#495
---
.../ExternalFieldTest/ExternalFieldTest.in | 12 ++++++------
.../GasStripping/reference/GasStripping.lbal.md5 | 2 +-
.../GasStripping/reference/GasStripping.out.md5 | 2 +-
.../GasStripping/reference/GasStripping.stat.md5 | 2 +-
RegressionTests/RestartTest-2/RestartTest-2.in | 10 +++++-----
RegressionTests/RingCyclotron/RingCyclotron.in | 8 ++++----
RegressionTests/RingCyclotronMTS/RingCyclotronMTS.in | 8 ++++----
.../RingCyclotronMatched/RingCyclotronMatched.in | 10 +++++-----
RegressionTests/VFFA-1/VFFA-1.in | 5 ++---
RegressionTests/opalimpact-1/opalimpact-1.in | 8 ++++----
10 files changed, 33 insertions(+), 34 deletions(-)
diff --git a/RegressionTests/ExternalFieldTest/ExternalFieldTest.in b/RegressionTests/ExternalFieldTest/ExternalFieldTest.in
index 76229772..1612d732 100644
--- a/RegressionTests/ExternalFieldTest/ExternalFieldTest.in
+++ b/RegressionTests/ExternalFieldTest/ExternalFieldTest.in
@@ -24,13 +24,13 @@ FINSS_RGUN: RFCavity, L = 0.34986, VOLT = 100.0, FMAPFN = "CTF3_Ez_ASTRA.opal",
ELEMEDGE =0.0, TYPE = "STANDING", FREQ = BF,
LAG = FINSS_RGUN_phi, APVETO=TRUE; // -(14.0/180.0*PI);
-FIND1_MSOL10: Solenoid, L = 0.6, KS = 0.206, FMAPFN = "NEW_SINGLE_SOL_NOFRINGE_ASTRA.opal", ELEMEDGE = 0.3;
+FIND1_MSOL010: Solenoid, L = 0.6, KS = 0.206, FMAPFN = "NEW_SINGLE_SOL_NOFRINGE_ASTRA.opal", ELEMEDGE = 0.3;
FIND1_MQ10: Quadrupole, L=0.1, K1= 0.0, ELEMEDGE=1.38;
FIND1_MQ20: Quadrupole, L=0.1, K1= 0.0, ELEMEDGE=1.56;
FIND1_MQ30: Quadrupole, L=0.1, K1= 0.0, ELEMEDGE=1.74;
-Injector: Line = (CATHODE, FINSS_RGUN, FIND1_MSOL10, FIND1_MQ10, FIND1_MQ20, FIND1_MQ30);
+Injector: Line = (CATHODE, FINSS_RGUN, FIND1_MSOL010, FIND1_MQ10, FIND1_MQ20, FIND1_MQ30);
// L-Band Structure starts here
// 40 cells in 2\pi/3 mode at 1.5 GHz (rfdata[1-4]); with 4 solenoids on top (1T6.T7)
@@ -55,7 +55,7 @@ FINLB02: Line = (FINLB02_RAC,
FINLB02_MSLAC30,
FINLB02_MSLAC40);
-l1: Line = (Injector,FINLB02);
+line1: Line = (Injector,FINLB02);
/*
We can specity ONE distribution
@@ -92,9 +92,9 @@ Fs1:FIELDSOLVER, FSTYPE=None, MX=16, MY=16, MT=128,
beam1: BEAM, PARTICLE=ELECTRON, pc=P0, NPART=1e3, BFREQ=1498.953425154, BCURRENT=0.032912, CHARGE=-1;
-Select, Line=l1;
+Select, Line=line1;
-track,line=l1, beam=beam1, ZSTOP=5.0, MAXSTEPS=14226, DT=1.0e-11;
+track,line=line1, beam=beam1, ZSTOP=5.0, MAXSTEPS=14226, DT=1.0e-11;
run, method = "PARALLEL-T", beam=beam1, fieldsolver=Fs1, distribution=Dist1;
endtrack;
-Stop;
\ No newline at end of file
+Stop;
diff --git a/RegressionTests/GasStripping/reference/GasStripping.lbal.md5 b/RegressionTests/GasStripping/reference/GasStripping.lbal.md5
index d56cdb46..3ca5b55d 100644
--- a/RegressionTests/GasStripping/reference/GasStripping.lbal.md5
+++ b/RegressionTests/GasStripping/reference/GasStripping.lbal.md5
@@ -1 +1 @@
-cda927a0c45bc3084367fec69b5766f7 GasStripping.lbal
+f4b758633a19387144493daba1f63b9e GasStripping.lbal
diff --git a/RegressionTests/GasStripping/reference/GasStripping.out.md5 b/RegressionTests/GasStripping/reference/GasStripping.out.md5
index e46db3b0..427edeec 100644
--- a/RegressionTests/GasStripping/reference/GasStripping.out.md5
+++ b/RegressionTests/GasStripping/reference/GasStripping.out.md5
@@ -1 +1 @@
-7711375ec985a82f7c4a411c436d30a8 GasStripping.out
+eda6c9280bfd70d6f828dce91cb95447 GasStripping.out
diff --git a/RegressionTests/GasStripping/reference/GasStripping.stat.md5 b/RegressionTests/GasStripping/reference/GasStripping.stat.md5
index 5dbda034..0ac89f83 100644
--- a/RegressionTests/GasStripping/reference/GasStripping.stat.md5
+++ b/RegressionTests/GasStripping/reference/GasStripping.stat.md5
@@ -1 +1 @@
-c2498b7acedc5b54d2b33962316eea1b GasStripping.stat
+dedbbdc29df47c58995b992ec86791fe GasStripping.stat
diff --git a/RegressionTests/RestartTest-2/RestartTest-2.in b/RegressionTests/RestartTest-2/RestartTest-2.in
index acd57376..3f66c54a 100644
--- a/RegressionTests/RestartTest-2/RestartTest-2.in
+++ b/RegressionTests/RestartTest-2/RestartTest-2.in
@@ -35,7 +35,7 @@ REAL nstep = 320;
REAL frequency=50.650;
REAL frequency3=3.0*frequency;
-ring: Cyclotron, TYPE="RING", CYHARMON=6, PHIINIT=0.0,
+ringCyclotron: Cyclotron, TYPE="RING", CYHARMON=6, PHIINIT=0.0,
PRINIT=-0.000174, RINIT=2130.0, SYMMETRY=8.0, RFFREQ=frequency,
FMAPFN="s03av.nar";
@@ -59,7 +59,7 @@ rf4: RFCavity, VOLT=volt1st, FMAPFN="Cav1.dat", TYPE="SINGLEGAP",
FREQ=frequency, RMIN = 1900.0, RMAX = 4500.0, ANGLE=305.0, PDIS = 416.0,
GAPWIDTH = 220.0, PHI0=phi05;
-l1: Line = (ring,rf0,rf1,rf2,rf3,rf4);
+line1: Line = (ringCyclotron,rf0,rf1,rf2,rf3,rf4);
Dist1:DISTRIBUTION, TYPE=gauss,
sigmax = 2.0e-03,
@@ -78,10 +78,10 @@ Fs1:FIELDSOLVER, FSTYPE=FFT, MX=8, MY=8, MT=8,
beam1: BEAM, PARTICLE=PROTON, pc=P0, NPART=1e3, BCURRENT=1.0E-3, CHARGE=1.0, BFREQ= frequency;
-Select, Line=l1;
+Select, Line=line1;
-TRACK,LINE=l1, BEAM=beam1, MAXSTEPS=nstep*turns, STEPSPERTURN=nstep, TIMEINTEGRATOR="LF-2"; // "RK-4";
+TRACK,LINE=line1, BEAM=beam1, MAXSTEPS=nstep*turns, STEPSPERTURN=nstep, TIMEINTEGRATOR="LF-2"; // "RK-4";
run, method = "CYCLOTRON-T", beam=beam1, fieldsolver=Fs1, distribution=Dist1;
endtrack;
-Stop;
\ No newline at end of file
+Stop;
diff --git a/RegressionTests/RingCyclotron/RingCyclotron.in b/RegressionTests/RingCyclotron/RingCyclotron.in
index 84473b27..36ae19ef 100644
--- a/RegressionTests/RingCyclotron/RingCyclotron.in
+++ b/RegressionTests/RingCyclotron/RingCyclotron.in
@@ -35,7 +35,7 @@ REAL nstep=2000;
REAL frequency=50.650;
REAL frequency3=3.0*frequency;
-ring: Cyclotron, TYPE="RING", CYHARMON=6, PHIINIT=0.0,
+ringCyclotron: Cyclotron, TYPE="RING", CYHARMON=6, PHIINIT=0.0,
PRINIT=-0.000174, RINIT=2130.0, SYMMETRY=8.0, RFFREQ=frequency,
FMAPFN="s03av.nar";
@@ -59,7 +59,7 @@ rf4: RFCavity, VOLT=volt1st, FMAPFN="Cav1.dat", TYPE="SINGLEGAP",
FREQ=frequency, RMIN = 1900.0, RMAX = 4500.0, ANGLE=305.0, PDIS = 416.0,
GAPWIDTH = 220.0, PHI0=phi05;
-l1: Line = (ring,rf0,rf1,rf2,rf3,rf4);
+line1: Line = (ringCyclotron,rf0,rf1,rf2,rf3,rf4);
Dist1:DISTRIBUTION, TYPE=gauss,
sigmax = 2.0e-03,
@@ -78,9 +78,9 @@ Fs1:FIELDSOLVER, FSTYPE=FFT, MX=32, MY=32, MT=16,
beam1: BEAM, PARTICLE=PROTON, pc=P0, NPART=1e5, BCURRENT=1.0E-3, CHARGE=1.0, BFREQ= frequency;
-Select, Line=l1;
+Select, Line=line1;
-TRACK,LINE=l1, BEAM=beam1, MAXSTEPS=nstep*turns, STEPSPERTURN=nstep,TIMEINTEGRATOR="RK-4";
+TRACK,LINE=line1, BEAM=beam1, MAXSTEPS=nstep*turns, STEPSPERTURN=nstep,TIMEINTEGRATOR="RK-4";
run, method = "CYCLOTRON-T", beam=beam1, fieldsolver=Fs1, distribution=Dist1;
endtrack;
diff --git a/RegressionTests/RingCyclotronMTS/RingCyclotronMTS.in b/RegressionTests/RingCyclotronMTS/RingCyclotronMTS.in
index 3f9b76aa..b48c064c 100644
--- a/RegressionTests/RingCyclotronMTS/RingCyclotronMTS.in
+++ b/RegressionTests/RingCyclotronMTS/RingCyclotronMTS.in
@@ -36,7 +36,7 @@ REAL nstep=200;
REAL frequency=50.650;
REAL frequency3=3.0*frequency;
-ring: Cyclotron, TYPE="RING", CYHARMON=6, PHIINIT=0.0,
+ringCyclotron: Cyclotron, TYPE="RING", CYHARMON=6, PHIINIT=0.0,
PRINIT=-0.000174, RINIT=2130.0, SYMMETRY=8.0, RFFREQ=frequency,
FMAPFN="s03av.nar";
@@ -60,7 +60,7 @@ rf4: RFCavity, VOLT=volt1st, FMAPFN="Cav1.dat", TYPE="SINGLEGAP",
FREQ=frequency, RMIN = 1900.0, RMAX = 4500.0, ANGLE=305.0, PDIS = 416.0,
GAPWIDTH = 220.0, PHI0=phi05;
-l1: Line = (ring,rf0,rf1,rf2,rf3,rf4);
+line1: Line = (ringCyclotron,rf0,rf1,rf2,rf3,rf4);
Dist1:DISTRIBUTION, TYPE=gauss,
sigmax = 2.0e-03,
@@ -79,9 +79,9 @@ Fs1:FIELDSOLVER, FSTYPE=FFT, MX=32, MY=32, MT=16,
beam1: BEAM, PARTICLE=PROTON, pc=P0, NPART=1e5, BCURRENT=1.0E-3, CHARGE=1.0, BFREQ= frequency;
-Select, Line=l1;
+Select, Line=line1;
-TRACK,LINE=l1, BEAM=beam1, MAXSTEPS=nstep*turns, STEPSPERTURN=nstep,TIMEINTEGRATOR="MTS";
+TRACK,LINE=line1, BEAM=beam1, MAXSTEPS=nstep*turns, STEPSPERTURN=nstep,TIMEINTEGRATOR="MTS";
run, method = "CYCLOTRON-T", beam=beam1, fieldsolver=Fs1, distribution=Dist1;
endtrack;
diff --git a/RegressionTests/RingCyclotronMatched/RingCyclotronMatched.in b/RegressionTests/RingCyclotronMatched/RingCyclotronMatched.in
index 8e25a3d9..deff9347 100644
--- a/RegressionTests/RingCyclotronMatched/RingCyclotronMatched.in
+++ b/RegressionTests/RingCyclotronMatched/RingCyclotronMatched.in
@@ -37,7 +37,7 @@ REAL frequency=50.650;
REAL frequency3=3.0*frequency;
-ring: Cyclotron, TYPE="RING", CYHARMON=6, PHIINIT=26.0, PRINIT=-0.01550354, RINIT=2042.86,
+ringCyclotron: Cyclotron, TYPE="RING", CYHARMON=6, PHIINIT=26.0, PRINIT=-0.01550354, RINIT=2042.86,
SYMMETRY=8.0, RFFREQ=frequency, FMAPFN="s03av.nar", FMLOWE=0.072, FMHIGHE=0.590;
rf0: RFCavity, VOLT=volt1st, FMAPFN="Cav1.dat", TYPE="SINGLEGAP",
@@ -60,9 +60,9 @@ rf4: RFCavity, VOLT=volt1st, FMAPFN="Cav1.dat", TYPE="SINGLEGAP",
FREQ=frequency, RMIN = 1900.0, RMAX = 4500.0, ANGLE=305.0, PDIS = 416.0,
GAPWIDTH = 220.0, PHI0=phi05;
-l1: LINE = (ring,rf0,rf1,rf2,rf3,rf4);
+line1: LINE = (ringCyclotron,rf0,rf1,rf2,rf3,rf4);
-Dist1:DISTRIBUTION, TYPE=GAUSSMATCHED, LINE=l1, NSTEPS=nstep, SECTOR=FALSE, SCALABLE=TRUE,
+Dist1:DISTRIBUTION, TYPE=GAUSSMATCHED, LINE=line1, NSTEPS=nstep, SECTOR=FALSE, SCALABLE=TRUE,
RESIDUUM=1e-14, EX = 1.0e-06, EY = 1.0e-06, ET = 1.0e-06;
Fs1:FIELDSOLVER, FSTYPE=FFT, MX=32, MY=32, MT=32,
@@ -71,9 +71,9 @@ Fs1:FIELDSOLVER, FSTYPE=FFT, MX=32, MY=32, MT=32,
beam1: BEAM, PARTICLE=PROTON, pc=P0, NPART=1e5, BCURRENT=2.2E-3, CHARGE=1.0, BFREQ= frequency;
-Select, Line=l1;
+Select, Line=line1;
-TRACK,LINE=l1, BEAM=beam1, MAXSTEPS=nstep*turns, STEPSPERTURN=nstep,TIMEINTEGRATOR="RK-4";
+TRACK,LINE=line1, BEAM=beam1, MAXSTEPS=nstep*turns, STEPSPERTURN=nstep,TIMEINTEGRATOR="RK-4";
run, method = "CYCLOTRON-T", beam=beam1, fieldsolver=Fs1, distribution=Dist1;
endtrack;
diff --git a/RegressionTests/VFFA-1/VFFA-1.in b/RegressionTests/VFFA-1/VFFA-1.in
index be742686..f94fb31b 100644
--- a/RegressionTests/VFFA-1/VFFA-1.in
+++ b/RegressionTests/VFFA-1/VFFA-1.in
@@ -366,7 +366,6 @@ IF (DO_REF_PROBES) {
REAL REF_Y0 = (REF_PROBE_Y-REF_DY)*1000*sin(ANGLE);
REAL REF_Y1 = (REF_PROBE_Y+REF_DY)*1000*sin(ANGLE);
- ECHO,MESSAGE=NAME;
VALUE, VALUE={ANGLE, REF_X0, REF_X1, REF_Y0, REF_Y1};
NAME: PROBE, xstart=REF_X0, xend=REF_X1, ystart=REF_Y0, yend=REF_Y1;
@@ -397,7 +396,7 @@ ringdef: RINGDEFINITION, HARMONIC_NUMBER=1, LAT_RINIT=R0, LAT_PHIINIT=LAT_PHI_IN
MIN_R=0., MAX_R=40;
// magnet_d_placement_in, magnet_d_placement_out,
cell: Line = (d_single, d_half_cell_drift, f_single, f_half_cell_drift);
-l1: Line = (ringdef, ringprobe, refprobe, f_test,
+line1: Line = (ringdef, ringprobe, refprobe, f_test,
cell, cell, cell, cell, cell,
cell, cell, cell, cell, cell,
cell, cell, cell, cell, cell
@@ -421,7 +420,7 @@ beam1: BEAM, PARTICLE=PROTON, pc=P0/1000., NPART=N_PARTICLES, BCURRENT=1, CHARGE
VALUE, VALUE={E0, P0, P_MASS};
-TRACK, LINE=l1, BEAM=beam1, MAXSTEPS=MAX_STEPS, STEPSPERTURN=STEPS_PER_TURN;
+TRACK, LINE=line1, BEAM=beam1, MAXSTEPS=MAX_STEPS, STEPSPERTURN=STEPS_PER_TURN;
RUN, METHOD="CYCLOTRON-T", BEAM=beam1, FIELDSOLVER=Fs1, DISTRIBUTION=Dist1;
ENDTRACK;
STOP;
diff --git a/RegressionTests/opalimpact-1/opalimpact-1.in b/RegressionTests/opalimpact-1/opalimpact-1.in
index bd47371f..0ef4b837 100644
--- a/RegressionTests/opalimpact-1/opalimpact-1.in
+++ b/RegressionTests/opalimpact-1/opalimpact-1.in
@@ -17,7 +17,7 @@ REAL brho = (PMASS*1.0e9*gambet) / CLIGHT;
D1: DRIFT, ELEMEDGE = 0.0, L = 1.0;
-L1: LINE = (D1);
+Line1: LINE = (D1);
Fs1: FIELDSOLVER, FSTYPE = FFT, MX = 16, MY = 16, MT = 16, BBOXINCR=0.1;
@@ -31,10 +31,10 @@ Dist1: DISTRIBUTION, TYPE = GAUSS,
Beam1: BEAM, PARTICLE = PROTON, CHARGE = 1.0, BFREQ = 1.0, PC = P0, NPART = 1E5, BCURRENT = CURRENT;
-SELECT, LINE = L1;
+SELECT, LINE = Line1;
-TRACK, LINE = L1, BEAM = Beam1, MAXSTEPS = 1000, ZSTOP = 1.0, DT = 1.0e-10, ZSTART = 15.0e-3;
+TRACK, LINE = Line1, BEAM = Beam1, MAXSTEPS = 1000, ZSTOP = 1.0, DT = 1.0e-10, ZSTART = 15.0e-3;
RUN, METHOD = "PARALLEL-T", BEAM = Beam1, FIELDSOLVER = Fs1, DISTRIBUTION = Dist1;
ENDTRACK;
-STOP;
\ No newline at end of file
+STOP;
--
GitLab