Commit 8cf3ab98 authored by Uwe Schulzweida's avatar Uwe Schulzweida
Browse files

renamed SVARINFO to svarinfo_t

parent b86289ac
......@@ -2793,7 +2793,7 @@ size_t gribapiEncode(int varID, int levelID, int vlistID, int gridID, int zaxisI
int lieee = FALSE;
int ensID, ensCount, forecast_type; /* Ensemble Data */
long bitsPerValue;
long editionNumber;
long editionNumber = 2;
char name[256];
grib_handle *gh = NULL;
gribContainer_t *gc = (gribContainer_t *) gribContainer;
......@@ -2804,7 +2804,7 @@ size_t gribapiEncode(int varID, int levelID, int vlistID, int gridID, int zaxisI
vlistInqVarName(vlistID, varID, name);
#if defined(GRIBAPIENCODETEST)
gh = (grib_handle *) gribHandleNew();
gh = (grib_handle *) gribHandleNew(editionNumber);
#else
gh = gc->gribHandle;
#endif
......
......@@ -587,7 +587,7 @@ void streamPrintP ( void * streamptr, FILE * fp )
fprintf ( fp, "nrecs = %d\n", sp->nrecs );
fprintf ( fp, "nvars = %d\n", sp->nvars );
fprintf ( fp, "varlocked = %d\n", sp->varlocked );
fprintf ( fp, "//SVARINFO *vars;\n" );
fprintf ( fp, "//svarinfo_t *vars;\n" );
fprintf ( fp, "varsAllocated = %d\n", sp->varsAllocated );
fprintf ( fp, "varinit = %d\n", sp->varinit );
fprintf ( fp, "curTsID = %d\n", sp->curTsID );
......
......@@ -188,7 +188,7 @@ typedef struct {
int tsteptype; /* TSTEP_* */
int nlevel;
}
SVARINFO;
svarinfo_t;
typedef struct {
......@@ -201,53 +201,53 @@ VCT;
typedef struct {
int self;
int accesstype; /* TYPE_REC or TYPE_VAR */
int accessmode;
int filetype;
int byteorder;
int fileID;
int dimgroupID;
int filemode;
off_t numvals;
char *filename;
Record *record;
int nrecs; /* number of records */
int nvars; /* number of variables */
int varlocked; /* variables locked */
SVARINFO *vars;
int varsAllocated;
int varinit;
int curTsID; /* current timestep ID */
int rtsteps; /* number of tsteps accessed */
long ntsteps; /* number of tsteps : only set if all records accessed */
int numTimestep; /* number of tsteps : only set if all records accessed */
TSTEPS *tsteps;
int tstepsTableSize;
int tstepsNextID;
BaseTime basetime;
int ncmode;
int vlistID;
int xdimID[MAX_GRIDS_PS];
int ydimID[MAX_GRIDS_PS];
int zaxisID[MAX_ZAXES_PS];
int ncxvarID[MAX_GRIDS_PS];
int ncyvarID[MAX_GRIDS_PS];
int ncavarID[MAX_GRIDS_PS];
int historyID;
int globalatts;
int localatts;
VCT vct;
int unreduced;
int sortname;
int have_missval;
int comptype; // compression type
int complevel; // compression level
int curfile;
int nfiles;
char **fnames;
void *gribContainers;
int vlistIDorig;
int self;
int accesstype; /* TYPE_REC or TYPE_VAR */
int accessmode;
int filetype;
int byteorder;
int fileID;
int dimgroupID;
int filemode;
off_t numvals;
char *filename;
Record *record;
int nrecs; /* number of records */
int nvars; /* number of variables */
int varlocked; /* variables locked */
svarinfo_t *vars;
int varsAllocated;
int varinit;
int curTsID; /* current timestep ID */
int rtsteps; /* number of tsteps accessed */
long ntsteps; /* number of tsteps : only set if all records accessed */
int numTimestep; /* number of tsteps : only set if all records accessed */
TSTEPS *tsteps;
int tstepsTableSize;
int tstepsNextID;
BaseTime basetime;
int ncmode;
int vlistID;
int xdimID[MAX_GRIDS_PS];
int ydimID[MAX_GRIDS_PS];
int zaxisID[MAX_ZAXES_PS];
int ncxvarID[MAX_GRIDS_PS];
int ncyvarID[MAX_GRIDS_PS];
int ncavarID[MAX_GRIDS_PS];
int historyID;
int globalatts;
int localatts;
VCT vct;
int unreduced;
int sortname;
int have_missval;
int comptype; // compression type
int complevel; // compression level
int curfile;
int nfiles;
char **fnames;
void *gribContainers;
int vlistIDorig;
}
stream_t;
......
......@@ -36,7 +36,7 @@ int streamvarNewEntry(int streamID)
{
int varID = 0;
int streamvarSize;
SVARINFO *streamvar;
svarinfo_t *streamvar;
stream_t *streamptr;
streamptr = stream_to_pointer(streamID);
......@@ -52,11 +52,11 @@ int streamvarNewEntry(int streamID)
int i;
streamvarSize = 2;
streamvar = (SVARINFO *) malloc(streamvarSize*sizeof(SVARINFO));
streamvar = (svarinfo_t *) malloc(streamvarSize*sizeof(svarinfo_t));
if ( streamvar == NULL )
{
Message("streamvarSize = %d", streamvarSize);
SysError("Allocation of SVARINFO failed");
SysError("Allocation of svarinfo_t failed");
}
for ( i = 0; i < streamvarSize; i++ )
......@@ -78,11 +78,11 @@ int streamvarNewEntry(int streamID)
int i;
streamvarSize = 2*streamvarSize;
streamvar = (SVARINFO *) realloc(streamvar, streamvarSize*sizeof(SVARINFO));
streamvar = (svarinfo_t *) realloc(streamvar, streamvarSize*sizeof(svarinfo_t));
if ( streamvar == NULL )
{
Message("streamvarSize = %d", streamvarSize);
SysError("Reallocation of SVARINFO failed");
SysError("Reallocation of svarinfo_t failed");
}
varID = streamvarSize/2;
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment