Commit bcb8d2e5 authored by Uwe Schulzweida's avatar Uwe Schulzweida

Removed function vlistDefVarTimave().

parent a7d0f24a
2020-06-17 Uwe Schulzweida
* Removed unsed function vlistInqVarTimave() and vlistDefVarTimave()
2020-06-10 Uwe Schulzweida
* Replaced vlistDefVarName()/vlistInqVarName() by cdiDefKeyString()/cdiInqKeyString() with CDI_KEY_NAME
......
......@@ -57,7 +57,7 @@ Define a text attribute.
int cdiDefKeyFloat (int cdiID, int varID, int key, double value);
\end{verbatim}
Define a float value from a key of a CDI variable.
Define a float value from a key.
\section*{\tt \htmlref{cdiDefKeyInt}{cdiDefKeyInt}}
......@@ -66,7 +66,7 @@ Define a float value from a key of a CDI variable.
int cdiDefKeyInt (int cdiID, int varID, int key, int value);
\end{verbatim}
Define an integer value from a key of a CDI variable.
Define an integer value from a key.
\section*{\tt \htmlref{cdiDefKeyString}{cdiDefKeyString}}
......@@ -75,7 +75,7 @@ Define an integer value from a key of a CDI variable.
int cdiDefKeyString (int cdiID, int varID, int key, const char *string);
\end{verbatim}
Define a string value from a key of a CDI variable.
Define a string from a key.
\section*{\tt \htmlref{cdiInqAtt}{cdiInqAtt}}
......@@ -122,7 +122,7 @@ Get the value(s) of a text attribute.
int cdiInqKeyInt (int cdiID, int varID, int key, int *value);
\end{verbatim}
Get an integer value from a key of a CDI variable.
Get an integer value from a key.
\section*{\tt \htmlref{cdiInqKeyLen}{cdiInqKeyLen}}
......@@ -140,7 +140,7 @@ Get the length of the string representation of the key.
int cdiInqKeyString (int cdiID, int varID, int key, char *string, int *length);
\end{verbatim}
Get a string value from a key of a CDI variable.
Get a string from a key.
\section*{\tt \htmlref{cdiInqNatts}{cdiInqNatts}}
......
......@@ -58,7 +58,7 @@ Define a text attribute.
DOUBLEPRECISION value)
\end{verbatim}
Define a float value from a key of a CDI variable.
Define a float value from a key.
\section*{\tt \htmlref{cdiDefKeyInt}{cdiDefKeyInt}}
......@@ -68,7 +68,7 @@ Define a float value from a key of a CDI variable.
INTEGER value)
\end{verbatim}
Define an integer value from a key of a CDI variable.
Define an integer value from a key.
\section*{\tt \htmlref{cdiDefKeyString}{cdiDefKeyString}}
......@@ -78,7 +78,7 @@ Define an integer value from a key of a CDI variable.
CHARACTER*(*) string)
\end{verbatim}
Define a string value from a key of a CDI variable.
Define a string from a key.
\section*{\tt \htmlref{cdiInqAtt}{cdiInqAtt}}
......@@ -128,7 +128,7 @@ Get the value(s) of a text attribute.
INTEGER value)
\end{verbatim}
Get an integer value from a key of a CDI variable.
Get an integer value from a key.
\section*{\tt \htmlref{cdiInqKeyLen}{cdiInqKeyLen}}
......@@ -148,7 +148,7 @@ Get the length of the string representation of the key.
CHARACTER*(*) string, INTEGER length)
\end{verbatim}
Get a string value from a key of a CDI variable.
Get a string from a key.
\section*{\tt \htmlref{cdiInqNatts}{cdiInqNatts}}
......
......@@ -646,8 +646,6 @@ double vlistInqVarScalefactor(int vlistID, int varID);
void vlistDefVarAddoffset(int vlistID, int varID, double addoffset);
double vlistInqVarAddoffset(int vlistID, int varID);
void vlistDefVarTimave(int vlistID, int varID, int timave);
size_t vlistInqVarSize(int vlistID, int varID);
void vlistDefIndex(int vlistID, int varID, int levID, int index);
......
......@@ -1238,12 +1238,6 @@
! INTEGER varID)
EXTERNAL vlistInqVarAddoffset
! vlistDefVarTimave
! (INTEGER vlistID,
! INTEGER varID,
! INTEGER timave)
EXTERNAL vlistDefVarTimave
INTEGER vlistInqVarSize
! (INTEGER vlistID,
! INTEGER varID)
......
......@@ -404,7 +404,6 @@ FCALLSCSUB3 (vlistDefVarScalefactor, VLISTDEFVARSCALEFACTOR, vlistdefvarscalefac
FCALLSCFUN2 (DOUBLE, vlistInqVarScalefactor, VLISTINQVARSCALEFACTOR, vlistinqvarscalefactor, INT, INT)
FCALLSCSUB3 (vlistDefVarAddoffset, VLISTDEFVARADDOFFSET, vlistdefvaraddoffset, INT, INT, DOUBLE)
FCALLSCFUN2 (DOUBLE, vlistInqVarAddoffset, VLISTINQVARADDOFFSET, vlistinqvaraddoffset, INT, INT)
FCALLSCSUB3 (vlistDefVarTimave, VLISTDEFVARTIMAVE, vlistdefvartimave, INT, INT, INT)
static int vlistInqVarSize_fwrap(int vlistID, int varID)
{
size_t v;
......
......@@ -400,7 +400,6 @@ module mo_cdi
public :: vlistInqVarScalefactor
public :: vlistDefVarAddoffset
public :: vlistInqVarAddoffset
public :: vlistDefVarTimave
public :: vlistInqVarSize
public :: vlistDefIndex
public :: vlistInqIndex
......@@ -1626,14 +1625,6 @@ module mo_cdi
real(c_double) :: f_result
end function vlistInqVarAddoffset
subroutine vlistDefVarTimave(vlistID_dummy, varID_dummy, timave_dummy)&
& bind(c, name = 'vlistDefVarTimave')
import c_int
integer(c_int), value :: vlistID_dummy
integer(c_int), value :: varID_dummy
integer(c_int), value :: timave_dummy
end subroutine vlistDefVarTimave
function vlistInqVarSize(vlistID_dummy, varID_dummy) bind(c, name =&
& 'vlistInqVarSize') result(f_result)
import c_int, c_size_t
......
......@@ -476,7 +476,6 @@ void cgribexAddRecord(stream_t *streamptr, cgribexrec_t *cgribexp, int param, si
record_t *record = &streamptr->tsteps[tsID].records[recID];
const int tsteptype = cgribexGetTsteptype(ISEC1_TimeRange);
const int numavg = ISEC1_AvgNum;
int leveltype, level1, level2;
cgribexGetLevel(isec1, &leveltype, &level1, &level2);
......@@ -554,7 +553,7 @@ void cgribexAddRecord(stream_t *streamptr, cgribexrec_t *cgribexp, int param, si
int varID = 0, levelID = 0;
varAddRecord(recID, param, gridID, zaxistype, lbounds, level1, level2, 0, 0,
datatype, &varID, &levelID, tsteptype, numavg, leveltype, -1,
datatype, &varID, &levelID, tsteptype, leveltype, -1,
NULL, NULL, NULL, NULL);
record->varID = (short)varID;
......
......@@ -191,7 +191,7 @@ void extAddRecord(stream_t *streamptr, int param, int level, size_t xysize,
int varID, levelID = 0;
varAddRecord(recID, param, gridID, leveltype, 0, level, 0, 0, 0,
datatype, &varID, &levelID, TSTEP_INSTANT, 0, 0, -1,
datatype, &varID, &levelID, TSTEP_INSTANT, 0, -1,
NULL, NULL, NULL, NULL);
record->varID = (short)varID;
......
......@@ -661,7 +661,6 @@ void gribapiAddRecord(stream_t *streamptr, int param, grib_handle *gh,
record_t *record = &streamptr->tsteps[tsID].records[recID];
const int tsteptype = gribapiGetTsteptype(gh);
// numavg = ISEC1_AvgNum;
int numavg = 0;
// fprintf(stderr, "param %d %d %d %d\n", param, level1, level2, leveltype1);
......@@ -736,7 +735,7 @@ void gribapiAddRecord(stream_t *streamptr, int param, grib_handle *gh,
int tile_index = 0;
int varID = 0, levelID = 0;
varAddRecord(recID, param, gridID, zaxistype, lbounds, level1, level2, level_sf, level_unit,
datatype, &varID, &levelID, tsteptype, numavg, leveltype1, leveltype2,
datatype, &varID, &levelID, tsteptype, leveltype1, leveltype2,
varname, scanKeys, tiles, &tile_index);
record->varID = (short)varID;
......@@ -949,7 +948,6 @@ int gribapiScanTimestep1(stream_t * streamptr)
DateTime datetime0 = { .date = 10101, .time = 0 };
int nrecs_scanned = 0; //Only used for debug output.
bool warn_time = true;
// bool warn_numavg = true;
int fcast = 0;
grib_handle *gh = NULL;
......@@ -1091,7 +1089,6 @@ int gribapiScanTimestep2(stream_t * streamptr)
DateTime datetime0 = { LONG_MIN, LONG_MIN };
// int gridID;
int recID;
// bool warn_numavg = true;
grib_handle *gh = NULL;
streamptr->curTsID = 1;
......@@ -1272,7 +1269,6 @@ int gribapiScanTimestep2(stream_t * streamptr)
int gribapiScanTimestep(stream_t * streamptr)
{
int vrecID, recID = -1;
//bool warn_numavg = true;
int nrecs = 0;
int vlistID = streamptr->vlistID;
......
......@@ -611,7 +611,7 @@ void iegAddRecord(stream_t *streamptr, int param, int *pdb, int *gdb, double *vc
int varID, levelID = 0;
varAddRecord(recID, param, gridID, leveltype, lbounds, level1, level2, 0, 0,
datatype, &varID, &levelID, TSTEP_INSTANT, 0, 0, -1,
datatype, &varID, &levelID, TSTEP_INSTANT, 0, -1,
NULL, NULL, NULL, NULL);
record->varID = (short)varID;
......
......@@ -189,7 +189,7 @@ void srv_add_record(stream_t *streamptr, int param, int level, size_t xsize, siz
int varID, levelID = 0;
varAddRecord(recID, param, gridID, leveltype, 0, level, 0, 0, 0,
datatype, &varID, &levelID, TSTEP_INSTANT, 0, 0, -1,
datatype, &varID, &levelID, TSTEP_INSTANT, 0, -1,
NULL, NULL, NULL, NULL);
xassert(varID <= SHRT_MAX && levelID <= SHRT_MAX);
......
......@@ -67,7 +67,6 @@ typedef struct
int tableID;
int comptype; // compression type
int complevel; // compression level
short timave;
bool lmissval;
double missval;
char *name;
......@@ -96,7 +95,6 @@ void paramInitEntry(unsigned varID, int param)
vartable[varID].prec = 0;
vartable[varID].tsteptype = TSTEP_INSTANT;
varScanKeysInit(&vartable[varID].scanKeys);
vartable[varID].timave = 0;
vartable[varID].gridID = CDI_UNDEFID;
vartable[varID].zaxistype = 0;
vartable[varID].ltype1 = 0;
......@@ -389,7 +387,7 @@ int varInsertTileSubtype(vartable_t *vptr, const var_tile_t *tiles)
void varAddRecord(int recID, int param, int gridID, int zaxistype, int lbounds,
int level1, int level2, int level_sf, int level_unit, int prec,
int *pvarID, int *plevelID, int tsteptype, int numavg, int ltype1, int ltype2,
int *pvarID, int *plevelID, int tsteptype, int ltype1, int ltype2,
const char *name, const VarScanKeys *scanKeys, const var_tile_t *tiles, int *tile_index)
{
unsigned varID = (cdiSplitLtype105 != 1 || zaxistype != ZAXIS_HEIGHT) ?
......@@ -409,8 +407,6 @@ void varAddRecord(int recID, int param, int gridID, int zaxistype, int lbounds,
vartable[varID].tsteptype = tsteptype;
if (scanKeys) vartable[varID].scanKeys = *scanKeys;
if ( numavg ) vartable[varID].timave = 1;
if ( name && name[0] ) vartable[varID].name = strdup(name);
}
else
......@@ -565,7 +561,6 @@ void cdi_generate_vars(stream_t *streamptr)
int modelID = vartable[varid].modelID;
int tableID = vartable[varid].tableID;
const int tsteptype = vartable[varid].tsteptype;
const int timave = vartable[varid].timave;
const int comptype = vartable[varid].comptype;
double level_sf = 1;
......@@ -701,7 +696,6 @@ void cdi_generate_vars(stream_t *streamptr)
vlistDefVarTsteptype(vlistID, varID, tsteptype);
vlistDefVarParam(vlistID, varID, param);
vlistDefVarDatatype(vlistID, varID, prec);
vlistDefVarTimave(vlistID, varID, timave);
vlistDefVarCompType(vlistID, varID, comptype);
varCopyKeys(vlistID, varID);
......
......@@ -8,7 +8,7 @@
void varAddRecord(int recID, int param, int gridID, int zaxistype, int lbounds,
int level1, int level2, int level_sf, int level_unit, int prec,
int *pvarID, int *plevelID, int tsteptype, int numavg, int ltype1, int ltype2,
int *pvarID, int *plevelID, int tsteptype, int ltype1, int ltype2,
const char *name, const VarScanKeys *scanKeys, const var_tile_t *tiles, int *tile_index);
void varDefVCT(size_t vctsize, double *vctptr);
......
......@@ -22,7 +22,6 @@ void vlistvarInitEntry(int vlistID, int varID)
vlistptr->vars[varID].datatype = CDI_UNDEFID;
vlistptr->vars[varID].timetype = CDI_UNDEFID;
vlistptr->vars[varID].tsteptype = TSTEP_INSTANT;
vlistptr->vars[varID].timave = 0;
vlistptr->vars[varID].chunktype = cdiChunkType;
vlistptr->vars[varID].xyz = 321;
vlistptr->vars[varID].gridID = CDI_UNDEFID;
......@@ -1114,17 +1113,6 @@ int vlistInqVarTsteptype(int vlistID, int varID)
}
void vlistDefVarTimave(int vlistID, int varID, int timave)
{
vlist_t *vlistptr = vlist_to_pointer(vlistID);
if (vlistptr->vars[varID].timave != timave)
{
vlistptr->vars[varID].timave = timave;
reshSetStatus(vlistID, &vlistOps, RESH_DESYNC_IN_USE);
}
}
int vlistInqVarMissvalUsed(int vlistID, int varID)
{
const vlist_t *vlistptr = vlist_to_pointer(vlistID);
......@@ -1507,7 +1495,7 @@ int vlistVarCompare(vlist_t *a, int varIDA, vlist_t *b, int varIDB)
#define FCMP2(f) (namespaceResHDecode(pva->f).idx \
!= namespaceResHDecode(pvb->f).idx)
int diff = FCMP(fvarID) | FCMP(mvarID) | FCMP(flag) | FCMP(param)
| FCMP(datatype) | FCMP(timetype) | FCMP(tsteptype) | FCMP(timave)
| FCMP(datatype) | FCMP(timetype) | FCMP(tsteptype)
| FCMP(chunktype) | FCMP(xyz) | FCMP2(gridID) | FCMP2(zaxisID)
| FCMP2(instID) | FCMP2(modelID) | FCMP2(tableID) | FCMP(missvalused)
| FCMPFLT(missval) | FCMPFLT(addoffset) | FCMPFLT(scalefactor)
......
......@@ -16,7 +16,6 @@ enum {
VLISTVAR_PACK_INT_IDX_INSTID,
VLISTVAR_PACK_INT_IDX_MODELID,
VLISTVAR_PACK_INT_IDX_TABLEID,
VLISTVAR_PACK_INT_IDX_TIMAVE,
VLISTVAR_PACK_INT_IDX_MISSVALUSED,
VLISTVAR_PACK_INT_IDX_COMPTYPE,
VLISTVAR_PACK_INT_IDX_COMPLEVEL,
......@@ -61,7 +60,6 @@ void vlistVarPack(vlist_t *p, int varID, char * buf, int size, int *position, vo
tempbuf[VLISTVAR_PACK_INT_IDX_INSTID] = var->instID;
tempbuf[VLISTVAR_PACK_INT_IDX_MODELID] = var->modelID;
tempbuf[VLISTVAR_PACK_INT_IDX_TABLEID] = var->tableID;
tempbuf[VLISTVAR_PACK_INT_IDX_TIMAVE] = var->timave;
tempbuf[VLISTVAR_PACK_INT_IDX_MISSVALUSED] = (int)var->missvalused;
tempbuf[VLISTVAR_PACK_INT_IDX_COMPTYPE] = var->comptype;
tempbuf[VLISTVAR_PACK_INT_IDX_COMPLEVEL] = var->complevel;
......@@ -136,7 +134,6 @@ void vlistVarUnpack(int vlistID, char * buf, int size, int *position,
vlistDefVarTable(vlistID, newvar, tempbuf[VLISTVAR_PACK_INT_IDX_TABLEID]);
// FIXME: changing the table might change the param code
vlistDefVarParam(vlistID, newvar, tempbuf[VLISTVAR_PACK_INT_IDX_PARAM]);
vlistDefVarTimave(vlistID, newvar, tempbuf[VLISTVAR_PACK_INT_IDX_TIMAVE]);
if (tempbuf[VLISTVAR_PACK_INT_IDX_MISSVALUSED])
vlistDefVarMissval(vlistID, newvar, dtempbuf[0]);
vlistDefVarScalefactor(vlistID, newvar, dtempbuf[1]);
......
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