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

Merge branch 'feature/ECC-1620_sub-hourly' of github.com:ecmwf/eccodes into feature/ECC-1620_sub-hourly

This commit is contained in:
Eugen Betke 2023-08-31 16:02:36 +00:00
parent 30010c6cdf 546b9851cb
commit 89f39200a1
3 changed files with 11 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/grib_accessor_class_g2step_range.cc
View File

@ -128,10 +128,10 @@ static void init(grib_accessor* a, const long l, grib_arguments* c)
a->length = 0;
}
static void dump(grib_accessor* a, grib_dumper* dumper)
{
grib_dump_string(dumper, a, NULL);
}
//static void dump(grib_accessor* a, grib_dumper* dumper)
//{
//grib_dump_string(dumper, a, NULL);
//}
static int unpack_string(grib_accessor* a, char* val, size_t* len)
{
@ -259,7 +259,6 @@ static int pack_string_new(grib_accessor* a, const char* val, size_t* len)
static int pack_string(grib_accessor* a, const char* val, size_t* len)
{
grib_accessor_g2step_range* self = (grib_accessor_g2step_range*)a;
grib_handle* h = grib_handle_of_accessor(a);
if (is_future_output_enabled(h)) {
return pack_string_new(a, val, len);
@ -294,9 +293,7 @@ static int unpack_long(grib_accessor* a, long* val, size_t* len)
{
grib_accessor_g2step_range* self = (grib_accessor_g2step_range*)a;
grib_handle* h = grib_handle_of_accessor(a);
char buf[100];
int ret = 0;
size_t size = 0;
long end_start_value = 0;
long end_step_value = 0;
long step_units = 0;

11
src/grib_accessor_class_optimal_step_units.cc
View File

@ -137,11 +137,11 @@ static void dump(grib_accessor* a, grib_dumper* dumper)
}
static int value_count(grib_accessor* a, long* count)
{
*count = 1;
return 0;
}
//static int value_count(grib_accessor* a, long* count)
//{
//*count = 1;
//return 0;
//}
static size_t string_length(grib_accessor* a)
{
@ -165,7 +165,6 @@ static int unpack_long(grib_accessor* a, long* val, size_t* len)
}
grib_accessor_optimal_step_units* self = (grib_accessor_optimal_step_units*)a;
grib_handle* h = grib_handle_of_accessor(a);
int ret = 0;
auto forecast_time_opt = get_step(h, self->forecast_time_value, self->forecast_time_unit);
auto time_range_opt = get_step(h, self->time_range_value, self->time_range_unit);

5
src/grib_accessor_class_step_in_units.cc
View File

@ -279,8 +279,8 @@ int pack_long_new_(grib_accessor* a, const long* val, size_t* len) {
long forecast_time_unit;
long step_units;
long start_step_value_old= 0;
long time_range_unit;
long time_range_value;
//long time_range_unit;
//long time_range_value;
if ((err = grib_get_long_internal(h, self->forecast_time_unit, &forecast_time_unit)) != GRIB_SUCCESS)
return err;
@ -382,7 +382,6 @@ int pack_long_new_(grib_accessor* a, const long* val, size_t* len) {
static int pack_long(grib_accessor* a, const long* val, size_t* len)
{
grib_accessor_step_in_units* self = (grib_accessor_step_in_units*)a;
grib_handle* h = grib_handle_of_accessor(a);
int ret;
if (is_future_output_enabled(h)) {