version 1.91, 2003/06/25 15:30:29
|
version 1.93, 2003/06/25 16:33:55
|
Line 1
|
Line 1
|
/* $Id$ |
/* $Id$ |
$State$ |
$State$ |
$Log$ |
$Log$ |
|
Revision 1.93 2003/06/25 16:33:55 brouard |
|
(Module): On windows (cygwin) function asctime_r doesn't |
|
exist so I changed back to asctime which exists. |
|
(Module): Version 0.96b |
|
|
|
Revision 1.92 2003/06/25 16:30:45 brouard |
|
(Module): On windows (cygwin) function asctime_r doesn't |
|
exist so I changed back to asctime which exists. |
|
|
Revision 1.91 2003/06/25 15:30:29 brouard |
Revision 1.91 2003/06/25 15:30:29 brouard |
* imach.c (Repository): Duplicated warning errors corrected. |
* imach.c (Repository): Duplicated warning errors corrected. |
(Repository): Elapsed time after each iteration is now output. It |
(Repository): Elapsed time after each iteration is now output. It |
Line 184
|
Line 193
|
/* $Id$ */ |
/* $Id$ */ |
/* $State$ */ |
/* $State$ */ |
|
|
char version[]="Imach version 0.96a, June 2003, INED-EUROREVES "; |
char version[]="Imach version 0.96b, June 2003, INED-EUROREVES "; |
char fullversion[]="$Revision$ $Date$"; |
char fullversion[]="$Revision$ $Date$"; |
int erreur, nberr=0, nbwarn=0; /* Error number, number of errors number of warnings */ |
int erreur, nberr=0, nbwarn=0; /* Error number, number of errors number of warnings */ |
int nvar; |
int nvar; |
Line 778 void powell(double p[], double **xi, int
|
Line 787 void powell(double p[], double **xi, int
|
fprintf(ficrespow,"\n");fflush(ficrespow); |
fprintf(ficrespow,"\n");fflush(ficrespow); |
if(*iter <=3){ |
if(*iter <=3){ |
tm = *localtime(&curr_time.tv_sec); |
tm = *localtime(&curr_time.tv_sec); |
asctime_r(&tm,strcurr); |
strcpy(strcurr,asctime(&tmf)); |
|
/* asctime_r(&tm,strcurr); */ |
forecast_time=curr_time; |
forecast_time=curr_time; |
itmp = strlen(strcurr); |
itmp = strlen(strcurr); |
if(strcurr[itmp-1]=='\n') |
if(strcurr[itmp-1]=='\n') |
Line 788 void powell(double p[], double **xi, int
|
Line 798 void powell(double p[], double **xi, int
|
for(niterf=10;niterf<=30;niterf+=10){ |
for(niterf=10;niterf<=30;niterf+=10){ |
forecast_time.tv_sec=curr_time.tv_sec+(niterf-*iter)*(curr_time.tv_sec-last_time.tv_sec); |
forecast_time.tv_sec=curr_time.tv_sec+(niterf-*iter)*(curr_time.tv_sec-last_time.tv_sec); |
tmf = *localtime(&forecast_time.tv_sec); |
tmf = *localtime(&forecast_time.tv_sec); |
asctime_r(&tmf,strfor); |
/* asctime_r(&tmf,strfor); */ |
/* strcpy(strfor,asctime(&tmf)); */ |
strcpy(strfor,asctime(&tmf)); |
itmp = strlen(strfor); |
itmp = strlen(strfor); |
if(strfor[itmp-1]=='\n') |
if(strfor[itmp-1]=='\n') |
strfor[itmp-1]='\0'; |
strfor[itmp-1]='\0'; |