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

GRIB: Support of typeOfStatisticalProcessing = 11 (Summation) [Feature #9055].

parent 84803fa9
...@@ -3,6 +3,10 @@ ...@@ -3,6 +3,10 @@
* using CGRIBEX library version 1.9.3 * using CGRIBEX library version 1.9.3
* Version 1.9.7 released * Version 1.9.7 released
2019-05-27 Uwe Schulzweida
* GRIB: Support of typeOfStatisticalProcessing = 11 (Summation) [Feature #9055]
2019-05-26 Uwe Schulzweida 2019-05-26 Uwe Schulzweida
* netCDF: don't decode timevalue if timeunits is missing * netCDF: don't decode timevalue if timeunits is missing
......
...@@ -199,35 +199,36 @@ typedef struct { ...@@ -199,35 +199,36 @@ typedef struct {
/* TIME types */ // TIME types
#define TIME_CONSTANT 0 /* Time constant */ #define TIME_CONSTANT 0 // Time constant
#define TIME_VARYING 1 /* Time varying */ #define TIME_VARYING 1 // Time varying
#define TIME_VARIABLE 1 /* obsolate, use TIME_VARYING */ #define TIME_VARIABLE 1 // obsolate, use TIME_VARYING
/* TSTEP types */ // TSTEP types
#define TSTEP_INSTANT 1 /* Instant */ #define TSTEP_INSTANT 1 // Instant
#define TSTEP_AVG 2 /* Average */ #define TSTEP_AVG 2 // Average
#define TSTEP_ACCUM 3 /* Accumulation */ #define TSTEP_ACCUM 3 // Accumulation
#define TSTEP_MAX 4 /* Maximum */ #define TSTEP_MAX 4 // Maximum
#define TSTEP_MIN 5 /* Minimum */ #define TSTEP_MIN 5 // Minimum
#define TSTEP_DIFF 6 /* Difference */ #define TSTEP_DIFF 6 // Difference
#define TSTEP_RMS 7 /* Root mean square */ #define TSTEP_RMS 7 // Root mean square
#define TSTEP_SD 8 /* Standard deviation */ #define TSTEP_SD 8 // Standard deviation
#define TSTEP_COV 9 /* Covariance */ #define TSTEP_COV 9 // Covariance
#define TSTEP_RATIO 10 /* Ratio */ #define TSTEP_RATIO 10 // Ratio
#define TSTEP_RANGE 11 #define TSTEP_RANGE 11
#define TSTEP_INSTANT2 12 #define TSTEP_INSTANT2 12
#define TSTEP_INSTANT3 13 #define TSTEP_INSTANT3 13
#define TSTEP_SUM 14 // Summation
/* TAXIS types */
// TAXIS types
#define TAXIS_ABSOLUTE 1 #define TAXIS_ABSOLUTE 1
#define TAXIS_RELATIVE 2 #define TAXIS_RELATIVE 2
#define TAXIS_FORECAST 3 #define TAXIS_FORECAST 3
/* TUNIT types */ // TUNIT types
#define TUNIT_SECOND 1 #define TUNIT_SECOND 1
#define TUNIT_MINUTE 2 #define TUNIT_MINUTE 2
...@@ -241,9 +242,9 @@ typedef struct { ...@@ -241,9 +242,9 @@ typedef struct {
#define TUNIT_MONTH 10 #define TUNIT_MONTH 10
#define TUNIT_YEAR 11 #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_GREGORIAN 1
#define CALENDAR_PROLEPTIC 2 #define CALENDAR_PROLEPTIC 2
#define CALENDAR_360DAYS 3 #define CALENDAR_360DAYS 3
......
...@@ -341,17 +341,20 @@ int gribapiTimeIsFC(grib_handle *gh) ...@@ -341,17 +341,20 @@ int gribapiTimeIsFC(grib_handle *gh)
} }
struct cdiGribAPI_ts_str_map_elem cdiGribAPI_ts_str_map[] = { struct cdiGribAPI_ts_str_map_elem cdiGribAPI_ts_str_map[] = {
// clang-format off
[TSTEP_INSTANT] = { 0, "instant" }, [TSTEP_INSTANT] = { 0, "instant" },
[TSTEP_AVG] = { 8, "avg" }, [TSTEP_AVG] = { 8, "avg" },
[TSTEP_ACCUM] = { 8, "accum" }, [TSTEP_ACCUM] = { 8, "accum" },
[TSTEP_MAX] = { 8, "max" }, [TSTEP_MAX] = { 8, "max" },
[TSTEP_MIN] = { 8, "min" }, [TSTEP_MIN] = { 8, "min" },
[TSTEP_DIFF] = { 8, "diff" }, [TSTEP_DIFF] = { 8, "diff" },
[TSTEP_RMS] = { 8, "rms" }, [TSTEP_RMS] = { 8, "rms" },
[TSTEP_SD] = { 8, "sd" }, [TSTEP_SD] = { 8, "sd" },
[TSTEP_COV] = { 8, "cov" }, [TSTEP_COV] = { 8, "cov" },
[TSTEP_RATIO] = { 8, "ratio" }, [TSTEP_RATIO] = { 8, "ratio" },
[TSTEP_SUM] = { 8, "sum" },
{ 0, "" } { 0, "" }
// clang-format on
}; };
......
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