--- imach/src/imach.c	2003/07/15 15:38:55	1.96
+++ imach/src/imach.c	2004/02/20 13:25:42	1.97
@@ -1,6 +1,10 @@
-/* $Id: imach.c,v 1.96 2003/07/15 15:38:55 brouard Exp $
+/* $Id: imach.c,v 1.97 2004/02/20 13:25:42 lievre Exp $
   $State: Exp $
   $Log: imach.c,v $
+  Revision 1.97  2004/02/20 13:25:42  lievre
+  Version 0.96d. Population forecasting command line is (temporarily)
+  suppressed.
+
   Revision 1.96  2003/07/15 15:38:55  brouard
   * imach.c (Repository): Errors in subdirf, 2, 3 while printing tmpout is
   rewritten within the same printf. Workaround: many printfs.
@@ -205,11 +209,11 @@
 #define ODIRSEPARATOR '/'
 #endif
 
-/* $Id: imach.c,v 1.96 2003/07/15 15:38:55 brouard Exp $ */
+/* $Id: imach.c,v 1.97 2004/02/20 13:25:42 lievre Exp $ */
 /* $State: Exp $ */
 
-char version[]="Imach version 0.96c, July 2003, INED-EUROREVES ";
-char fullversion[]="$Revision: 1.96 $ $Date: 2003/07/15 15:38:55 $"; 
+char version[]="Imach version 0.96d, February 2004, INED-EUROREVES ";
+char fullversion[]="$Revision: 1.97 $ $Date: 2004/02/20 13:25:42 $"; 
 int erreur, nberr=0, nbwarn=0; /* Error number, number of errors number of warnings  */
 int nvar;
 int cptcovn=0, cptcovage=0, cptcoveff=0,cptcov;
@@ -4484,6 +4488,7 @@ int main(int argc, char *argv[])
 
 }*/
 
+
   printf("Total number of individuals= %d, Agemin = %.2f, Agemax= %.2f\n\n", imx, agemin, agemax);
   fprintf(ficlog,"Total number of individuals= %d, Agemin = %.2f, Agemax= %.2f\n\n", imx, agemin, agemax); 
 
@@ -4836,9 +4841,9 @@ Interval (in months) between two waves:
   }
   ungetc(c,ficpar);
 
-  fscanf(ficpar,"popforecast=%d popfile=%s popfiledate=%lf/%lf/%lf last-popfiledate=%lf/%lf/%lf\n",&popforecast,popfile,&jpyram,&mpyram,&anpyram,&jpyram1,&mpyram1,&anpyram1);
+  /*  fscanf(ficpar,"popforecast=%d popfile=%s popfiledate=%lf/%lf/%lf last-popfiledate=%lf/%lf/%lf\n",&popforecast,popfile,&jpyram,&mpyram,&anpyram,&jpyram1,&mpyram1,&anpyram1);
   fprintf(ficparo,"popforecast=%d popfile=%s popfiledate=%.lf/%.lf/%.lf last-popfiledate=%.lf/%.lf/%.lf\n",popforecast,popfile,jpyram,mpyram,anpyram,jpyram1,mpyram1,anpyram1);
-  fprintf(ficres,"popforecast=%d popfile=%s popfiledate=%.lf/%.lf/%.lf last-popfiledate=%.lf/%.lf/%.lf\n",popforecast,popfile,jpyram,mpyram,anpyram,jpyram1,mpyram1,anpyram1);
+  fprintf(ficres,"popforecast=%d popfile=%s popfiledate=%.lf/%.lf/%.lf last-popfiledate=%.lf/%.lf/%.lf\n",popforecast,popfile,jpyram,mpyram,anpyram,jpyram1,mpyram1,anpyram1);*/
 
   /*  freqsummary(fileres, agemin, agemax, s, agev, nlstate, imx,Tvaraff,nbcode, ncodemax,mint,anint);*/
   /*,dateprev1,dateprev2,jprev1, mprev1,anprev1,jprev2, mprev2,anprev2);*/