Commit 557a1b26 authored by Uwe Schulzweida's avatar Uwe Schulzweida
Browse files

cdi_generate_vars: changed argument type to stream_t

parent 1e82bbf9
...@@ -710,7 +710,7 @@ int cgribexScanTimestep1(int streamID) ...@@ -710,7 +710,7 @@ int cgribexScanTimestep1(int streamID)
if ( nrecs == 0 ) return (CDI_EUFSTRUCT); if ( nrecs == 0 ) return (CDI_EUFSTRUCT);
cdiGenVars(streamID); cdi_generate_vars(streamptr);
if ( fcast ) if ( fcast )
{ {
......
...@@ -442,7 +442,7 @@ void extScanTimestep1(int streamID) ...@@ -442,7 +442,7 @@ void extScanTimestep1(int streamID)
streamptr->rtsteps = 1; streamptr->rtsteps = 1;
cdiGenVars(streamID); cdi_generate_vars(streamptr);
taxisID = taxisCreate(TAXIS_ABSOLUTE); taxisID = taxisCreate(TAXIS_ABSOLUTE);
taxis->type = TAXIS_ABSOLUTE; taxis->type = TAXIS_ABSOLUTE;
......
...@@ -888,7 +888,7 @@ void gribapiAddRecord(int streamID, int param, grib_handle *gh, ...@@ -888,7 +888,7 @@ void gribapiAddRecord(int streamID, int param, grib_handle *gh,
/* /*
Get the ensemble Info from the grib-2 Tables and update the intermediate datastructure. Get the ensemble Info from the grib-2 Tables and update the intermediate datastructure.
Further update to the "vlist" is handled in the same way as for GRIB-1 by "cdiGenVars" Further update to the "vlist" is handled in the same way as for GRIB-1 by "cdi_generate_vars"
*/ */
{ {
int status; int status;
...@@ -1203,7 +1203,7 @@ int gribapiScanTimestep1(int streamID) ...@@ -1203,7 +1203,7 @@ int gribapiScanTimestep1(int streamID)
if ( nrecs == 0 ) return (CDI_EUFSTRUCT); if ( nrecs == 0 ) return (CDI_EUFSTRUCT);
cdiGenVars(streamID); cdi_generate_vars(streamptr);
if ( fcast ) if ( fcast )
{ {
......
...@@ -960,7 +960,7 @@ void iegScanTimestep1(int streamID) ...@@ -960,7 +960,7 @@ void iegScanTimestep1(int streamID)
streamptr->rtsteps = 1; streamptr->rtsteps = 1;
cdiGenVars(streamID); cdi_generate_vars(streamptr);
taxisID = taxisCreate(TAXIS_ABSOLUTE); taxisID = taxisCreate(TAXIS_ABSOLUTE);
taxis->type = TAXIS_ABSOLUTE; taxis->type = TAXIS_ABSOLUTE;
......
...@@ -291,7 +291,7 @@ int tstepsNewEntry(stream_t *streamptr); ...@@ -291,7 +291,7 @@ int tstepsNewEntry(stream_t *streamptr);
char *strfiletype(int filetype); char *strfiletype(int filetype);
void cdiGenVars(int streamID); void cdi_generate_vars(stream_t *streamptr);
void cdiCheckContents(int streamID); void cdiCheckContents(int streamID);
......
...@@ -443,7 +443,7 @@ void srvScanTimestep1(int streamID) ...@@ -443,7 +443,7 @@ void srvScanTimestep1(int streamID)
streamptr->rtsteps = 1; streamptr->rtsteps = 1;
cdiGenVars(streamID); cdi_generate_vars(streamptr);
taxisID = taxisCreate(TAXIS_ABSOLUTE); taxisID = taxisCreate(TAXIS_ABSOLUTE);
taxis->type = TAXIS_ABSOLUTE; taxis->type = TAXIS_ABSOLUTE;
......
...@@ -392,7 +392,7 @@ int cmpltype(const void *s1, const void *s2) ...@@ -392,7 +392,7 @@ int cmpltype(const void *s1, const void *s2)
} }
void cdiGenVars(int streamID) void cdi_generate_vars(stream_t *streamptr)
{ {
int varID, gridID, zaxisID, levelID; int varID, gridID, zaxisID, levelID;
int instID, modelID, tableID; int instID, modelID, tableID;
...@@ -408,11 +408,8 @@ void cdiGenVars(int streamID) ...@@ -408,11 +408,8 @@ void cdiGenVars(int streamID)
double *dlevels2 = NULL; double *dlevels2 = NULL;
int vlistID; int vlistID;
int *varids, index, varid; int *varids, index, varid;
stream_t *streamptr;
streamptr = stream_to_pointer(streamID); vlistID = streamptr->vlistID;
vlistID = streamInqVlist(streamID);
varids = (int *) malloc(nvars*sizeof(int)); varids = (int *) malloc(nvars*sizeof(int));
for ( varID = 0; varID < nvars; varID++ ) varids[varID] = varID; for ( varID = 0; varID < nvars; varID++ ) varids[varID] = varID;
......
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