core
/
eccodes
mirror of https://github.com/ecmwf/eccodes.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #187 from ecmwf/feature/test_dynamic_step_native_type 

Default native step type is string. It's long if unit is not shown.
This commit is contained in:
shahramn 2024-01-19 14:30:55 +00:00 committed by GitHub
parent 501fa84cad e392cb9607
commit b2a6ef824f
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
3 changed files with 25 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
src/grib_accessor_class_g2end_step.cc
View File

@ -744,14 +744,15 @@ static int pack_string(grib_accessor* a, const char* val, size_t* len)
static int get_native_type(grib_accessor* a)
{
// TODO: Still experimental.
// Change the type to depend on the stepUnits for backward compatibility
grib_handle* h = grib_handle_of_accessor(a);
long step_units = 0;
if (grib_get_long_internal(h, "stepUnits", &step_units) == GRIB_SUCCESS) {
if (step_units == 1) {
return GRIB_TYPE_LONG;
int show_hours = a->context->show_hour_stepunit;
if (!show_hours) {
long step_units = 0;
if (grib_get_long_internal(h, "stepUnits", &step_units) == GRIB_SUCCESS) {
if (eccodes::Unit{step_units} == eccodes::Unit::Value::HOUR) {
return GRIB_TYPE_LONG;
}
}
}

16
src/grib_accessor_class_step_in_units.cc
View File

@ -349,16 +349,16 @@ static int unpack_string(grib_accessor* a, char* val, size_t* len)
static int get_native_type(grib_accessor* a)
{
// TODO: Still experimental.
// Change the type to depend on the stepUnits for backward compatibility
grib_handle* h = grib_handle_of_accessor(a);
long step_units = 0;
if (grib_get_long_internal(h, "stepUnits", &step_units) == GRIB_SUCCESS) {
if (step_units == 1) {
return GRIB_TYPE_LONG;
int show_hours = a->context->show_hour_stepunit;
if (!show_hours) {
long step_units = 0;
if (grib_get_long_internal(h, "stepUnits", &step_units) == GRIB_SUCCESS) {
if (eccodes::Unit{step_units} == eccodes::Unit::Value::HOUR) {
return GRIB_TYPE_LONG;
}
}
}
return GRIB_TYPE_STRING;
}

9
tests/grib_sub_hourly.sh
View File

@ -490,6 +490,15 @@ grib_check_key_equals $temp '-p startStep' '16m'
grib_check_key_equals $temp '-p indicatorOfUnitOfTimeRange' '0'
grib_check_key_equals $temp '-p forecastTime' '16'
export ECCODES_GRIB_SHOW_HOUR_STEPUNIT=1
cat >$tempFilt<<EOF
assert ( step is "6h" );
EOF
cat $tempFilt
${tools_dir}/grib_filter $tempFilt $data_dir/constant_field.grib2
unset ECCODES_GRIB_SHOW_HOUR_STEPUNIT
# Bad stepUnits
set +e
${tools_dir}/grib_set -s stepUnits=190 $sample_g2 $temp > $tempText 2>&1