Changeset 8139 for branches/2017/dev_r8126_UKMO_AGRIF_vert_interp/NEMOGCM/EXTERNAL/AGRIF/LIB/UtilListe.c

Timestamp:

2017-06-05T12:05:17+02:00 (7 years ago)

Author:

timgraham

Message:

Updates to conv library as received from Laurent - required for vertical refinement

File:

• branches/2017/dev_r8126_UKMO_AGRIF_vert_interp/NEMOGCM/EXTERNAL/AGRIF/LIB/UtilListe.c (modified) (10 diffs)

branches/2017/dev_r8126_UKMO_AGRIF_vert_interp/NEMOGCM/EXTERNAL/AGRIF/LIB/UtilListe.c

@@ -52 +52 @@
    strcpy(var->v_subroutinename     , "");
    strcpy(var->v_precision          , "");
-   strcpy(var->v_initialvalue       , "");
+   var->v_initialvalue = (listname *)NULL;
+   var->v_initialvalue_array = (listname *)NULL;
+   var->v_do_loop = NULL;
    strcpy(var->v_IntentSpec         , "");
    strcpy(var->v_readedlistdimension, "");
@@ -103 +105 @@
             newvar->suiv = l;
         }
+        newvar=glob;
+        while (newvar)
+        {
+        newvar=newvar->suiv;
+        }
     }
     return glob;
@@ -117 +124 @@
 void CreateAndFillin_Curvar(const char *type, variable *curvar)
 {
+listname *newvar;
+
     if ( !strcasecmp(type, "character") && strcasecmp(CharacterSize, "") )
     {
@@ -150 +159 @@
     if (InitialValueGiven == 1 )
     {
-        strcpy(curvar->v_initialvalue,InitValue);
+    curvar->v_initialvalue=Insertname(curvar->v_initialvalue,InitValue,0);
+    
+//        strcpy(curvar->v_initialvalue,InitValue);
+        
         Save_Length(InitValue,14);
     }
@@ -481 +493 @@
       v = newvar->var;
       strcpy(v->v_typevar,nom);
+      
       v->v_catvar = get_cat_var(v);
+
       newvar = newvar->suiv;
    }
@@ -502 +516 @@
    {
       v=newvar->var;
-      printf("nom = %s, allocatable = %d dim = %s\n",v->v_nomvar,v->v_allocatable,(v->v_dimension)->dim.last);
       newvar=newvar->suiv;
    }
@@ -564 +577 @@
 }
 
+int testandextractfromlist(listname **lin, char*nom)
+{
+listname *newvar;
+int val_1, val_2;
+int return_stmt;
+
+printname(*lin);
+if (!(*lin))
+ {
+  return 0;
+ }
+else
+ {
+ sscanf(nom,"%d",&val_1);
+ sscanf((*lin)->n_name,"%d",&val_2);
+ if (val_1==val_2)
+   {
+/*   newvar = *lin;
+   *lin = (*lin)->suiv;
+   free(newvar);*/
+   /* continue to remove while the label stays the same */
+/*   return_stmt=testandextractfromlist(lin,nom);*/
+   return 1;
+   }
+ else
+  {
+  return 0;
+  }
+ }
+}
+
+void removefromlist(listname **lin, char*nom)
+{
+listname *newvar,*prev;
+int val_1, val_2;
+int return_stmt;
+int out;
+
+printname(*lin);
+if (*lin)
+ {
+ sscanf(nom,"%d",&val_1);
+ prev=(listname *) calloc(1,sizeof(listname));
+ prev->suiv=*lin;
+ *lin=prev;
+ newvar=(*lin)->suiv;
+ out = 0;
+ while (newvar && out == 0)
+ {
+ sscanf((newvar)->n_name,"%d",&val_2);
+ if (val_1==val_2)
+   {
+   prev->suiv=newvar->suiv;
+   free(newvar);
+   }
+  if (prev->suiv) 
+    {
+    prev=prev->suiv;
+    newvar=prev->suiv;
+    }
+   else
+   {
+   out = 1;
+   }
+  }
+ prev=*lin;
+ *lin=(*lin)->suiv;
+ free(prev);
+ }
+}
+
 listname *concat_listname(listname *l1, listname *l2)
 {
@@ -606 +690 @@
    while (newvar)
    {
-      printf("nom = %s \n",newvar->n_name);
       newvar=newvar->suiv;
    }
@@ -694 +777 @@
 int get_cat_var(variable *var)
 {
+
     if (!strcasecmp(var->v_typevar, "CHARACTER"))
         return 1;
@@ -705 +789 @@
         return 0;
 }
+
+void Insertdoloop(variable *var,char *do_var,char *do_begin, char *do_end, char *do_step)
+{
+listdoloop *new_do_loop;
+listdoloop *tmploop;
+new_do_loop = (listdoloop *) calloc(1,sizeof(listdoloop));
+
+new_do_loop->cur_do_loop = (do_loop *) calloc(1,sizeof(do_loop));
+
+strcpy(new_do_loop->cur_do_loop->do_variable,do_var);
+strcpy(new_do_loop->cur_do_loop->do_begin,do_begin);
+strcpy(new_do_loop->cur_do_loop->do_end,do_end);
+strcpy(new_do_loop->cur_do_loop->do_step,do_step);
+new_do_loop->suiv = NULL;
+
+if (!var->v_do_loop)
+{
+  var->v_do_loop = new_do_loop;
+}
+else
+{
+  new_do_loop->suiv = var->v_do_loop;
+  var->v_do_loop = new_do_loop;
+      
+//   tmploop = var->v_do_loop;
+//   while (tmploop->suiv)
+//   {
+//     tmploop=tmploop->suiv;
+//   }
+//   tmploop->suiv = new_do_loop ;
+//   }
+}
+}