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:
shahramn 2024-08-21 18:22:42 +01:00
parent 0f3a10b727
commit f1377122fb
2 changed files with 68 additions and 64 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
definitions/grib1/predefined_grid.def
View File

@ -121,7 +121,7 @@ constant numberOfUnusedBitsAtEndOfSection3 = 0;
constant tableReference = 0; constant tableReference = 0;
#position offsetBeforeBitmap; #position offsetBeforeBitmap;
meta bitmap gds_not_present_bitmap( missingValue,numberOfValues, # meta bitmap gds_not_present_bitmap( missingValue,numberOfValues,
numberOfPoints, # numberOfPoints,
latitudeOfFirstGridPoint, # latitudeOfFirstGridPoint,
Ni,numberOfUnusedBitsAtEndOfSection3) : read_only; # Ni,numberOfUnusedBitsAtEndOfSection3) : read_only;

124
src/accessor/grib_accessor_class_gds_not_present_bitmap.cc
View File

@ -16,88 +16,92 @@ grib_accessor_class* grib_accessor_class_gds_not_present_bitmap = &_grib_accesso
void grib_accessor_class_gds_not_present_bitmap_t::init(grib_accessor* a, const long v, grib_arguments* args) void grib_accessor_class_gds_not_present_bitmap_t::init(grib_accessor* a, const long v, grib_arguments* args)
{ {
grib_accessor_class_gen_t::init(a, v, args); Assert(!"grib_accessor_class_gds_not_present_bitmap_t::init should not be called");
int n = 0; // grib_accessor_class_gen_t::init(a, v, args);
grib_accessor_gds_not_present_bitmap_t* self = (grib_accessor_gds_not_present_bitmap_t*)a; // int n = 0;
grib_handle* hand = grib_handle_of_accessor(a); // grib_accessor_gds_not_present_bitmap_t* self = (grib_accessor_gds_not_present_bitmap_t*)a;
// grib_handle* hand = grib_handle_of_accessor(a);
self->missing_value = grib_arguments_get_name(hand, args, n++); // self->missing_value = grib_arguments_get_name(hand, args, n++);
self->number_of_values = grib_arguments_get_name(hand, args, n++); // self->number_of_values = grib_arguments_get_name(hand, args, n++);
self->number_of_points = grib_arguments_get_name(hand, args, n++); // self->number_of_points = grib_arguments_get_name(hand, args, n++);
self->latitude_of_first_point = grib_arguments_get_name(hand, args, n++); // self->latitude_of_first_point = grib_arguments_get_name(hand, args, n++);
self->ni = grib_arguments_get_name(hand, args, n++); // self->ni = grib_arguments_get_name(hand, args, n++);
a->length = 0; // a->length = 0;
} }
int grib_accessor_class_gds_not_present_bitmap_t::value_count(grib_accessor* a, long* number_of_points) int grib_accessor_class_gds_not_present_bitmap_t::value_count(grib_accessor* a, long* number_of_points)
{ {
grib_accessor_gds_not_present_bitmap_t* self = (grib_accessor_gds_not_present_bitmap_t*)a; return GRIB_NOT_IMPLEMENTED;
*number_of_points = 0; // grib_accessor_gds_not_present_bitmap_t* self = (grib_accessor_gds_not_present_bitmap_t*)a;
return grib_get_long_internal(grib_handle_of_accessor(a), self->number_of_points, number_of_points); // *number_of_points = 0;
// return grib_get_long_internal(grib_handle_of_accessor(a), self->number_of_points, number_of_points);
} }
int grib_accessor_class_gds_not_present_bitmap_t::unpack_double(grib_accessor* a, double* val, size_t* len) int grib_accessor_class_gds_not_present_bitmap_t::unpack_double(grib_accessor* a, double* val, size_t* len)
{ {
grib_accessor_gds_not_present_bitmap_t* self = (grib_accessor_gds_not_present_bitmap_t*)a; return GRIB_NOT_IMPLEMENTED;
grib_handle* hand = grib_handle_of_accessor(a);
long number_of_points = 0, number_of_values = 0, ni = 0; // grib_accessor_gds_not_present_bitmap_t* self = (grib_accessor_gds_not_present_bitmap_t*)a;
long latitude_of_first_point = 0; // grib_handle* hand = grib_handle_of_accessor(a);
size_t i = 0;
size_t n_vals = 0;
long nn = 0;
long missing_value;
double* coded_vals = NULL; // long number_of_points = 0, number_of_values = 0, ni = 0;
int err = a->value_count(&nn); // long latitude_of_first_point = 0;
n_vals = nn; // size_t i = 0;
if (err) // size_t n_vals = 0;
return err; // long nn = 0;
// long missing_value;
if ((err = grib_get_long(hand, self->number_of_points, &number_of_points)) != GRIB_SUCCESS) // double* coded_vals = NULL;
return err; // int err = a->value_count(&nn);
// n_vals = nn;
// if (err)
// return err;
if ((err = grib_get_long(hand, self->number_of_values, &number_of_values)) != GRIB_SUCCESS) // if ((err = grib_get_long(hand, self->number_of_points, &number_of_points)) != GRIB_SUCCESS)
return err; // return err;
if ((err = grib_get_long(hand, self->latitude_of_first_point, &latitude_of_first_point)) != GRIB_SUCCESS) // if ((err = grib_get_long(hand, self->number_of_values, &number_of_values)) != GRIB_SUCCESS)
return err; // return err;
if ((err = grib_get_long(hand, self->missing_value, &missing_value)) != GRIB_SUCCESS) // if ((err = grib_get_long(hand, self->latitude_of_first_point, &latitude_of_first_point)) != GRIB_SUCCESS)
return err; // return err;
if ((err = grib_get_long(hand, self->ni, &ni)) != GRIB_SUCCESS) // if ((err = grib_get_long(hand, self->missing_value, &missing_value)) != GRIB_SUCCESS)
return err; // return err;
if (*len < number_of_points) { // if ((err = grib_get_long(hand, self->ni, &ni)) != GRIB_SUCCESS)
*len = n_vals; // return err;
return GRIB_ARRAY_TOO_SMALL;
}
if (number_of_values > 0) { // if (*len < number_of_points) {
coded_vals = (double*)grib_context_malloc(a->context, number_of_values * sizeof(double)); // *len = n_vals;
// return GRIB_ARRAY_TOO_SMALL;
// }
if (coded_vals == NULL) // if (number_of_values > 0) {
return GRIB_OUT_OF_MEMORY; // coded_vals = (double*)grib_context_malloc(a->context, number_of_values * sizeof(double));
}
if (latitude_of_first_point == 0) { // if (coded_vals == NULL)
for (i = 0; i < number_of_values; i++) // return GRIB_OUT_OF_MEMORY;
val[i] = 1; // }
for (i = number_of_values; i < number_of_points; i++)
val[i] = 0;
}
else {
for (i = 0; i < ni - 1; i++)
val[i] = 0;
for (i = ni - 1; i < number_of_points; i++)
val[i] = 1;
}
*len = number_of_points; // if (latitude_of_first_point == 0) {
// for (i = 0; i < number_of_values; i++)
// val[i] = 1;
// for (i = number_of_values; i < number_of_points; i++)
// val[i] = 0;
// }
// else {
// for (i = 0; i < ni - 1; i++)
// val[i] = 0;
// for (i = ni - 1; i < number_of_points; i++)
// val[i] = 1;
// }
grib_context_free(a->context, coded_vals); // *len = number_of_points;
return err;
// grib_context_free(a->context, coded_vals);
// return err;
} }
int grib_accessor_class_gds_not_present_bitmap_t::pack_double(grib_accessor* a, const double* val, size_t* len) int grib_accessor_class_gds_not_present_bitmap_t::pack_double(grib_accessor* a, const double* val, size_t* len)