Commit 1175de6b authored by Uwe Schulzweida's avatar Uwe Schulzweida
Browse files

Removed CDI function vlistDefVarTimaccu()/vlistInqVarTimaccu().

parent 276f5046
......@@ -2,6 +2,10 @@
* Version 1.9.3 released
2018-01-06 Uwe Schulzweida
* Removed CDI function vlistDefVarTimaccu()/vlistInqVarTimaccu().
2018-01-05 Uwe Schulzweida
* Replaced vlistDefVarEnsemble() by cdiDefKeyInt().
......
......@@ -662,8 +662,6 @@ double vlistInqVarAddoffset(int vlistID, int varID);
void vlistDefVarTimave(int vlistID, int varID, int timave);
int vlistInqVarTimave(int vlistID, int varID);
void vlistDefVarTimaccu(int vlistID, int varID, int timaccu);
int vlistInqVarTimaccu(int vlistID, int varID);
size_t vlistInqVarSize(int vlistID, int varID);
......
......@@ -1248,17 +1248,6 @@
! INTEGER varID)
EXTERNAL vlistInqVarTimave
! vlistDefVarTimaccu
! (INTEGER vlistID,
! INTEGER varID,
! INTEGER timaccu)
EXTERNAL vlistDefVarTimaccu
INTEGER vlistInqVarTimaccu
! (INTEGER vlistID,
! INTEGER varID)
EXTERNAL vlistInqVarTimaccu
INTEGER vlistInqVarSize
! (INTEGER vlistID,
! INTEGER varID)
......
......@@ -360,8 +360,6 @@ FCALLSCSUB3 (vlistDefVarAddoffset, VLISTDEFVARADDOFFSET, vlistdefvaraddoffset, I
FCALLSCFUN2 (DOUBLE, vlistInqVarAddoffset, VLISTINQVARADDOFFSET, vlistinqvaraddoffset, INT, INT)
FCALLSCSUB3 (vlistDefVarTimave, VLISTDEFVARTIMAVE, vlistdefvartimave, INT, INT, INT)
FCALLSCFUN2 (INT, vlistInqVarTimave, VLISTINQVARTIMAVE, vlistinqvartimave, INT, INT)
FCALLSCSUB3 (vlistDefVarTimaccu, VLISTDEFVARTIMACCU, vlistdefvartimaccu, INT, INT, INT)
FCALLSCFUN2 (INT, vlistInqVarTimaccu, VLISTINQVARTIMACCU, vlistinqvartimaccu, INT, INT)
static int vlistInqVarSize_fwrap(int vlistID, int varID)
{
size_t v;
......
......@@ -49,7 +49,6 @@ typedef struct
int param;
int prec;
int tsteptype;
int timaccu;
int gridID;
int zaxistype;
int ltype1; /* GRIB first level type */
......@@ -107,7 +106,6 @@ void paramInitEntry(unsigned varID, int param)
vartable[varID].prec = 0;
vartable[varID].tsteptype = TSTEP_INSTANT;
vartable[varID].timave = 0;
vartable[varID].timaccu = 0;
vartable[varID].gridID = CDI_UNDEFID;
vartable[varID].zaxistype = 0;
vartable[varID].ltype1 = 0;
......@@ -637,7 +635,6 @@ void cdi_generate_vars(stream_t *streamptr)
int tableID = vartable[varid].tableID;
int tsteptype = vartable[varid].tsteptype;
int timave = vartable[varid].timave;
int timaccu = vartable[varid].timaccu;
int comptype = vartable[varid].comptype;
double level_sf = 1;
......@@ -776,7 +773,6 @@ void cdi_generate_vars(stream_t *streamptr)
vlistDefVarParam(vlistID, varID, param);
vlistDefVarDatatype(vlistID, varID, prec);
vlistDefVarTimave(vlistID, varID, timave);
vlistDefVarTimaccu(vlistID, varID, timaccu);
vlistDefVarCompType(vlistID, varID, comptype);
varCopyKeys(vlistID, varID);
......
......@@ -62,7 +62,6 @@ typedef struct
int modelID;
int tableID;
int timave;
int timaccu;
int chunktype;
int xyz;
bool missvalused; // true if missval is defined
......
......@@ -33,7 +33,6 @@ void vlistvarInitEntry(int vlistID, int varID)
vlistptr->vars[varID].timetype = CDI_UNDEFID;
vlistptr->vars[varID].tsteptype = TSTEP_INSTANT;
vlistptr->vars[varID].timave = 0;
vlistptr->vars[varID].timaccu = 0;
vlistptr->vars[varID].chunktype = cdiChunkType;
vlistptr->vars[varID].xyz = 321;
vlistptr->vars[varID].gridID = CDI_UNDEFID;
......@@ -1263,24 +1262,6 @@ int vlistInqVarTimave(int vlistID, int varID)
}
void vlistDefVarTimaccu(int vlistID, int varID, int timaccu)
{
vlist_t *vlistptr = vlist_to_pointer(vlistID);
if (vlistptr->vars[varID].timaccu != timaccu)
{
vlistptr->vars[varID].timaccu = timaccu;
reshSetStatus(vlistID, &vlistOps, RESH_DESYNC_IN_USE);
}
}
int vlistInqVarTimaccu(int vlistID, int varID)
{
vlist_t *vlistptr = vlist_to_pointer(vlistID);
return vlistptr->vars[varID].timaccu;
}
void vlistDestroyVarName(int vlistID, int varID)
{
vlist_t *vlistptr = vlist_to_pointer(vlistID);
......@@ -1887,7 +1868,7 @@ double vlistInqVarDblKey(int vlistID, int varID, const char* name)
/* vlistInqVarIntKey: raw access to GRIB meta-data */
int vlistInqVarIntKey(int vlistID, int varID, const char* name)
{
long int value = 0;
long value = 0;
#if defined (HAVE_LIBGRIB_API)
/* check if the GRIB key was previously read and is stored in "opt_grib_int_val" */
vlist_t *vlistptr = vlist_to_pointer(vlistID);
......@@ -1946,7 +1927,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(timaccu)
| FCMP(datatype) | FCMP(timetype) | FCMP(tsteptype) | FCMP(timave)
| FCMP(chunktype) | FCMP(xyz) | FCMP2(gridID) | FCMP2(zaxisID)
| FCMP2(instID) | FCMP2(modelID) | FCMP2(tableID) | FCMP(missvalused)
| FCMPFLT(missval) | FCMPFLT(addoffset) | FCMPFLT(scalefactor) | FCMPSTR(name)
......@@ -2030,7 +2011,6 @@ void vlistVarPack(vlist_t *p, int varID, char * buf, int size, int *position,
tempbuf[11] = var->modelID;
tempbuf[12] = var->tableID;
tempbuf[13] = var->timave;
tempbuf[14] = var->timaccu;
tempbuf[15] = (int)var->missvalused;
tempbuf[16] = var->comptype;
tempbuf[17] = var->complevel;
......@@ -2152,7 +2132,6 @@ void vlistVarUnpack(int vlistID, char * buf, int size, int *position,
/* FIXME: changing the table might change the param code */
vlistDefVarParam(vlistID, newvar, tempbuf[9]);
vlistDefVarTimave(vlistID, newvar, tempbuf[13]);
vlistDefVarTimaccu(vlistID, newvar, tempbuf[14]);
if (tempbuf[15])
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