Commit 460b0350 authored by Uwe Schulzweida's avatar Uwe Schulzweida
Browse files

Replaced zaxisDefUUID() by cdiDefKeyBytes().

parent eceb9bfe
......@@ -33,7 +33,7 @@ int main(void)
cdiDefKeyInt(zaxisID2, CDI_GLOBAL, CDI_KEY_NLEV, nlev);
cdiDefKeyInt(zaxisID2, CDI_GLOBAL, CDI_KEY_NUMBEROFVGRIDUSED, 71);
//zaxisDefReference(zaxisID2, "http://www.x.y/vgridfile.nc");
cdiDefKeyBytes(zaxisID2, CDI_GLOBAL, CDI_KEY_UUID, "8765432112345678", CDI_UUID_SIZE)
cdiDefKeyBytes(zaxisID2, CDI_GLOBAL, CDI_KEY_UUID, "8765432112345678", CDI_UUID_SIZE);
// Create a variable list
vlistID = vlistCreate();
......
......@@ -241,7 +241,7 @@ main(int argc, char *argv[])
for (int i = 0; i < 2; ++i)
{
cdiStr2UUID(zaxisUUIDTxt[i], uuid);
cdiDefKeyBytes(zaxisID[i], CDI_GLOBAL, CDI_KEY_UUID, uuid, CDI_UUID_SIZE)
cdiDefKeyBytes(zaxisID[i], CDI_GLOBAL, CDI_KEY_UUID, uuid, CDI_UUID_SIZE);
}
}
......
......@@ -207,7 +207,7 @@ modelRun(struct model_config setup, MPI_Comm comm)
#if USE_MPI
MPI_Bcast(uuid, CDI_UUID_SIZE, MPI_UNSIGNED_CHAR, 0, comm);
#endif
cdiDefKeyBytes(varDesc[varIdx].zaxisID, CDI_GLOBAL, CDI_KEY_UUID, uuid, CDI_UUID_SIZE)
cdiDefKeyBytes(varDesc[varIdx].zaxisID, CDI_GLOBAL, CDI_KEY_UUID, uuid, CDI_UUID_SIZE);
}
zaxisIDset:
varDesc[varIdx].id
......
......@@ -174,7 +174,7 @@ modelRun(struct model_config setup, MPI_Comm comm)
#if USE_MPI
MPI_Bcast(uuid, CDI_UUID_SIZE, MPI_UNSIGNED_CHAR, 0, comm);
#endif
cdiDefKeyBytes(varDesc[varIdx].zaxisID, CDI_GLOBAL, CDI_KEY_UUID, uuid, CDI_UUID_SIZE)
cdiDefKeyBytes(varDesc[varIdx].zaxisID, CDI_GLOBAL, CDI_KEY_UUID, uuid, CDI_UUID_SIZE);
}
zaxisIDset:
varDesc[varIdx].id
......
......@@ -107,7 +107,7 @@ static int defineZaxis (void)
{
unsigned char uuid[CDI_UUID_SIZE];
cdiCreateUUID(uuid);
cdiDefKeyBytes(zaxisID, CDI_GLOBAL, CDI_KEY_UUID, uuid, CDI_UUID_SIZE)
cdiDefKeyBytes(zaxisID, CDI_GLOBAL, CDI_KEY_UUID, uuid, CDI_UUID_SIZE);
}
return zaxisID;
......
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