From 65c42d075527820cc751d7d13d9dea90a0c2a588 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Agn=C3=A8s=20Li=C3=A8vre?= Date: Fri, 22 Feb 2002 18:08:30 +0000 Subject: [PATCH] Merge OK --- src/imach.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/imach.c b/src/imach.c index 94e55d4..f6023e1 100644 --- 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]; char optionfilext[10], optionfilefiname[FILENAMELENGTH], optionfilegnuplot[FILENAMELENGTH], plotcmd[FILENAMELENGTH]; - char fileres[FILENAMELENGTH], filerespij[FILENAMELENGTH], filereso[FILENAMELENGTH], fileresf[FILENAMELENGTH];; + char fileres[FILENAMELENGTH], filerespij[FILENAMELENGTH], filereso[FILENAMELENGTH], fileresf[FILENAMELENGTH]; char filerest[FILENAMELENGTH]; char fileregp[FILENAMELENGTH]; @@ -2991,19 +2991,19 @@ fclose(fichtm); } } } - free_ma3x(p3mat,1,nlstate+ndeath,1, nlstate+ndeath, 0,nhstepm); + /* free_ma3x(p3mat,1,nlstate+ndeath,1, nlstate+ndeath, 0,nhstepm);*/ } } } } - if (mobilav==1) free_ma3x(mobaverage,1, AGESUP,1,NCOVMAX, 1,NCOVMAX); + /* if (mobilav==1) free_ma3x(mobaverage,1, AGESUP,1,NCOVMAX, 1,NCOVMAX); if (popforecast==1) { free_ivector(popage,0,AGESUP); free_vector(popeffectif,0,AGESUP); free_vector(popcount,0,AGESUP); } free_imatrix(s,1,maxwav+1,1,n); - free_vector(weight,1,n); + free_vector(weight,1,n);*/ fclose(ficresf); }/* End forecasting */ else{ -- 2.43.0