Changeset 3289 for branches/2011/dev_NEMO_MERGE_2011/NEMOGCM/EXTERNAL/AGRIF/LIB/UtilListe.c

Timestamp:

2012-01-27T15:37:34+01:00 (12 years ago)

Author:

rblod

Message:

Fix agrif for 3_4_beta see ticket #921

File:

• branches/2011/dev_NEMO_MERGE_2011/NEMOGCM/EXTERNAL/AGRIF/LIB/UtilListe.c (modified) (3 diffs)

branches/2011/dev_NEMO_MERGE_2011/NEMOGCM/EXTERNAL/AGRIF/LIB/UtilListe.c

@@ -147 +147 @@
    Save_Length(curmodulename,6);
    /* Si cette variable a ete initialisee                                     */
-   if (InitialValueGiven == 1 )
+/*RB*/
+   if ( ! strcmp(InitialValueGiven,"=")  ) 
+/*RBend*/
    {
       strcpy(curvar->v_initialvalue,InitValue);
@@ -153 +155 @@
    }
    /* Si cette variable est declaree en save                                  */
-   if (SaveDeclare == 1 ) {
+/*RB*/
+   if (SaveDeclare == 1 &&  !strcasecmp(curvar->v_typevar,"type")) {
+/*RBend*/
    curvar->v_save = 1;
    }
@@ -399 +403 @@
          dims = dims->suiv;
       }
-      if ( dimsempty == 1 ) var->v_dimsempty=1;
+/*RB*/
+      if ( dimsempty == 1 || GlobalDeclarationType == 1 ) var->v_dimsempty=1;
+/*RBend*/
    }
    strcpy(var->v_readedlistdimension,listdimension);