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

Fix incorrect packing of positive axis flag.

parent 054817f6
......@@ -137,6 +137,7 @@ extern "C" {
#define CDI_DATATYPE_CPX 254
#define CDI_DATATYPE_UCHAR 255
#define CDI_DATATYPE_LONG 256
#define CDI_DATATYPE_UINT 257
#define DATATYPE_INT 251
#define DATATYPE_FLT 252
......
......@@ -227,6 +227,8 @@
PARAMETER (CDI_DATATYPE_UCHAR = 255)
INTEGER CDI_DATATYPE_LONG
PARAMETER (CDI_DATATYPE_LONG = 256)
INTEGER CDI_DATATYPE_UINT
PARAMETER (CDI_DATATYPE_UINT = 257)
INTEGER DATATYPE_INT
PARAMETER (DATATYPE_INT = 251)
INTEGER DATATYPE_FLT
......
......@@ -123,6 +123,7 @@ module mo_cdi
integer(c_int), public, parameter :: CDI_DATATYPE_CPX = 254
integer(c_int), public, parameter :: CDI_DATATYPE_UCHAR = 255
integer(c_int), public, parameter :: CDI_DATATYPE_LONG = 256
integer(c_int), public, parameter :: CDI_DATATYPE_UINT = 257
integer(c_int), public, parameter :: DATATYPE_INT = 251
integer(c_int), public, parameter :: DATATYPE_FLT = 252
integer(c_int), public, parameter :: DATATYPE_TXT = 253
......
......@@ -28,6 +28,7 @@ static struct
{ CDI_DATATYPE_UINT32, MPI_UINT32_T },
#endif
{ CDI_DATATYPE_INT, MPI_INT },
{ CDI_DATATYPE_UINT, MPI_UNSIGNED },
{ CDI_DATATYPE_FLT64, MPI_DOUBLE },
{ CDI_DATATYPE_TXT, MPI_CHAR },
{ CDI_DATATYPE_UCHAR, MPI_UNSIGNED_CHAR },
......
......@@ -57,6 +57,9 @@ serializeGetSizeInCore(int count, int datatype, void *context)
case CDI_DATATYPE_INT:
elemSize = sizeof (int);
break;
case CDI_DATATYPE_UINT:
elemSize = sizeof (unsigned);
break;
case CDI_DATATYPE_FLT:
case CDI_DATATYPE_FLT64:
elemSize = sizeof (double);
......
......@@ -1820,7 +1820,7 @@ zaxisUnpack(char * unpackBuffer, int unpackBufferSize,
}
serializeUnpack(unpackBuffer, unpackBufferSize, unpackBufferPos,
&zaxisP->positive, 1, CDI_DATATYPE_UCHAR, context);
&zaxisP->positive, 1, CDI_DATATYPE_UINT, context);
if (memberMask & zaxisHasUUIDFlag)
serializeUnpack(unpackBuffer, unpackBufferSize, unpackBufferPos,
......@@ -1915,7 +1915,7 @@ zaxisPack(void * voidP, void * packBuffer, int packBufferSize,
packBuffer, packBufferSize, packBufferPos, context);
}
serializePack(&zaxisP->positive, 1, CDI_DATATYPE_UCHAR,
serializePack(&zaxisP->positive, 1, CDI_DATATYPE_UINT,
packBuffer, packBufferSize, packBufferPos, context);
if (memberMask & zaxisHasUUIDFlag)
......
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