--- imach/src/imach.c 2014/06/16 10:20:28 1.146 +++ imach/src/imach.c 2014/06/18 16:43:30 1.151 @@ -1,6 +1,26 @@ -/* $Id: imach.c,v 1.146 2014/06/16 10:20:28 brouard Exp $ +/* $Id: imach.c,v 1.151 2014/06/18 16:43:30 brouard Exp $ $State: Exp $ $Log: imach.c,v $ + Revision 1.151 2014/06/18 16:43:30 brouard + *** empty log message *** + + Revision 1.150 2014/06/18 16:42:35 brouard + Summary: If gnuplot is not in the path try on same directory than imach binary (OSX) + Author: brouard + + Revision 1.149 2014/06/18 15:51:14 brouard + Summary: Some fixes in parameter files errors + Author: Nicolas Brouard + + Revision 1.148 2014/06/17 17:38:48 brouard + Summary: Nothing new + Author: Brouard + + Just a new packaging for OS/X version 0.98nS + + Revision 1.147 2014/06/16 10:33:11 brouard + *** empty log message *** + Revision 1.146 2014/06/16 10:20:28 brouard Summary: Merge Author: Brouard @@ -483,20 +503,11 @@ extern int errno; #define ODIRSEPARATOR '/' #endif -<<<<<<< imach.c -/* $Id: imach.c,v 1.146 2014/06/16 10:20:28 brouard Exp $ */ -======= -/* $Id: imach.c,v 1.146 2014/06/16 10:20:28 brouard Exp $ */ ->>>>>>> 1.145 +/* $Id: imach.c,v 1.151 2014/06/18 16:43:30 brouard Exp $ */ /* $State: Exp $ */ -<<<<<<< imach.c -char version[]="Imach version 0.98nR2, January 2014,INED-EUROREVES-Institut de longevite-Japan Society for the Promotion of Science (Grant-in-Aid for Scientific Research 25293121)"; -char fullversion[]="$Revision: 1.146 $ $Date: 2014/06/16 10:20:28 $"; -======= -char version[]="Imach version 0.98nR2, January 2014,INED-EUROREVES-Institut de longevite-Japan Society for the Promotion of Science (Grant-in-Aid for Scientific Research 25293121)"; -char fullversion[]="$Revision: 1.146 $ $Date: 2014/06/16 10:20:28 $"; ->>>>>>> 1.145 +char version[]="Imach version 0.98nT, January 2014,INED-EUROREVES-Institut de longevite-Japan Society for the Promotion of Science (Grant-in-Aid for Scientific Research 25293121)"; +char fullversion[]="$Revision: 1.151 $ $Date: 2014/06/18 16:43:30 $"; char strstart[80]; char optionfilext[10], optionfilefiname[FILENAMELENGTH]; int erreur=0, nberr=0, nbwarn=0; /* Error number, number of errors number of warnings */ @@ -5385,10 +5396,11 @@ int main(int argc, char *argv[]) /*---------arguments file --------*/ if((ficpar=fopen(optionfile,"r"))==NULL) { - printf("Problem with optionfile %s\n",optionfile); - fprintf(ficlog,"Problem with optionfile %s\n",optionfile); + 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)); fflush(ficlog); - goto end; + /* goto end; */ + exit(70); } @@ -6658,7 +6670,11 @@ Interval (in months) between two waves: printf("Starting graphs with: %s\n",plotcmd);fflush(stdout); if((outcmd=system(plotcmd)) != 0){ - printf("\n Problem with gnuplot\n"); + printf("\n Problem with gnuplot command %s\n", plotcmd); + printf("\n Trying on same directory\n"); + sprintf(plotcmd,"./gnuplot %s", optionfilegnuplot); + if((outcmd=system(plotcmd)) != 0) + printf("\n Still a problem with gnuplot command %s\n", plotcmd); } printf(" Wait..."); while (z[0] != 'q') {