diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 26626b355..83b73f01e 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -359,7 +359,6 @@ list( APPEND eccodes_src_files grib_yacc.h md5.h md5.cc - grib_accessor_class_int16.cc grib_accessor_class_int16_little_endian.cc grib_accessor_class_int32.cc grib_accessor_class_int32_little_endian.cc diff --git a/src/accessor_class_hierarchy.txt b/src/accessor_class_hierarchy.txt index 97f43b727..c51bb989d 100644 --- a/src/accessor_class_hierarchy.txt +++ b/src/accessor_class_hierarchy.txt @@ -90,7 +90,6 @@ Generated by src/make_accessor_class_hierarchy_dirs.sh |---grib_accessor_class_hash_array |---grib_accessor_class_headers_only |---grib_accessor_class_ifs_param - |---grib_accessor_class_int16 |---grib_accessor_class_int16_little_endian |---grib_accessor_class_int32 |---grib_accessor_class_int32_little_endian diff --git a/src/grib_accessor_class_int16.cc b/src/deprecated/grib_accessor_class_int16.cc similarity index 100% rename from src/grib_accessor_class_int16.cc rename to src/deprecated/grib_accessor_class_int16.cc diff --git a/src/eccodes_prototypes.h b/src/eccodes_prototypes.h index 74a3838d2..5ca069f99 100644 --- a/src/eccodes_prototypes.h +++ b/src/eccodes_prototypes.h @@ -423,8 +423,6 @@ int grib_g1_step_get_steps(grib_accessor* a, long* start, long* theEnd); /* grib_accessor_class_ifs_param.cc*/ -/* grib_accessor_class_int16.cc*/ - /* grib_accessor_class_int16_little_endian.cc*/ /* grib_accessor_class_int32.cc*/ diff --git a/src/grib_accessor_class.h b/src/grib_accessor_class.h index 52bbfc49c..b1442d879 100644 --- a/src/grib_accessor_class.h +++ b/src/grib_accessor_class.h @@ -113,7 +113,6 @@ extern grib_accessor_class* grib_accessor_class_headers_only; extern grib_accessor_class* grib_accessor_class_ibmfloat; extern grib_accessor_class* grib_accessor_class_ieeefloat; extern grib_accessor_class* grib_accessor_class_ifs_param; -extern grib_accessor_class* grib_accessor_class_int16; extern grib_accessor_class* grib_accessor_class_int16_little_endian; extern grib_accessor_class* grib_accessor_class_int32; extern grib_accessor_class* grib_accessor_class_int32_little_endian; diff --git a/src/grib_accessor_classes_hash.cc b/src/grib_accessor_classes_hash.cc index 66c7a9091..d975c0ab4 100644 --- a/src/grib_accessor_classes_hash.cc +++ b/src/grib_accessor_classes_hash.cc @@ -37,7 +37,7 @@ #line 6 "accessor_class_list.gperf" struct accessor_class_hash { char *name; grib_accessor_class **cclass;}; -#define TOTAL_KEYWORDS 211 +#define TOTAL_KEYWORDS 210 #define MIN_WORD_LENGTH 1 #define MAX_WORD_LENGTH 44 #define MIN_HASH_VALUE 1 @@ -60,12 +60,12 @@ static unsigned int grib_accessor_classes_get_id (const char *str, size_t len) 621, 621, 621, 621, 621, 621, 621, 621, 621, 621, 621, 621, 0, 621, 621, 621, 621, 621, 621, 621, 621, 621, 621, 621, 621, 621, 621, 621, 2, 144, - 14, 10, 20, 621, 7, 621, 0, 621, 621, 621, + 14, 10, 7, 621, 3, 621, 0, 621, 621, 621, 621, 621, 621, 621, 621, 621, 621, 621, 621, 621, 621, 621, 621, 621, 621, 621, 621, 621, 621, 621, 621, 621, 621, 621, 621, 621, 621, 621, 621, 621, 621, 621, 621, 621, 621, 0, 621, 0, 82, 111, - 0, 0, 102, 29, 186, 1, 0, 2, 76, 193, + 0, 0, 102, 29, 186, 1, 3, 2, 76, 193, 13, 57, 20, 621, 128, 1, 42, 62, 201, 3, 18, 21, 621, 621, 621, 621, 621, 621, 621, 621, 621, 621, 621, 621, 621, 621, 621, 621, 621, 621, @@ -117,48 +117,48 @@ static const struct accessor_class_hash classes[] = #line 9 "accessor_class_list.gperf" {" "}, {""}, {""}, {""}, {""}, -#line 184 "accessor_class_list.gperf" +#line 183 "accessor_class_list.gperf" {"size", &grib_accessor_class_size}, #line 12 "accessor_class_list.gperf" {"ascii", &grib_accessor_class_ascii}, -#line 181 "accessor_class_list.gperf" +#line 180 "accessor_class_list.gperf" {"signed", &grib_accessor_class_signed}, {""}, {""}, {""}, {""}, {""}, -#line 182 "accessor_class_list.gperf" +#line 181 "accessor_class_list.gperf" {"signed_bits", &grib_accessor_class_signed_bits}, {""}, #line 67 "accessor_class_list.gperf" {"data_raw_packing", &grib_accessor_class_data_raw_packing}, {""}, -#line 129 "accessor_class_list.gperf" +#line 128 "accessor_class_list.gperf" {"int8", &grib_accessor_class_int8}, {""}, #line 73 "accessor_class_list.gperf" {"data_simple_packing", &grib_accessor_class_data_simple_packing}, #line 69 "accessor_class_list.gperf" {"data_secondary_bitmap", &grib_accessor_class_data_secondary_bitmap}, -#line 175 "accessor_class_list.gperf" +#line 174 "accessor_class_list.gperf" {"section", &grib_accessor_class_section}, -#line 161 "accessor_class_list.gperf" +#line 160 "accessor_class_list.gperf" {"pad", &grib_accessor_class_pad}, -#line 187 "accessor_class_list.gperf" +#line 186 "accessor_class_list.gperf" {"spd", &grib_accessor_class_spd}, #line 75 "accessor_class_list.gperf" {"dictionary", &grib_accessor_class_dictionary}, -#line 123 "accessor_class_list.gperf" - {"int16", &grib_accessor_class_int16}, +#line 126 "accessor_class_list.gperf" + {"int64", &grib_accessor_class_int64}, #line 76 "accessor_class_list.gperf" {"dirty", &grib_accessor_class_dirty}, {""}, #line 66 "accessor_class_list.gperf" {"data_png_packing", &grib_accessor_class_data_png_packing}, -#line 177 "accessor_class_list.gperf" +#line 176 "accessor_class_list.gperf" {"section_padding", &grib_accessor_class_section_padding}, -#line 178 "accessor_class_list.gperf" +#line 177 "accessor_class_list.gperf" {"section_pointer", &grib_accessor_class_section_pointer}, #line 113 "accessor_class_list.gperf" {"gen", &grib_accessor_class_gen}, -#line 125 "accessor_class_list.gperf" +#line 124 "accessor_class_list.gperf" {"int32", &grib_accessor_class_int32}, {""}, #line 58 "accessor_class_list.gperf" @@ -168,12 +168,10 @@ static const struct accessor_class_hash classes[] = {"data_apply_bitmap", &grib_accessor_class_data_apply_bitmap}, #line 62 "accessor_class_list.gperf" {"data_g2shsimple_packing", &grib_accessor_class_data_g2shsimple_packing}, -#line 127 "accessor_class_list.gperf" - {"int64", &grib_accessor_class_int64}, - {""}, -#line 174 "accessor_class_list.gperf" + {""}, {""}, +#line 173 "accessor_class_list.gperf" {"second_order_bits_per_value", &grib_accessor_class_second_order_bits_per_value}, -#line 176 "accessor_class_list.gperf" +#line 175 "accessor_class_list.gperf" {"section_length", &grib_accessor_class_section_length}, #line 65 "accessor_class_list.gperf" {"data_jpeg2000_packing", &grib_accessor_class_data_jpeg2000_packing}, @@ -183,7 +181,7 @@ static const struct accessor_class_hash classes[] = {"gds_is_present", &grib_accessor_class_gds_is_present}, #line 44 "accessor_class_list.gperf" {"data_apply_boustrophedonic", &grib_accessor_class_data_apply_boustrophedonic}, -#line 196 "accessor_class_list.gperf" +#line 195 "accessor_class_list.gperf" {"time", &grib_accessor_class_time}, #line 114 "accessor_class_list.gperf" {"getenv", &grib_accessor_class_getenv}, @@ -201,41 +199,41 @@ static const struct accessor_class_hash classes[] = {"data_g2simple_packing", &grib_accessor_class_data_g2simple_packing}, #line 60 "accessor_class_list.gperf" {"data_g2complex_packing", &grib_accessor_class_data_g2complex_packing}, -#line 162 "accessor_class_list.gperf" +#line 161 "accessor_class_list.gperf" {"padding", &grib_accessor_class_padding}, {""}, {""}, {""}, #line 108 "accessor_class_list.gperf" {"g2lon", &grib_accessor_class_g2lon}, -#line 149 "accessor_class_list.gperf" +#line 148 "accessor_class_list.gperf" {"nearest", &grib_accessor_class_nearest}, {""}, {""}, {""}, -#line 194 "accessor_class_list.gperf" +#line 193 "accessor_class_list.gperf" {"sum", &grib_accessor_class_sum}, {""}, -#line 209 "accessor_class_list.gperf" +#line 208 "accessor_class_list.gperf" {"uint8", &grib_accessor_class_uint8}, #line 99 "accessor_class_list.gperf" {"g2_eps", &grib_accessor_class_g2_eps}, -#line 193 "accessor_class_list.gperf" +#line 192 "accessor_class_list.gperf" {"step_in_units", &grib_accessor_class_step_in_units}, {""}, -#line 132 "accessor_class_list.gperf" - {"julian_day", &grib_accessor_class_julian_day}, -#line 131 "accessor_class_list.gperf" - {"julian_date", &grib_accessor_class_julian_date}, +#line 206 "accessor_class_list.gperf" + {"uint64", &grib_accessor_class_uint64}, + {""}, #line 64 "accessor_class_list.gperf" {"data_g2simple_packing_with_preprocessing", &grib_accessor_class_data_g2simple_packing_with_preprocessing}, - {""}, -#line 207 "accessor_class_list.gperf" - {"uint64", &grib_accessor_class_uint64}, +#line 131 "accessor_class_list.gperf" + {"julian_day", &grib_accessor_class_julian_day}, +#line 130 "accessor_class_list.gperf" + {"julian_date", &grib_accessor_class_julian_date}, #line 48 "accessor_class_list.gperf" {"data_complex_packing", &grib_accessor_class_data_complex_packing}, #line 49 "accessor_class_list.gperf" {"data_dummy_field", &grib_accessor_class_data_dummy_field}, -#line 205 "accessor_class_list.gperf" +#line 204 "accessor_class_list.gperf" {"uint32", &grib_accessor_class_uint32}, {""}, {""}, -#line 163 "accessor_class_list.gperf" +#line 162 "accessor_class_list.gperf" {"padto", &grib_accessor_class_padto}, {""}, #line 109 "accessor_class_list.gperf" @@ -259,66 +257,65 @@ static const struct accessor_class_hash classes[] = {"data_g2secondary_bitmap", &grib_accessor_class_data_g2secondary_bitmap}, #line 59 "accessor_class_list.gperf" {"data_g2bifourier_packing", &grib_accessor_class_data_g2bifourier_packing}, -#line 190 "accessor_class_list.gperf" +#line 189 "accessor_class_list.gperf" {"statistics", &grib_accessor_class_statistics}, #line 16 "accessor_class_list.gperf" {"bits_per_value", &grib_accessor_class_bits_per_value}, {""}, -#line 150 "accessor_class_list.gperf" +#line 149 "accessor_class_list.gperf" {"non_alpha", &grib_accessor_class_non_alpha}, -#line 183 "accessor_class_list.gperf" +#line 182 "accessor_class_list.gperf" {"simple_packing_error", &grib_accessor_class_simple_packing_error}, {""}, {""}, {""}, {""}, -#line 191 "accessor_class_list.gperf" +#line 190 "accessor_class_list.gperf" {"statistics_spectral", &grib_accessor_class_statistics_spectral}, #line 112 "accessor_class_list.gperf" {"gds_not_present_bitmap", &grib_accessor_class_gds_not_present_bitmap}, {""}, -#line 130 "accessor_class_list.gperf" +#line 129 "accessor_class_list.gperf" {"iterator", &grib_accessor_class_iterator}, #line 29 "accessor_class_list.gperf" {"bytes", &grib_accessor_class_bytes}, #line 97 "accessor_class_list.gperf" {"g2_aerosol", &grib_accessor_class_g2_aerosol}, -#line 152 "accessor_class_list.gperf" +#line 151 "accessor_class_list.gperf" {"number_of_points", &grib_accessor_class_number_of_points}, -#line 212 "accessor_class_list.gperf" +#line 211 "accessor_class_list.gperf" {"unsigned", &grib_accessor_class_unsigned}, {""}, {""}, {""}, {""}, -#line 172 "accessor_class_list.gperf" +#line 171 "accessor_class_list.gperf" {"scale", &grib_accessor_class_scale}, -#line 213 "accessor_class_list.gperf" +#line 212 "accessor_class_list.gperf" {"unsigned_bits", &grib_accessor_class_unsigned_bits}, {""}, -#line 153 "accessor_class_list.gperf" +#line 152 "accessor_class_list.gperf" {"number_of_points_gaussian", &grib_accessor_class_number_of_points_gaussian}, #line 115 "accessor_class_list.gperf" {"global_gaussian", &grib_accessor_class_global_gaussian}, -#line 198 "accessor_class_list.gperf" +#line 197 "accessor_class_list.gperf" {"to_integer", &grib_accessor_class_to_integer}, {""}, -#line 192 "accessor_class_list.gperf" +#line 191 "accessor_class_list.gperf" {"step_human_readable", &grib_accessor_class_step_human_readable}, #line 79 "accessor_class_list.gperf" {"element", &grib_accessor_class_element}, -#line 180 "accessor_class_list.gperf" +#line 179 "accessor_class_list.gperf" {"sexagesimal2decimal", &grib_accessor_class_sexagesimal2decimal}, -#line 135 "accessor_class_list.gperf" +#line 134 "accessor_class_list.gperf" {"latitudes", &grib_accessor_class_latitudes}, - {""}, +#line 207 "accessor_class_list.gperf" + {"uint64_little_endian", &grib_accessor_class_uint64_little_endian}, #line 47 "accessor_class_list.gperf" {"data_ccsds_packing", &grib_accessor_class_data_ccsds_packing}, -#line 210 "accessor_class_list.gperf" +#line 209 "accessor_class_list.gperf" {"unexpanded_descriptors", &grib_accessor_class_unexpanded_descriptors}, -#line 168 "accessor_class_list.gperf" +#line 167 "accessor_class_list.gperf" {"raw", &grib_accessor_class_raw}, -#line 208 "accessor_class_list.gperf" - {"uint64_little_endian", &grib_accessor_class_uint64_little_endian}, - {""}, {""}, -#line 206 "accessor_class_list.gperf" + {""}, {""}, {""}, +#line 205 "accessor_class_list.gperf" {"uint32_little_endian", &grib_accessor_class_uint32_little_endian}, {""}, -#line 140 "accessor_class_list.gperf" +#line 139 "accessor_class_list.gperf" {"long", &grib_accessor_class_long}, {""}, #line 78 "accessor_class_list.gperf" @@ -326,22 +323,22 @@ static const struct accessor_class_hash classes[] = {""}, {""}, #line 100 "accessor_class_list.gperf" {"g2_mars_labeling", &grib_accessor_class_g2_mars_labeling}, -#line 189 "accessor_class_list.gperf" +#line 188 "accessor_class_list.gperf" {"sprintf", &grib_accessor_class_sprintf}, {""}, {""}, {""}, -#line 169 "accessor_class_list.gperf" +#line 168 "accessor_class_list.gperf" {"rdbtime_guess_date", &grib_accessor_class_rdbtime_guess_date}, {""}, #line 77 "accessor_class_list.gperf" {"divdouble", &grib_accessor_class_divdouble}, #line 106 "accessor_class_list.gperf" {"g2latlon", &grib_accessor_class_g2latlon}, -#line 199 "accessor_class_list.gperf" +#line 198 "accessor_class_list.gperf" {"to_string", &grib_accessor_class_to_string}, -#line 179 "accessor_class_list.gperf" +#line 178 "accessor_class_list.gperf" {"select_step_template", &grib_accessor_class_select_step_template}, {""}, {""}, {""}, {""}, -#line 134 "accessor_class_list.gperf" +#line 133 "accessor_class_list.gperf" {"label", &grib_accessor_class_label}, {""}, #line 19 "accessor_class_list.gperf" @@ -361,72 +358,72 @@ static const struct accessor_class_hash classes[] = {"data_g1shsimple_packing", &grib_accessor_class_data_g1shsimple_packing}, #line 121 "accessor_class_list.gperf" {"ieeefloat", &grib_accessor_class_ieeefloat}, -#line 158 "accessor_class_list.gperf" +#line 157 "accessor_class_list.gperf" {"offset_file", &grib_accessor_class_offset_file}, #line 28 "accessor_class_list.gperf" {"bufrdc_expanded_descriptors", &grib_accessor_class_bufrdc_expanded_descriptors}, -#line 165 "accessor_class_list.gperf" +#line 164 "accessor_class_list.gperf" {"padtomultiple", &grib_accessor_class_padtomultiple}, {""}, -#line 202 "accessor_class_list.gperf" +#line 201 "accessor_class_list.gperf" {"trim", &grib_accessor_class_trim}, {""}, #line 110 "accessor_class_list.gperf" {"gaussian_grid_name", &grib_accessor_class_gaussian_grid_name}, {""}, {""}, {""}, -#line 200 "accessor_class_list.gperf" +#line 199 "accessor_class_list.gperf" {"transient", &grib_accessor_class_transient}, {""}, #line 116 "accessor_class_list.gperf" {"group", &grib_accessor_class_group}, {""}, -#line 166 "accessor_class_list.gperf" +#line 165 "accessor_class_list.gperf" {"position", &grib_accessor_class_position}, #line 57 "accessor_class_list.gperf" {"data_g1simple_packing", &grib_accessor_class_data_g1simple_packing}, #line 50 "accessor_class_list.gperf" {"data_g1complex_packing", &grib_accessor_class_data_g1complex_packing}, -#line 201 "accessor_class_list.gperf" +#line 200 "accessor_class_list.gperf" {"transient_darray", &grib_accessor_class_transient_darray}, - {""}, {""}, -#line 171 "accessor_class_list.gperf" +#line 123 "accessor_class_list.gperf" + {"int16_little_endian", &grib_accessor_class_int16_little_endian}, + {""}, +#line 170 "accessor_class_list.gperf" {"round", &grib_accessor_class_round}, #line 84 "accessor_class_list.gperf" {"g1_message_length", &grib_accessor_class_g1_message_length}, -#line 124 "accessor_class_list.gperf" - {"int16_little_endian", &grib_accessor_class_int16_little_endian}, -#line 219 "accessor_class_list.gperf" +#line 127 "accessor_class_list.gperf" + {"int64_little_endian", &grib_accessor_class_int64_little_endian}, +#line 218 "accessor_class_list.gperf" {"when", &grib_accessor_class_when}, #line 18 "accessor_class_list.gperf" {"budgdate", &grib_accessor_class_budgdate}, {""}, -#line 146 "accessor_class_list.gperf" +#line 145 "accessor_class_list.gperf" {"md5", &grib_accessor_class_md5}, {""}, {""}, -#line 126 "accessor_class_list.gperf" +#line 125 "accessor_class_list.gperf" {"int32_little_endian", &grib_accessor_class_int32_little_endian}, -#line 147 "accessor_class_list.gperf" +#line 146 "accessor_class_list.gperf" {"message", &grib_accessor_class_message}, -#line 143 "accessor_class_list.gperf" - {"lookup", &grib_accessor_class_lookup}, -#line 195 "accessor_class_list.gperf" - {"suppressed", &grib_accessor_class_suppressed}, -#line 144 "accessor_class_list.gperf" - {"mars_param", &grib_accessor_class_mars_param}, - {""}, -#line 128 "accessor_class_list.gperf" - {"int64_little_endian", &grib_accessor_class_int64_little_endian}, #line 142 "accessor_class_list.gperf" + {"lookup", &grib_accessor_class_lookup}, +#line 194 "accessor_class_list.gperf" + {"suppressed", &grib_accessor_class_suppressed}, +#line 143 "accessor_class_list.gperf" + {"mars_param", &grib_accessor_class_mars_param}, + {""}, {""}, +#line 141 "accessor_class_list.gperf" {"longitudes", &grib_accessor_class_longitudes}, -#line 216 "accessor_class_list.gperf" +#line 215 "accessor_class_list.gperf" {"values", &grib_accessor_class_values}, -#line 151 "accessor_class_list.gperf" +#line 150 "accessor_class_list.gperf" {"number_of_coded_values", &grib_accessor_class_number_of_coded_values}, {""}, -#line 188 "accessor_class_list.gperf" +#line 187 "accessor_class_list.gperf" {"spectral_truncation", &grib_accessor_class_spectral_truncation}, {""}, {""}, -#line 203 "accessor_class_list.gperf" +#line 202 "accessor_class_list.gperf" {"uint16", &grib_accessor_class_uint16}, #line 95 "accessor_class_list.gperf" {"g1step_range", &grib_accessor_class_g1step_range}, @@ -442,7 +439,7 @@ static const struct accessor_class_hash classes[] = {"g1bitmap", &grib_accessor_class_g1bitmap}, #line 55 "accessor_class_list.gperf" {"data_g1secondary_bitmap", &grib_accessor_class_data_g1secondary_bitmap}, -#line 148 "accessor_class_list.gperf" +#line 147 "accessor_class_list.gperf" {"message_copy", &grib_accessor_class_message_copy}, {""}, #line 72 "accessor_class_list.gperf" @@ -450,68 +447,67 @@ static const struct accessor_class_hash classes[] = {""}, #line 102 "accessor_class_list.gperf" {"g2bitmap_present", &grib_accessor_class_g2bitmap_present}, -#line 167 "accessor_class_list.gperf" +#line 166 "accessor_class_list.gperf" {"proj_string", &grib_accessor_class_proj_string}, #line 39 "accessor_class_list.gperf" {"constant", &grib_accessor_class_constant}, {""}, #line 27 "accessor_class_list.gperf" {"bufr_string_values", &grib_accessor_class_bufr_string_values}, -#line 159 "accessor_class_list.gperf" +#line 158 "accessor_class_list.gperf" {"offset_values", &grib_accessor_class_offset_values}, -#line 157 "accessor_class_list.gperf" +#line 156 "accessor_class_list.gperf" {"octet_number", &grib_accessor_class_octet_number}, #line 53 "accessor_class_list.gperf" {"data_g1second_order_general_packing", &grib_accessor_class_data_g1second_order_general_packing}, {""}, -#line 139 "accessor_class_list.gperf" +#line 138 "accessor_class_list.gperf" {"local_definition", &grib_accessor_class_local_definition}, #line 54 "accessor_class_list.gperf" {"data_g1second_order_row_by_row_packing", &grib_accessor_class_data_g1second_order_row_by_row_packing}, - {""}, -#line 138 "accessor_class_list.gperf" +#line 85 "accessor_class_list.gperf" + {"g1_section4_length", &grib_accessor_class_g1_section4_length}, +#line 137 "accessor_class_list.gperf" {"library_version", &grib_accessor_class_library_version}, {""}, #line 51 "accessor_class_list.gperf" {"data_g1second_order_constant_width_packing", &grib_accessor_class_data_g1second_order_constant_width_packing}, -#line 145 "accessor_class_list.gperf" +#line 144 "accessor_class_list.gperf" {"mars_step", &grib_accessor_class_mars_step}, #line 52 "accessor_class_list.gperf" {"data_g1second_order_general_extended_packing", &grib_accessor_class_data_g1second_order_general_extended_packing}, {""}, -#line 197 "accessor_class_list.gperf" +#line 196 "accessor_class_list.gperf" {"to_double", &grib_accessor_class_to_double}, {""}, {""}, {""}, {""}, #line 21 "accessor_class_list.gperf" {"bufr_elements_table", &grib_accessor_class_bufr_elements_table}, -#line 85 "accessor_class_list.gperf" - {"g1_section4_length", &grib_accessor_class_g1_section4_length}, - {""}, {""}, -#line 214 "accessor_class_list.gperf" + {""}, {""}, {""}, +#line 213 "accessor_class_list.gperf" {"validity_date", &grib_accessor_class_validity_date}, -#line 215 "accessor_class_list.gperf" +#line 214 "accessor_class_list.gperf" {"validity_time", &grib_accessor_class_validity_time}, {""}, {""}, #line 122 "accessor_class_list.gperf" {"ifs_param", &grib_accessor_class_ifs_param}, {""}, {""}, {""}, -#line 218 "accessor_class_list.gperf" +#line 217 "accessor_class_list.gperf" {"vector", &grib_accessor_class_vector}, {""}, {""}, #line 117 "accessor_class_list.gperf" {"gts_header", &grib_accessor_class_gts_header}, #line 89 "accessor_class_list.gperf" {"g1end_of_interval_monthly", &grib_accessor_class_g1end_of_interval_monthly}, -#line 204 "accessor_class_list.gperf" +#line 203 "accessor_class_list.gperf" {"uint16_little_endian", &grib_accessor_class_uint16_little_endian}, {""}, {""}, -#line 141 "accessor_class_list.gperf" +#line 140 "accessor_class_list.gperf" {"long_vector", &grib_accessor_class_long_vector}, {""}, {""}, #line 119 "accessor_class_list.gperf" {"headers_only", &grib_accessor_class_headers_only}, {""}, -#line 136 "accessor_class_list.gperf" +#line 135 "accessor_class_list.gperf" {"latlon_increment", &grib_accessor_class_latlon_increment}, #line 34 "accessor_class_list.gperf" {"codeflag", &grib_accessor_class_codeflag}, @@ -521,27 +517,27 @@ static const struct accessor_class_hash classes[] = #line 33 "accessor_class_list.gperf" {"closest_date", &grib_accessor_class_closest_date}, {""}, -#line 217 "accessor_class_list.gperf" +#line 216 "accessor_class_list.gperf" {"variable", &grib_accessor_class_variable}, #line 74 "accessor_class_list.gperf" {"decimal_precision", &grib_accessor_class_decimal_precision}, -#line 164 "accessor_class_list.gperf" +#line 163 "accessor_class_list.gperf" {"padtoeven", &grib_accessor_class_padtoeven}, {""}, -#line 185 "accessor_class_list.gperf" +#line 184 "accessor_class_list.gperf" {"smart_table", &grib_accessor_class_smart_table}, {""}, {""}, -#line 154 "accessor_class_list.gperf" +#line 153 "accessor_class_list.gperf" {"number_of_values", &grib_accessor_class_number_of_values}, #line 24 "accessor_class_list.gperf" {"bufr_extract_subsets", &grib_accessor_class_bufr_extract_subsets}, {""}, {""}, -#line 186 "accessor_class_list.gperf" +#line 185 "accessor_class_list.gperf" {"smart_table_column", &grib_accessor_class_smart_table_column}, {""}, #line 22 "accessor_class_list.gperf" {"bufr_extract_area_subsets", &grib_accessor_class_bufr_extract_area_subsets}, -#line 160 "accessor_class_list.gperf" +#line 159 "accessor_class_list.gperf" {"pack_bufr_values", &grib_accessor_class_pack_bufr_values}, {""}, #line 35 "accessor_class_list.gperf" @@ -549,10 +545,10 @@ static const struct accessor_class_hash classes[] = #line 23 "accessor_class_list.gperf" {"bufr_extract_datetime_subsets", &grib_accessor_class_bufr_extract_datetime_subsets}, {""}, -#line 133 "accessor_class_list.gperf" +#line 132 "accessor_class_list.gperf" {"ksec1expver", &grib_accessor_class_ksec1expver}, {""}, {""}, {""}, {""}, -#line 155 "accessor_class_list.gperf" +#line 154 "accessor_class_list.gperf" {"number_of_values_data_raw_packing", &grib_accessor_class_number_of_values_data_raw_packing}, {""}, #line 70 "accessor_class_list.gperf" @@ -566,7 +562,7 @@ static const struct accessor_class_hash classes[] = {""}, #line 118 "accessor_class_list.gperf" {"hash_array", &grib_accessor_class_hash_array}, -#line 173 "accessor_class_list.gperf" +#line 172 "accessor_class_list.gperf" {"scale_values", &grib_accessor_class_scale_values}, {""}, #line 107 "accessor_class_list.gperf" @@ -574,7 +570,7 @@ static const struct accessor_class_hash classes[] = {""}, {""}, {""}, #line 90 "accessor_class_list.gperf" {"g1fcperiod", &grib_accessor_class_g1fcperiod}, -#line 211 "accessor_class_list.gperf" +#line 210 "accessor_class_list.gperf" {"unpack_bufr_values", &grib_accessor_class_unpack_bufr_values}, {""}, {""}, {""}, #line 11 "accessor_class_list.gperf" @@ -585,7 +581,7 @@ static const struct accessor_class_hash classes[] = #line 42 "accessor_class_list.gperf" {"count_total", &grib_accessor_class_count_total}, {""}, {""}, {""}, {""}, {""}, {""}, -#line 137 "accessor_class_list.gperf" +#line 136 "accessor_class_list.gperf" {"latlonvalues", &grib_accessor_class_latlonvalues}, {""}, {""}, #line 36 "accessor_class_list.gperf" @@ -603,7 +599,7 @@ static const struct accessor_class_hash classes[] = #line 82 "accessor_class_list.gperf" {"from_scale_factor_scaled_value", &grib_accessor_class_from_scale_factor_scaled_value}, {""}, -#line 156 "accessor_class_list.gperf" +#line 155 "accessor_class_list.gperf" {"octahedral_gaussian", &grib_accessor_class_octahedral_gaussian}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, @@ -632,7 +628,7 @@ static const struct accessor_class_hash classes[] = {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, -#line 170 "accessor_class_list.gperf" +#line 169 "accessor_class_list.gperf" {"reference_value_error", &grib_accessor_class_reference_value_error}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, diff --git a/src/grib_accessor_factory.h b/src/grib_accessor_factory.h index 1c79ed01a..9da8fff00 100644 --- a/src/grib_accessor_factory.h +++ b/src/grib_accessor_factory.h @@ -112,7 +112,6 @@ { "ibmfloat", &grib_accessor_class_ibmfloat, }, { "ieeefloat", &grib_accessor_class_ieeefloat, }, { "ifs_param", &grib_accessor_class_ifs_param, }, -{ "int16", &grib_accessor_class_int16, }, { "int16_little_endian", &grib_accessor_class_int16_little_endian, }, { "int32", &grib_accessor_class_int32, }, { "int32_little_endian", &grib_accessor_class_int32_little_endian, }, diff --git a/src/grib_accessor_factory_hash_list b/src/grib_accessor_factory_hash_list index e88a4acff..aefe1a24d 100644 --- a/src/grib_accessor_factory_hash_list +++ b/src/grib_accessor_factory_hash_list @@ -113,7 +113,6 @@ headers_only, &grib_accessor_class_headers_only ibmfloat, &grib_accessor_class_ibmfloat ieeefloat, &grib_accessor_class_ieeefloat ifs_param, &grib_accessor_class_ifs_param -int16, &grib_accessor_class_int16 int16_little_endian, &grib_accessor_class_int16_little_endian int32, &grib_accessor_class_int32 int32_little_endian, &grib_accessor_class_int32_little_endian