version 1.154, 2014/06/20 17:32:08
|
version 1.156, 2014/08/25 20:10:10
|
Line 1
|
Line 1
|
/* $Id$ |
/* $Id$ |
$State$ |
$State$ |
$Log$ |
$Log$ |
|
Revision 1.156 2014/08/25 20:10:10 brouard |
|
*** empty log message *** |
|
|
|
Revision 1.155 2014/08/25 18:32:34 brouard |
|
Summary: New compile, minor changes |
|
Author: Brouard |
|
|
Revision 1.154 2014/06/20 17:32:08 brouard |
Revision 1.154 2014/06/20 17:32:08 brouard |
Summary: Outputs now all graphs of convergence to period prevalence |
Summary: Outputs now all graphs of convergence to period prevalence |
|
|
Line 516 extern int errno;
|
Line 523 extern int errno;
|
/* $Id$ */ |
/* $Id$ */ |
/* $State$ */ |
/* $State$ */ |
|
|
char version[]="Imach version 0.98nU, January 2014,INED-EUROREVES-Institut de longevite-Japan Society for the Promotion of Science (Grant-in-Aid for Scientific Research 25293121)"; |
char version[]="Imach version 0.98nV, August 2014,INED-EUROREVES-Institut de longevite-Japan Society for the Promotion of Science (Grant-in-Aid for Scientific Research 25293121)"; |
char fullversion[]="$Revision$ $Date$"; |
char fullversion[]="$Revision$ $Date$"; |
char strstart[80]; |
char strstart[80]; |
char optionfilext[10], optionfilefiname[FILENAMELENGTH]; |
char optionfilext[10], optionfilefiname[FILENAMELENGTH]; |
Line 5175 calandcheckages(int imx, int maxwav, dou
|
Line 5182 calandcheckages(int imx, int maxwav, dou
|
} |
} |
else if(agev[m][i] >*agemax){ |
else if(agev[m][i] >*agemax){ |
*agemax=agev[m][i]; |
*agemax=agev[m][i]; |
printf(" Max anint[%d][%d]=%.0f annais[%d]=%.0f, agemax=%.2f\n",m,i,anint[m][i], i,annais[i], *agemax); |
/* printf(" Max anint[%d][%d]=%.0f annais[%d]=%.0f, agemax=%.2f\n",m,i,anint[m][i], i,annais[i], *agemax);*/ |
} |
} |
/*agev[m][i]=anint[m][i]-annais[i];*/ |
/*agev[m][i]=anint[m][i]-annais[i];*/ |
/* agev[m][i] = age[i]+2*m;*/ |
/* agev[m][i] = age[i]+2*m;*/ |
Line 5337 int main(int argc, char *argv[])
|
Line 5344 int main(int argc, char *argv[])
|
i=strlen(pathr); |
i=strlen(pathr); |
if(pathr[i-1]=='\n') |
if(pathr[i-1]=='\n') |
pathr[i-1]='\0'; |
pathr[i-1]='\0'; |
|
i=strlen(pathr); |
|
if(pathr[i-1]==' ') /* This may happen when dragging on oS/X! */ |
|
pathr[i-1]='\0'; |
for (tok = pathr; tok != NULL; ){ |
for (tok = pathr; tok != NULL; ){ |
printf("Pathr |%s|\n",pathr); |
printf("Pathr |%s|\n",pathr); |
while ((val = strsep(&tok, "\"" )) != NULL && *val == '\0'); |
while ((val = strsep(&tok, "\"" )) != NULL && *val == '\0'); |
Line 5392 int main(int argc, char *argv[])
|
Line 5402 int main(int argc, char *argv[])
|
path=%s \n\ |
path=%s \n\ |
optionfile=%s\n\ |
optionfile=%s\n\ |
optionfilext=%s\n\ |
optionfilext=%s\n\ |
optionfilefiname=%s\n",pathimach,pathtot,path,optionfile,optionfilext,optionfilefiname); |
optionfilefiname='%s'\n",pathimach,pathtot,path,optionfile,optionfilext,optionfilefiname); |
|
|
printf("Local time (at start):%s",strstart); |
printf("Local time (at start):%s",strstart); |
fprintf(ficlog,"Local time (at start): %s",strstart); |
fprintf(ficlog,"Local time (at start): %s",strstart); |
Line 5408 int main(int argc, char *argv[])
|
Line 5418 int main(int argc, char *argv[])
|
/*---------arguments file --------*/ |
/*---------arguments file --------*/ |
|
|
if((ficpar=fopen(optionfile,"r"))==NULL) { |
if((ficpar=fopen(optionfile,"r"))==NULL) { |
printf("Problem with optionfile %s with errno=%s\n",optionfile,strerror(errno)); |
printf("Problem with optionfile '%s' with errno='%s'\n",optionfile,strerror(errno)); |
fprintf(ficlog,"Problem with optionfile %s with errno=%s\n",optionfile,strerror(errno)); |
fprintf(ficlog,"Problem with optionfile '%s' with errno='%s'\n",optionfile,strerror(errno)); |
fflush(ficlog); |
fflush(ficlog); |
/* goto end; */ |
/* goto end; */ |
exit(70); |
exit(70); |
Line 6663 Interval (in months) between two waves:
|
Line 6673 Interval (in months) between two waves:
|
sprintf(plotcmd,"\"%sgnuplot.exe\"",pathimach); |
sprintf(plotcmd,"\"%sgnuplot.exe\"",pathimach); |
#endif |
#endif |
if(!stat(plotcmd,&info)){ |
if(!stat(plotcmd,&info)){ |
printf("Error gnuplot program not found: %s\n",plotcmd);fflush(stdout); |
printf("Error or gnuplot program not found: %s\n",plotcmd);fflush(stdout); |
if(!stat(getenv("GNUPLOTBIN"),&info)){ |
if(!stat(getenv("GNUPLOTBIN"),&info)){ |
printf("Error gnuplot program not found: %s Environment GNUPLOTBIN not set.\n",plotcmd);fflush(stdout); |
printf("Error or gnuplot program not found: %s Environment GNUPLOTBIN not set.\n",plotcmd);fflush(stdout); |
}else |
}else |
strcpy(pplotcmd,plotcmd); |
strcpy(pplotcmd,plotcmd); |
#ifdef UNIX |
#ifdef UNIX |