Merge OK

diff --git a/src/imach.c b/src/imach.c
index 94e55d45c159b05eaa68bfdc74591e6a9ade66b8..f6023e16dfcdb2082fdc9e826bdfe7d168347698 100644 (file)
--- a/src/imach.c
+++ b/src/imach.c
@@ -1901,7 +1901,7 @@ int main(int argc, char *argv[])
   char optionfile[FILENAMELENGTH], datafile[FILENAMELENGTH],  filerespl[FILENAMELENGTH], optionfilehtm[FILENAMELENGTH];\r
   char optionfilext[10], optionfilefiname[FILENAMELENGTH], optionfilegnuplot[FILENAMELENGTH], plotcmd[FILENAMELENGTH];\r
   \r
-  char fileres[FILENAMELENGTH], filerespij[FILENAMELENGTH], filereso[FILENAMELENGTH], fileresf[FILENAMELENGTH];;\r
+  char fileres[FILENAMELENGTH], filerespij[FILENAMELENGTH], filereso[FILENAMELENGTH], fileresf[FILENAMELENGTH];\r
 \r
   char filerest[FILENAMELENGTH];\r
   char fileregp[FILENAMELENGTH];\r
@@ -2991,19 +2991,19 @@ fclose(fichtm);
            }\r
          }\r
        }\r
-       free_ma3x(p3mat,1,nlstate+ndeath,1, nlstate+ndeath, 0,nhstepm);\r
+       /*      free_ma3x(p3mat,1,nlstate+ndeath,1, nlstate+ndeath, 0,nhstepm);*/\r
       }\r
       }\r
     }\r
   }\r
-  if (mobilav==1) free_ma3x(mobaverage,1, AGESUP,1,NCOVMAX, 1,NCOVMAX);\r
+  /*  if (mobilav==1) free_ma3x(mobaverage,1, AGESUP,1,NCOVMAX, 1,NCOVMAX);\r
   if (popforecast==1) {\r
     free_ivector(popage,0,AGESUP);\r
     free_vector(popeffectif,0,AGESUP);\r
     free_vector(popcount,0,AGESUP);\r
   }\r
   free_imatrix(s,1,maxwav+1,1,n);\r
-  free_vector(weight,1,n);\r
+  free_vector(weight,1,n);*/\r
   fclose(ficresf);\r
   }/* End forecasting */\r
   else{\r