From f7ffdd7f7198e57ff530eaa0bba87f033c376d01 Mon Sep 17 00:00:00 2001
From: nadolski <nadolski@9a6e40ed-f3a0-4838-9b4a-bf418f78e88d>
Date: Mon, 24 Jun 2013 08:23:44 +0000
Subject: [PATCH] myid jobs does not work come back ...
---
tracy/tracy/src/soleillib.cc | 22 +++++++++++-----------
1 file changed, 11 insertions(+), 11 deletions(-)
diff --git a/tracy/tracy/src/soleillib.cc b/tracy/tracy/src/soleillib.cc
index 411b086..1f6f106 100644
--- a/tracy/tracy/src/soleillib.cc
+++ b/tracy/tracy/src/soleillib.cc
@@ -1079,7 +1079,7 @@ void fmap_p(const char *FmapFile_p, long Nbx, long Nby, long Nbtour, double xmax
struct tm *newtime;
char FmapFile[max_str];
- sprintf(FmapFile,"myid%05d_",myid);
+ sprintf(FmapFile,"%d",myid);
strcat(FmapFile,FmapFile_p);
fprintf(stdout, "%s\n",FmapFile);
@@ -1475,7 +1475,7 @@ void fmapdp_p(const char *FmapdpFile_p, long Nbx, long Nbe, long Nbtour, double
struct tm *newtime;
char FmapdpFile[max_str];
- sprintf(FmapdpFile,"myid%05d_",myid);
+ sprintf(FmapdpFile,"%d",myid);
strcat(FmapdpFile,FmapdpFile_p);
if (trace) fprintf(stdout, "fmap_dp_p: %s\n",FmapdpFile);
@@ -3589,12 +3589,12 @@ void MomentumAcceptance(char *MomAccFile, long deb, long fin,
set_vectorcod(codvector, dP);
// coordinates around closed orbit specially useful for 6D
- x0[x_] = codvector[0][x_];
- x0[px_] = codvector[0][px_];
- x0[y_] = codvector[0][y_] + ymax;
- x0[py_] = codvector[0][py_];
- x0[delta_] = codvector[0][delta_];
- x0[ct_] = codvector[0][ct_];
+ x0[0] = codvector[0][x_];
+ x0[1] = codvector[0][px_];
+ x0[2] = codvector[0][y_] + ymax;
+ x0[3] = codvector[0][py_];
+ x0[4] = codvector[0][delta_];
+ x0[5] = codvector[0][ct_];
if (0) fprintf(stdout,"dP=% e : %e %e %e %e %e %e\n",
dP,x0[x_],x0[px_],x0[y_],x0[py_],x0[delta_],x0[ct_]);
@@ -3676,7 +3676,7 @@ void MomentumAcceptance(char *MomAccFile, long deb, long fin,
else
dp2 = ep_max;
- if (trace) fprintf(stdout, "i=%4ld pos=%4ld dp=%6.4g\n",i,pos,dp2);
+ if (trace) fprintf(stdout, "i=%4ld pos=%4ld dp=%6.4g\n",i,pos,dp2);
if (trace) fprintf(stdout,"pos=%4ld z0 =% 10.5f py0 =% 10.5f \n",
pos, taby0[i-1L][pos-1L], tabpy0[i-1L][pos-1L]);
@@ -3960,7 +3960,7 @@ void MomentumAcceptance_p(char *_MomAccFile, long deb, long fin, double ep_min,
// File opening for writing
char PhaseFile[50];
PhaseFile[0]='\0';
- sprintf(PhaseFile,"myid%05d_",myid);
+ sprintf(PhaseFile,"%d",myid);
strcat(PhaseFile,"phase.out");
//printf("%s\n",PhaseFile);
outf1 = fopen(PhaseFile, "w");
@@ -3972,7 +3972,7 @@ void MomentumAcceptance_p(char *_MomAccFile, long deb, long fin, double ep_min,
char MomAccFile[50];
MomAccFile[0]='\0';
- sprintf(MomAccFile,"myid%05d_",myid);
+ sprintf(MomAccFile,"%d",myid);
strcat(MomAccFile,_MomAccFile);
fprintf(stdout, "%s\n",MomAccFile);
--
GitLab