diff --git a/ChangeLog b/ChangeLog
index 4a0993b11732ffa778063adad8c6e2b7eb9c8555..7d1c5ab2ea063744967e811242bab9cc6c880070 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -3,6 +3,10 @@
* using CGRIBEX library version 2.3.1
* Version 2.5.0 released
+2024-10-24 Uwe Schulzweida
+
+ * Renamed interface functions streamXXXRecord to streamXXXField
+
2024-10-22 Uwe Schulzweida
* NetCDF: search for time dimension only if it is undefined
diff --git a/app/cdi.c b/app/cdi.c
index 0ff261e87665efcae74d8f730043966ef66ee978..819d74e3c1cd69eedde49f4a3eb764ab1483e6b1 100644
--- a/app/cdi.c
+++ b/app/cdi.c
@@ -175,8 +175,8 @@ usage(void)
fprintf(stderr, " -E Use ecCodes to decode/encode GRIB1 messages\n");
fprintf(stderr, " -f <format> Format of the output file. (grb, grb2, nc, nc2, nc4, nc4c, nc5, nczarr, srv, ext or ieg)\n");
fprintf(stderr, " -i <num> Number of worker to decode/decompress GRIB records\n");
- fprintf(stderr, " -m Move records\n");
- fprintf(stderr, " -r Use CDI record API\n");
+ fprintf(stderr, " -m Move fields\n");
+ fprintf(stderr, " -r Use CDI field API\n");
fprintf(stderr, " -s give short information if ofile is missing\n");
fprintf(stderr, " -T Pre scan hole GRIB file to get the number of timesteps\n");
fprintf(stderr, " -t <table> Parameter table name/file\n");
@@ -765,7 +765,7 @@ main(int argc, char *argv[])
char *wTable = NULL;
bool preScan = false;
int Move = 0;
- int Record = 0;
+ int Field = 0;
int Variable = 0;
int Debug = 0;
int Vardis = 0;
@@ -816,7 +816,7 @@ main(int argc, char *argv[])
case 'N': queryNames[numQueryNames++] = strdup(optarg); break;
case 'n': Info = 0; NoInfo = 1; break;
case 'R': cdiDefGlobal("REGULARGRID", 1); break;
- case 'r': Record = 1; break;
+ case 'r': Field = 1; break;
case 'X': Variable = 1; break;
case 'S': queryStepidx[numQueryStepidx++] = atoi(optarg); break;
case 's': Shortinfo = 1; break;
@@ -976,12 +976,12 @@ main(int argc, char *argv[])
CdiDateTime vdatetime = taxisInqVdatetime(taxisID1);
- if (Record)
+ if (Field)
{
for (recID = 0; recID < nrecs; recID++)
{
- streamInqRecord(streamID1, &varID, &levelID);
- streamReadRecord(streamID1, data, &nmiss);
+ streamInqField(streamID1, &varID, &levelID);
+ streamReadField(streamID1, data, &nmiss);
int number = vlistInqVarNumber(vlistID1, varID);
int gridID = vlistInqVarGrid(vlistID1, varID);
@@ -1006,11 +1006,11 @@ main(int argc, char *argv[])
if (fname2)
{
- streamDefRecord(streamID2, varID, levelID);
+ streamDefField(streamID2, varID, levelID);
if (Move)
- streamCopyRecord(streamID2, streamID1);
+ streamCopyField(streamID2, streamID1);
else
- streamWriteRecord(streamID2, data, nmiss);
+ streamWriteField(streamID2, data, nmiss);
}
}
}
diff --git a/src/cdf_read.c b/src/cdf_read.c
index a5d1f836a2e7c16b850c211e410bec1e82083ffd..05622e06081bc7bfa5e099e941303d242be8c217 100644
--- a/src/cdf_read.c
+++ b/src/cdf_read.c
@@ -944,7 +944,7 @@ cdf_read_next_record(stream_t *streamptr, int recID, int memtype, void *data, si
}
void
-cdf_read_record(stream_t *streamptr, int memtype, void *data, size_t *numMissVals)
+cdf_read_field(stream_t *streamptr, int memtype, void *data, size_t *numMissVals)
{
int tsID = streamptr->curTsID;
int vrecID = streamptr->tsteps[tsID].curRecID;
diff --git a/src/cdf_records.c b/src/cdf_records.c
index 5e179588cd65309681121926d45e78bb858e58b1..1ad97c2a7d8aa5f25b0fcf4306e68117ffabaa81 100644
--- a/src/cdf_records.c
+++ b/src/cdf_records.c
@@ -82,19 +82,19 @@ cdf_create_records(stream_t *streamptr, size_t tsID)
tsteps_t *sourceTstep = streamptr->tsteps;
tsteps_t *destTstep = sourceTstep + tsID;
- int numRecs = vlistNumRecords(vlistID);
- if (numRecs <= 0) return;
+ int numFields = vlistNumFields(vlistID);
+ if (numFields <= 0) return;
if (tsID == 0)
{
- int numRecsAvail = numRecs; // use all records at first timestep
+ int numRecsAvail = numFields; // use all records at first timestep
- streamptr->nrecs += numRecs;
+ streamptr->nrecs += numFields;
- cdf_init_timestep(destTstep, numRecs, numRecsAvail);
+ cdf_init_timestep(destTstep, numFields, numRecsAvail);
destTstep->recIDs = (int *) Malloc((size_t) numRecsAvail * sizeof(int));
- cdf_init_records_step0(numRecs, destTstep->recIDs, destTstep->records, vlistID);
+ cdf_init_records_step0(numFields, destTstep->recIDs, destTstep->records, vlistID);
}
else if (tsID == 1)
{
@@ -102,14 +102,14 @@ cdf_create_records(stream_t *streamptr, size_t tsID)
streamptr->nrecs += numRecsAvail;
- cdf_init_timestep(destTstep, numRecs, numRecsAvail);
+ cdf_init_timestep(destTstep, numFields, numRecsAvail);
- memcpy(destTstep->records, sourceTstep->records, (size_t) numRecs * sizeof(record_t));
+ memcpy(destTstep->records, sourceTstep->records, (size_t) numFields * sizeof(record_t));
if (numRecsAvail)
{
destTstep->recIDs = (int *) Malloc((size_t) numRecsAvail * sizeof(int));
- cdf_init_records_step1(numRecs, destTstep->recIDs, destTstep->records, vlistID);
+ cdf_init_records_step1(numFields, destTstep->recIDs, destTstep->records, vlistID);
}
}
else
@@ -120,9 +120,9 @@ cdf_create_records(stream_t *streamptr, size_t tsID)
streamptr->nrecs += numRecsAvail;
- cdf_init_timestep(destTstep, numRecs, numRecsAvail);
+ cdf_init_timestep(destTstep, numFields, numRecsAvail);
- memcpy(destTstep->records, sourceTstep->records, (size_t) numRecs * sizeof(record_t));
+ memcpy(destTstep->records, sourceTstep->records, (size_t) numFields * sizeof(record_t));
if (numRecsAvail)
{
diff --git a/src/cdf_write.c b/src/cdf_write.c
index 521802dc209a9059abcfe7ba78acfe8ff578359a..eb556afcac38904a2ddbc11224283458fb6d6c16 100644
--- a/src/cdf_write.c
+++ b/src/cdf_write.c
@@ -1638,7 +1638,7 @@ cdf_write_var_slice(stream_t *streamptr, int varID, int levelID, int memtype, co
}
void
-cdf_write_record(stream_t *streamptr, int memtype, const void *data, size_t numMissVals)
+cdf_write_field(stream_t *streamptr, int memtype, const void *data, size_t numMissVals)
{
int varID = streamptr->record->varID;
int levelID = streamptr->record->levelID;
diff --git a/src/cdi.h b/src/cdi.h
index bbe58c112e726faf6a39d6dde07007bf93629e34..748b7fd5d576ff3c8fd61040bf43629413a454f5 100644
--- a/src/cdi.h
+++ b/src/cdi.h
@@ -443,15 +443,15 @@ void streamWriteVarChunk(int streamID, int varID, const int rect[][2], const
void streamWriteVarChunkF(int streamID, int varID, const int rect[][2], const float data[], SizeType numMissVals);
-// STREAM record I/O routines (sequential access)
+// STREAM field I/O routines (sequential access)
-void streamDefRecord(int streamID, int varID, int levelID);
-void streamInqRecord(int streamID, int *varID, int *levelID);
-void streamWriteRecord(int streamID, const double data[], SizeType numMissVals);
-void streamWriteRecordF(int streamID, const float data[], SizeType numMissVals);
-void streamReadRecord(int streamID, double data[], SizeType *numMissVals);
-void streamReadRecordF(int streamID, float data[], SizeType *numMissVals);
-void streamCopyRecord(int streamIDdest, int streamIDsrc);
+void streamDefField(int streamID, int varID, int levelID);
+void streamInqField(int streamID, int *varID, int *levelID);
+void streamWriteField(int streamID, const double data[], SizeType numMissVals);
+void streamWriteFieldF(int streamID, const float data[], SizeType numMissVals);
+void streamReadField(int streamID, double data[], SizeType *numMissVals);
+void streamReadFieldF(int streamID, float data[], SizeType *numMissVals);
+void streamCopyField(int streamIDdest, int streamIDsrc);
void streamInqGRIBinfo(int streamID, int *intnum, float *fltnum, off_t *bignum);
@@ -565,7 +565,7 @@ int vlistZaxis(int vlistID, int index);
int vlistZaxisIndex(int vlistID, int zaxisID);
void vlistChangeZaxisIndex(int vlistID, int index, int zaxisID);
void vlistChangeZaxis(int vlistID, int zaxisID1, int zaxisID2);
-int vlistNumRecords(int vlistID);
+int vlistNumFields(int vlistID);
int vlistSubtype(int vlistID, int index);
int vlistSubtypeIndex(int vlistID, int subtypeID);
diff --git a/src/grb_read.c b/src/grb_read.c
index 628f43b8b317cc16be5163e45aa1210c5b6e96d3..9c82461945d496e7b14a77979cd8bda2addf1717 100644
--- a/src/grb_read.c
+++ b/src/grb_read.c
@@ -309,7 +309,7 @@ grb_read_next_record(stream_t *streamptr, int recID, int memType, void *data, si
}
void
-grb_read_record(stream_t *streamptr, int memType, void *data, size_t *numMissVals)
+grb_read_field(stream_t *streamptr, int memType, void *data, size_t *numMissVals)
{
int tsID = streamptr->curTsID;
int vrecID = streamptr->tsteps[tsID].curRecID;
diff --git a/src/grb_write.c b/src/grb_write.c
index f9c9ec8d02b344815bcca5ad83fb80f10e5dbfe0..9ece9e4c10669e5875cc02efa512ac4047b1c8d8 100644
--- a/src/grb_write.c
+++ b/src/grb_write.c
@@ -216,7 +216,7 @@ fillup_gribbuffer(size_t nbytes, unsigned char *gribbuffer)
}
void
-grbCopyRecord(stream_t *streamptr2, stream_t *streamptr1)
+grbCopyField(stream_t *streamptr2, stream_t *streamptr1)
{
int filetype = streamptr1->filetype;
int fileID1 = streamptr1->fileID;
@@ -488,7 +488,7 @@ grb_write_var(stream_t *streamptr, int varID, int memtype, const void *data, siz
}
void
-grb_write_record(stream_t *streamptr, int memtype, const void *data, size_t numMissVals)
+grb_write_field(stream_t *streamptr, int memtype, const void *data, size_t numMissVals)
{
int varID = streamptr->record->varID;
int levelID = streamptr->record->levelID;
diff --git a/src/stream_cdf.h b/src/stream_cdf.h
index 0e0991c1d81507db6385c16a57a2048bf30fb6c5..d4b379742b09f9983910c0310f8c0220e3eac2e8 100644
--- a/src/stream_cdf.h
+++ b/src/stream_cdf.h
@@ -30,14 +30,14 @@ int cdfInqTimestep(stream_t *streamptr, int tsID);
int cdfInqContents(stream_t *streamptr);
void cdfEndDef(stream_t *streamptr);
-void cdfDefRecord(stream_t *streamptr);
+void cdfDefField(stream_t *streamptr);
void cdfCopyRecord(stream_t *streamptr2, stream_t *streamptr1);
void cdfDefineAttributes(int filetype, int vlistID, int varID, int fileID, int ncvarID);
-void cdf_read_record(stream_t *streamptr, int memtype, void *data, size_t *numMissVals);
-void cdf_write_record(stream_t *streamptr, int memtype, const void *data, size_t numMissVals);
+void cdf_read_field(stream_t *streamptr, int memtype, void *data, size_t *numMissVals);
+void cdf_write_field(stream_t *streamptr, int memtype, const void *data, size_t numMissVals);
void cdf_read_var(stream_t *streamptr, int varID, int memtype, void *data, size_t *numMissVals);
void cdf_write_var(stream_t *streamptr, int varID, int memtype, const void *data, size_t numMissVals);
diff --git a/src/stream_cdf_o.c b/src/stream_cdf_o.c
index cd07f30a2ee6fd274b897e31f13807d947e0f8b6..987fb0514748e8247f2af414fa2003f1264e9217 100644
--- a/src/stream_cdf_o.c
+++ b/src/stream_cdf_o.c
@@ -33,14 +33,14 @@ cdfCopyRecord(stream_t *streamptr2, stream_t *streamptr1)
void *data = Malloc(datasize * ((memtype == MEMTYPE_DOUBLE) ? sizeof(double) : sizeof(float)));
size_t numMissVals;
- cdf_read_record(streamptr1, memtype, data, &numMissVals);
- cdf_write_record(streamptr2, memtype, data, numMissVals);
+ cdf_read_field(streamptr1, memtype, data, &numMissVals);
+ cdf_write_field(streamptr2, memtype, data, numMissVals);
Free(data);
}
void
-cdfDefRecord(stream_t *streamptr)
+cdfDefField(stream_t *streamptr)
{
(void) streamptr;
}
diff --git a/src/stream_ext.c b/src/stream_ext.c
index 8f4e7ee86e3972ec99471cea938bae0e2e25c938..616ef92dc08043afedb8b2f06dc9aec377039ef0 100644
--- a/src/stream_ext.c
+++ b/src/stream_ext.c
@@ -38,43 +38,6 @@ extDefDatatype(int datatype, int *prec, int *number)
*prec = (datatype == CDI_DATATYPE_FLT64 || datatype == CDI_DATATYPE_CPX64) ? EXSE_PREC_FP64 : EXSE_PREC_FP32;
}
-/* not used
-int extInqRecord(stream_t *streamptr, int *varID, int *levelID)
-{
- int status;
- int fileID;
- int icode, ilevel;
- int zaxisID = -1;
- int header[4];
- int vlistID;
- void *extp = streamptr->record->objectp;
-
- vlistID = streamptr->vlistID;
- fileID = streamptr->fileID;
-
- *varID = -1;
- *levelID = -1;
-
- status = extRead(fileID, extp);
- if ( status != 0 ) return 0;
-
- extInqHeader(extp, header);
-
- icode = header[1];
- ilevel = header[2];
-
- *varID = vlistInqVarID(vlistID, icode);
-
- if ( *varID == CDI_UNDEFID ) Error("Code %d undefined", icode);
-
- zaxisID = vlistInqVarZaxis(vlistID, *varID);
-
- *levelID = zaxisInqLevelID(zaxisID, (double) ilevel);
-
- return 1;
-}
-*/
-
static void
ext_read_recordSP(stream_t *streamptr, float *data, size_t *numMissVals)
{
@@ -140,7 +103,7 @@ ext_read_recordDP(stream_t *streamptr, double *data, size_t *numMissVals)
}
void
-ext_read_record(stream_t *streamptr, int memtype, void *data, size_t *numMissVals)
+ext_read_field(stream_t *streamptr, int memtype, void *data, size_t *numMissVals)
{
if (memtype == MEMTYPE_DOUBLE)
ext_read_recordDP(streamptr, (double *) data, numMissVals);
@@ -149,13 +112,13 @@ ext_read_record(stream_t *streamptr, int memtype, void *data, size_t *numMissVal
}
void
-extCopyRecord(stream_t *streamptr2, stream_t *streamptr1)
+extCopyField(stream_t *streamptr2, stream_t *streamptr1)
{
streamFCopyRecord(streamptr2, streamptr1, "EXTRA");
}
void
-extDefRecord(stream_t *streamptr)
+extDefField(stream_t *streamptr)
{
Record *record = streamptr->record;
@@ -192,7 +155,7 @@ ext_write_recordDP(stream_t *streamptr, const double *data)
}
void
-ext_write_record(stream_t *streamptr, int memtype, const void *data)
+ext_write_field(stream_t *streamptr, int memtype, const void *data)
{
if (memtype == MEMTYPE_DOUBLE)
ext_write_recordDP(streamptr, (const double *) data);
diff --git a/src/stream_ext.h b/src/stream_ext.h
index 3f6d3516066c1b0bf4c1c9bf9b5ed09fafd7d17d..1a0b331a56eb83d7de9c9af8755398a83eb48c76 100644
--- a/src/stream_ext.h
+++ b/src/stream_ext.h
@@ -8,11 +8,10 @@
int extInqContents(stream_t *streamptr);
int extInqTimestep(stream_t *streamptr, int tsID);
-int extInqRecord(stream_t *streamptr, int *varID, int *levelID);
-void extDefRecord(stream_t *streamptr);
-void extCopyRecord(stream_t *streamptr2, stream_t *streamptr1);
-void ext_read_record(stream_t *streamptr, int memtype, void *data, size_t *numMissVals);
-void ext_write_record(stream_t *streamptr, int memtype, const void *data);
+void extDefField(stream_t *streamptr);
+void extCopyField(stream_t *streamptr2, stream_t *streamptr1);
+void ext_read_field(stream_t *streamptr, int memtype, void *data, size_t *numMissVals);
+void ext_write_field(stream_t *streamptr, int memtype, const void *data);
void extReadVarDP(stream_t *streamptr, int varID, double *data, size_t *numMissVals);
void extWriteVarDP(stream_t *streamptr, int varID, const double *data);
diff --git a/src/stream_grb.c b/src/stream_grb.c
index a6985f86ba2c0273b7d81a4329f1ed21728fcea5..9441a53e3876091937dc1881c924dd5b05afde71 100644
--- a/src/stream_grb.c
+++ b/src/stream_grb.c
@@ -250,19 +250,8 @@ grbBitsPerValue(int datatype)
return bitsPerValue;
}
-/*
-int grbInqRecord(stream_t * streamptr, int *varID, int *levelID)
-{
- int status;
-
- status = cgribexInqRecord(streamptr, varID, levelID);
-
- return (status);
-}
-*/
-
void
-grbDefRecord(stream_t *streamptr)
+grbDefField(stream_t *streamptr)
{
UNUSED(streamptr);
}
diff --git a/src/stream_grb.h b/src/stream_grb.h
index d2c6bde1d930a8243495a30d19e0e7db4dbb659e..123a9a77f74c64f57f031b923058d0707387d8de 100644
--- a/src/stream_grb.h
+++ b/src/stream_grb.h
@@ -37,11 +37,10 @@ long grbInqContents(stream_t *streamptr);
int fdbInqTimestep(stream_t *streamptr, int tsID);
int grbInqTimestep(stream_t *streamptr, int tsID);
-int grbInqRecord(stream_t *streamptr, int *varID, int *levelID);
-void grbDefRecord(stream_t *streamptr);
-void grb_read_record(stream_t *streamptr, int memtype, void *data, size_t *numMissVals);
-void grb_write_record(stream_t *streamptr, int memtype, const void *data, size_t numMissVals);
-void grbCopyRecord(stream_t *streamptr2, stream_t *streamptr1);
+void grbDefField(stream_t *streamptr);
+void grb_read_field(stream_t *streamptr, int memtype, void *data, size_t *numMissVals);
+void grb_write_field(stream_t *streamptr, int memtype, const void *data, size_t numMissVals);
+void grbCopyField(stream_t *streamptr2, stream_t *streamptr1);
void grb_read_var(stream_t *streamptr, int varID, int memtype, void *data, size_t *numMissVals);
void grb_write_var(stream_t *streamptr, int varID, int memtype, const void *data, size_t numMissVals);
diff --git a/src/stream_ieg.c b/src/stream_ieg.c
index a913e69e787aad1d403bf731172ca797fde70652..4194ed0373cba5a384ee4cbfc4515d54dbee1aa6 100644
--- a/src/stream_ieg.c
+++ b/src/stream_ieg.c
@@ -90,7 +90,7 @@ ieg_read_recordDP(stream_t *streamptr, double *data, size_t *numMissVals)
}
void
-ieg_read_record(stream_t *streamptr, int memtype, void *data, size_t *numMissVals)
+ieg_read_field(stream_t *streamptr, int memtype, void *data, size_t *numMissVals)
{
if (memtype == MEMTYPE_DOUBLE)
ieg_read_recordDP(streamptr, (double *) data, numMissVals);
@@ -418,13 +418,13 @@ iegDefLevel(int *pdb, int *gdb, double *vct, int zaxisID, int levelID)
}
void
-iegCopyRecord(stream_t *streamptr2, stream_t *streamptr1)
+iegCopyField(stream_t *streamptr2, stream_t *streamptr1)
{
streamFCopyRecord(streamptr2, streamptr1, "IEG");
}
void
-iegDefRecord(stream_t *streamptr)
+iegDefField(stream_t *streamptr)
{
Record *record = streamptr->record;
@@ -507,7 +507,7 @@ ieg_write_recordDP(stream_t *streamptr, const double *data)
}
void
-ieg_write_record(stream_t *streamptr, int memtype, const void *data)
+ieg_write_field(stream_t *streamptr, int memtype, const void *data)
{
if (memtype == MEMTYPE_DOUBLE)
ieg_write_recordDP(streamptr, (const double *) data);
diff --git a/src/stream_ieg.h b/src/stream_ieg.h
index a099cdaf4b96dbb58248c015a23926a2685d5d80..85e841411cb4066f04e1bc7ee740457dda2bd181 100644
--- a/src/stream_ieg.h
+++ b/src/stream_ieg.h
@@ -8,11 +8,10 @@
int iegInqContents(stream_t *streamptr);
int iegInqTimestep(stream_t *streamptr, int tsID);
-int iegInqRecord(stream_t *streamptr, int *varID, int *levelID);
-void iegDefRecord(stream_t *streamptr);
-void iegCopyRecord(stream_t *streamptr2, stream_t *streamptr1);
-void ieg_read_record(stream_t *streamptr, int memtype, void *data, size_t *numMissVals);
-void ieg_write_record(stream_t *streamptr, int memtype, const void *data);
+void iegDefField(stream_t *streamptr);
+void iegCopyField(stream_t *streamptr2, stream_t *streamptr1);
+void ieg_read_field(stream_t *streamptr, int memtype, void *data, size_t *numMissVals);
+void ieg_write_field(stream_t *streamptr, int memtype, const void *data);
void iegReadVarDP(stream_t *streamptr, int varID, double *data, size_t *numMissVals);
void iegWriteVarDP(stream_t *streamptr, int varID, const double *data);
diff --git a/src/stream_read.c b/src/stream_read.c
index 059547401207df92a4b16d4d59d9eecc7b5e81ef..c5655dd332ba5042628bcfb04c5e416865c50a82 100644
--- a/src/stream_read.c
+++ b/src/stream_read.c
@@ -237,19 +237,19 @@ stream_read_record(int streamID, int memtype, void *data, size_t *numMissVals)
switch (cdiBaseFiletype(streamptr->filetype))
{
#ifdef HAVE_LIBGRIB
- case CDI_FILETYPE_GRIB: grb_read_record(streamptr, memtype, data, numMissVals); break;
+ case CDI_FILETYPE_GRIB: grb_read_field(streamptr, memtype, data, numMissVals); break;
#endif
#ifdef HAVE_LIBSERVICE
- case CDI_FILETYPE_SRV: srv_read_record(streamptr, memtype, data, numMissVals); break;
+ case CDI_FILETYPE_SRV: srv_read_field(streamptr, memtype, data, numMissVals); break;
#endif
#ifdef HAVE_LIBEXTRA
- case CDI_FILETYPE_EXT: ext_read_record(streamptr, memtype, data, numMissVals); break;
+ case CDI_FILETYPE_EXT: ext_read_field(streamptr, memtype, data, numMissVals); break;
#endif
#ifdef HAVE_LIBIEG
- case CDI_FILETYPE_IEG: ieg_read_record(streamptr, memtype, data, numMissVals); break;
+ case CDI_FILETYPE_IEG: ieg_read_field(streamptr, memtype, data, numMissVals); break;
#endif
#ifdef HAVE_LIBNETCDF
- case CDI_FILETYPE_NETCDF: cdf_read_record(streamptr, memtype, data, numMissVals); break;
+ case CDI_FILETYPE_NETCDF: cdf_read_field(streamptr, memtype, data, numMissVals); break;
#endif
default: Error("%s support not compiled in!", strfiletype(streamptr->filetype));
}
@@ -258,7 +258,7 @@ stream_read_record(int streamID, int memtype, void *data, size_t *numMissVals)
}
void
-streamReadRecord(int streamID, double *data, SizeType *numMissVals)
+streamReadField(int streamID, double *data, SizeType *numMissVals)
{
size_t numMiss = 0;
stream_read_record(streamID, MEMTYPE_DOUBLE, (void *) data, &numMiss);
@@ -266,7 +266,7 @@ streamReadRecord(int streamID, double *data, SizeType *numMissVals)
}
void
-streamReadRecordF(int streamID, float *data, SizeType *numMissVals)
+streamReadFieldF(int streamID, float *data, SizeType *numMissVals)
{
size_t numMiss = 0;
stream_read_record(streamID, MEMTYPE_FLOAT, (void *) data, &numMiss);
diff --git a/src/stream_record.c b/src/stream_record.c
index a8c6b3ec9818da91aba3d70563e335345c8d2aa1..114b0df4065a60eb624c4f4eff57a749c80807cf 100644
--- a/src/stream_record.c
+++ b/src/stream_record.c
@@ -97,7 +97,7 @@ cdiInitRecord(stream_t *streamptr)
}
void
-streamInqRecord(int streamID, int *varID, int *levelID)
+streamInqField(int streamID, int *varID, int *levelID)
{
check_parg(varID);
check_parg(levelID);
@@ -146,7 +146,7 @@ The function streamDefRecord defines the meta-data of the next record.
@EndFunction
*/
void
-streamDefRecord(int streamID, int varID, int levelID)
+streamDefField(int streamID, int varID, int levelID)
{
stream_t *streamptr = stream_to_pointer(streamID);
@@ -178,21 +178,21 @@ streamDefRecord(int streamID, int varID, int levelID)
switch (cdiBaseFiletype(streamptr->filetype))
{
#ifdef HAVE_LIBGRIB
- case CDI_FILETYPE_GRIB: grbDefRecord(streamptr); break;
+ case CDI_FILETYPE_GRIB: grbDefField(streamptr); break;
#endif
#ifdef HAVE_LIBSERVICE
- case CDI_FILETYPE_SRV: srvDefRecord(streamptr); break;
+ case CDI_FILETYPE_SRV: srvDefField(streamptr); break;
#endif
#ifdef HAVE_LIBEXTRA
- case CDI_FILETYPE_EXT: extDefRecord(streamptr); break;
+ case CDI_FILETYPE_EXT: extDefField(streamptr); break;
#endif
#ifdef HAVE_LIBIEG
- case CDI_FILETYPE_IEG: iegDefRecord(streamptr); break;
+ case CDI_FILETYPE_IEG: iegDefField(streamptr); break;
#endif
#ifdef HAVE_LIBNETCDF
case CDI_FILETYPE_NETCDF:
if (streamptr->accessmode == 0) cdfEndDef(streamptr);
- cdfDefRecord(streamptr);
+ cdfDefField(streamptr);
break;
#endif
default: Error("%s support not compiled in!", strfiletype(streamptr->filetype)); break;
@@ -200,7 +200,7 @@ streamDefRecord(int streamID, int varID, int levelID)
}
void
-streamCopyRecord(int streamID2, int streamID1)
+streamCopyField(int streamID2, int streamID1)
{
stream_t *streamptr1 = stream_to_pointer(streamID1), *streamptr2 = stream_to_pointer(streamID2);
int filetype1 = streamptr1->filetype, filetype2 = streamptr2->filetype, filetype = CDI_FILETYPE_UNDEF;
@@ -213,16 +213,16 @@ streamCopyRecord(int streamID2, int streamID1)
switch (cdiBaseFiletype(filetype))
{
#ifdef HAVE_LIBGRIB
- case CDI_FILETYPE_GRIB: grbCopyRecord(streamptr2, streamptr1); break;
+ case CDI_FILETYPE_GRIB: grbCopyField(streamptr2, streamptr1); break;
#endif
#ifdef HAVE_LIBSERVICE
- case CDI_FILETYPE_SRV: srvCopyRecord(streamptr2, streamptr1); break;
+ case CDI_FILETYPE_SRV: srvCopyField(streamptr2, streamptr1); break;
#endif
#ifdef HAVE_LIBEXTRA
- case CDI_FILETYPE_EXT: extCopyRecord(streamptr2, streamptr1); break;
+ case CDI_FILETYPE_EXT: extCopyField(streamptr2, streamptr1); break;
#endif
#ifdef HAVE_LIBIEG
- case CDI_FILETYPE_IEG: iegCopyRecord(streamptr2, streamptr1); break;
+ case CDI_FILETYPE_IEG: iegCopyField(streamptr2, streamptr1); break;
#endif
#ifdef HAVE_LIBNETCDF
case CDI_FILETYPE_NETCDF: cdfCopyRecord(streamptr2, streamptr1); break;
diff --git a/src/stream_srv.c b/src/stream_srv.c
index b38d669198c4ac8966cf1d004fee6415080a5ee9..fa1beba762d18c1133569a7ef733b72232458318 100644
--- a/src/stream_srv.c
+++ b/src/stream_srv.c
@@ -34,43 +34,6 @@ srvDefDatatype(int datatype)
return (datatype == CDI_DATATYPE_FLT64) ? EXSE_PREC_FP64 : EXSE_PREC_FP32;
}
-/* not used
-int srvInqRecord(stream_t *streamptr, int *varID, int *levelID)
-{
- int status;
- int fileID;
- int icode, ilevel;
- int zaxisID = -1;
- int header[8];
- int vlistID;
- void *srvp = streamptr->record->objectp;
-
- vlistID = streamptr->vlistID;
- fileID = streamptr->fileID;
-
- *varID = -1;
- *levelID = -1;
-
- status = srvRead(fileID, srvp);
- if ( status != 0 ) return (0);
-
- srvInqHeader(srvp, header);
-
- icode = header[0];
- ilevel = header[1];
-
- *varID = vlistInqVarID(vlistID, icode);
-
- if ( *varID == CDI_UNDEFID ) Error("Code %d undefined", icode);
-
- zaxisID = vlistInqVarZaxis(vlistID, *varID);
-
- *levelID = zaxisInqLevelID(zaxisID, (double) ilevel);
-
- return 1;
-}
-*/
-
static void
srv_read_recordSP(stream_t *streamptr, float *data, size_t *numMissVals)
{
@@ -130,7 +93,7 @@ srv_read_recordDP(stream_t *streamptr, double *data, size_t *numMissVals)
}
void
-srv_read_record(stream_t *streamptr, int memtype, void *data, size_t *numMissVals)
+srv_read_field(stream_t *streamptr, int memtype, void *data, size_t *numMissVals)
{
if (memtype == MEMTYPE_DOUBLE)
srv_read_recordDP(streamptr, (double *) data, numMissVals);
@@ -139,13 +102,13 @@ srv_read_record(stream_t *streamptr, int memtype, void *data, size_t *numMissVal
}
void
-srvCopyRecord(stream_t *streamptr2, stream_t *streamptr1)
+srvCopyField(stream_t *streamptr2, stream_t *streamptr1)
{
streamFCopyRecord(streamptr2, streamptr1, "SRV");
}
void
-srvDefRecord(stream_t *streamptr)
+srvDefField(stream_t *streamptr)
{
Record *record = streamptr->record;
@@ -198,7 +161,7 @@ srv_write_recordDP(stream_t *streamptr, const double *data)
}
void
-srv_write_record(stream_t *streamptr, int memtype, const void *data)
+srv_write_field(stream_t *streamptr, int memtype, const void *data)
{
if (memtype == MEMTYPE_DOUBLE)
srv_write_recordDP(streamptr, (const double *) data);
diff --git a/src/stream_srv.h b/src/stream_srv.h
index adeaf679200828310ac9245e697cac6e25f75b7b..8e13653b13061c77b13ec394c32440467b01a678 100644
--- a/src/stream_srv.h
+++ b/src/stream_srv.h
@@ -8,11 +8,10 @@
int srvInqContents(stream_t *streamptr);
int srvInqTimestep(stream_t *streamptr, int tsID);
-int srvInqRecord(stream_t *streamptr, int *varID, int *levelID);
-void srvDefRecord(stream_t *streamptr);
-void srvCopyRecord(stream_t *streamptr2, stream_t *streamptr1);
-void srv_read_record(stream_t *streamptr, int memtype, void *data, size_t *numMissVals);
-void srv_write_record(stream_t *streamptr, int memtype, const void *data);
+void srvDefField(stream_t *streamptr);
+void srvCopyField(stream_t *streamptr2, stream_t *streamptr1);
+void srv_read_field(stream_t *streamptr, int memtype, void *data, size_t *numMissVals);
+void srv_write_field(stream_t *streamptr, int memtype, const void *data);
void srvReadVarDP(stream_t *streamptr, int varID, double *data, size_t *numMissVals);
void srvWriteVarDP(stream_t *streamptr, int varID, const double *data);
diff --git a/src/stream_write.c b/src/stream_write.c
index 4383cb782b7d3883762bc4ecf426782d071cc3fa..11f781e5abdcdea85783d3637d36152b55af8816 100644
--- a/src/stream_write.c
+++ b/src/stream_write.c
@@ -286,19 +286,19 @@ stream_write_record(int streamID, int memtype, const void *data, SizeType numMis
switch (cdiBaseFiletype(streamptr->filetype))
{
#ifdef HAVE_LIBGRIB
- case CDI_FILETYPE_GRIB: grb_write_record(streamptr, memtype, data, (size_t) numMissVals); break;
+ case CDI_FILETYPE_GRIB: grb_write_field(streamptr, memtype, data, (size_t) numMissVals); break;
#endif
#ifdef HAVE_LIBSERVICE
- case CDI_FILETYPE_SRV: srv_write_record(streamptr, memtype, data); break;
+ case CDI_FILETYPE_SRV: srv_write_field(streamptr, memtype, data); break;
#endif
#ifdef HAVE_LIBEXTRA
- case CDI_FILETYPE_EXT: ext_write_record(streamptr, memtype, data); break;
+ case CDI_FILETYPE_EXT: ext_write_field(streamptr, memtype, data); break;
#endif
#ifdef HAVE_LIBIEG
- case CDI_FILETYPE_IEG: ieg_write_record(streamptr, memtype, data); break;
+ case CDI_FILETYPE_IEG: ieg_write_field(streamptr, memtype, data); break;
#endif
#ifdef HAVE_LIBNETCDF
- case CDI_FILETYPE_NETCDF: cdf_write_record(streamptr, memtype, data, (size_t) numMissVals); break;
+ case CDI_FILETYPE_NETCDF: cdf_write_field(streamptr, memtype, data, (size_t) numMissVals); break;
#endif
default: Error("%s support not compiled in!", strfiletype(streamptr->filetype));
}
@@ -322,13 +322,13 @@ The values are converted to the external data type of the variable, if necessary
@EndFunction
*/
void
-streamWriteRecord(int streamID, const double *data, SizeType numMissVals)
+streamWriteField(int streamID, const double *data, SizeType numMissVals)
{
stream_write_record(streamID, MEMTYPE_DOUBLE, (const void *) data, numMissVals);
}
void
-streamWriteRecordF(int streamID, const float *data, SizeType numMissVals)
+streamWriteFieldF(int streamID, const float *data, SizeType numMissVals)
{
stream_write_record(streamID, MEMTYPE_FLOAT, (const void *) data, numMissVals);
}
diff --git a/src/vlist.c b/src/vlist.c
index 9a4c817ce0cdbf94acc5f92d8dfbfc98a8fcc848..be99645856a386166af6443eb295fb48b9dd6be2 100644
--- a/src/vlist.c
+++ b/src/vlist.c
@@ -948,7 +948,7 @@ vlistNvars(int vlistID)
}
int
-vlistNumRecords(int vlistID)
+vlistNumFields(int vlistID)
{
vlist_t *vlistptr = vlist_to_pointer(vlistID);