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

Dead code removal

This commit is contained in:
Shahram Najm 2023-06-23 19:12:51 +01:00
parent 0ccd1badb7
commit 6a6fb1bab5
3 changed files with 76 additions and 78 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

73
src/deprecated/grib_accessor_class_g2end_step.unpack_long.cc Normal file
View File

@ -0,0 +1,73 @@
static int unpack_long(grib_accessor* a, long* val, size_t *len)
{
grib_accessor_g2end_step* self = (grib_accessor_g2end_step*)a;
int err = 0;
long start_step;
long unit;
long coded_unit;
long coded_time_range, typeOfTimeIncrement, numberOfTimeRange;
long coded_time_range_sec=0;
int factor;
long u2sf,u2sf_step_unit;
int add_time_range = 1; /* whether we add lengthOfTimeRange */
grib_handle* h=grib_handle_of_accessor(a);
if((err = grib_get_long_internal(h,self->start_step,&start_step))) return err;
/*point in time */
if (self->year == NULL) {
*val=start_step;
return 0;
}
if((err = grib_get_long_internal(h,self->unit,&unit))) return err;
if((err = grib_get_long_internal(h,self->coded_unit,&coded_unit))) return err;
if((err = grib_get_long_internal(h,self->coded_time_range, &coded_time_range))) return err;
if((err = grib_get_long_internal(h,self->typeOfTimeIncrement, &typeOfTimeIncrement))) return err;
if((err = grib_get_long_internal(h,self->numberOfTimeRange, &numberOfTimeRange))) return err;
Assert(numberOfTimeRange == 1 || numberOfTimeRange == 2);
err = convert_time_range(h, unit, coded_unit, &coded_time_range);
if (err != GRIB_SUCCESS) return err;
#if 0
if (coded_unit!=unit) {
coded_time_range_sec=coded_time_range*u2s2[coded_unit];
if (coded_time_range_sec<0) {
factor=60;
if (u2s2[coded_unit] % factor) return GRIB_DECODING_ERROR;
if (u2s[unit] % factor) return GRIB_DECODING_ERROR;
u2sf=u2s2[coded_unit]/factor;
coded_time_range_sec=coded_time_range*u2sf;
u2sf_step_unit=u2s[unit]/factor;
} else {
u2sf_step_unit=u2s[unit];
}
if (coded_time_range_sec % u2sf_step_unit!=0) {
grib_context_log(h->context,GRIB_LOG_ERROR,"unable to convert endStep in stepUnits");
return GRIB_WRONG_STEP_UNIT;
}
coded_time_range = coded_time_range_sec / u2sf_step_unit;
}
#endif
if (typeOfTimeIncrement == 1) {
/* See GRIB-488 */
/* Note: For this case, lengthOfTimeRange is not related to step and should not be used to calculate step */
add_time_range = 0;
if (is_special_expver(h)) {
add_time_range = 1;
}
}
if (add_time_range) {
*val = start_step + coded_time_range;
} else {
*val = start_step;
}
return GRIB_SUCCESS;
}

4
src/grib_accessor_class_abstract_vector.cc
View File

@ -8,10 +8,6 @@
* virtue of its status as an intergovernmental organisation nor does it submit to any jurisdiction.
*/
/******************************************************************
* Enrico Fucile
******************************************************************/
#include "grib_api_internal.h"
/*
This is used by make_class.pl

77
src/grib_accessor_class_g2end_step.cc
View File

@ -365,6 +365,9 @@ static int unpack_multiple_time_ranges(grib_accessor* a, long* val, size_t* len)
return GRIB_DECODING_ERROR;
}
// For the old implementation of unpack_long, see
// src/deprecated/grib_accessor_class_g2end_step.unpack_long.cc
//
static int unpack_long(grib_accessor* a, long* val, size_t* len)
{
grib_accessor_g2end_step* self = (grib_accessor_g2end_step*)a;
@ -395,80 +398,6 @@ static int unpack_long(grib_accessor* a, long* val, size_t* len)
}
}
#if 0
static int unpack_long(grib_accessor* a, long* val, size_t *len)
{
grib_accessor_g2end_step* self = (grib_accessor_g2end_step*)a;
int err = 0;
long start_step;
long unit;
long coded_unit;
long coded_time_range, typeOfTimeIncrement, numberOfTimeRange;
long coded_time_range_sec=0;
int factor;
long u2sf,u2sf_step_unit;
int add_time_range = 1; /* whether we add lengthOfTimeRange */
grib_handle* h=grib_handle_of_accessor(a);
if((err = grib_get_long_internal(h,self->start_step,&start_step))) return err;
/*point in time */
if (self->year == NULL) {
*val=start_step;
return 0;
}
if((err = grib_get_long_internal(h,self->unit,&unit))) return err;
if((err = grib_get_long_internal(h,self->coded_unit,&coded_unit))) return err;
if((err = grib_get_long_internal(h,self->coded_time_range, &coded_time_range))) return err;
if((err = grib_get_long_internal(h,self->typeOfTimeIncrement, &typeOfTimeIncrement))) return err;
if((err = grib_get_long_internal(h,self->numberOfTimeRange, &numberOfTimeRange))) return err;
Assert(numberOfTimeRange == 1 || numberOfTimeRange == 2);
err = convert_time_range(h, unit, coded_unit, &coded_time_range);
if (err != GRIB_SUCCESS) return err;
#if 0
if (coded_unit!=unit) {
coded_time_range_sec=coded_time_range*u2s2[coded_unit];
if (coded_time_range_sec<0) {
factor=60;
if (u2s2[coded_unit] % factor) return GRIB_DECODING_ERROR;
if (u2s[unit] % factor) return GRIB_DECODING_ERROR;
u2sf=u2s2[coded_unit]/factor;
coded_time_range_sec=coded_time_range*u2sf;
u2sf_step_unit=u2s[unit]/factor;
} else {
u2sf_step_unit=u2s[unit];
}
if (coded_time_range_sec % u2sf_step_unit!=0) {
grib_context_log(h->context,GRIB_LOG_ERROR,"unable to convert endStep in stepUnits");
return GRIB_WRONG_STEP_UNIT;
}
coded_time_range = coded_time_range_sec / u2sf_step_unit;
}
#endif
if (typeOfTimeIncrement == 1) {
/* See GRIB-488 */
/* Note: For this case, lengthOfTimeRange is not related to step and should not be used to calculate step */
add_time_range = 0;
if (is_special_expver(h)) {
add_time_range = 1;
}
}
if (add_time_range) {
*val = start_step + coded_time_range;
} else {
*val = start_step;
}
return GRIB_SUCCESS;
}
#endif
static int pack_long(grib_accessor* a, const long* val, size_t* len)
{
grib_accessor_g2end_step* self = (grib_accessor_g2end_step*)a;