Commit a2f94771 authored by Uwe Schulzweida's avatar Uwe Schulzweida
Browse files

gribapiScanTimestep1: fixed bug from previous merge of...

gribapiScanTimestep1: fixed bug from previous merge of branches/cdi_fileDrivenInput (GRIB2 read failed)
parent e863c1f1
2015-03-27 Uwe Schulzweida
* gribapiScanTimestep1: fixed bug from previous merge of branches/cdi_fileDrivenInput (GRIB2 read failed)
2015-03-26 Uwe Schulzweida 2015-03-26 Uwe Schulzweida
* merged changes from branches/cdi_fileDrivenInput * merged changes from branches/cdi_fileDrivenInput
......
...@@ -960,7 +960,7 @@ int gribapiScanTimestep1(stream_t * streamptr) ...@@ -960,7 +960,7 @@ int gribapiScanTimestep1(stream_t * streamptr)
vlistDefTaxis(vlistID, taxisID); vlistDefTaxis(vlistID, taxisID);
int nrecords = streamptr->tsteps[0].nallrecs; int nrecords = streamptr->tsteps[0].nallrecs;
if ( nrecords > streamptr->tsteps[0].recordSize ) if ( nrecords < streamptr->tsteps[0].recordSize )
{ {
streamptr->tsteps[0].recordSize = nrecords; streamptr->tsteps[0].recordSize = nrecords;
streamptr->tsteps[0].records = streamptr->tsteps[0].records =
......
...@@ -47,7 +47,7 @@ int recordNewEntry(stream_t *streamptr, int tsID) ...@@ -47,7 +47,7 @@ int recordNewEntry(stream_t *streamptr, int tsID)
if ( records == NULL ) if ( records == NULL )
{ {
Message("recordSize = %d", recordSize); Message("recordSize = %d", recordSize);
SysError("Allocation of record_tTABLE failed"); SysError("Allocation of records failed");
} }
for ( i = 0; i < recordSize; i++ ) for ( i = 0; i < recordSize; i++ )
...@@ -74,7 +74,7 @@ int recordNewEntry(stream_t *streamptr, int tsID) ...@@ -74,7 +74,7 @@ int recordNewEntry(stream_t *streamptr, int tsID)
if ( records == NULL ) if ( records == NULL )
{ {
Message("recordSize = %d", recordSize); Message("recordSize = %d", recordSize);
SysError("Reallocation of record_tTABLE failed"); SysError("Reallocation of records failed");
} }
recordID = recordSize/2; recordID = recordSize/2;
...@@ -443,7 +443,7 @@ void cdi_create_records(stream_t *streamptr, int tsID) ...@@ -443,7 +443,7 @@ void cdi_create_records(stream_t *streamptr, int tsID)
if ( destTstep->records ) return; if ( destTstep->records ) return;
int vlistID = streamptr->vlistID; int vlistID = streamptr->vlistID;
if ( tsID == 0 ) if ( tsID == 0 )
{ {
......
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