Summary: Cleaned 0.99r19

diff --git a/src/imach.c b/src/imach.c
index 42cccf1b7be1274bc24ba9976a6f560cba448503..f523dd015809cc3ecf832d262aaf44fcc668d69d 100644 (file)
--- a/src/imach.c
+++ b/src/imach.c
@@ -1,6 +1,9 @@
 /* $Id$
   $State$
   $Log$
+  Revision 1.298  2019/05/22 18:19:56  brouard
+  *** empty log message ***
+
   Revision 1.297  2019/05/22 17:56:10  brouard
   Summary: Fix bug by moving date2dmy and nhstepm which gaefin=-1
 
@@ -12227,6 +12230,7 @@ Please run with mle=-1 to get a correct covariance matrix.\n",ageminpar,agemaxpa
        fputs(line,stdout);
        fputs(line,ficparo);
        fputs(line,ficlog);
+       fputs(line,ficres);
        continue;
       }else
        break;
@@ -12272,6 +12276,7 @@ Please run with mle=-1 to get a correct covariance matrix.\n",ageminpar,agemaxpa
        fputs(line,stdout);
        fputs(line,ficparo);
        fputs(line,ficlog);
+       fputs(line,ficres);
        continue;
       }else
        break;
@@ -12297,6 +12302,7 @@ Please run with mle=-1 to get a correct covariance matrix.\n",ageminpar,agemaxpa
        fputs(line,stdout);
        fputs(line,ficparo);
        fputs(line,ficlog);
+       fputs(line,ficres);
        continue;
       }else
        break;
@@ -12330,6 +12336,7 @@ Please run with mle=-1 to get a correct covariance matrix.\n",ageminpar,agemaxpa
        fputs(line,stdout);
        fputs(line,ficparo);
        fputs(line,ficlog);
+       fputs(line,ficres);
        continue;
       }else if(sscanf(line,"prevforecast=%[^\n]\n",modeltemp))
        parameterline=11;
@@ -12353,7 +12360,9 @@ Please run with mle=-1 to get a correct covariance matrix.\n",ageminpar,agemaxpa
           prvforecast = 1;
        } 
        else if((num_filled=sscanf(line,"prevforecast=%d yearsfproj=%lf mobil_average=%d\n",&prevfcast,&yrfproj,&mobilavproj)) !=EOF){/* && (num_filled == 3))*/
-          printf(" Num_filled=%d, yearsfproj=%lf, mobil_average=%d\n",prevfcast,yrfproj,mobilavproj);
+         printf("prevforecast=%d yearsfproj=%lf mobil_average=%d\n",prevfcast,yrfproj,mobilavproj);
+         fprintf(ficlog,"prevforecast=%d yearsfproj=%lf mobil_average=%d\n",prevfcast,yrfproj,mobilavproj);
+         fprintf(ficres,"prevforecast=%d yearsfproj=%lf mobil_average=%d\n",prevfcast,yrfproj,mobilavproj);
           prvforecast = 2;
        }
        else {
@@ -12374,7 +12383,9 @@ Please run with mle=-1 to get a correct covariance matrix.\n",ageminpar,agemaxpa
           prvbackcast = 1;
        } 
        else if((num_filled=sscanf(line,"prevbackcast=%d yearsbproj=%lf mobil_average=%d\n",&prevbcast,&yrbproj,&mobilavproj)) ==3){/* && (num_filled == 3))*/
-          printf(" Num_filled=%d, yearsbproj=%lf, mobil_average=%d\n",prevbcast,yrbproj,mobilavproj);
+         printf("prevbackcast=%d yearsbproj=%lf mobil_average=%d\n",prevbcast,yrbproj,mobilavproj);
+         fprintf(ficlog,"prevbackcast=%d yearsfproj=%lf mobil_average=%d\n",prevbcast,yrbproj,mobilavproj);
+         fprintf(ficres,"prevbackcast=%d yearsfproj=%lf mobil_average=%d\n",prevbcast,yrbproj,mobilavproj);
           prvbackcast = 2;
        }
        else {
@@ -12383,22 +12394,6 @@ Please run with mle=-1 to get a correct covariance matrix.\n",ageminpar,agemaxpa
          goto end;
        }
        break;
-       /* /\*fscanf(ficpar,"backcast=%d starting-back-date=%lf/%lf/%lf final-back-date=%lf/%lf/%lf mobil_average=%d\n",&backcast,&jback1,&mback1,&anback1,&jback2,&mback2,&anback2,&mobilavproj);*\/ */
-       /* if((num_filled=sscanf(line,"backcast=%d starting-back-date=%lf/%lf/%lf final-back-date=%lf/%lf/%lf mobil_average=%d\n",&backcast,&jback1,&mback1,&anback1,&jback2,&mback2,&anback2,&mobilavproj)) !=EOF){ */
-       /*   if (num_filled != 8) { */
-       /*     printf("Error: Not 8 (data)parameters in line but %d, for example:backcast=1 starting-back-date=1/1/1990 final-back-date=1/1/1970 mobil_average=1\n, your line=%s . Probably you are running an older format.\n",num_filled,line); */
-       /*     fprintf(ficlog,"Error: Not 8 (data)parameters in line but %d, for example:backcast=1 starting-back-date=1/1/1990 final-back-date=1/1/1970 mobil_average=1\n, your line=%s . Probably you are running an older format.\n",num_filled,line); */
-       /*     goto end; */
-       /*   } */
-       /*   printf("backcast=%d starting-back-date=%.lf/%.lf/%.lf final-back-date=%.lf/%.lf/%.lf mobil_average=%d\n",backcast,jback1,mback1,anback1,jback2,mback2,anback2,mobilavproj); */
-       /*   fprintf(ficparo,"backcast=%d starting-back-date=%.lf/%.lf/%.lf final-back-date=%.lf/%.lf/%.lf mobil_average=%d\n",backcast,jback1,mback1,anback1,jback2,mback2,anback2,mobilavproj); */
-       /*   fprintf(ficlog,"backcast=%d starting-back-date=%.lf/%.lf/%.lf final-back-date=%.lf/%.lf/%.lf mobil_average=%d\n",backcast,jback1,mback1,anback1,jback2,mback2,anback2,mobilavproj); */
-       /*   fprintf(ficres,"backcast=%d starting-back-date=%.lf/%.lf/%.lf final-back-date=%.lf/%.lf/%.lf mobil_average=%d\n",backcast,jback1,mback1,anback1,jback2,mback2,anback2,mobilavproj); */
-       /*   /\* day and month of proj2 are not used but only year anproj2.*\/ */
-       /*   dateback1=anback1+(mback1-1)/12.+(jback1-1)/365.; */
-       /*   dateback2=anback2+(mback2-1)/12.+(jback2-1)/365.; */
-       /* } */
-       /* break; */
       case 13:
        if((num_filled=sscanf(line,"result:%[^\n]\n",resultline)) !=EOF){
          if (num_filled == 0){