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

Timestamp:

2008-09-24T15:05:20+02:00 (16 years ago)

Author:

rblod

Message:

Adapt Agrif to the new SBC and correct several bugs for agrif (restart writing and reading), see ticket #133
Note : this fix does not work yet on NEC computerq (sxf90/360)

File:

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

trunk/AGRIF/LIB/SubLoopCreation.c

@@ -84 +84 @@
       /* now we should write the function declaration                         */
       /*    case if it is the                                                 */
-      WriteFunctionDeclaration();
+      WriteFunctionDeclaration(1);
       if ( mark == 1 ) fprintf(fortranout,"!!! 555555555555555 \n");
-      if ( SubInList_ContainsSubroutine() == 0 ) WriteSubroutineDeclaration(1);
+
+//      if ( SubInList_ContainsSubroutine() == 0 ) WriteSubroutineDeclaration(1);
+  
       if ( mark == 1 ) fprintf(fortranout,"!!! 666666666666666 \n");
       if ( todebug == 1 ) printf("Out of writeheadnewsub_0\n");
@@ -100 +102 @@
       WriteLocalParamDeclaration();
       if ( mark == 1 ) fprintf(fortranout,"!!! bbbbbbbbbbbbbbb \n");
-      if ( functiondeclarationisdone == 0 ) WriteFunctionDeclaration();
+      if ( functiondeclarationisdone == 0 ) WriteFunctionDeclaration(1);
       WriteArgumentDeclaration_beforecall();
 /*      writesub_loopdeclaration_scalar(List_SubroutineArgument_Var,fortranout);
@@ -106 +108 @@
       if ( mark == 1 ) fprintf(fortranout,"!!! ccccccccccccccc \n");
       if ( mark == 1 ) fprintf(fortranout,"!!! ddddddddddddddd \n");
-      WriteSubroutineDeclaration(1);
+//      WriteSubroutineDeclaration(1);
       if ( mark == 1 ) fprintf(fortranout,"!!! eeeeeeeeeeeeeee \n");
    }
@@ -138 +140 @@
    while ( parcours )
    {
+
       /* if the readed variable is a variable of the subroutine               */
       /*    subroutinename we should write the name of this variable          */
@@ -229 +232 @@
    int compteur ;
 
+   strcpy(ligne,"");
+   
    if ( todebug == 1 ) printf("Enter in WriteVariablelist_subloop_Call\n");
    parcours = List_UsedInSubroutine_Var;
@@ -238 +243 @@
       /*    in the output file                                                */
       if ( !strcasecmp(parcours->var->v_subroutinename,subroutinename)  &&
-           parcours->var->v_allocatable == 0                            &&
+          (parcours->var->v_allocatable == 0  || !strcasecmp(parcours->var->v_typevar,"type"))      &&
            parcours->var->v_pointerdeclare == 0
          )
@@ -300 +305 @@
       parcours = parcours -> suiv;
    }
+   
    Save_Length(ligne,41);
    tofich(outputfile,ligne,0);
@@ -327 +333 @@
 {
    listvar *parcours;
-   char ligne[LONG_40M];
+/*   char ligne[LONG_40M];*/
+   char *ligne;
    int compteur;
 
+/*   strcpy(ligne," ");*/
+
+   ligne=(char *)malloc(LONG_40M*sizeof(char));
+   
    if ( todebug == 1 ) printf("Enter in WriteVariablelist_subloop_Def\n");
    parcours = List_UsedInSubroutine_Var;
@@ -339 +350 @@
       /*    in the output file                                                */
       if ( !strcasecmp(parcours->var->v_subroutinename,subroutinename)  &&
-           parcours->var->v_allocatable == 0                            &&
+          (parcours->var->v_allocatable == 0  || !strcasecmp(parcours->var->v_typevar,"type"))      &&
            parcours->var->v_pointerdeclare == 0
          )
@@ -385 +396 @@
    if ( didvariableadded == 0 ) fseek(outputfile,-1,SEEK_CUR);*/
    if ( todebug == 1 ) printf("Out of WriteVariablelist_subloop_Def\n");
+   strcpy(ligne,"");
+   
+   free(ligne);
 }
 
@@ -462 +476 @@
       fclose(fortranout);
       fortranout = oldfortranout;
+
+
       AddUseAgrifUtilBeforeCall_0(fortranout);
-      if ( functiondeclarationisdone == 0 ) WriteFunctionDeclaration();
+      if ( functiondeclarationisdone == 0 ) WriteFunctionDeclaration(0);
       WriteArgumentDeclaration_beforecall();
       if ( !strcasecmp(subofagrifinitgrids,subroutinename) )
@@ -493 +509 @@
       tofich(fortranout,ligne,1);
       }
+    oldfortranout = (FILE *)NULL;      
    if ( todebug == 1 ) printf("Out of closeandcallsubloopandincludeit_0\n");
    }
+   
 }
 
@@ -514 +532 @@
       fclose(fortranout);
       fortranout = oldfortranout;
+
       AddUseAgrifUtilBeforeCall_0(fortranout);
       if ( ImplicitNoneInSubroutine() == 1 ) fprintf(fortranout,
                                                        "      IMPLICIT NONE\n");
       WriteLocalParamDeclaration();
-      if ( functiondeclarationisdone == 0 ) WriteFunctionDeclaration();
+      if ( functiondeclarationisdone == 0 ) WriteFunctionDeclaration(0);
       WriteArgumentDeclaration_beforecall();
       WriteSubroutineDeclaration(0);
@@ -543 +562 @@
       tofich(fortranout,ligne,1);
       }
+   oldfortranout = (FILE *)NULL;
    if ( todebug == 1 ) printf("Out of closeandcallsubloopandincludeit_0\n");
    }