Changeset 10088 for vendors/AGRIF/CMEMS_2020/LIB/decl.h

Timestamp:

2018-09-05T15:35:32+02:00 (6 years ago)

Author:

rblod

Message:

update conv

File:

• vendors/AGRIF/CMEMS_2020/LIB/decl.h (modified) (13 diffs)

vendors/AGRIF/CMEMS_2020/LIB/decl.h

@@ -36 +36 @@
 #define LONG_FNAME 1000    // Max length for a file name
 #define LONG_C     200
-#define LONG_M     2000
+#define LONG_M     1500
 
 #define NB_CAT_VARIABLES 5
@@ -55 +55 @@
    struct listdim *suiv;
 } listdim;                 /* list of the dimensions of a variable            */
+
+typedef struct listname
+{
+   char n_name[LONG_M];
+   struct  listname* suiv;
+} listname ;            /* list of names                                  */
+
+typedef struct do_loop
+{
+   char do_variable[LONG_VNAME];
+   char do_begin[LONG_VNAME];
+   char do_end[LONG_VNAME];
+   char do_step[LONG_VNAME];
+} do_loop ;
+
+typedef struct listdoloop
+{
+   do_loop *cur_do_loop;
+   struct listdoloop* suiv;
+} listdoloop;
 
 typedef struct variable
@@ -68 +88 @@
    char v_commoninfile[LONG_FNAME];
    char v_subroutinename[LONG_VNAME];
+   listdoloop *v_do_loop;
    char v_precision[LONG_C];
-   char v_initialvalue[LONG_M];
+   listname *v_initialvalue;
+   listname *v_initialvalue_array;
    char v_IntentSpec[LONG_M];
    char v_readedlistdimension[LONG_M];
@@ -126 +148 @@
 } listparameter ;           /* list of names                                  */
 
-typedef struct listname
-{
-   char n_name[LONG_VNAME];
-   struct  listname* suiv;
-} listname ;            /* list of names                                  */
-
 typedef struct listcouple
 {
@@ -198 +214 @@
  listname *List_Pointer_Var;
  listname *List_ImplicitNoneSubroutine;
+ 
+ listname *List_Do_labels; 
+ /* A list that contains the do labels if any */
 
  listusemodule *List_NameOfModuleUsed;
@@ -321 +340 @@
  char curmodulename[LONG_VNAME];
  char subroutinename[LONG_VNAME];
+ char old_subroutinename[LONG_VNAME]; // For internal subprogramm
  char cur_filename[LONG_FNAME];     // Name of the current parsed Fortran file
  char config_file[LONG_FNAME];      // Name of conv configuration file (ex: amr.in)
@@ -331 +351 @@
  FILE *fortran_in;           /* Input File                                     */
  FILE *oldfortran_out;
+ FILE *old_oldfortran_out; // For internal subprogramm
  FILE *subloop;
  FILE *module_declar;
@@ -433 +454 @@
 /******************************************************************************/
 extern void WriteBeginof_SubLoop();
-extern void WriteVariablelist_subloop(char *ligne);
-extern void WriteVariablelist_subloop_Call(char **ligne, size_t line_length);
-extern void WriteVariablelist_subloop_Def(char *ligne);
+extern void WriteVariablelist_subloop(char **ligne, size_t *line_length);
+extern void WriteVariablelist_subloop_Call(char **ligne, size_t *line_length);
+extern void WriteVariablelist_subloop_Def(char **ligne, size_t *line_length);
 extern void WriteHeadofSubroutineLoop();
 extern void closeandcallsubloopandincludeit_0(int suborfun);
@@ -516 +537 @@
 extern int varistyped_0(char *ident);
 extern void dump_var(const variable* var);
+extern void removenewline(char *nom);
 /******************************************************************************/
 /*********** UtilListe.c ******************************************************/
@@ -532 +554 @@
 extern int IsinListe(listvar *lin,char *nom);
 extern listname *Insertname(listname *lin,char *nom,int sens);
+extern int testandextractfromlist(listname **lin, char*nom);
+extern void removefromlist(listname **lin, char*nom);
 extern listname *concat_listname(listname *l1, listname *l2);
 extern void createstringfromlistname(char *ligne, listname *lin);
@@ -540 +564 @@
 extern void  addprecision_derivedfromkind(variable *curvar);
 extern int get_cat_var(variable *var);
+extern void Insertdoloop(variable *var,char *do_var, char *do_begin, char *do_end, char *do_step);
 /******************************************************************************/
 /*********** UtilNotGridDep.c *************************************************/
@@ -560 +585 @@
 /******************************************************************************/
 extern void Add_Data_Var_1 (listvar **curlist,char *name,char *values);
-extern void Add_Data_Var_Names_01 (listvar **curlist,listname *l1, listname *l2);
+extern void Add_Data_Var_Names_01 (listvar **curlist,listvar *l1, listname *l2);
 /******************************************************************************/
 /*********** WorkWithlistmoduleinfile.c ***************************************/
@@ -641 +666 @@
 extern void WriteArgumentDeclaration_beforecall();
 extern void WriteArgumentDeclaration_Sort(FILE* tofile);
-extern listnom * writedeclarationintoamr(listvar *deb_common, FILE *fileout, variable *var,
-                  const char *commonname, listnom *neededparameter, const char *name_common);
+extern int writedeclarationintoamr(listvar *deb_common, FILE *fileout, variable *var,
+                  const char *commonname, listnom **neededparameter, const char *name_common, int global_check);
 extern void writesub_loopdeclaration_scalar(listvar *deb_common, FILE *fileout);
 extern void writesub_loopdeclaration_tab(listvar *deb_common, FILE *fileout);