From: N. Brouard <brouard@ined.fr>
Date: Mon, 25 Aug 2014 20:10:10 +0000 (+0000)
Subject: *** empty log message ***
X-Git-Tag: imach-099s7~429
X-Git-Url: https://henry.ined.fr/git/?a=commitdiff_plain;h=2653a34c3de13bc6a29bf818f5a14d3295ca8505;p=.git

*** empty log message ***
---

diff --git a/src/imach.c b/src/imach.c
index d858d7d..edba352 100644
--- a/src/imach.c
+++ b/src/imach.c
@@ -1,6 +1,10 @@
 /* $Id$
   $State$
   $Log$
+  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
   Summary: Outputs now all graphs of convergence to period prevalence
 
@@ -5175,7 +5179,7 @@ calandcheckages(int imx, int maxwav, double *agemin, double *agemax, int *nberr,
 	  }
 	  else if(agev[m][i] >*agemax){
 	    *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] = age[i]+2*m;*/
@@ -5337,6 +5341,9 @@ int main(int argc, char *argv[])
     i=strlen(pathr);
     if(pathr[i-1]=='\n')
       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; ){
       printf("Pathr |%s|\n",pathr);
       while ((val = strsep(&tok, "\"" )) != NULL && *val == '\0');
@@ -5392,7 +5399,7 @@ int main(int argc, char *argv[])
  path=%s \n\
  optionfile=%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);
   fprintf(ficlog,"Local time (at start): %s",strstart);