Skip to content

GitLab

Commit 94fd4554 authored by Thomas Planche's avatar Thomas Planche
Browse files
Options

TOSCA/FIT works with 90 deg map

parent d42e9d0a
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 50843 additions and 30461 deletions
TOSCA/FIT/Bscale1_zgoubi.plt 0 → 100644
View file @ 94fd4554
This diff is collapsed.
TOSCA/FIT/BzThplot.eps 0 → 100644
View file @ 94fd4554
This diff is collapsed.
TOSCA/BzXplot.gnu → TOSCA/FIT/BzThplot.gnu
View file @ 94fd4554
set term postscript eps color enhanced "Times-Roman" 18 lw 2
set output "plots/BzXplot.eps"
set output "BzThplot.eps"
set xlabel 'Theta [deg.]'
set ylabel 'Bz [T]'
set grid
titletext="HRS TOSCA reference trajectory"
#titletext="HRS TOSCA reference trajectory"
labeltext="(c) `whoami`, "
today="`date +%Y/%b/%d`"
set label labeltext.today at screen .01, screen .02
set title titletext
#set title titletext
set key top left
cm2mm=10.0
plot "zgoubi.plt" using ($22/pi*180.):($25/10.) with p pt 0 notitle
plot "zgoubi.plt" using ($22/pi*180.):($25/10.) with p pt 0 notitle
TOSCA/1_FIT_TOSCA.in → TOSCA/FIT/FIT_TOSCA.in
View file @ 94fd4554
......@@ -12,12 +12,12 @@
1.0365 1. 1. 1. !Magnetic field scaling (adjusted so that R at the center=120cm+60cm*sqrt(2), 120cm is reference radius of the HRS, 60cm is the amound by which the map has been enlarge to include fringe fields); X coordinate scaling; Y; Z
HEADER_2 ! Title
181 47 1 22. ! Nb of nodes in Theta; R; Z (=1 for 2D map); MOD(see manual, =0 for Cartesian, with mid-plane symmetry)
zgoubi_TOSCAMOD22.dat !File name
../TOSCAMOD22.dat !File name
0 0 0 0. ! ID (see manual);
4 !IORDRE(=2, 4 or 25 if 2D, unused if 3D)
0.1 !Integration step size[cm]
2 !KPOS, normally=2
170.9440551 0. 170.9440551 0. !RE has been fitted to be =RS; TE=0 because the map opening = the bending angle = 90 deg; RS=RE; TS=-TE
180.1396693 0. 180.1396693 0. !RE has been fitted to be =RS; TE=0 because the map opening = the bending angle = 90 deg; RS=RE; TS=-TE
'FIT' 4
......
TOSCA/FIT/RThplot.eps 0 → 100644
View file @ 94fd4554
This diff is collapsed.
TOSCA/RThplot.gnu → TOSCA/FIT/RThplot.gnu
View file @ 94fd4554
set term postscript eps color enhanced "Times-Roman" 18 lw 2
set output "plots/RThplot.eps"
set output "RThplot.eps"
set xlabel 'Theta [deg.]'
set ylabel 'R [m]'
set grid
titletext="HRS TOSCA reference trajectory"
#set grid
#titletext="HRS TOSCA reference trajectory"
labeltext="(c) `whoami`, "
today="`date +%Y/%b/%d`"
set label labeltext.today at screen .01, screen .02
set title titletext
#set title titletext
set key top left
cm2mm=10.0
set xrange[-50:50]
set yrange[1.8:2.2]
set key bot cent
plot "zgoubi.plt" using ($22/pi*180.):($10/100.) with p pt 0 notitle
plot "Bscale1_zgoubi.plt" using ($22/pi*180.):($10/100.) with p pt 7 ps 0.3 lc 3 title "B scale = 1",\
"zgoubi.plt" using ($22/pi*180.):($10/100.) with p pt 7 ps 0.3 lc 1 title "B scale = 1.0365",\
1.2+0.6*sqrt(2.) w l lw 0.5 lt 2 lc 0 title "R=1.2+0.6*sqrt(2.)"
TOSCA/thinBeam.gnu → TOSCA/FIT/thinBeam.gnu
View file @ 94fd4554
set term postscript eps color enhanced "Times-Roman" 18 lw 2
set output "plots/thinBeam.eps"
set output "thinBeam.eps"
set xlabel 'X [mm]'
set ylabel 'X` [mrad]'
set grid
......
TOSCA/FIT/xyplot.eps 0 → 100644
View file @ 94fd4554
This diff is collapsed.
TOSCA/XYplot.gnu → TOSCA/FIT/xyplot.gnu
View file @ 94fd4554
set term postscript eps color enhanced "Times-Roman" 18 lw 2
set output "plots/XYplot.eps"
set xlabel 'Z [m]'
set ylabel 'X [m]'
set output "xyplot.eps"
set xlabel 'y [m]'
set ylabel 'x [m]'
set grid
titletext="HRS TOSCA reference trajectory"
#titletext="HRS TOSCA reference trajectory"
labeltext="(c) `whoami`, "
today="`date +%Y/%b/%d`"
set label labeltext.today at screen .01, screen .02
set title titletext
set key top left
#set title titletext
set key bot rig
cm2mm=10.0
set xrange[-2:0]
set yrange[0:2]
set sample 2000
set size ratio -1
plot "zgoubi.plt" using ($10/100.*sin($22-pi/4.)):($10/100.*cos($22-pi/4.)) with lp pt 0 notitle
plot "zgoubi.plt" using ($10/100.*sin($22-pi/4.)):($10/100.*cos($22-pi/4.)) with p pt 7 ps 0.3 title "reference trajectory",\
sqrt(-(x+0.6)**2+1.2**2)+0.6 w l lw 0.5 lt 2 lc 0 title "designed bending radius",\
-sqrt(-(x+0.6)**2+1.2**2)+0.6 w l lw 0.5 lt 2 lc 0 notitle
TOSCA/FIT/zgoubi.plt 0 → 100644
View file @ 94fd4554
This diff is collapsed.
TOSCA/zgoubi.res → TOSCA/FIT/zgoubi.res
View file @ 94fd4554
......@@ -12,12 +12,12 @@
1.0365 1. 1. 1. !Magnetic field scaling (adjusted so that R at the center=120cm+60cm*sqrt(2), 120cm is reference radius of the HRS, 60cm is the amound by which the map has been enlarge to include fringe fields); X coordinate scaling; Y; Z
HEADER_2 ! Title
181 47 1 22. ! Nb of nodes in Theta; R; Z (=1 for 2D map); MOD(see manual, =0 for Cartesian, with mid-plane symmetry)
zgoubi_TOSCAMOD22.dat !File name
../TOSCAMOD22.dat !File name
0 0 0 0. ! ID (see manual);
4 !IORDRE(=2, 4 or 25 if 2D, unused if 3D)
0.1 !Integration step size[cm]
2 !KPOS, normally=2
170.9440551 0. 170.9440551 0. !RE has been fitted to be =RS; TE=0 because the map opening = the bending angle = 90 deg; RS=RE; TS=-TE
180.1396693 0. 180.1396693 0. !RE has been fitted to be =RS; TE=0 because the map opening = the bending angle = 90 deg; RS=RE; TS=-TE
'FIT' 3
......@@ -54,12 +54,12 @@ zgoubi_TOSCAMOD22.dat !File name
1.000000E+00
New field map(s) now used, polar mesh (MOD .ge. 20) ; name(s) of map data file(s) are :
zgoubi_TOSCAMOD22.dat
../TOSCAMOD22.dat
----
Map file number 1 ( of 1) :
zgoubi_TOSCAMOD22.dat map, FORMAT type : regular. Field multiplication factor : 1.00000000E+00
../TOSCAMOD22.dat map, FORMAT type : regular. Field multiplication factor : 1.00000000E+00
HEADER (2 lines) :
165.852814 1.500000 0.50000 0.000000
......@@ -71,10 +71,10 @@ R_min (cm), DR (cm), DTTA (deg), DZ (cm) : 1.658528E+02 1.500000E+00 5.00000
Field map limits, angle, min, max, max-min (rad) : -0.785398E+00 0.785398E+00 0.157080E+01
Field map limits, radius, min, max, max-min (cm) : 0.165853E+03 0.234853E+03 0.690000E+02
Min / max fields drawn from map data : -9.10 / 4.41
@ x-node, y-node, z-node : 0.323 229. 0.00 / 0.785 226. 0.00
Min / max fields drawn from map data : -1.90 / 4.24
@ x-node, y-node, z-node : 0.314 232. 0.00 / 0.777 185. 0.00
Normalisation coeff. BNORM : 1.036
Field min/max normalised : -9.43 / 4.57
Field min/max normalised : -1.97 / 4.39
Nbre of nodes in x/y/z : 181/ 47/ 1
Node distance in x/y/z : 8.7266E-03/ 1.500 / 0.000
......@@ -84,13 +84,13 @@ R_min (cm), DR (cm), DTTA (deg), DZ (cm) : 1.658528E+02 1.500000E+00 5.00000
Integration step : 0.1000 cm (i.e., 4.9912E-04 rad at mean radius RM = 200.4 )
KPOS = 2. Position of reference orbit on mechanical faces
at entrance RE = 170.944 cm TE = 0.00000 rad
at exit RS = 170.944 cm TS = 0.00000 rad
at entrance RE = 180.140 cm TE = 0.00000 rad
at exit RS = 180.140 cm TS = 0.00000 rad
A 1 1.0000 0.000 0.000 0.000 0.000 0.785 170.944 0.000 0.000 0.000 1
A 1 1.0000 0.000 0.000 0.000 0.000 0.785 180.140 -0.000 0.000 0.000 1
CONDITIONS DE MAXWELL ( 2923. PAS ) :
CONDITIONS DE MAXWELL ( 3086. PAS ) :
DIV(B) LAPLACIEN(B) ROTATIONNEL(B)
0.000 0.000 0.000
0.000 0.000
......@@ -120,12 +120,12 @@ R_min (cm), DR (cm), DTTA (deg), DZ (cm) : 1.658528E+02 1.500000E+00 5.00000
STATUS OF VARIABLES (Iteration # 0 / 90 max.)
LMNT VAR PARAM MINIMUM INITIAL FINAL MAXIMUM STEP NAME LBL1 LBL2
2 1 70 85.5 171. 170.9440551 256. 0.570 TOSCA - -
2 1 72 85.5 171. 170.9440551 256. 0.570
2 1 70 90.1 180. 180.1396693 270. 0.600 TOSCA - -
2 1 72 90.1 180. 180.1396693 270. 0.600
STATUS OF CONSTRAINTS (Target penalty = 1.0000E-10)
TYPE I J LMNT# DESIRED WEIGHT REACHED KI2 NAME LBL1 LBL2 Parameter(s)
3 1 2 2 0.0000000E+00 1.0000E+00 7.4093677E-07 1.0000E+00 TOSCA - - 0 :
Fit reached penalty value 5.4899E-13
3 1 2 2 0.0000000E+00 1.0000E+00 8.8493140E-06 1.0000E+00 TOSCA - - 0 :
Fit reached penalty value 7.8310E-11
************************************************************************************************************************************
......@@ -155,16 +155,16 @@ R_min (cm), DR (cm), DTTA (deg), DZ (cm) : 1.658528E+02 1.500000E+00 5.00000
3-D map. MOD=22 or 23. Single field map, with field coefficient value :
1.000000E+00
No new map file to be opened. Already stored.
Skip reading field map file : zgoubi_TOSCAMOD22.dat
Pgm toscap, restored mesh coordinates for field map # 1, name : zgoubi_TOSCAMOD22.dat
Skip reading field map file : ../TOSCAMOD22.dat
Pgm toscap, restored mesh coordinates for field map # 1, name : ../TOSCAMOD22.dat
Field map limits, angle, min, max, max-min (rad) : -0.785398E+00 0.785398E+00 0.157080E+01
Field map limits, radius, min, max, max-min (cm) : 0.165853E+03 0.234853E+03 0.690000E+02
Min / max fields drawn from map data : -9.10 / 4.41
@ x-node, y-node, z-node : 0.323 229. 0.00 / 0.785 226. 0.00
Min / max fields drawn from map data : -1.90 / 4.24
@ x-node, y-node, z-node : 0.314 232. 0.00 / 0.777 185. 0.00
Normalisation coeff. BNORM : 1.036
Field min/max normalised : -9.43 / 4.57
Field min/max normalised : -1.97 / 4.39
Nbre of nodes in x/y/z : 181/ 47/ 1
Node distance in x/y/z : 8.7266E-03/ 1.500 / 0.000
......@@ -174,13 +174,13 @@ R_min (cm), DR (cm), DTTA (deg), DZ (cm) : 1.658528E+02 1.500000E+00 5.00000
Integration step : 0.1000 cm (i.e., 4.9912E-04 rad at mean radius RM = 200.4 )
KPOS = 2. Position of reference orbit on mechanical faces
at entrance RE = 170.944 cm TE = 0.00000 rad
at exit RS = 170.944 cm TS = 0.00000 rad
at entrance RE = 180.140 cm TE = 0.00000 rad
at exit RS = 180.140 cm TS = 0.00000 rad
A 1 1.0000 0.000 0.000 0.000 0.000 0.785 170.944 0.000 0.000 0.000 1
A 1 1.0000 0.000 0.000 0.000 0.000 0.785 180.140 -0.000 0.000 0.000 1
CONDITIONS DE MAXWELL ( 2923. PAS ) :
CONDITIONS DE MAXWELL ( 3086. PAS ) :
DIV(B) LAPLACIEN(B) ROTATIONNEL(B)
0.000 0.000 0.000
0.000 0.000
......
TOSCA/TOSCAMOD22.dat 0 → 100644
View file @ 94fd4554
This diff is collapsed.
TOSCA/plots/BzXplot.eps deleted 100644 → 0
View file @ d42e9d0a
This diff is collapsed.
TOSCA/plots/RThplot.eps deleted 100644 → 0
View file @ d42e9d0a
This diff is collapsed.
TOSCA/plots/XYplot.eps deleted 100644 → 0
View file @ d42e9d0a
This diff is collapsed.
TOSCA/plots/thinBeam.eps deleted 100644 → 0
View file @ d42e9d0a
This diff is collapsed.
TOSCA/zgoubi.map deleted 100644 → 0
View file @ d42e9d0a
This source diff could not be displayed because it is too large. You can view the blob instead.
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