Skip to content
GitLab
Menu
Projects
Groups
Snippets
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
mpim-sw
libcdi
Commits
f752ac6a
Commit
f752ac6a
authored
May 27, 2019
by
Uwe Schulzweida
Browse files
GRIB: Support of typeOfStatisticalProcessing = 11 (Summation) [Feature #9055].
parent
84803fa9
Changes
3
Hide whitespace changes
Inline
Side-by-side
ChangeLog
View file @
f752ac6a
...
...
@@ -3,6 +3,10 @@
* using CGRIBEX library version 1.9.3
* Version 1.9.7 released
2019-05-27 Uwe Schulzweida
* GRIB: Support of typeOfStatisticalProcessing = 11 (Summation) [Feature #9055]
2019-05-26 Uwe Schulzweida
* netCDF: don't decode timevalue if timeunits is missing
...
...
src/cdi.h
View file @
f752ac6a
...
...
@@ -199,35 +199,36 @@ typedef struct {
/* TIME types */
#define TIME_CONSTANT 0
/* Time constant */
#define TIME_VARYING 1
/* Time varying */
#define TIME_VARIABLE 1
/* obsolate, use TIME_VARYING */
/* TSTEP types */
#define TSTEP_INSTANT 1
/* Instant */
#define TSTEP_AVG 2
/* Average */
#define TSTEP_ACCUM 3
/* Accumulation */
#define TSTEP_MAX 4
/* Maximum */
#define TSTEP_MIN 5
/* Minimum */
#define TSTEP_DIFF 6
/* Difference */
#define TSTEP_RMS 7
/* Root mean square */
#define TSTEP_SD 8
/* Standard deviation */
#define TSTEP_COV 9
/* Covariance */
#define TSTEP_RATIO 10
/* Ratio */
#define TSTEP_RANGE 11
#define TSTEP_INSTANT2 12
#define TSTEP_INSTANT3 13
/* TAXIS types */
// TIME types
#define TIME_CONSTANT 0 // Time constant
#define TIME_VARYING 1 // Time varying
#define TIME_VARIABLE 1 // obsolate, use TIME_VARYING
// TSTEP types
#define TSTEP_INSTANT 1 // Instant
#define TSTEP_AVG 2 // Average
#define TSTEP_ACCUM 3 // Accumulation
#define TSTEP_MAX 4 // Maximum
#define TSTEP_MIN 5 // Minimum
#define TSTEP_DIFF 6 // Difference
#define TSTEP_RMS 7 // Root mean square
#define TSTEP_SD 8 // Standard deviation
#define TSTEP_COV 9 // Covariance
#define TSTEP_RATIO 10 // Ratio
#define TSTEP_RANGE 11
#define TSTEP_INSTANT2 12
#define TSTEP_INSTANT3 13
#define TSTEP_SUM 14 // Summation
// TAXIS types
#define TAXIS_ABSOLUTE 1
#define TAXIS_RELATIVE 2
#define TAXIS_FORECAST 3
/
*
TUNIT types
*/
/
/
TUNIT types
#define TUNIT_SECOND 1
#define TUNIT_MINUTE 2
...
...
@@ -241,9 +242,9 @@ typedef struct {
#define TUNIT_MONTH 10
#define TUNIT_YEAR 11
/
*
CALENDAR types
*/
/
/
CALENDAR types
#define CALENDAR_STANDARD 0
/
*
don't change this value (used also in cgribexlib)!
*/
#define CALENDAR_STANDARD 0 /
/
don't change this value (used also in cgribexlib)!
#define CALENDAR_GREGORIAN 1
#define CALENDAR_PROLEPTIC 2
#define CALENDAR_360DAYS 3
...
...
src/gribapi_utilities.c
View file @
f752ac6a
...
...
@@ -341,17 +341,20 @@ int gribapiTimeIsFC(grib_handle *gh)
}
struct
cdiGribAPI_ts_str_map_elem
cdiGribAPI_ts_str_map
[]
=
{
// clang-format off
[
TSTEP_INSTANT
]
=
{
0
,
"instant"
},
[
TSTEP_AVG
]
=
{
8
,
"avg"
},
[
TSTEP_ACCUM
]
=
{
8
,
"accum"
},
[
TSTEP_MAX
]
=
{
8
,
"max"
},
[
TSTEP_MIN
]
=
{
8
,
"min"
},
[
TSTEP_DIFF
]
=
{
8
,
"diff"
},
[
TSTEP_RMS
]
=
{
8
,
"rms"
},
[
TSTEP_SD
]
=
{
8
,
"sd"
},
[
TSTEP_COV
]
=
{
8
,
"cov"
},
[
TSTEP_RATIO
]
=
{
8
,
"ratio"
},
[
TSTEP_AVG
]
=
{
8
,
"avg"
},
[
TSTEP_ACCUM
]
=
{
8
,
"accum"
},
[
TSTEP_MAX
]
=
{
8
,
"max"
},
[
TSTEP_MIN
]
=
{
8
,
"min"
},
[
TSTEP_DIFF
]
=
{
8
,
"diff"
},
[
TSTEP_RMS
]
=
{
8
,
"rms"
},
[
TSTEP_SD
]
=
{
8
,
"sd"
},
[
TSTEP_COV
]
=
{
8
,
"cov"
},
[
TSTEP_RATIO
]
=
{
8
,
"ratio"
},
[
TSTEP_SUM
]
=
{
8
,
"sum"
},
{
0
,
""
}
// clang-format on
};
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment