Skip to content
Snippets Groups Projects

Compare revisions

Changes are shown as if the source revision was being merged into the target revision. Learn more about comparing revisions.

Source

Select target project
No results found

Target

Select target project
  • PA/optics/tracy3
1 result
Show changes
Commits on Source (4)
Hide whitespace changes
Inline Side-by-side
make_for_tracy3.sh
View file @ 0b293408
...@@ -47,12 +47,14 @@ dirName=/nfs/tegile/work/sources/physmach/blanco-garcia/codes ...@@ -47,12 +47,14 @@ dirName=/nfs/tegile/work/sources/physmach/blanco-garcia/codes
if [ $1 == "opt" ] if [ $1 == "opt" ]
then then
CC=icc CXX=icpc LDFLAGS="-L$dirnName/nrecipes/recipes_c-ansi/lib/" ./configure --prefix=$dir/$TRACY/tracy FFLAGS="-O2 -Wall -fbounds-check" CFLAGS="-O2 -Wall -fno-implicit-templates" CXXFLAGS="-O2 -Wall -fno-implicit-templates" CC=icc CXX=icpc LDFLAGS="-L$dirnName/nrecipes/recipes_c-ansi/lib/" ./configure --prefix=$dir/$TRACY/tracy FFLAGS="-O2 -Wall -fbounds-check" CFLAGS="-O2 -Wall -fno-implicit-templates" CXXFLAGS="-O2 -Wall -fno-implicit-templates"
# CC=gcc CXX=g++ LDFLAGS=" -L$dirnName/nrecipes/recipes_c-ansi/lib/ " ./configure FFLAGS="-O2 -Wall -fbounds-check " CFLAGS=" -Wall -ansi -fno-implicit-templates -Wunused-label -Wunused-dummy-argument -Wunused-variable " CXXFLAGS="-O2 -Wall -ansi "
fi fi
if [ $1 == "mpi" ] if [ $1 == "mpi" ]
then then
#CC=icc CXX=icpc LDFLAGS="-L$dirName/nrecipes/recipes_c-ansi/lib/ -L/opt/intel/parallel_studio_xe_2017_update2/compilers_and_libraries_2017.2.174/linux/mpi/intel64/lib -lmpi" ./configure --enable-mpi-exec --prefix=$dir/$TRACY/tracy FFLAGS="-O2 -Wall -fbounds-check" CFLAGS="-O2 -Wall -fno-implicit-templates" CXXFLAGS="-O2 -Wall -fno-implicit-templates" #CC=icc CXX=icpc LDFLAGS="-L$dirName/nrecipes/recipes_c-ansi/lib/ -L/opt/intel/parallel_studio_xe_2017_update2/compilers_and_libraries_2017.2.174/linux/mpi/intel64/lib -lmpi" ./configure --enable-mpi-exec --prefix=$dir/$TRACY/tracy FFLAGS="-O2 -Wall -fbounds-check" CFLAGS="-O2 -Wall -fno-implicit-templates" CXXFLAGS="-O2 -Wall -fno-implicit-templates"
CC=icc CXX=icpc LDFLAGS="-L$dirName/nrecipes/recipes_c-ansi/lib/ -L/opt/intel/parallel_studio_xe_2017_update2/compilers_and_libraries_2017.2.174/linux/mpi/intel64/lib -lmpi" ./configure --enable-mpi-exec --prefix=$dir/$TRACY/tracy FFLAGS="-O2 -Wall -fbounds-check" CFLAGS="-O2 -ansi -Wall -fno-implicit-templates" CXXFLAGS="-O2 -ansi -Wall -fno-implicit-templates" CC=icc CXX=icpc LDFLAGS="-L$dirName/nrecipes/recipes_c-ansi/lib/ -L/opt/intel/parallel_studio_xe_2017_update2/compilers_and_libraries_2017.2.174/linux/mpi/intel64/lib -lmpi" ./configure --enable-mpi-exec --prefix=$dir/$TRACY/tracy FFLAGS="-O2 -Wall -fbounds-check" CFLAGS="-O2 -ansi -Wall -fno-implicit-templates" CXXFLAGS="-O2 -ansi -Wall -fno-implicit-templates"
# CC=gcc CXX=g++ LDFLAGS="-L$dirName/nrecipes/recipes_c-ansi/lib/ -I/usr/local/applications/tools/openmpi/4.1.1/include -L/usr/local/applications/tools/openmpi/4.1.1/lib -lmpi" ./configure --enable-mpi-exec FFLAGS="-O2 -Wall -fbounds-check " CFLAGS="-O2 -Wall -ansi " CXXFLAGS="-O2 -Wall -ansi -fno-implicit-templates -I/usr/local/applications/tools/openmpi/4.1.1/include -L/usr/local/applications/tools/openmpi/4.1.1/lib -lmpi_cxx"
fi fi
make make
......
tracy/tracy/src/soleillib.cc
View file @ 0b293408
...@@ -729,7 +729,7 @@ void TunesShiftWithAmplitude(const char *NudxFile, const char *NudzFile, long Nb ...@@ -729,7 +729,7 @@ void TunesShiftWithAmplitude(const char *NudxFile, const char *NudzFile, long Nb
xstep = xmax/Nbx*2.0; xstep = xmax/Nbx*2.0;
x0 = 1e-6 - xmax; x0 = 1e-6 - xmax;
z0 = 1e-3; z0 = 1e-5;
for (i = 0; i <= Nbx; i++) { for (i = 0; i <= Nbx; i++) {
x = x0 + i*xstep ; x = x0 + i*xstep ;
...@@ -770,7 +770,7 @@ void TunesShiftWithAmplitude(const char *NudxFile, const char *NudzFile, long Nb ...@@ -770,7 +770,7 @@ void TunesShiftWithAmplitude(const char *NudxFile, const char *NudzFile, long Nb
fprintf(outf,"# x[mm] z[mm] fx fy \n"); fprintf(outf,"# x[mm] z[mm] fx fy \n");
zstep = ymax/Nby*2.0; zstep = ymax/Nby*2.0;
x0 = 1e-3; x0 = 1e-5;
z0 = 1e-6 - ymax; z0 = 1e-6 - ymax;
for (i = 0; i <= Nby; i++) { for (i = 0; i <= Nby; i++) {
x = x0 ; x = x0 ;
...@@ -2155,19 +2155,19 @@ void Multipole_thicksext(const char *fic_hcorr, const char *fic_vcorr, const cha ...@@ -2155,19 +2155,19 @@ void Multipole_thicksext(const char *fic_hcorr, const char *fic_vcorr, const cha
int dlist[500]; /* dipole list */ int dlist[500]; /* dipole list */
int qlist[500]; /* Quadrupole list */ int qlist[500]; /* Quadrupole list */
int slist[500]; /* Sextupole list */ int slist[500]; /* Sextupole list */
int hcorrlist[120]; /* horizontal corrector list */ int hcorrlist[1200]; /* horizontal corrector list */
int vcorrlist[120]; /* vertical corrector list */ int vcorrlist[1200]; /* vertical corrector list */
int qcorrlist[120]; /* skew quad list */ int qcorrlist[1200]; /* skew quad list */
int hcorrlistThick[120]; /* horizontal corrector list */ int hcorrlistThick[1200]; /* horizontal corrector list */
int vcorrlistThick[120]; /* vertical corrector list */ int vcorrlistThick[1200]; /* vertical corrector list */
int qcorrlistThick[120]; /* skew quad list */ int qcorrlistThick[1200]; /* skew quad list */
CellType Cell; CellType Cell;
int mOrder = 0; /* multipole order */ int mOrder = 0; /* multipole order */
double mKL = 0.0 ; /* multipole integrated strength */ double mKL = 0.0 ; /* multipole integrated strength */
double corr_strength = 0.0; double corr_strength = 0.0;
double hcorr[120], vcorr[120], qcorr[120]; double hcorr[1200], vcorr[1200], qcorr[1200];
double b2 = 0.0, b3 = 0.0; double b2 = 0.0, b3 = 0.0;
double dBoB2 = 0.0, dBoB3 = 0.0, dBoB4 = 0.0, dBoB5 = 0.0, dBoB6 = 0.0, double dBoB2 = 0.0, dBoB3 = 0.0, dBoB4 = 0.0, dBoB5 = 0.0, dBoB6 = 0.0,
dBoB7 = 0.0, dBoB9 = 0.0, dBoB11 = 0.0, dBoB15 = 0.0, dBoB21 = 0.0, dBoB7 = 0.0, dBoB9 = 0.0, dBoB11 = 0.0, dBoB15 = 0.0, dBoB21 = 0.0,
...@@ -2832,16 +2832,16 @@ void Multipole_thinsext(const char *fic_hcorr, const char *fic_vcorr, const char ...@@ -2832,16 +2832,16 @@ void Multipole_thinsext(const char *fic_hcorr, const char *fic_vcorr, const char
int dlist[500]; /* dipole list */ int dlist[500]; /* dipole list */
int qlist[500]; /* Quadrupole list */ int qlist[500]; /* Quadrupole list */
int slist[500]; /* Sextupole list */ int slist[500]; /* Sextupole list */
int hcorrlist[120]; /* horizontal corrector list */ int hcorrlist[1200]; /* horizontal corrector list */
int vcorrlist[120]; /* vertical corrector list */ int vcorrlist[1200]; /* vertical corrector list */
int qcorrlist[120]; /* skew quad list */ int qcorrlist[1200]; /* skew quad list */
CellType Cell; CellType Cell;
int mOrder = 0; /* multipole order */ int mOrder = 0; /* multipole order */
double mKL = 0.0 ; /* multipole integrated strength */ double mKL = 0.0 ; /* multipole integrated strength */
double corr_strength = 0.0; double corr_strength = 0.0;
double hcorr[120], vcorr[120], qcorr[120]; double hcorr[1200], vcorr[1200], qcorr[1200];
double b2 = 0.0, b3 = 0.0; double b2 = 0.0, b3 = 0.0;
double dBoB2 = 0.0, dBoB3 = 0.0, dBoB4 = 0.0, dBoB5 = 0.0, dBoB6 = 0.0, double dBoB2 = 0.0, dBoB3 = 0.0, dBoB4 = 0.0, dBoB5 = 0.0, dBoB6 = 0.0,
dBoB7 = 0.0, dBoB9 = 0.0, dBoB11 = 0.0, dBoB15 = 0.0, dBoB21 = 0.0, dBoB7 = 0.0, dBoB9 = 0.0, dBoB11 = 0.0, dBoB15 = 0.0, dBoB21 = 0.0,
...@@ -3587,7 +3587,7 @@ void MomentumAcceptance(char *MomAccFile, long deb, long fin, ...@@ -3587,7 +3587,7 @@ void MomentumAcceptance(char *MomAccFile, long deb, long fin,
x0[4] = codvector[0][delta_]; x0[4] = codvector[0][delta_];
x0[5] = codvector[0][ct_]; x0[5] = codvector[0][ct_];
if (0) fprintf(stdout,"dP=% e : %e %e %e %e %e %e\n", if (1) fprintf(stdout,"dP=% e : %e %e %e %e %e %e\n",
dP,x0[x_],x0[px_],x0[y_],x0[py_],x0[delta_],x0[ct_]); dP,x0[x_],x0[px_],x0[y_],x0[py_],x0[delta_],x0[ct_]);
// Store vertical initial conditions // Store vertical initial conditions
// case where deb is not element 1 // case where deb is not element 1
...@@ -4110,10 +4110,10 @@ void MomentumAcceptance_p(char *_MomAccFile, long deb, long fin, double ep_min, ...@@ -4110,10 +4110,10 @@ void MomentumAcceptance_p(char *_MomAccFile, long deb, long fin, double ep_min,
delta = Cell.BeamPos[delta_]; delta = Cell.BeamPos[delta_];
ctau0 = Cell.BeamPos[ct_]; ctau0 = Cell.BeamPos[ct_];
if (trace) fprintf(stdout,"%3ld %6.4g %6.4g %6.4g %6.4g %6.4g %6.4g\n", if (trace) fprintf(stdout,"Closed orbit: %3ld %6.4g %6.4g %6.4g %6.4g %6.4g %6.4g\n",
pos, x, px, y, py, delta, ctau0); pos, x, px, y, py, delta, ctau0);
if (trace) fprintf(stdout,"%3ld %6.4g %6.4g %6.4g %6.4g %6.4g %6.4g\n", pos, if (trace) fprintf(stdout,"CODvect:%3ld %6.4g %6.4g %6.4g %6.4g %6.4g %6.4g\n", pos,
globval.CODvect[x_], globval.CODvect[px_],globval.CODvect[y_], globval.CODvect[x_], globval.CODvect[px_],globval.CODvect[y_],
globval.CODvect[py_], globval.CODvect[delta_],globval.CODvect[ct_]); globval.CODvect[py_], globval.CODvect[delta_],globval.CODvect[ct_]);
...@@ -4130,16 +4130,17 @@ void MomentumAcceptance_p(char *_MomAccFile, long deb, long fin, double ep_min, ...@@ -4130,16 +4130,17 @@ void MomentumAcceptance_p(char *_MomAccFile, long deb, long fin, double ep_min,
else else
dp2 = ep_max; dp2 = ep_max;
if (trace) if (!trace)
fprintf(stdout, "i=%4ld dp=%6.4g pos=%3ld %6.4g %6.4g %6.4g %6.4g %6.4g %6.4g\n", fprintf(stdout, "i=%4ld dp=%6.4g pos=%3ld x=%6.4g px=%6.4g y=%6.4g py=%6.4g dp=%6.4g ctau=%6.4g\n",
i, dp2, pos, x, px, y+taby0[i-1L][pos-1L], i, dp2, pos, x, px, y+taby0[i-1L][pos-1L],
py+tabpy0[i-1L][pos-1L], dp2+delta, ctau0); py+tabpy0[i-1L][pos-1L], dp2+delta, ctau0);
if (trace) fprintf(stdout,"pos=%4ld z0 =% 10.5f py0 =% 10.5f \n", if (trace) fprintf(stdout,"pos=%4ld y0 =% 10.5f py0 =% 10.5f \n",
pos, taby0[i-1L][pos-1L], tabpy0[i-1L][pos-1L]); pos, taby0[i-1L][pos-1L], tabpy0[i-1L][pos-1L]);
Trac(x, px, y+taby0[i-1L][pos-1L], py+tabpy0[i-1L][pos-1L], dp2+delta , Trac(x, px, y+taby0[i-1L][pos-1L], py+tabpy0[i-1L][pos-1L], dp2+delta ,
ctau0, nturn, pos, lastn, lastpos, outf1, x1); ctau0, nturn, pos, lastn, lastpos, outf1, x1);
if (!trace) fprintf(stdout, "last turn= %ld\n", lastn);
}while (((lastn) == nturn) && (i != nstepp)); }while (((lastn) == nturn) && (i != nstepp));
...@@ -6439,7 +6440,7 @@ void AddCorrQtErr_fam(char const *fic, const int Fnum, const double conv, const ...@@ -6439,7 +6440,7 @@ void AddCorrQtErr_fam(char const *fic, const int Fnum, const double conv, const
double bnL = 0.0, anL = 0.0; double bnL = 0.0, anL = 0.0;
double brho = 0.0, conv_strength = 0.0; double brho = 0.0, conv_strength = 0.0;
double corr; /* skew quadrupole horizontal or vertical corrector error, read from a file*/ double corr; /* skew quadrupole horizontal or vertical corrector error, read from a file*/
int corrlistThick[120]; /* index of associated sextupole*/ int corrlistThick[1200]; /* index of associated sextupole*/
FILE *fi; FILE *fi;
......

The place to be for your source code