Commit 85799729 authored by Thomas Jahns's avatar Thomas Jahns 🤸
Browse files

Re-align fields of grid_t.

parent 0c787e61
...@@ -3852,7 +3852,7 @@ void gridDefComplexPacking(int gridID, int lcomplex) ...@@ -3852,7 +3852,7 @@ void gridDefComplexPacking(int gridID, int lcomplex)
if (gridptr->lcomplex != lcomplex) if (gridptr->lcomplex != lcomplex)
{ {
gridptr->lcomplex = lcomplex; gridptr->lcomplex = (short)(lcomplex != 0);
gridMark4Update(gridID); gridMark4Update(gridID);
} }
} }
...@@ -3870,9 +3870,9 @@ void gridDefHasDims(int gridID, int hasdims) ...@@ -3870,9 +3870,9 @@ void gridDefHasDims(int gridID, int hasdims)
{ {
grid_t* gridptr = gridID2Ptr(gridID); grid_t* gridptr = gridID2Ptr(gridID);
if (gridptr->hasdims != hasdims) if (gridptr->hasdims != (hasdims != 0))
{ {
gridptr->hasdims = hasdims; gridptr->hasdims = hasdims != 0;
gridMark4Update(gridID); gridMark4Update(gridID);
} }
} }
...@@ -4290,7 +4290,7 @@ gridUnpack(char * unpackBuffer, int unpackBufferSize, ...@@ -4290,7 +4290,7 @@ gridUnpack(char * unpackBuffer, int unpackBufferSize,
gridP->size = intBuffer[21]; gridP->size = intBuffer[21];
gridP->xsize = intBuffer[22]; gridP->xsize = intBuffer[22];
gridP->ysize = intBuffer[23]; gridP->ysize = intBuffer[23];
gridP->lcomplex = intBuffer[24]; gridP->lcomplex = (short)intBuffer[24];
memberMask = intBuffer[25]; memberMask = intBuffer[25];
gridP->xstdname = xystdname_tab[intBuffer[26]][0]; gridP->xstdname = xystdname_tab[intBuffer[26]][0];
gridP->ystdname = xystdname_tab[intBuffer[27]][1]; gridP->ystdname = xystdname_tab[intBuffer[27]][1];
......
...@@ -94,8 +94,8 @@ struct grid_t { ...@@ -94,8 +94,8 @@ struct grid_t {
int xsize; /* number of values along X */ int xsize; /* number of values along X */
int ysize; /* number of values along Y */ int ysize; /* number of values along Y */
int np; /* number of parallels between a pole and the equator */ int np; /* number of parallels between a pole and the equator */
int lcomplex; short lcomplex;
int hasdims; short hasdims;
const char *xstdname; const char *xstdname;
const char *ystdname; const char *ystdname;
char xname[CDI_MAX_NAME]; char xname[CDI_MAX_NAME];
......
Supports Markdown
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