Changeset 2715 for trunk/NEMOGCM/EXTERNAL/AGRIF/LIB/WorkWithlistdatavariable.c

Timestamp:

2011-03-30T17:58:35+02:00 (13 years ago)

Author:

rblod

Message:

First attempt to put dynamic allocation on the trunk

File:

• trunk/NEMOGCM/EXTERNAL/AGRIF/LIB/WorkWithlistdatavariable.c (modified) (2 diffs)

trunk/NEMOGCM/EXTERNAL/AGRIF/LIB/WorkWithlistdatavariable.c

@@ -48 +48 @@
 /*                                                                            */
 /******************************************************************************/
-void Add_Data_Var_1 (char *name,char *values)
+void Add_Data_Var_1 (listvar **curlist,char *name,char *values)
 {
   listvar *newvar;
+  char ligne[LONG_C];
 
-  if ( firstpass == 1 )
-  {
+//  if ( firstpass == 1 )
+//  {
      newvar=(listvar *)malloc(sizeof(listvar));
      newvar->var=(variable *)malloc(sizeof(variable));
@@ -68 +69 @@
      strcpy(newvar->var->v_commoninfile,mainfile);
      Save_Length(mainfile,10);
-     strcpy(newvar->var->v_initialvalue,values);
-     Save_Length(values,14);
+     if (strchr(values,',') && strncasecmp(values,"'",1))
+            {
+            sprintf(ligne,"(/%s/)",values);
+            }
+     else
+       strcpy(ligne,values);
+       
+     strcpy(newvar->var->v_initialvalue,ligne);
+     Save_Length(ligne,14);
      newvar->suiv = NULL;
-
-     if ( !List_Data_Var )
+     if ( ! (*curlist) )
      {
-        List_Data_Var  = newvar ;
+        *curlist  = newvar ;
      }
      else
      {
-        newvar->suiv = List_Data_Var;
-        List_Data_Var = newvar;
+        newvar->suiv = *curlist;
+        *curlist = newvar;
      }
+//  }
+}
+
+void Add_Data_Var_Names_01 (listvar **curlist,listname *l1,listname *l2)
+{
+  listvar *newvar;
+  listvar *tmpvar;
+  listname *tmpvar1;
+  listname *tmpvar2;  
+  char ligne[LONG_C];
+  
+  tmpvar1 = l1;
+  tmpvar2 = l2;
+  
+  while (tmpvar1)
+     {
+     newvar=(listvar *)malloc(sizeof(listvar));
+     newvar->var=(variable *)malloc(sizeof(variable));
+     /*                                                                       */
+     Init_Variable(newvar->var);
+     /*                                                                       */
+     if ( inmoduledeclare == 1 ) newvar->var->v_module=1;
+     strcpy(newvar->var->v_nomvar,tmpvar1->n_name);
+     Save_Length(tmpvar1->n_name,4);
+     strcpy(newvar->var->v_subroutinename,subroutinename);
+     Save_Length(subroutinename,11);
+     strcpy(newvar->var->v_modulename,curmodulename);
+     Save_Length(curmodulename,6);
+     strcpy(newvar->var->v_commoninfile,mainfile);
+     Save_Length(mainfile,10);
+       
+     strcpy(newvar->var->v_initialvalue,tmpvar2->n_name);
+     Save_Length(tmpvar2->n_name,14);
+     newvar->suiv = NULL;
+     
+     if ( ! (*curlist) )
+     {
+        *curlist  = newvar ;
+     }
+     else
+     {
+        tmpvar = *curlist;
+        while (tmpvar->suiv)
+          tmpvar=tmpvar->suiv;
+        tmpvar->suiv = newvar;
+     }
+     
+  tmpvar1 = tmpvar1->suiv;
+  tmpvar2 = tmpvar2->suiv;  
   }
+  return;
+
+
 }