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

Merge branch 'develop' of git.mpimet.mpg.de:cdo into develop

parents 26dce253 93781fb7
......@@ -4,9 +4,9 @@
GRIB1 standard:
max record length: 2**23 - 1 (---> 8388607)
P8 : gridsize max: <8388607, 4000x2000
P16: gridsize max: <8388607/2, 2880x1440
max record length: 2**24 (---> 16777216)
P8 : gridsize max: <16777216, 5760x2880
P16: gridsize max: <16777216/2, 4000x2000
ECMWF extension:
max record length: (2**23 - 1)*120 (---> 1006632840)
......
......@@ -88,7 +88,7 @@ int gridFromNCfile(const char *gridfile)
if ( grid_rank == 1 )
{
grid.type = GRID_UNSTRUCTURED;
if ( (size_t)grid_dims[0] != grid_size ) return(gridID);
if ( (size_t)grid_dims[0] != grid_size ) return gridID;
}
else
{
......@@ -98,7 +98,7 @@ int gridFromNCfile(const char *gridfile)
grid.xsize = grid_dims[0];
grid.ysize = grid_dims[1];
if ( (size_t)grid_dims[0]*grid_dims[1] != grid_size ) return(gridID);
if ( (size_t)grid_dims[0]*grid_dims[1] != grid_size ) return gridID;
}
/* allocate grid coordinates and read data */
......
......@@ -591,7 +591,7 @@ void printZaxisInfo(int vlistID)
if ( number > 0 )
{
fprintf(stdout, "%33s : ", "zaxis");
fprintf(stdout, "number = %d\n", number);
fprintf(stdout, "number=%d\n", number);
}
unsigned char uuidOfVGrid[CDI_UUID_SIZE];
......
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