Skip to content

Commit

Permalink
pds 4.87
Browse files Browse the repository at this point in the history
  • Loading branch information
@AlysonStahl-NOAA
AlysonStahl-NOAA committed Dec 5, 2024
1 parent dee75f8 commit aaa2495
Show file tree
Hide file tree
Showing 3 changed files with 44 additions and 7 deletions.
2 changes: 1 addition & 1 deletion src/grib2.h.in
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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 70 /**< Maximum number of PDS templates. */
#define G2C_MAX_PDS_TEMPLATE 71 /**< 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. */
Expand Down
21 changes: 21 additions & 0 deletions src/pdstemplates.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -327,6 +327,10 @@ static const struct pdstemplate templatespds[G2C_MAX_PDS_TEMPLATE] =
/** PDT 4.86 (12/04/2024)
4.86: Quantile forecasts at a horizontal level or in a horizontal layer at a point in time */
{86, 17, 0, {1, 1, 1, 1, 1, 2, 1, 1, -4, 1, -1, -4, 1, -1, -4, 2, 2}},
/** PDT 4.87 (12/04/2024)
4.87: Quantile forecasts at a horizontal level or in a horizontal layer
in a continuous or non-continuous time interval */
{87, 31, 1, {1, 1, 1, 1, 1, 2, 1, 1, -4, 1, -1, -4, 1, -1, -4, 2, 2, 2, 1, 1, 1, 1, 1, 1, 4, 1, 1, 1, 4, 1, 4}},
};

/**
Expand Down Expand Up @@ -1117,6 +1121,23 @@ extpdstemplate(g2int number, g2int *list)
}
}
}
/* PDT 4.87 (12/04/2024) */
else if (number == 87)
{
if (list[23] > 1)
{
new->extlen = (list[23] - 1) * 6;
new->ext = malloc(sizeof(g2int) * new->extlen);
for (j = 2; j <= list[23]; j++)
{
l = (j - 2) * 6;
for (k = 0; k < 6; k++)
{
new->ext[l + k] = new->map[25 + k];
}
}
}
}
return new;
}

Expand Down
28 changes: 22 additions & 6 deletions tests/tst_pdstemplates.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -495,25 +495,36 @@ main()
return G2C_ERROR;
free(tmpl->ext);
free(tmpl);

/* Check for one that's there but does need an extension. */
tmpl = extpdstemplate(87, list);
if (!tmpl)
return G2C_ERROR;
if (tmpl->num != 87 || tmpl->maplen != 31 || !tmpl->needext)
return G2C_ERROR;
if (!tmpl->ext)
return G2C_ERROR;
free(tmpl->ext);
free(tmpl);
}
printf("ok!\n");
printf("Testing all getpdstemplate() calls with extensions...\n");
{
#define NUM_TEST 70
#define NUM_TEST 71
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, 55, 58, 59, 62, 63, 67, 68, 70,
71, 72, 73, 76, 77, 78, 79, 80, 81, 82, 83, 84, 85, 86};
71, 72, 73, 76, 77, 78, 79, 80, 81, 82, 83, 84, 85, 86, 87};
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, 21, 7, 24, 35, 38, 7, 7, 19, 21, 32,
34, 17, 20, 31, 34, 27, 30, 36, 40, 39, 38, 17};
34, 17, 20, 31, 34, 27, 30, 36, 40, 39, 38, 17, 31};
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, 1,
0, 1, 1, 1, 1, 0, 0, 1, 1, 0, 0, 1, 1, 0, 0, 1, 1, 1, 1, 0};
0, 1, 1, 1, 1, 0, 0, 1, 1, 0, 0, 1, 1, 0, 0, 1, 1, 1, 1, 0, 1};
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 */
Expand Down Expand Up @@ -585,6 +596,7 @@ main()
{1, 1, 2, 1, 1, -1, -4, -1, -4, 1, 1, 1, 2, 1, 1, -4, 1, -1, -4, 1, -1, -4, 1, 1, 1, 2, 1, 1, 1, 1, 1, 1, 4, 1, 1, 1, 4, 1, 4}, /* 84 */
{1, 1, 2, 1, -1, -4, -1, -4, 1, 1, 1, 2, 1, 1, -4, 1, -1, -4, 1, -1, -4, 1, 1, 1, 2, 1, 1, 1, 1, 1, 1, 4, 1, 1, 1, 4, 1, 4}, /* 85 */
{1, 1, 1, 1, 1, 2, 1, 1, -4, 1, -1, -4, 1, -1, -4, 2, 2}, /* 86 */
{1, 1, 1, 1, 1, 2, 1, 1, -4, 1, -1, -4, 1, -1, -4, 2, 2, 2, 1, 1, 1, 1, 1, 1, 4, 1, 1, 1, 4, 1, 4}, /* 87 */
};
int t;
int ext_t = 0;
Expand Down Expand Up @@ -626,11 +638,11 @@ main()
if (map[m] != expected_map[t][m])
return G2C_ERROR;

#define NUM_EXT_TEST 38
#define NUM_EXT_TEST 39
int template[G2C_MAX_PDS_TEMPLATE_MAPLEN];
int expected_extlen[NUM_EXT_TEST] = {
2, 2, 6, 6, 6, 6, 6, 8, 8, 10, 10, 6, 6, 10, 6, 6, 12, 8, 2, 8, 2, 2, 30, 6,
10, 20, 6, 6, 31, 34, 6, 6, 6, 6, 6, 6, 6, 6};
10, 20, 6, 6, 31, 34, 6, 6, 6, 6, 6, 6, 6, 6, 6};
int expected_ext[NUM_EXT_TEST][48] = {
{1, 1}, /* 3 */
{1, 1}, /* 4 */
Expand Down Expand Up @@ -670,6 +682,7 @@ main()
{1, 1, 1, 4, 1, 4}, /* 83 */
{1, 1, 1, 4, 1, 4}, /* 84 */
{1, 1, 1, 4, 1, 4}, /* 85 */
{1, 1, 1, 4, 1, 4}, /* 87 */
};

if (needext)
Expand Down Expand Up @@ -800,6 +813,9 @@ main()
case 85:
template[30] = 2;
break;
case 87:
template[23] = 2;
break;
default:
return G2C_ERROR;
}
Expand Down

0 comments on commit aaa2495

Please sign in to comment.