Changeset 774 for trunk/AGRIF/LIB/SubLoopCreation.c

Timestamp:

2007-12-18T17:45:53+01:00 (17 years ago)

Author:

rblod

Message:

Update Agrif, see ticket:#39

File:

• trunk/AGRIF/LIB/SubLoopCreation.c (modified) (16 diffs)

trunk/AGRIF/LIB/SubLoopCreation.c

@@ -31 +31 @@
 /* knowledge of the CeCILL-C license and that you accept its terms.           */
 /******************************************************************************/
-/* version 1.6                                                                */
+/* version 1.7                                                                */
 /******************************************************************************/
 #include <stdio.h>
@@ -49 +49 @@
 /* Firstpass 0                                                                */
 /* We should write the head of the subroutine sub_loop_<subroutinename>       */
-/* suborfunc = 1 from subroutine                                              */
-/* suborfunc = 2 from function                                                */
-/******************************************************************************/
-/*                                                                            */
-/******************************************************************************/
-void writeheadnewsub_0(int suborfunc)
-{
-   int out;
-   char ligne[LONGNOM];
-   listusemodule *newmodule;
+/******************************************************************************/
+/*                                                                            */
+/******************************************************************************/
+void writeheadnewsub_0()
+{
+   char ligne[LONG_C];
 
    if ( firstpass == 0 && IsTabvarsUseInArgument_0() == 1 )
@@ -79 +75 @@
       tofich(fortranout,ligne,1);
 
-   /*   writesub_loopdeclaration_scalar(List_SubroutineArgument_Var,paramout);*/
       WriteArgumentDeclaration_Sort();
-/*      writesub_loopdeclaration_tab(List_SubroutineArgument_Var,fortranout);*/
 
       if ( mark == 1 ) fprintf(fortranout,"!!! 222222222222222 \n");
@@ -134 +128 @@
 {
    listvar *parcours;
-   char ligne[LONGNOM];
+   char ligne[LONG_C];
    int compteur;
 
@@ -230 +224 @@
 {
    listvar *parcours;
-   char ligne[LONGNOM*100];
+   char ligne[LONG_40M];
    char ligne2[10];
    int i;
+   int compteur ;
 
    if ( todebug == 1 ) printf("Enter in WriteVariablelist_subloop_Call\n");
    parcours = List_UsedInSubroutine_Var;
+   compteur = 0 ;
    while ( parcours )
    {
@@ -248 +244 @@
          if ( didvariableadded == 0 )
          {
-            strcpy(ligne,"");
+            if ( retour77 == 1 ) strcpy(ligne,"\n     & ");
+            else strcpy(ligne,"\n      ");
          }
          else
          {
-            strcpy(ligne,"");
-            strcat(ligne,",");
+            if ( compteur == 0 )
+            {
+               if ( retour77 == 1 ) strcpy(ligne,"\n     & ");
+               else strcpy(ligne,"\n      ");
+            }
+            strcat(ligne," , ");
          }
          strcat(ligne,vargridcurgridtabvars(parcours->var,0));
@@ -288 +289 @@
          }
          didvariableadded = 1;
-         if ( retour77 == 0 )
+         compteur = compteur +1 ;
+         /*if ( retour77 == 0 )
          {
             strcat(ligne," &");
             fprintf(outputfile,"\n");
          }
-         else fprintf(outputfile,"\n     & ");
-         tofich(outputfile,ligne,0);
+         else fprintf(outputfile,"\n     & ");*/
+         /*tofich(outputfile,ligne,0);*/
       }
       parcours = parcours -> suiv;
    }
+   Save_Length(ligne,41);
+   tofich(outputfile,ligne,0);
    /* Now we should replace the last ", &" by " &"                            */
-   if ( didvariableadded != 0 && retour77 == 0 ) fseek(outputfile,-1,SEEK_CUR);
-   if ( didvariableadded == 0 ) fseek(outputfile,-2,SEEK_CUR);
+/*   if ( didvariableadded != 0 && retour77 == 0 ) fseek(outputfile,-1,SEEK_CUR);
+   if ( didvariableadded == 0 ) fseek(outputfile,-1,SEEK_CUR);*/
    if ( todebug == 1 ) printf("Out of WriteVariablelist_subloop_Call\n");
 }
@@ -323 +327 @@
 {
    listvar *parcours;
-   char ligne[LONGNOM];
+   char ligne[LONG_40M];
    int compteur;
 
@@ -341 +345 @@
          if ( didvariableadded == 0 )
          {
-            strcpy(ligne,"");
+            if ( retour77 == 1 ) strcpy(ligne,"\n     &");
+            else strcpy(ligne,"\n      ");
          }
          else
          {
-            if ( compteur == 0 ) strcpy(ligne,"");
+            if ( compteur == 0 )
+            {
+               if ( retour77 == 1 ) strcpy(ligne,"\n     & ");
+               else strcpy(ligne,"\n      ");
+            }
             strcat(ligne,",");
          }
@@ -351 +360 @@
          compteur = compteur + 1;
          didvariableadded = 1;
-         if ( compteur == 3 )
+/*         if ( compteur == 3 )
          {
             if ( retour77 == 0 )
@@ -360 +369 @@
             else fprintf(outputfile,"\n     & %s",ligne);
             compteur = 0;
-         }
+         }*/
       }
       parcours = parcours -> suiv;
    }
