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

Timestamp:

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

Author:

rblod

Message:

Update Agrif, see ticket:#39

File:

• trunk/AGRIF/LIB/UtilAgrif.c (modified) (7 diffs)

trunk/AGRIF/LIB/UtilAgrif.c

@@ -31 +31 @@
 /* knowledge of the CeCILL-C license and that you accept its terms.           */
 /******************************************************************************/
-/* version 1.6                                                                */
+/* version 1.7                                                                */
 /******************************************************************************/
 #include <stdio.h>
@@ -237 +237 @@
      listnomtmp=(listnom *)malloc(sizeof(listnom));
      strcpy(listnomtmp->o_nom,sub);
+     Save_Length(sub,23);
      strcpy(listnomtmp->o_module,mod);
+     Save_Length(mod,24);
      listnomtmp->suiv = NULL;
      List_SubroutineWhereAgrifUsed  =  listnomtmp;
@@ -252 +254 @@
        listnomtmp=(listnom *)malloc(sizeof(listnom));
        strcpy(listnomtmp->o_nom,sub);
+       Save_Length(sub,23);
        strcpy(listnomtmp->o_module,mod);
+       Save_Length(mod,24);
        listnomtmp->suiv = List_SubroutineWhereAgrifUsed;
        List_SubroutineWhereAgrifUsed  =  listnomtmp;
