Skip to content

GitLab

Commit a7d0f24a authored by Uwe Schulzweida's avatar Uwe Schulzweida
Browse files

Removed function vlistInqVarTimave().

parent 53275317
Hide whitespace changes
Inline Side-by-side
Showing with 115 additions and 98 deletions
src/cdf_write.c
View file @ a7d0f24a
......@@ -786,10 +786,10 @@ int cdfDefVar(stream_t *streamptr, int varID)
int length = CDI_MAX_NAME;
cdiInqKeyString(vlistID, varID, CDI_KEY_NAME, name, &length);
char longname[CDI_MAX_NAME]; longname[0] = 0;
char longname[CDI_MAX_NAME];
vlistInqVarLongname(vlistID, varID, longname);
char units[CDI_MAX_NAME]; units[0] = 0;
char units[CDI_MAX_NAME];
vlistInqVarUnits(vlistID, varID, units);
char stdname[CDI_MAX_NAME];
......
src/cdi.h
View file @ a7d0f24a
......@@ -647,7 +647,6 @@ void vlistDefVarAddoffset(int vlistID, int varID, double addoffset);
double vlistInqVarAddoffset(int vlistID, int varID);
void vlistDefVarTimave(int vlistID, int varID, int timave);
int vlistInqVarTimave(int vlistID, int varID);
size_t vlistInqVarSize(int vlistID, int varID);
......@@ -801,6 +800,7 @@ size_t gridInqYCvals(int gridID, char *ycvals[]);
#define CDI_KEY_NLEV 962 // GRIB2 nlev
// Floating point keys
#define CDI_KEY_MISSVAL 701 // Missing value
// Byte array keys
#define CDI_KEY_UUID 960 // UUID for grid/Z-axis reference [size: CDI_UUID_SIZE]
......
src/cdi.inc
View file @ a7d0f24a
......@@ -4,7 +4,7 @@
!
! Author:
! -------
! Uwe Schulzweida, MPI-MET, Hamburg, February 2020
! Uwe Schulzweida, MPI-MET, Hamburg, June 2020
!
INTEGER CDI_MAX_NAME
......@@ -1244,11 +1244,6 @@
! INTEGER timave)
EXTERNAL vlistDefVarTimave
INTEGER vlistInqVarTimave
! (INTEGER vlistID,
! INTEGER varID)
EXTERNAL vlistInqVarTimave
INTEGER vlistInqVarSize
! (INTEGER vlistID,
! INTEGER varID)
......@@ -1365,6 +1360,12 @@
! CHARACTER*(*) name)
EXTERNAL cdiInqAttLen
INTEGER cdiInqAttType
! (INTEGER cdiID,
! INTEGER varID,
! CHARACTER*(*) name)
EXTERNAL cdiInqAttType
INTEGER cdiDelAtt
! (INTEGER cdiID,
! INTEGER varID,
......@@ -1570,6 +1571,48 @@
!
! CDI var keys
!
!
! String keys
!
INTEGER CDI_KEY_NAME
PARAMETER (CDI_KEY_NAME = 942)
INTEGER CDI_KEY_LONGNAME
PARAMETER (CDI_KEY_LONGNAME = 943)
INTEGER CDI_KEY_STDNAME
PARAMETER (CDI_KEY_STDNAME = 944)
INTEGER CDI_KEY_UNITS
PARAMETER (CDI_KEY_UNITS = 945)
INTEGER CDI_KEY_REFERENCEURI
PARAMETER (CDI_KEY_REFERENCEURI = 965)
!
! Integer keys
!
INTEGER CDI_KEY_NUMBEROFGRIDUSED
PARAMETER (CDI_KEY_NUMBEROFGRIDUSED = 963)
INTEGER CDI_KEY_NUMBEROFGRIDINREFERENCE
PARAMETER (CDI_KEY_NUMBEROFGRIDINREFERENCE = 964)
INTEGER CDI_KEY_NUMBEROFVGRIDUSED
PARAMETER (CDI_KEY_NUMBEROFVGRIDUSED = 961)
INTEGER CDI_KEY_NLEV
PARAMETER (CDI_KEY_NLEV = 962)
!
! Floating point keys
!
INTEGER CDI_KEY_MISSVAL
PARAMETER (CDI_KEY_MISSVAL = 701)
!
! Byte array keys
!
INTEGER CDI_KEY_UUID
PARAMETER (CDI_KEY_UUID = 960)
INTEGER CDI_KEY_DIMNAME
PARAMETER (CDI_KEY_DIMNAME = 941)
INTEGER CDI_KEY_PSNAME
PARAMETER (CDI_KEY_PSNAME = 950)
INTEGER CDI_KEY_P0NAME
PARAMETER (CDI_KEY_P0NAME = 951)
INTEGER CDI_KEY_P0VALUE
PARAMETER (CDI_KEY_P0VALUE = 952)
INTEGER CDI_KEY_TABLESVERSION
PARAMETER (CDI_KEY_TABLESVERSION = 801)
INTEGER CDI_KEY_LOCALTABLESVERSION
......@@ -1610,16 +1653,16 @@
PARAMETER (CDI_KEY_SECTION2PADDINGLENGTH = 819)
INTEGER CDI_KEY_SECTION2PADDING
PARAMETER (CDI_KEY_SECTION2PADDING = 820)
INTEGER CDI_KEY_UVRELATIVETOGRID
PARAMETER (CDI_KEY_UVRELATIVETOGRID = 821)
INTEGER CDI_KEY_CONSTITUENTTYPE
PARAMETER (CDI_KEY_CONSTITUENTTYPE = 822)
PARAMETER (CDI_KEY_CONSTITUENTTYPE = 821)
INTEGER CDI_KEY_TYPEOFTIMEINCREMENT
PARAMETER (CDI_KEY_TYPEOFTIMEINCREMENT = 823)
PARAMETER (CDI_KEY_TYPEOFTIMEINCREMENT = 822)
INTEGER CDI_KEY_TYPEOFFIRSTFIXEDSURFACE
PARAMETER (CDI_KEY_TYPEOFFIRSTFIXEDSURFACE = 824)
PARAMETER (CDI_KEY_TYPEOFFIRSTFIXEDSURFACE = 823)
INTEGER CDI_KEY_TYPEOFSECONDFIXEDSURFACE
PARAMETER (CDI_KEY_TYPEOFSECONDFIXEDSURFACE = 825)
PARAMETER (CDI_KEY_TYPEOFSECONDFIXEDSURFACE = 824)
INTEGER CDI_KEY_UVRELATIVETOGRID
PARAMETER (CDI_KEY_UVRELATIVETOGRID = 825)
INTEGER CDI_KEY_SCANNINGMODE
PARAMETER (CDI_KEY_SCANNINGMODE = 826)
INTEGER CDI_KEY_VDIMNAME
......@@ -1630,34 +1673,6 @@
PARAMETER (CDI_KEY_GRIDMAP_VARNAME = 922)
INTEGER CDI_KEY_GRIDMAP_NAME
PARAMETER (CDI_KEY_GRIDMAP_NAME = 923)
INTEGER CDI_KEY_DIMNAME
PARAMETER (CDI_KEY_DIMNAME = 941)
INTEGER CDI_KEY_NAME
PARAMETER (CDI_KEY_NAME = 942)
INTEGER CDI_KEY_LONGNAME
PARAMETER (CDI_KEY_LONGNAME = 943)
INTEGER CDI_KEY_STDNAME
PARAMETER (CDI_KEY_STDNAME = 944)
INTEGER CDI_KEY_UNITS
PARAMETER (CDI_KEY_UNITS = 945)
INTEGER CDI_KEY_PSNAME
PARAMETER (CDI_KEY_PSNAME = 950)
INTEGER CDI_KEY_P0NAME
PARAMETER (CDI_KEY_P0NAME = 951)
INTEGER CDI_KEY_P0VALUE
PARAMETER (CDI_KEY_P0VALUE = 952)
INTEGER CDI_KEY_UUID
PARAMETER (CDI_KEY_UUID = 960)
INTEGER CDI_KEY_NUMBEROFVGRIDUSED
PARAMETER (CDI_KEY_NUMBEROFVGRIDUSED = 961)
INTEGER CDI_KEY_NLEV
PARAMETER (CDI_KEY_NLEV = 962)
INTEGER CDI_KEY_NUMBEROFGRIDUSED
PARAMETER (CDI_KEY_NUMBEROFGRIDUSED = 963)
INTEGER CDI_KEY_NUMBEROFGRIDINREFERENCE
PARAMETER (CDI_KEY_NUMBEROFGRIDINREFERENCE = 964)
INTEGER CDI_KEY_REFERENCEURI
PARAMETER (CDI_KEY_REFERENCEURI = 965)
INTEGER cdiDefKeyInt
! (INTEGER cdiID,
! INTEGER varID,
......@@ -1680,7 +1695,7 @@
EXTERNAL cdiDefKeyFloat
!
! cdiInqKeyFloat Get a float value from a key of a CDI variable
! cdiInqKeyFloat Get a float value from a key
!
INTEGER cdiInqKeyFloat
! (INTEGER cdiID,
......@@ -1725,6 +1740,12 @@
! INTEGER cdiID2)
EXTERNAL cdiCopyKey
INTEGER cdiDeleteKey
! (INTEGER cdiID,
! INTEGER varID,
! INTEGER key)
EXTERNAL cdiDeleteKey
!
! GRID routines
!
......
src/cdiFortran.c
View file @ a7d0f24a
......@@ -405,7 +405,6 @@ FCALLSCFUN2 (DOUBLE, vlistInqVarScalefactor, VLISTINQVARSCALEFACTOR, vlistinqvar
FCALLSCSUB3 (vlistDefVarAddoffset, VLISTDEFVARADDOFFSET, vlistdefvaraddoffset, INT, INT, DOUBLE)
FCALLSCFUN2 (DOUBLE, vlistInqVarAddoffset, VLISTINQVARADDOFFSET, vlistinqvaraddoffset, INT, INT)
FCALLSCSUB3 (vlistDefVarTimave, VLISTDEFVARTIMAVE, vlistdefvartimave, INT, INT, INT)
FCALLSCFUN2 (INT, vlistInqVarTimave, VLISTINQVARTIMAVE, vlistinqvartimave, INT, INT)
static int vlistInqVarSize_fwrap(int vlistID, int varID)
{
size_t v;
......@@ -434,6 +433,7 @@ FCALLSCFUN3 (INT, vlistInqVarIntKey, VLISTINQVARINTKEY, vlistinqvarintkey, INT,
FCALLSCFUN3 (INT, cdiInqNatts, CDIINQNATTS, cdiinqnatts, INT, INT, PINT)
FCALLSCFUN6 (INT, cdiInqAtt, CDIINQATT, cdiinqatt, INT, INT, INT, PSTRING, PINT, PINT)
FCALLSCFUN3 (INT, cdiInqAttLen, CDIINQATTLEN, cdiinqattlen, INT, INT, STRING)
FCALLSCFUN3 (INT, cdiInqAttType, CDIINQATTTYPE, cdiinqatttype, INT, INT, STRING)
FCALLSCFUN3 (INT, cdiDelAtt, CDIDELATT, cdidelatt, INT, INT, STRING)
FCALLSCFUN4 (INT, cdiCopyAtts, CDICOPYATTS, cdicopyatts, INT, INT, INT, INT)
FCALLSCFUN6 (INT, cdiDefAttInt, CDIDEFATTINT, cdidefattint, INT, INT, STRING, INT, INT, INTV)
......@@ -533,11 +533,23 @@ FCALLSCFUN1 (INT, gridInqYIsc, GRIDINQYISC, gridinqyisc, INT)
/* CDI var keys */
/* String keys */
/* Integer keys */
/* Floating point keys */
/* Byte array keys */
FCALLSCFUN4 (INT, cdiDefKeyInt, CDIDEFKEYINT, cdidefkeyint, INT, INT, INT, INT)
FCALLSCFUN4 (INT, cdiInqKeyInt, CDIINQKEYINT, cdiinqkeyint, INT, INT, INT, PINT)
FCALLSCFUN4 (INT, cdiDefKeyFloat, CDIDEFKEYFLOAT, cdidefkeyfloat, INT, INT, INT, DOUBLE)
/* cdiInqKeyFloat Get a float value from a key of a CDI variable */
/* cdiInqKeyFloat Get a float value from a key */
FCALLSCFUN4 (INT, cdiInqKeyFloat, CDIINQKEYFLOAT, cdiinqkeyfloat, INT, INT, INT, PDOUBLE)
FCALLSCFUN4 (INT, cdiDefKeyString, CDIDEFKEYSTRING, cdidefkeystring, INT, INT, INT, STRING)
......@@ -545,6 +557,7 @@ FCALLSCFUN5 (INT, cdiInqKeyString, CDIINQKEYSTRING, cdiinqkeystring, INT, INT, I
FCALLSCFUN4 (INT, cdiInqKeyLen, CDIINQKEYLEN, cdiinqkeylen, INT, INT, INT, PINT)
FCALLSCFUN4 (INT, cdiCopyKeys, CDICOPYKEYS, cdicopykeys, INT, INT, INT, INT)
FCALLSCFUN4 (INT, cdiCopyKey, CDICOPYKEY, cdicopykey, INT, INT, INT, INT)
FCALLSCFUN3 (INT, cdiDeleteKey, CDIDELETEKEY, cdideletekey, INT, INT, INT)
/* GRID routines */
......
src/mo_cdi.f90
View file @ a7d0f24a
! >>> Warning: This is a generated file. If you modify it, you get what you deserve. <<<
!
! Generated by "../interfaces/f2003/bindGen.rb" from input file "../src/cdi.h".
! Generated by "../../../interfaces/f2003/bindGen.rb" from input file "../../../src/cdi.h".
module mo_cdi
use iso_c_binding
......@@ -401,7 +401,6 @@ module mo_cdi
public :: vlistDefVarAddoffset
public :: vlistInqVarAddoffset
public :: vlistDefVarTimave
public :: vlistInqVarTimave
public :: vlistInqVarSize
public :: vlistDefIndex
public :: vlistInqIndex
......@@ -459,6 +458,21 @@ module mo_cdi
public :: gridInqYvals
public :: gridInqYvalsPart
public :: gridInqYIsc
integer(c_int), public, parameter :: CDI_KEY_NAME = 942
integer(c_int), public, parameter :: CDI_KEY_LONGNAME = 943
integer(c_int), public, parameter :: CDI_KEY_STDNAME = 944
integer(c_int), public, parameter :: CDI_KEY_UNITS = 945
integer(c_int), public, parameter :: CDI_KEY_REFERENCEURI = 965
integer(c_int), public, parameter :: CDI_KEY_NUMBEROFGRIDUSED = 963
integer(c_int), public, parameter :: CDI_KEY_NUMBEROFGRIDINREFERENCE = 964
integer(c_int), public, parameter :: CDI_KEY_NUMBEROFVGRIDUSED = 961
integer(c_int), public, parameter :: CDI_KEY_NLEV = 962
integer(c_int), public, parameter :: CDI_KEY_MISSVAL = 701
integer(c_int), public, parameter :: CDI_KEY_UUID = 960
integer(c_int), public, parameter :: CDI_KEY_DIMNAME = 941
integer(c_int), public, parameter :: CDI_KEY_PSNAME = 950
integer(c_int), public, parameter :: CDI_KEY_P0NAME = 951
integer(c_int), public, parameter :: CDI_KEY_P0VALUE = 952
integer(c_int), public, parameter :: CDI_KEY_TABLESVERSION = 801
integer(c_int), public, parameter :: CDI_KEY_LOCALTABLESVERSION = 802
integer(c_int), public, parameter :: CDI_KEY_TYPEOFGENERATINGPROCESS = 803
......@@ -480,30 +494,16 @@ module mo_cdi
integer(c_int), public, parameter :: CDI_KEY_GRIB2LOCALSECTIONNUMBER = 818
integer(c_int), public, parameter :: CDI_KEY_SECTION2PADDINGLENGTH = 819
integer(c_int), public, parameter :: CDI_KEY_SECTION2PADDING = 820
integer(c_int), public, parameter :: CDI_KEY_UVRELATIVETOGRID = 821
integer(c_int), public, parameter :: CDI_KEY_CONSTITUENTTYPE = 822
integer(c_int), public, parameter :: CDI_KEY_TYPEOFTIMEINCREMENT = 823
integer(c_int), public, parameter :: CDI_KEY_TYPEOFFIRSTFIXEDSURFACE = 824
integer(c_int), public, parameter :: CDI_KEY_TYPEOFSECONDFIXEDSURFACE = 825
integer(c_int), public, parameter :: CDI_KEY_CONSTITUENTTYPE = 821
integer(c_int), public, parameter :: CDI_KEY_TYPEOFTIMEINCREMENT = 822
integer(c_int), public, parameter :: CDI_KEY_TYPEOFFIRSTFIXEDSURFACE = 823
integer(c_int), public, parameter :: CDI_KEY_TYPEOFSECONDFIXEDSURFACE = 824
integer(c_int), public, parameter :: CDI_KEY_UVRELATIVETOGRID = 825
integer(c_int), public, parameter :: CDI_KEY_SCANNINGMODE = 826
integer(c_int), public, parameter :: CDI_KEY_VDIMNAME = 920
integer(c_int), public, parameter :: CDI_KEY_GRIDMAP_VARTYPE = 921
integer(c_int), public, parameter :: CDI_KEY_GRIDMAP_VARNAME = 922
integer(c_int), public, parameter :: CDI_KEY_GRIDMAP_NAME = 923
integer(c_int), public, parameter :: CDI_KEY_DIMNAME = 941
integer(c_int), public, parameter :: CDI_KEY_NAME = 942
integer(c_int), public, parameter :: CDI_KEY_LONGNAME = 943
integer(c_int), public, parameter :: CDI_KEY_STDNAME = 944
integer(c_int), public, parameter :: CDI_KEY_UNITS = 945
integer(c_int), public, parameter :: CDI_KEY_PSNAME = 950
integer(c_int), public, parameter :: CDI_KEY_P0NAME = 951
integer(c_int), public, parameter :: CDI_KEY_P0VALUE = 952
integer(c_int), public, parameter :: CDI_KEY_UUID = 960
integer(c_int), public, parameter :: CDI_KEY_NUMBEROFVGRIDUSED = 961
integer(c_int), public, parameter :: CDI_KEY_NLEV = 962
integer(c_int), public, parameter :: CDI_KEY_NUMBEROFGRIDUSED = 963
integer(c_int), public, parameter :: CDI_KEY_NUMBEROFGRIDINREFERENCE = 964
integer(c_int), public, parameter :: CDI_KEY_REFERENCEURI = 965
public :: cdiDefKeyInt
public :: cdiInqKeyInt
public :: cdiDefKeyFloat
......@@ -515,6 +515,7 @@ module mo_cdi
public :: cdiInqKeyLen
public :: cdiCopyKeys
public :: cdiCopyKey
public :: cdiDeleteKey
public :: gridDefXname
public :: gridInqXname
public :: gridDefXlongname
......@@ -1633,14 +1634,6 @@ module mo_cdi
integer(c_int), value :: timave_dummy
end subroutine vlistDefVarTimave
function vlistInqVarTimave(vlistID_dummy, varID_dummy) bind(c, name =&
& 'vlistInqVarTimave') result(f_result)
import c_int
integer(c_int), value :: vlistID_dummy
integer(c_int), value :: varID_dummy
integer(c_int) :: f_result
end function vlistInqVarTimave
function vlistInqVarSize(vlistID_dummy, varID_dummy) bind(c, name =&
& 'vlistInqVarSize') result(f_result)
import c_int, c_size_t
......@@ -2029,6 +2022,15 @@ module mo_cdi
integer(c_int) :: f_result
end function cdiCopyKey
function cdiDeleteKey(cdiID_dummy, varID_dummy, key_dummy) bind(c, name =&
& 'cdiDeleteKey') result(f_result)
import c_int
integer(c_int), value :: cdiID_dummy
integer(c_int), value :: varID_dummy
integer(c_int), value :: key_dummy
integer(c_int) :: f_result
end function cdiDeleteKey
subroutine gridDefDatatype(gridID_dummy, prec_dummy) bind(c, name =&
& 'gridDefDatatype')
import c_int
......
src/stream_cgribex.c
View file @ a7d0f24a
......@@ -968,14 +968,9 @@ int cgribexScanTimestep2(stream_t * streamptr)
if ( ISEC1_AvgNum )
{
if ( taxis->numavg && warn_numavg && (taxis->numavg != ISEC1_AvgNum) )
{
// Warning("Changing numavg from %d to %d not supported!", taxis->numavg, ISEC1_AvgNum);
warn_numavg = false;
}
warn_numavg = false;
else
{
taxis->numavg = ISEC1_AvgNum;
}
taxis->numavg = ISEC1_AvgNum;
}
compvar_t compVar = cgribexVarSet(param, level1, level2, leveltype, ISEC1_TimeRange);
......@@ -1171,16 +1166,9 @@ int cgribexScanTimestep(stream_t * streamptr)
if ( ISEC1_AvgNum )
{
if ( taxis->numavg && warn_numavg && (taxis->numavg != ISEC1_AvgNum) )
{
/*
Warning("Changing numavg from %d to %d not supported!", streamptr->tsteps[tsID].taxis.numavg, ISEC1_AvgNum);
*/
warn_numavg = false;
}
warn_numavg = false;
else
{
taxis->numavg = ISEC1_AvgNum;
}
taxis->numavg = ISEC1_AvgNum;
}
datetime.date = vdate;
......
src/vlist_var.c
View file @ a7d0f24a
......@@ -1125,13 +1125,6 @@ void vlistDefVarTimave(int vlistID, int varID, int timave)
}
int vlistInqVarTimave(int vlistID, int varID)
{
const vlist_t *vlistptr = vlist_to_pointer(vlistID);
return vlistptr->vars[varID].timave;
}
int vlistInqVarMissvalUsed(int vlistID, int varID)
{
const vlist_t *vlistptr = vlist_to_pointer(vlistID);
......
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