From 5b1202d17d9d41e157afe73c9e94e4fcdd6f1715 Mon Sep 17 00:00:00 2001 From: AlysonStahl-NOAA <166434581+AlysonStahl-NOAA@users.noreply.github.com> Date: Wed, 4 Dec 2024 13:47:42 -0800 Subject: [PATCH] pds 4.55 --- src/grib2.h.in | 2 +- src/pdstemplates.c | 3 +++ tests/tst_pdstemplates.c | 9 +++++---- 3 files changed, 9 insertions(+), 5 deletions(-) diff --git a/src/grib2.h.in b/src/grib2.h.in index dc3b46f4..88a3a1d1 100644 --- a/src/grib2.h.in +++ b/src/grib2.h.in @@ -291,7 +291,7 @@ g2int g2_gribend(unsigned char *cgrib); /* Constants to help with templates. */ #define G2C_MAX_GDS_TEMPLATE 31 /**< Maximum number of grid templates. */ #define G2C_MAX_GDS_TEMPLATE_MAPLEN 28 /**< Maximum grid template map length. */ -#define G2C_MAX_PDS_TEMPLATE 48 /**< Maximum number of PDS templates. */ +#define G2C_MAX_PDS_TEMPLATE 49 /**< Maximum number of PDS templates. */ #define G2C_MAX_PDS_TEMPLATE_MAPLEN 45 /**< Maximum template map length. */ #define G2C_MAX_DRS_TEMPLATE 10 /**< Maximum number of DRS templates. */ #define G2C_MAX_DRS_TEMPLATE_MAPLEN 18 /**< Maximum DRS template map length. */ diff --git a/src/pdstemplates.c b/src/pdstemplates.c index bdd302b5..c2314c93 100644 --- a/src/pdstemplates.c +++ b/src/pdstemplates.c @@ -227,6 +227,9 @@ static const struct pdstemplate templatespds[G2C_MAX_PDS_TEMPLATE] = at a horizontal level or in a horizontal layer at a point in time for Optical Properties of Aerosol for Optical Properties of Aerosol */ {49, 29, 0, {1, 1, 2, 1, -1, -4, -1, -4, 1, -1, -4, -1, -4, 1, 1, 1, 2, 1, 1, -4, 1, -1, -4, 1, -1, -4, 1, 1, 1}}, + /** 4.55: Spatio-temporal changing tiles + at a horizontal level or horizontal layer at a point in time */ + {55, 21, 0, {1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 2, 1, 1, -4, 1, -1, -4, 1, -1, -4}}, }; /** diff --git a/tests/tst_pdstemplates.c b/tests/tst_pdstemplates.c index 6eb87ebd..dcdd7b63 100644 --- a/tests/tst_pdstemplates.c +++ b/tests/tst_pdstemplates.c @@ -356,18 +356,18 @@ main() printf("ok!\n"); printf("Testing all getpdstemplate() calls with extensions...\n"); { -#define NUM_TEST 48 +#define NUM_TEST 49 int number[NUM_TEST] = { 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 20, 30, 31, 40, 41, 42, 43, 254, 1000, 1001, 1002, 1100, 1101, 32, 44, 45, 46, 47, 48, 50, 52, - 51, 91, 33, 34, 53, 54, 57, 60, 61, 35, 49}; + 51, 91, 33, 34, 53, 54, 57, 60, 61, 35, 49, 55}; int expected_maplen[NUM_TEST] = { 15, 18, 17, 31, 30, 22, 16, 15, 29, 36, 30, 32, 31, 45, 44, 18, 19, 5, 5, 16, 19, 30, 33, 3, 9, 16, 15, 15, 22, 10, 21, 24, 35, 38, 26, 21, 15, 16, - 36, 18, 32, 19, 22, 7, 24, 38, 6, 29}; + 36, 18, 32, 19, 22, 7, 24, 38, 6, 29, 21}; int expected_needext[NUM_TEST] = { 0, 0, 0, 1, 1, 0, 0, 0, 1, 1, 1, 1, 1, 1, 1, 0, 0, 1, 1, 0, 0, 1, 1, 0, 0, - 0, 0, 0, 0, 1, 0, 0, 1, 1, 0, 0, 0, 1, 1, 1, 1, 1, 1, 1, 0, 1, 1, 0}; + 0, 0, 0, 0, 1, 0, 0, 1, 1, 0, 0, 0, 1, 1, 1, 1, 1, 1, 1, 0, 1, 1, 0, 0}; int expected_map[NUM_TEST][48] = { {1, 1, 1, 1, 1, 2, 1, 1, -4, 1, -1, -4, 1, -1, -4}, /* 0 */ {1, 1, 1, 1, 1, 2, 1, 1, -4, 1, -1, -4, 1, -1, -4, 1, 1, 1}, /* 1 */ @@ -417,6 +417,7 @@ main() {1, 1, 1, 1, 1, 2, 1, 1, -4, 1, -1, -4, 1, -1, -4, 1, 1, 1, 2, 1, 1, 1, 1, 1, 2, 1, 1, 1, 1, 1, 1, 4, 1, 1, 1, 4, 1, 4}, /* 61 */ {1, 1, 1, 1, 1, 1}, /* 35 */ {1, 1, 2, 1, -1, -4, -1, -4, 1, -1, -4, -1, -4, 1, 1, 1, 2, 1, 1, -4, 1, -1, -4, 1, -1, -4, 1, 1, 1}, /* 49 */ + {1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 2, 1, 1, -4, 1, -1, -4, 1, -1, -4}, /* 55 */ }; int t; int ext_t = 0;