@@ -280 +284 @@
 {
   listnom *parcours;
-  listusemodule *newmodule;
-  int out;
 
   if ( firstpass == 0 )
@@ -578 +580 @@
 void AgriffunctionModify_0(char *ident,int whichone)
 {
-   char toprint[LONGNOM];
+   char toprint[LONG_C];
 
    if ( firstpass == 0 )
@@ -606 +608 @@
       else if ( whichone == 3 ) /* Agrif_Rhox                                 */
       {
-         sprintf(toprint,"REAL(Agrif_Curgrid %% spaceref(1))");
+         sprintf(toprint,"REAL(");
+         if( retour77 == 0 ) strcat(toprint," & \n");
+         else strcat(toprint,"\n     & ");
+         strcat(toprint,"Agrif_Curgrid % spaceref(1))");
       }
       else if ( whichone == 4 ) /* Agrif_Parent_Rhox                          */
       {
-         sprintf(toprint,"REAL(Agrif_Curgrid %% parent %% spaceref(1))");
+         sprintf(toprint,"REAL(");
+         if( retour77 == 0 ) strcat(toprint," & \n");
+         else strcat(toprint,"\n     & ");
+         strcat(toprint,"Agrif_Curgrid % parent % spaceref(1))");
       }
       else if ( whichone == 5 ) /* Agrif_Rhox                                 */
       {
-         sprintf(toprint,"Agrif_Curgrid %% spaceref(1)");
+         sprintf(toprint,"Agrif_Curgrid");
+         if( retour77 == 0 ) strcat(toprint," & \n");
+         else strcat(toprint,"\n     & ");
+         strcat(toprint,"% spaceref(1)");
       }
       else if ( whichone == 6 ) /* Agrif_Parent_Rhox                          */
       {
-         sprintf(toprint,"Agrif_Curgrid %% parent %% spaceref(1)");
+         sprintf(toprint,"Agrif_Curgrid");
+         if( retour77 == 0 ) strcat(toprint," & \n");
+         else strcat(toprint,"\n     & ");
+         strcat(toprint,"% parent % spaceref(1)");
       }
       else if ( whichone == 7 ) /* Agrif_Rhoy                                 */
       {
-         sprintf(toprint,"REAL(Agrif_Curgrid %% spaceref(2))");
+         sprintf(toprint,"REAL(Agrif_Curgrid");
+         if( retour77 == 0 ) strcat(toprint," & \n");
+         else strcat(toprint,"\n     & ");
+         strcat(toprint,"% spaceref(2))");
       }
       else if ( whichone == 8 ) /* Agrif_Parent_Rhoy                          */
       {
-         sprintf(toprint,"REAL(Agrif_Curgrid %% parent %% spaceref(2))");
+         sprintf(toprint,"REAL(Agrif_Curgrid");
+         if( retour77 == 0 ) strcat(toprint," & \n");
+         else strcat(toprint,"\n     & ");
+         strcat(toprint,"% parent % spaceref(2))");
       }
       else if ( whichone == 9 ) /* Agrif_Rhoy                                 */
       {
-         sprintf(toprint,"Agrif_Curgrid %% spaceref(2)");
+         sprintf(toprint,"Agrif_Curgrid");
+         if( retour77 == 0 ) strcat(toprint," & \n");
+         else strcat(toprint,"\n     & ");
+         strcat(toprint,"% spaceref(2)");
       }
       else if ( whichone == 10 ) /* Agrif_Parent_Rhoy                         */
       {
-         sprintf(toprint,"Agrif_Curgrid %% parent %% spaceref(2)");
+         sprintf(toprint,"Agrif_Curgrid");
+         if( retour77 == 0 ) strcat(toprint," & \n");
+         else strcat(toprint,"\n     & ");
+         strcat(toprint,"% parent % spaceref(2)");
       }
       else if ( whichone == 11 ) /* Agrif_Rhoz                                */
       {
-         sprintf(toprint,"REAL(Agrif_Curgrid %% spaceref(3))");
+         sprintf(toprint,"REAL(Agrif_Curgrid");
+         if( retour77 == 0 ) strcat(toprint," & \n");
+         else strcat(toprint,"\n     & ");
+         strcat(toprint,"% spaceref(3))");
       }
       else if ( whichone == 12 ) /* Agrif_Parent_Rhoz                         */
       {
-         sprintf(toprint,"REAL(Agrif_Curgrid %% parent %% spaceref(3))");
+         sprintf(toprint,"REAL(Agrif_Curgrid");
+         if( retour77 == 0 ) strcat(toprint," & \n");
+         else strcat(toprint,"\n     & ");
+         strcat(toprint,"% parent % spaceref(3))");
       }
       else if ( whichone == 13 ) /* Agrif_Rhoz                                */
       {
-         sprintf(toprint,"Agrif_Curgrid %% spaceref(3)");
+         sprintf(toprint,"Agrif_Curgrid");
+         if( retour77 == 0 ) strcat(toprint," & \n");
+         else strcat(toprint,"\n     & ");
+         strcat(toprint,"% spaceref(3)");
       }
       else if ( whichone == 14 ) /* Agrif_Parent_Rhoz                         */
       {
-         sprintf(toprint,"Agrif_Curgrid %% parent %% spaceref(3)");
+         sprintf(toprint,"Agrif_Curgrid");
+         if( retour77 == 0 ) strcat(toprint," & \n");
+         else strcat(toprint,"\n     & ");
+         strcat(toprint,"% parent % spaceref(3)");
       }
       else if ( whichone == 15 ) /* Agrif_NearCommonBorderX                   */
       {
-         sprintf(toprint,"Agrif_Curgrid %% NearRootBorder(1)");
+         sprintf(toprint,"Agrif_Curgrid");
+         if( retour77 == 0 ) strcat(toprint," & \n");
+         else strcat(toprint,"\n     & ");
+         strcat(toprint,"% NearRootBorder(1)");
       }
       else if ( whichone == 16 ) /* Agrif_NearCommonBorderY                   */
       {
-         sprintf(toprint,"Agrif_Curgrid %% NearRootBorder(2)");
+         sprintf(toprint,"Agrif_Curgrid");
+         if( retour77 == 0 ) strcat(toprint," & \n");
+         else strcat(toprint,"\n     & ");
+         strcat(toprint,"% NearRootBorder(2)");
       }
       else if ( whichone == 17 ) /* Agrif_NearCommonBorderZ                   */
       {
-         sprintf(toprint,"Agrif_Curgrid %% NearRootBorder(3)");
+         sprintf(toprint,"Agrif_Curgrid");
+         if( retour77 == 0 ) strcat(toprint," & \n");
+         else strcat(toprint,"\n     & ");
+         strcat(toprint,"% NearRootBorder(3)");
       }
       else if ( whichone == 18 ) /* Agrif_NearCommonBorderX                   */
       {
-         sprintf(toprint,"Agrif_Curgrid %% DistantRootBorder(1)");
+         sprintf(toprint,"Agrif_Curgrid");
+         if( retour77 == 0 ) strcat(toprint," & \n");
+         else strcat(toprint,"\n     & ");
+         strcat(toprint,"% DistantRootBorder(1)");
       }
       else if ( whichone == 19 ) /* Agrif_NearCommonBorderY                   */
       {
-         sprintf(toprint,"Agrif_Curgrid %% DistantRootBorder(2)");
+         sprintf(toprint,"Agrif_Curgrid");
+         if( retour77 == 0 ) strcat(toprint," & \n");
+         else strcat(toprint,"\n     & ");
+         strcat(toprint,"% DistantRootBorder(2)");
       }
       else if ( whichone == 20 ) /* Agrif_NearCommonBorderZ                   */
       {
-         sprintf(toprint,"Agrif_Curgrid %% DistantRootBorder(3)");
+         sprintf(toprint,"Agrif_Curgrid");
+         if( retour77 == 0 ) strcat(toprint," & \n");
+         else strcat(toprint,"\n     & ");
+         strcat(toprint,"% DistantRootBorder(3)");
       }
       else if ( whichone == 21 ) /* Agrif_Get_parent_id                       */
       {
-         sprintf(toprint,"Agrif_Curgrid %% parent %% grid_id");
+         sprintf(toprint,"Agrif_Curgrid");
+         if( retour77 == 0 ) strcat(toprint," & \n");
+         else strcat(toprint,"\n     & ");
+         strcat(toprint,"% parent % grid_id");
       }
       else if ( whichone == 22 ) /*  Agrif_Get_grid_id                        */
       {
-         sprintf(toprint,"Agrif_Curgrid %% grid_id");
+         sprintf(toprint,"Agrif_Curgrid");
+         if( retour77 == 0 ) strcat(toprint," & \n");
+         else strcat(toprint,"\n     & ");
+         strcat(toprint,"% grid_id");
       }
       else if ( whichone == 23 ) /*  Agrif_Parent_Iz                          */
       {
-         sprintf(toprint,"Agrif_Curgrid %% parent %% ix(3)");
+         sprintf(toprint,"Agrif_Curgrid");
+         if( retour77 == 0 ) strcat(toprint," & \n");
+         else strcat(toprint,"\n     & ");
+         strcat(toprint,"% parent % ix(3)");
       }
       else if ( whichone == 24 ) /*  Agrif_Parent_Iy                          */
       {
-         sprintf(toprint,"Agrif_Curgrid %% parent %% ix(2)");
+         sprintf(toprint,"Agrif_Curgrid");
+         if( retour77 == 0 ) strcat(toprint," & \n");
+         else strcat(toprint,"\n     & ");
+         strcat(toprint,"% parent % ix(2)");
       }
       else if ( whichone == 25 ) /*  Agrif_Parent_Ix                          */
       {
-         sprintf(toprint,"Agrif_Curgrid %% parent %% ix(1)");
+         sprintf(toprint,"Agrif_Curgrid");
+         if( retour77 == 0 ) strcat(toprint," & \n");
+         else strcat(toprint,"\n     & ");
+         strcat(toprint,"% parent % ix(1)");
       }
       else if ( whichone == 26 ) /* Agrif_Iz                                  */
       {
-         sprintf(toprint,"Agrif_Curgrid %% ix(3)");
+         sprintf(toprint,"Agrif_Curgrid");
+         if( retour77 == 0 ) strcat(toprint," & \n");
+         else strcat(toprint,"\n     & ");
+         strcat(toprint," % ix(3)");
       }
       else if ( whichone == 27 ) /* Agrif_Iy                                  */
       {
-         sprintf(toprint,"Agrif_Curgrid %% ix(2)");
+         sprintf(toprint,"Agrif_Curgrid");
+         if( retour77 == 0 ) strcat(toprint," & \n");
+         else strcat(toprint,"\n     & ");
+         strcat(toprint,"% ix(2)");
       }
       else if ( whichone == 28 ) /* Agrif_Ix                                  */
       {
-         sprintf(toprint,"Agrif_Curgrid %% ix(1)");
+         sprintf(toprint,"Agrif_Curgrid");
+         if( retour77 == 0 ) strcat(toprint," & \n");
+         else strcat(toprint,"\n     & ");
+         strcat(toprint,"% ix(1)");
       }
       else if ( whichone == 29 ) /* Agrif_Nb_Fixed_Grids                      */
@@ -714 +794 @@
       else if ( whichone == 30 ) /* AGRIF_Nb_Step                             */
       {
-         sprintf(toprint,"Agrif_Curgrid %% ngridstep");
+         sprintf(toprint,"Agrif_Curgrid");
+         if( retour77 == 0 ) strcat(toprint," & \n");
+         else strcat(toprint,"\n     & ");
+         strcat(toprint,"% ngridstep");
       }
       /*                                                                      */
       if ( whichone == 1 || whichone == 2 )
       {
+         Save_Length(toprint,43);
          tofich(fortranout,toprint,2);
       }
       else
       {
-         if( retour77 == 0 ) fprintf(fortranout," & \n");
-         else fprintf(fortranout,"\n     & ");
+/*         if( retour77 == 0 ) fprintf(fortranout," & \n");
+         else fprintf(fortranout,"\n     & ");*/
+         Save_Length(toprint,43);
          fprintf(fortranout,"%s",toprint);
       }