mirror/netcdf-c
2
0
Fork 0
mirror of https://github.com/Unidata/netcdf-c.git synced 2025-02-17 16:50:18 +08:00
Code Issues Packages Projects Releases Wiki Activity

add CDF format checking in hash4 to exclude the NC_BYTE-to-uchar exception fro CDF-5 format

Browse Source
This commit is contained in:
Wei-keng Liao 2016-10-08 13:48:22 -05:00
parent e1643f9fd8
commit 0eff6cb128
5 changed files with 33 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
nc_test/test_get.m4
View File

@ -84,7 +84,7 @@ test_nc_get_var1_$1(void)
err = toMixedBase(j, var_rank[i], var_shape[i], index);
IF (err)
error("error in toMixedBase 1");
expect = hash4( var_type[i], var_rank[i], index, NCT_ITYPE($1) );
expect = hash4(cdf_format, var_type[i], var_rank[i], index, NCT_ITYPE($1));
if (var_rank[i] == 0 && i%2 )
err = nc_get_var1_$1(ncid, i, NULL, &value);
else
@ -183,7 +183,7 @@ test_nc_get_var_$1(void)
err = toMixedBase(j, var_rank[i], var_shape[i], index);
IF (err)
error("error in toMixedBase 1");
expect[j] = hash4(var_type[i], var_rank[i], index, NCT_ITYPE($1));
expect[j] = hash4(cdf_format, var_type[i], var_rank[i], index, NCT_ITYPE($1));
if (inRange3(cdf_format, expect[j],var_type[i], NCT_ITYPE($1))) {
allInIntRange = allInIntRange && expect[j] >= $1_min
&& expect[j] <= $1_max;
@ -357,7 +357,7 @@ test_nc_get_vara_$1(void)
error("error in toMixedBase 1");
for (d = 0; d < var_rank[i]; d++)
index[d] += start[d];
expect[j] = hash4(var_type[i], var_rank[i], index, NCT_ITYPE($1));
expect[j] = hash4(cdf_format, var_type[i], var_rank[i], index, NCT_ITYPE($1));
if (inRange3(cdf_format, expect[j],var_type[i], NCT_ITYPE($1))) {
allInIntRange = allInIntRange && expect[j] >= $1_min
&& expect[j] <= $1_max;
@ -550,7 +550,7 @@ test_nc_get_vars_$1(void)
error("error in toMixedBase 1");
for (d = 0; d < var_rank[i]; d++)
index2[d] = index[d] + index2[d] * stride[d];
expect[j] = hash4(var_type[i], var_rank[i], index2,
expect[j] = hash4(cdf_format, var_type[i], var_rank[i], index2,
NCT_ITYPE($1));
if (inRange3(cdf_format, expect[j],var_type[i],NCT_ITYPE($1))) {
allInIntRange = allInIntRange && expect[j] >= $1_min
@ -754,7 +754,7 @@ test_nc_get_varm_$1(void)
error("error in toMixedBase 1");
for (d = 0; d < var_rank[i]; d++)
index2[d] = index[d] + index2[d] * stride[d];
expect[j] = hash4(var_type[i], var_rank[i], index2,
expect[j] = hash4(cdf_format, var_type[i], var_rank[i], index2,
NCT_ITYPE($1));
if (inRange3(cdf_format, expect[j],var_type[i],NCT_ITYPE($1))) {
allInIntRange = allInIntRange && expect[j] >= $1_min
@ -867,7 +867,7 @@ test_nc_get_att_$1(void)
error("Bad attribute name: status = %d", err);
allInExtRange = allInIntRange = 1;
for (k = 0; k < ATT_LEN(i,j); k++) {
expect[k] = hash4(ATT_TYPE(i,j), -1, &k, NCT_ITYPE($1));
expect[k] = hash4(cdf_format, ATT_TYPE(i,j), -1, &k, NCT_ITYPE($1));
if (inRange3(cdf_format, expect[k],ATT_TYPE(i,j),NCT_ITYPE($1))) {
allInIntRange = allInIntRange && expect[k] >= $1_min
&& expect[k] <= $1_max;

12
nc_test/test_get_p5.m4
View File

@ -82,7 +82,7 @@ test_nc_get_var1_$1(void)
err = toMixedBase(j, var_rank[i], var_shape[i], index);
IF (err)
error("error in toMixedBase 1");
expect = hash4( var_type[i], var_rank[i], index, NCT_ITYPE($1) );
expect = hash4(cdf_format, var_type[i], var_rank[i], index, NCT_ITYPE($1));
if (var_rank[i] == 0 && i%2 )
err = nc_get_var1_$1(ncid, i, NULL, &value);
else
@ -182,7 +182,7 @@ test_nc_get_var_$1(void)
err = toMixedBase(j, var_rank[i], var_shape[i], index);
IF (err)
error("error in toMixedBase 1");
expect[j] = hash4(var_type[i], var_rank[i], index, NCT_ITYPE($1));
expect[j] = hash4(cdf_format,var_type[i], var_rank[i], index, NCT_ITYPE($1));
if (inRange3(expect[j],var_type[i], NCT_ITYPE($1))) {
allInIntRange = allInIntRange && expect[j] >= $1_min
&& expect[j] <= $1_max;
@ -366,7 +366,7 @@ test_nc_get_vara_$1(void)
error("error in toMixedBase 1");
for (d = 0; d < var_rank[i]; d++)
index[d] += start[d];
expect[j] = hash4(var_type[i], var_rank[i], index, NCT_ITYPE($1));
expect[j] = hash4(cdf_format,var_type[i], var_rank[i], index, NCT_ITYPE($1));
if (inRange3(expect[j],var_type[i], NCT_ITYPE($1))) {
allInIntRange = allInIntRange && expect[j] >= $1_min
&& expect[j] <= $1_max;
@ -560,7 +560,7 @@ test_nc_get_vars_$1(void)
error("error in toMixedBase 1");
for (d = 0; d < var_rank[i]; d++)
index2[d] = index[d] + index2[d] * stride[d];
expect[j] = hash4(var_type[i], var_rank[i], index2,
expect[j] = hash4(cdf_format,var_type[i], var_rank[i], index2,
NCT_ITYPE($1));
if (inRange3(expect[j],var_type[i],NCT_ITYPE($1))) {
allInIntRange = allInIntRange && expect[j] >= $1_min
@ -766,7 +766,7 @@ test_nc_get_varm_$1(void)
error("error in toMixedBase 1");
for (d = 0; d < var_rank[i]; d++)
index2[d] = index[d] + index2[d] * stride[d];
expect[j] = hash4(var_type[i], var_rank[i], index2,
expect[j] = hash4(cdf_format,var_type[i], var_rank[i], index2,
NCT_ITYPE($1));
if (inRange3(expect[j],var_type[i],NCT_ITYPE($1))) {
allInIntRange = allInIntRange && expect[j] >= $1_min
@ -881,7 +881,7 @@ test_nc_get_att_$1(void)
error("Bad attribute name: status = %d", err);
allInExtRange = allInIntRange = 1;
for (k = 0; k < ATT_LEN(i,j); k++) {
expect[k] = hash4(ATT_TYPE(i,j), -1, &k, NCT_ITYPE($1));
expect[k] = hash4(cdf_format,ATT_TYPE(i,j), -1, &k, NCT_ITYPE($1));
if (inRange3(expect[k],ATT_TYPE(i,j),NCT_ITYPE($1))) {
allInIntRange = allInIntRange && expect[k] >= $1_min
&& expect[k] <= $1_max;

21
nc_test/test_put.m4
View File

@ -45,6 +45,7 @@ define(`HASH',dnl
static
double
hash_$1(
const int cdf_format,
const nc_type type,
const int rank,
const size_t *index,
@ -53,7 +54,7 @@ hash_$1(
const double min = $1_min;
const double max = $1_max;
return MAX(min, MIN(max, hash4( type, rank, index, itype)));
return MAX(min, MIN(max, hash4(cdf_format, type, rank, index, itype)));
}
')dnl
@ -130,7 +131,7 @@ check_vars_$1(const char *filename)
err = toMixedBase(j, var_rank[i], var_shape[i], index);
IF (err)
error("error in toMixedBase 2");
expect = hash4( var_type[i], var_rank[i], index, NCT_ITYPE($1));
expect = hash4(cdf_format, var_type[i], var_rank[i], index, NCT_ITYPE($1));
err = nc_get_var1_$1(ncid, i, index, &value);
if (inRange3(cdf_format, expect,datatype,NCT_ITYPE($1))) {
if (expect >= $1_min && expect <= $1_max) {
@ -223,7 +224,7 @@ check_atts_$1(int ncid)
assert(length <= MAX_NELS);
nInIntRange = nInExtRange = 0;
for (k = 0; k < length; k++) {
expect[k] = hash4( datatype, -1, &k, NCT_ITYPE($1));
expect[k] = hash4(cdf_format, datatype, -1, &k, NCT_ITYPE($1));
if (inRange3(cdf_format, expect[k], datatype, NCT_ITYPE($1))) {
++nInExtRange;
if (expect[k] >= $1_min && expect[k] <= $1_max)
@ -345,7 +346,7 @@ test_nc_put_var1_$1(void)
err = toMixedBase(j, var_rank[i], var_shape[i], index);
IF (err)
error("error in toMixedBase 1");
value = hash_$1( var_type[i], var_rank[i], index, NCT_ITYPE($1));
value = hash_$1(cdf_format, var_type[i], var_rank[i], index, NCT_ITYPE($1));
if (var_rank[i] == 0 && i%2 == 0)
err = nc_put_var1_$1(ncid, i, NULL, &value);
else
@ -461,7 +462,7 @@ test_nc_put_var_$1(void)
err = toMixedBase(j, var_rank[i], var_shape[i], index);
IF (err)
error("error in toMixedBase 1");
value[j]= hash_$1(var_type[i], var_rank[i], index, NCT_ITYPE($1));
value[j]= hash_$1(cdf_format,var_type[i], var_rank[i], index, NCT_ITYPE($1));
allInExtRange = allInExtRange
&& inRange3(cdf_format, value[j], var_type[i], NCT_ITYPE($1));
}
@ -509,7 +510,7 @@ test_nc_put_var_$1(void)
err = toMixedBase(j, var_rank[i], var_shape[i], index);
IF (err)
error("error in toMixedBase 1");
value[j]= hash_$1(var_type[i], var_rank[i], index, NCT_ITYPE($1));
value[j]= hash_$1(cdf_format,var_type[i], var_rank[i], index, NCT_ITYPE($1));
allInExtRange = allInExtRange
&& inRange3(cdf_format, value[j], var_type[i], NCT_ITYPE($1));
}
@ -680,7 +681,7 @@ test_nc_put_vara_$1(void)
error("error in toMixedBase 1");
for (d = 0; d < var_rank[i]; d++)
index[d] += start[d];
value[j]= hash_$1(var_type[i], var_rank[i], index, NCT_ITYPE($1));
value[j]= hash_$1(cdf_format,var_type[i], var_rank[i], index, NCT_ITYPE($1));
allInExtRange = allInExtRange
&& inRange3(cdf_format, value[j], var_type[i], NCT_ITYPE($1));
}
@ -873,7 +874,7 @@ test_nc_put_vars_$1(void)
error("error in toMixedBase");
for (d = 0; d < var_rank[i]; d++)
index2[d] = index[d] + index2[d] * stride[d];
value[j] = hash_$1(var_type[i], var_rank[i], index2,
value[j] = hash_$1(cdf_format,var_type[i], var_rank[i], index2,
NCT_ITYPE($1));
allInExtRange = allInExtRange
&& inRange3(cdf_format, value[j], var_type[i], NCT_ITYPE($1));
@ -1076,7 +1077,7 @@ test_nc_put_varm_$1(void)
error("error in toMixedBase");
for (d = 0; d < var_rank[i]; d++)
index2[d] = index[d] + index2[d] * stride[d];
value[j] = hash_$1(var_type[i], var_rank[i], index2,
value[j] = hash_$1(cdf_format,var_type[i], var_rank[i], index2,
NCT_ITYPE($1));
allInExtRange = allInExtRange
&& inRange3(cdf_format, value[j], var_type[i], NCT_ITYPE($1));
@ -1232,7 +1233,7 @@ test_nc_put_att_$1(void)
IF (err != NC_EBADTYPE)
error("bad type: status = %d", err);
for (allInExtRange = 1, k = 0; k < ATT_LEN(i,j); k++) {
value[k] = hash_$1(ATT_TYPE(i,j), -1, &k, NCT_ITYPE($1));
value[k] = hash_$1(cdf_format,ATT_TYPE(i,j), -1, &k, NCT_ITYPE($1));
allInExtRange = allInExtRange
&& inRange3(cdf_format, value[k], ATT_TYPE(i,j), NCT_ITYPE($1));
}

1
nc_test/tests.h
View File

@ -536,6 +536,7 @@ int dbl2nc ( const double d, const nc_type datatype, void *p);
double hash( const nc_type type, const int rank, const size_t *index );
double hash4(
const int cdf_format,
const nc_type type,
const int rank,
const size_t *index,

10
nc_test/util.c
View File

@ -592,6 +592,7 @@ hash( const nc_type xtype, const int rank, const size_t *index )
/* wrapper for hash to handle special NC_BYTE/uchar adjustment */
double
hash4(
const int cdf_format,
const nc_type xtype,
const int rank,
const size_t *index,
@ -600,8 +601,15 @@ hash4(
double result;
result = hash( xtype, rank, index );
if (itype == NCT_UCHAR && xtype == NC_BYTE && result >= -128 && result < 0)
if (cdf_format < NC_FORMAT_CDF5 &&
itype == NCT_UCHAR && xtype == NC_BYTE && result >= -128 && result < 0)
/* netCDF specification make a special case for type conversion between
* uchar and scahr: do not check for range error. See
* http://www.unidata.ucar.edu/software/netcdf/docs_rc/data_type.html#type_conversion
*/
result += 256;
return result;
}