--- ray/src/util/eplus_idf.h 2014/02/09 02:18:16 2.3 +++ ray/src/util/eplus_idf.h 2014/02/10 04:51:26 2.6 @@ -1,4 +1,4 @@ -/* RCSid $Id: eplus_idf.h,v 2.3 2014/02/09 02:18:16 greg Exp $ */ +/* RCSid $Id: eplus_idf.h,v 2.6 2014/02/10 04:51:26 greg Exp $ */ /* * eplus_idf.h * @@ -23,7 +23,7 @@ extern "C" { typedef struct s_idf_field { struct s_idf_field *next; /* next in parameter list */ char *rem; /* string following argument */ - char arg[2]; /* argument (extends struct) */ + char val[2]; /* value (extends struct) */ } IDF_FIELD; /* Input Data File parameter */ @@ -31,6 +31,7 @@ typedef struct s_idf_parameter { const char *pname; /* parameter name (type) */ struct s_idf_parameter *pnext; /* next parameter same type */ struct s_idf_parameter *dnext; /* next parameter in IDF */ + int nfield; /* field count */ IDF_FIELD *flist; /* field list */ char rem[1]; /* comment (extends struct) */ } IDF_PARAMETER; @@ -54,9 +55,13 @@ extern int idf_addfield(IDF_PARAMETER *param, const c /* Retrieve the indexed field from parameter (first field index is 1) */ extern IDF_FIELD *idf_getfield(IDF_PARAMETER *param, int fn); -/* Delete the specified parameter from our IDF */ +/* Delete the specified parameter from the IDF */ extern int idf_delparam(IDF_LOADED *idf, IDF_PARAMETER *param); +/* Move the specified parameter to the given position in the IDF */ +extern int idf_movparam(IDF_LOADED *idf, IDF_PARAMETER *param, + IDF_PARAMETER *prev); + /* Get a named parameter list */ extern IDF_PARAMETER *idf_getparam(IDF_LOADED *idf, const char *pname); @@ -66,14 +71,19 @@ extern IDF_PARAMETER *idf_readparam(IDF_LOADED *idf, F /* Initialize an IDF struct */ extern IDF_LOADED *idf_create(const char *hdrcomm); +/* Add comment(s) to header */ +extern int idf_add2hdr(IDF_LOADED *idf, const char *hdrcomm); + /* Load an Input Data File */ extern IDF_LOADED *idf_load(const char *fname); /* Write a parameter and fields to an open file */ -int idf_writeparam(IDF_PARAMETER *param, FILE *fp); +int idf_writeparam(IDF_PARAMETER *param, FILE *fp, + int incl_comm); /* Write out an Input Data File */ -extern int idf_write(IDF_LOADED *idf, const char *fname); +extern int idf_write(IDF_LOADED *idf, const char *fname, + int incl_comm); /* Free a loaded IDF */ extern void idf_free(IDF_LOADED *idf);