-   if ( compteur != 3 && compteur != 0 )
+ /*  if ( compteur != 3 && compteur != 0 )
    {
       if ( retour77 == 0 ) fprintf(outputfile,"\n      %s &",ligne);
       else fprintf(outputfile,"\n     & %s",ligne);
-   }
+   }*/
+   Save_Length(ligne,41);
+   tofich(outputfile,ligne,0);
 
    /* Now we should replace the last ", &" by " &"                            */
-   if ( didvariableadded != 0 && retour77 == 0 ) fseek(outputfile,-1,SEEK_CUR);
-   if ( didvariableadded == 0 ) fseek(outputfile,-1,SEEK_CUR);
+  /* if ( didvariableadded != 0 && retour77 == 0 ) fseek(outputfile,-1,SEEK_CUR);
+   if ( didvariableadded == 0 ) fseek(outputfile,-1,SEEK_CUR);*/
    if ( todebug == 1 ) printf("Out of WriteVariablelist_subloop_Def\n");
 }
@@ -394 +405 @@
 void WriteHeadofSubroutineLoop()
 {
-   char ligne[LONGNOM];
+   char ligne[LONG_C];
    FILE * subloop;
 
@@ -412 +423 @@
    /*                                                                         */
    sprintf(ligne,")");
-   tofich(subloop,ligne,1);
+   fprintf(subloop,ligne);
    /* if USE agrif_Uti l should be add                                        */
    AddUseAgrifUtil_0(subloop);
@@ -434 +445 @@
 /*                                                                            */
 /******************************************************************************/
-void closeandcallsubloopandincludeit_0(int suborfun, char endsub[LONGNOM])
-{
-   char ligne[LONGNOM];
+void closeandcallsubloopandincludeit_0(int suborfun)
+{
+   char ligne[LONG_C];
 
    if ( firstpass == 0 )
@@ -468 +479 @@
       /* Close the parenthesis of the new subroutine called                   */
       sprintf(ligne,")");
-      tofich(fortranout,ligne,1);
+      fprintf(fortranout,ligne);
       /* We should close the original subroutine                              */
       if ( suborfun == 3 ) sprintf(ligne,"\n      end program %s"
@@ -489 +500 @@
 
 
-void closeandcallsubloop_contains_0(int suborfun, char endsub[LONGNOM])
-{
-   char ligne[LONGNOM];
+void closeandcallsubloop_contains_0()
+{
+   char ligne[LONG_C];
 
    if ( firstpass == 0 )