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 a03eabc5 authored by ext-calvo_p's avatar ext-calvo_p
Browse files

fix predefined string as unquoted

parent 3e757d76
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
control.asciidoc
+ 3
− 3
View file @ a03eabc5
......@@ -148,12 +148,12 @@ SCSOLVEFREQ::
this option allows to change the frequency of space charge
calculation, i.e. the space charge forces are evaluated every
SCSOLVEFREQ step and then reused for the following steps. Affects
integrators LF-2 and RK-4 of _OPAL-cycl_. Its default value is 1.
Note: as the multiple-time-stepping (MTS) integrator maintains
integrators `LF2` and `RK4` of _OPAL-cycl_. Its default value is 1.
Note: as the multiple-time-stepping (`MTS`) integrator maintains
accuracy much better with reduced space charge solve frequency, this
option should probably not be used anymore.
MTSSUBSTEPS::
Only used for multiple-time-stepping (MTS) integrator in _OPAL-cycl_.
Only used for multiple-time-stepping (`MTS`) integrator in _OPAL-cycl_.
Specifies how many sub-steps for external field integration are done
per step. Default value is 1. Making less steps per turn and
increasing this value is the recommended way to reduce space charge
......
elements.asciidoc
+ 10
− 10
View file @ a03eabc5
......@@ -1524,7 +1524,7 @@ or ASCII if link:control#sec.control.option[`ASCIIDUMP`] is true
Example:
----
ring: CYCLOTRON, TYPE="RING", CYHARMON=6, PHIINIT=0.0,
ring: CYCLOTRON, TYPE=RING, CYHARMON=6, PHIINIT=0.0,
PRINIT=-0.000240, RINIT=2131.4, SYMMETRY=8.0,
RFFREQ=50.650, FMAPFN="s03av.nar",
MAXZ=10, MINZ=-10, MINR=0, MAXR=2500;
......@@ -1638,7 +1638,7 @@ tc15: TRIMCOIL, TYPE="PSI-BFIELD", RMIN=3000, RMAX=4500, BMAX=13e
COEFNUM = {-0.426038643356, 0.311242287271, -0.0484487029431},
COEFDENOM = {19.3541404562, -22.2057165548, 9.99489842329, -2.00909633025, 0.14942099903};
Ring: CYCLOTRON, TYPE="RING", CYHARMON=6, PHIINIT=0.0, PRINIT=0.0,
Ring: CYCLOTRON, TYPE=RING, CYHARMON=6, PHIINIT=0.0, PRINIT=0.0,
RINIT=2131, SYMMETRY=8.0, RFFREQ=50.65, BSCALE=1, FMAPFN="s03av.nar",
TRIMCOIL={tc1, tc15};
----
......@@ -1889,18 +1889,18 @@ Example standing wave cavity which mimics a DC gun:
----
gun: RFCAVITY, L=0.018, VOLT=-131/(1.052*2.658),
FMAPFN="1T3.T7", ELEMEDGE=0.00,
TYPE="STANDING", FREQ=1.0e-6;
TYPE=STANDING, FREQ=1.0e-6;
----
Example of a two frequency standing wave cavity:
----
rf1: RFCAVITY, L=0.54, VOLT=19.961, LAG=193.0/360.0,
FMAPFN="1T3.T7", ELEMEDGE=0.129, TYPE="STANDING",
FMAPFN="1T3.T7", ELEMEDGE=0.129, TYPE=STANDING,
FREQ=1498.956;
rf2: RFCavity, L=0.54, VOLT=6.250, LAG=136.0/360.0,
FMAPFN="1T4.T7", ELEMEDGE=0.129, TYPE="STANDING",
FMAPFN="1T4.T7", ELEMEDGE=0.129, TYPE=STANDING,
FREQ=4497.536;
----
......@@ -1939,7 +1939,7 @@ Example of a RF cavity of cyclotron:
----
rf0: RFCAVITY, VOLT=0.25796, FMAPFN="Cav1.dat",
TYPE="SINGLEGAP", FREQ=50.637, RMIN=350.0,
TYPE=SINGLEGAP, FREQ=50.637, RMIN=350.0,
RMAX=3350.0, ANGLE=35.0, PDIS=0.0,
GAPWIDTH=0.0, PHI0=phi01;
----
......@@ -2490,7 +2490,7 @@ REAL x2=-220.0;
REAL x3=0.0;
REAL x4=0.0;
cmphys: PARTICLEMATTERINTERACTION, TYPE="SCATTERING", MATERIAL="COPPER";
cmphys: PARTICLEMATTERINTERACTION, TYPE=SCATTERING, MATERIAL=COPPER;
cma1: CCOLLIMATOR, XSTART=x1, XEND=x2, YSTART=y1, YEND=y2,
ZSTART=2, ZEND=100, WIDTH=10.0, PARTICLEMATTERINTERACTION=cmphys ;
......@@ -2648,7 +2648,7 @@ PARTICLEMATTERINTERACTION::
Example: Graphite degrader of 15 cm thickness.
----
DEGPHYS: PARTICLEMATTERINTERACTION, TYPE="SCATTERING", MATERIAL="GRAPHITE";
DEGPHYS: PARTICLEMATTERINTERACTION, TYPE=SCATTERING, MATERIAL=GRAPHITE;
DEG1: DEGRADER, L=0.15, ELEMEDGE=0.02, PARTICLEMATTERINTERACTION=DEGPHYS;
----
......@@ -2766,10 +2766,10 @@ PARTICLEMATTERINTERACTION::
Example: Vacuum representation with latexmath:[H_2] residual gas.
----
bstp_phys: PARTICLEMATTERINTERACTION, TYPE="BEAMSTRIPPING";
bstp_phys: PARTICLEMATTERINTERACTION, TYPE=BEAMSTRIPPING;
vac: VACUUM, PRESSURE=1E-8, TEMPERATURE=300,
GAS="H2", STOP=true, PARTICLEMATTERINTERACTION=bstp_phys;
GAS=H2, STOP=true, PARTICLEMATTERINTERACTION=bstp_phys;
----
No matter what the value of STOP is, the particles stripped are recorded in the HDF5 file
......
fieldsolvers.asciidoc
+ 24
− 25
View file @ a03eabc5
......@@ -666,42 +666,41 @@ REAL frequency = 50.650;
...
// define the cyclotron
ring: Cyclotron, ...
rf0: RFCavity, ...
rf1: RFCavity, ...
rf2: RFCavity, ...
rf3: RFCavity, ...
rf4: RFCavity, ...
l1: Line = (ring, rf0, rf1, rf2, rf3, rf4);
ring: CYCLOTRON, ...
rf0: RFCAVITY, ...
rf1: RFCAVITY, ...
rf2: RFCAVITY, ...
rf3: RFCAVITY, ...
rf4: RFCAVITY, ...
l1: LINE = (ring, rf0, rf1, rf2, rf3, rf4);
// define the distribution
Dist1: DISTRIBUTION, ...
// fieldsolver command
Fs1:FIELDSOLVER, FSTYPE=AMR_MG,
MX=128, MY=128, MT=128,
PARFFTX=true, PARFFTY=true, PARFFTT=true,
BCFFTX=open, BCFFTY=open, BCFFTT=open,
BBOXINCR=20, AMR_MAXLEVEL=2,
AMR_MAXGRIDX=32, AMR_MAXGRIDY=32, AMR_MAXGRIDZ=32,
AMR_BFX=16, AMR_BFY=16, AMR_BFZ=16,
AMR_REFX=2, AMR_REFY=2, AMR_REFZ=2,
AMR_DOMAIN_RATIO={1.0, 0.75, 0.75},
AMR_TAGGING="CHARGE_DENSITY", AMR_DENSITY=1.0e-9,
AMR_MG_VERBOSE=true, AMR_MG_REBALANCE=true, AMR_MG_REUSE=FULL,
ITSOLVER=SA, AMR_MG_NORM=LINF_NORM, AMR_MG_NSWEEPS=12;
Fs1: FIELDSOLVER, FSTYPE=AMR_MG,
MX=128, MY=128, MT=128,
PARFFTX=true, PARFFTY=true, PARFFTT=true,
BCFFTX=open, BCFFTY=open, BCFFTT=open,
BBOXINCR=20, AMR_MAXLEVEL=2,
AMR_MAXGRIDX=32, AMR_MAXGRIDY=32, AMR_MAXGRIDZ=32,
AMR_BFX=16, AMR_BFY=16, AMR_BFZ=16,
AMR_REFX=2, AMR_REFY=2, AMR_REFZ=2,
AMR_DOMAIN_RATIO={1.0, 0.75, 0.75},
AMR_TAGGING="CHARGE_DENSITY", AMR_DENSITY=1.0e-9,
AMR_MG_VERBOSE=true, AMR_MG_REBALANCE=true, AMR_MG_REUSE=FULL,
ITSOLVER=SA, AMR_MG_NORM=LINF_NORM, AMR_MG_NSWEEPS=12;
beam1: BEAM, PARTICLE=PROTON, pc=P0, NPART=1e5, BCURRENT=2.0E-3, CHARGE=1.0, BFREQ= frequency;
Select, Line=l1;
SELECT, LINE=l1;
TRACK,LINE=l1, BEAM=beam1, MAXSTEPS=nstep*turns, STEPSPERTURN=nstep,TIMEINTEGRATOR="RK-4";
run, method = "CYCLOTRON-T", beam=beam1, fieldsolver=Fs1, distribution=Dist1,
TRACK, LINE=l1, BEAM=beam1, MAXSTEPS=nstep*turns, STEPSPERTURN=nstep,TIMEINTEGRATOR=RK4;
RUN, METHOD="CYCLOTRON-T", BEAM=beam1, FIELDSOLVER=Fs1, DISTRIBUTION=Dist1,
MBMODE=FORCE, TURNS=11, MB_BINNING=GAMMA_BINNING, MB_ETA=0.25;
endtrack;
Stop;
ENDTRACK;
STOP;
----
[[sec.fieldsolvers.bibliography]]
......
sampler.asciidoc
+ 28
− 28
View file @ a03eabc5
......@@ -174,17 +174,17 @@ MX nstep
Although the file contains samples for `MX`, too, they are not considered. The
corresponding template file `Ring.tmpl` reads:
----
Option, ECHO=FALSE;
Option, PSDUMPFREQ=100000;
Option, SPTDUMPFREQ = 10;
Option, PSDUMPEACHTURN=false;
Option, REPARTFREQ=20;
Option, ECHO=FALSE;
Option, STATDUMPFREQ=1;
Option, CZERO=FALSE;
Option, MEMORYDUMP=TRUE;
Option, TELL=TRUE;
Option, VERSION=10900;
OPTION, ECHO=FALSE;
OPTION, PSDUMPFREQ=100000;
OPTION, SPTDUMPFREQ = 10;
OPTION, PSDUMPEACHTURN=false;
OPTION, REPARTFREQ=20;
OPTION, ECHO=FALSE;
OPTION, STATDUMPFREQ=1;
OPTION, CZERO=FALSE;
OPTION, MEMORYDUMP=TRUE;
OPTION, TELL=TRUE;
OPTION, VERSION=10900;
Title,string="OPAL-cycl: the first turn acceleration in PSI 590MeV Ring";
......@@ -212,33 +212,33 @@ REAL nstep=_nstep_;
REAL frequency=50.650;
REAL frequency3=3.0*frequency;
ring: Cyclotron, TYPE="RING", CYHARMON=6, PHIINIT=0.0,
ring: CYCLOTRON, TYPE=RING, CYHARMON=6, PHIINIT=0.0,
PRINIT=-0.000174, RINIT=2130.0, SYMMETRY=8.0, RFFREQ=frequency,
FMAPFN="s03av.nar";
rf0: RFCavity, VOLT=volt1st, FMAPFN="Cav1.dat", TYPE="SINGLEGAP",
rf0: RFCAVITY, VOLT=volt1st, FMAPFN="Cav1.dat", TYPE=SINGLEGAP,
FREQ=frequency, RMIN = 1900.0, RMAX = 4500.0, ANGLE=35.0, PDIS = 416.0,
GAPWIDTH = 220.0, PHI0=phi01;
rf1: RFCavity, VOLT=volt1st, FMAPFN="Cav1.dat", TYPE="SINGLEGAP",
rf1: RFCAVITY, VOLT=volt1st, FMAPFN="Cav1.dat", TYPE=SINGLEGAP,
FREQ=frequency, RMIN = 1900.0, RMAX = 4500.0, ANGLE=125.0, PDIS = 416.0,
GAPWIDTH = 220.0, PHI0=phi02;
rf2: RFCavity, VOLT=volt3rd, FMAPFN="Cav3.dat", TYPE="SINGLEGAP",
rf2: RFCAVITY, VOLT=volt3rd, FMAPFN="Cav3.dat", TYPE=SINGLEGAP,
FREQ=frequency3,RMIN = 1900.0, RMAX = 4500.0, ANGLE=170.0, PDIS = 452.0,
GAPWIDTH = 250.0, PHI0=phi03;
rf3: RFCavity, VOLT=volt1st, FMAPFN="Cav1.dat", TYPE="SINGLEGAP",
rf3: RFCAVITY, VOLT=volt1st, FMAPFN="Cav1.dat", TYPE=SINGLEGAP,
FREQ=frequency, RMIN = 1900.0, RMAX = 4500.0, ANGLE=215.0, PDIS = 416.0,
GAPWIDTH = 220.0, PHI0=phi04;
rf4: RFCavity, VOLT=volt1st, FMAPFN="Cav1.dat", TYPE="SINGLEGAP",
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);
l1: LINE = (ring,rf0,rf1,rf2,rf3,rf4);
Dist1:DISTRIBUTION, TYPE=gauss,
Dist1: DISTRIBUTION, TYPE=gauss,
sigmax = 2.0e-03,
sigmapx = 1.0e-7,
corrx = 0.0,
......@@ -249,20 +249,20 @@ Dist1:DISTRIBUTION, TYPE=gauss,
sigmapt = 3.394e-4,
corrt=0.0;
Fs1:FIELDSOLVER, FSTYPE=FFT, MX=_MX_, MY=16, MT=16,
PARFFTX=true, PARFFTY=true, PARFFTT=true,
BCFFTX=open, BCFFTY=open, BCFFTT=open, BBOXINCR=2;
Fs1: FIELDSOLVER, FSTYPE=FFT, MX=_MX_, MY=16, MT=16,
PARFFTX=true, PARFFTY=true, PARFFTT=true,
BCFFTX=open, BCFFTY=open, BCFFTT=open, BBOXINCR=2;
beam1: BEAM, PARTICLE=PROTON, pc=P0, NPART=8192, BCURRENT=1.0E-3, CHARGE=1.0,
beam1: BEAM, PARTICLE=PROTON, PC=P0, NPART=8192, BCURRENT=1.0E-3, CHARGE=1.0,
BFREQ= frequency;
Select, Line=l1;
SELECT, LINE=l1;
TRACK,LINE=l1, BEAM=beam1, MAXSTEPS=nstep*turns, STEPSPERTURN=360,TIMEINTEGRATOR="RK-4";
run, method = "CYCLOTRON-T", beam=beam1, fieldsolver=Fs1, distribution=Dist1;
endtrack;
TRACK, LINE=l1, BEAM=beam1, MAXSTEPS=nstep*turns, STEPSPERTURN=360, TIMEINTEGRATOR=RK4;
RUN, METHOD="CYCLOTRON-T", BEAM=beam1, FIELDSOLVER=Fs1, DISTRIBUTION=Dist1;
Stop;
ENDTRACK;
STOP;
----
// EOF
track.asciidoc
+ 11
− 10
View file @ a03eabc5
......@@ -84,16 +84,16 @@ ZSTOP::
last set of the array then the simulation stops.
TIMEINTEGRATOR::
Define the time integrator. Currently only available in _OPAL-cycl_.
The valid options are `RK-4`, `LF-2` and `MTS`:
The valid options are `RK4`, `LF2` and `MTS`:
+
* RK-4
* RK4
the fourth-order Runge-Kutta integrator. This is the default
integrator for _OPAL-cycl_.
* LF-2
* LF2
the second-order Boris-Buneman (leapfrog-like) integrator.
Currently, `LF-2` is only available for multi-particles with/without
space charge. For single particle tracking and tune calculations,
use the `RK-4` for the time being.
use the `RK4` for the time being.
* MTS
the multiple-time-stepping integrator. Considering that the space
charge fields change much slower than the external fields in
......@@ -105,7 +105,7 @@ TIMEINTEGRATOR::
number of sub-steps can be set with the option `MTSSUBSTEPS` and its
default value is 1. When using this integrator, the input file has
to be rewritten in the units of the outer step. For example,
extracts of the input file suited for `LF-2` or `RK-4` read
extracts of the input file suited for `LF2` or `RK4` read
+
----
Option, PSDUMPFREQ=100;
......@@ -114,9 +114,10 @@ Option, SPTDUMPFREQ=50;
Option, VERSION=10600;
REAL turns=5;
REAL nstep=3000;
TRACK, LINE=l1, BEAM=beam1, MAXSTEPS=nstep*turns, STEPSPERTURN=nstep,
TIMEINTEGRATOR="LF-2";
RUN, METHOD = "CYCLOTRON-T", BEAM=beam1, FIELDSOLVER=Fs1, DISTRIBUTION=Dist1;
TRACK, LINE=l1, BEAM=beam1, MAXSTEPS=nstep*turns, STEPSPERTURN=nstep, TIMEINTEGRATOR=LF2
RUN, METHOD="CYCLOTRON-T", BEAM=beam1, FIELDSOLVER=Fs1, DISTRIBUTION=Dist1;
ENDTRACK;
----
+
......@@ -131,7 +132,7 @@ Option, VERSION=10600;
REAL turns=5;
REAL nstep=300;
TRACK, LINE=l1, BEAM=beam1, MAXSTEPS=nstep*turns, STEPSPERTURN=nstep,
TIMEINTEGRATOR="MTS";
TIMEINTEGRATOR=MTS;
RUN, METHOD = "CYCLOTRON-T", BEAM=beam1, FIELDSOLVER=Fs1, DISTRIBUTION=Dist1;
ENDTRACK;
----
......@@ -243,7 +244,7 @@ TRACKBACK::
Example:
----
RUN, FILE="table", TURNS=5, MBMODE="AUTO", PARAMB=10.0,
RUN, FILE="table", TURNS=5, MBMODE=AUTO, PARAMB=10.0,
METHOD="CYCLOTRON-T", BEAM=beam1, FIELDSOLVER=Fs1,
DISTRIBUTION=Dist1;
----
......
tutorial.asciidoc
+ 1
− 1
View file @ a03eabc5
......@@ -127,7 +127,7 @@ The cavity would be defined like
----
FINSS_RGUN: RFCavity, L = 0.17493, VOLT = 100.0,
FMAPFN = "FINSS-RGUN.dat",
ELEMEDGE =0.0, TYPE = "STANDING", FREQ = 2998.0,
ELEMEDGE = 0.0, TYPE = STANDING, FREQ = 2998.0,
LAG = FINSS_RGUN_phi;
----
......
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