Skip to content
Snippets Groups Projects
Commit 7e036074 authored by Thomas Jahns's avatar Thomas Jahns :cartwheel:
Browse files

Consistently use size_t for nmissing.

parent 2db1c258
No related branches found
No related tags found
2 merge requests!91Add alternative code path for huge buffers.,!89Miscellaneous fixes and CDI-PIO improvements
......@@ -326,7 +326,7 @@ cdiPioBufferPartData_(int streamID, int varID, int memtype, const void *packData
xassert(varID >= 0 && varID < streamInqNvars(streamID));
collWaitAll();
int dataHeaderID = memtype == MEMTYPE_DOUBLE ? DATA_HEADER_DOUBLE : DATA_HEADER_FLOAT;
struct winHeaderEntry dataHeader = { .id = dataHeaderID, .specific.dataRecord = { varID, numMissVals }, .offset = -1 };
struct winHeaderEntry dataHeader = { .id = dataHeaderID, .specific.dataRecord = { varID, (int)numMissVals }, .offset = -1 };
modelWinEnqueue(streamIdx, dataHeader, packData, packDataFunc);
{
struct winHeaderEntry partHeader = { .id = PARTDESCMARKER, .offset = 0 };
......@@ -748,15 +748,17 @@ pioWriteTimestep(void)
}
void
cdiPioStreamWriteVarPart_(int streamID, int varID, int memtype, const void *data, int numMissVals, Xt_idxlist partDesc)
cdiPioStreamWriteVarPart_(int streamID, int varID, int memtype,
const void *data, size_t numMissVals,
Xt_idxlist partDesc)
{
if (CDI_Debug) Message("streamID = %d varID = %d", streamID, varID);
int chunk = xt_idxlist_get_num_indices(partDesc);
xassert(chunk == 0 || data);
void (*myStreamWriteVarPart)(int streamID, int varID, int memtype, const void *data, int numMissVals, Xt_idxlist partDesc)
= (void (*)(int, int, int, const void *, int, Xt_idxlist)) namespaceSwitchGet(NSSWITCH_STREAM_WRITE_VAR_PART_).func;
void (*myStreamWriteVarPart)(int streamID, int varID, int memtype, const void *data, size_t numMissVals, Xt_idxlist partDesc)
= (void (*)(int, int, int, const void *, size_t, Xt_idxlist)) namespaceSwitchGet(NSSWITCH_STREAM_WRITE_VAR_PART_).func;
if (!myStreamWriteVarPart) xabort("local part writing is unsupported!");
......
......@@ -27,7 +27,9 @@ void memcpyPackFunc(void *dataDesc, void *buf, int size, int *pos, void *context
extern float cdiPIOpartInflate_;
void cdiPioStreamWriteVarPart_(int streamID, int varID, int memtype, const void *data, int numMissVals, Xt_idxlist partDesc);
void cdiPioStreamWriteVarPart_(int streamID, int varID, int memtype,
const void *data, size_t numMissVals,
Xt_idxlist partDesc);
void cdiPioClientStreamWinInit(int streamID);
void cdiPioClientStreamWinCreate(int streamID, struct collSpec *cspec);
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment