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

ECC-1383: Spelling: Accessor 'octect_number' should be 'octet_number'

This commit is contained in:
Shahram Najm 2022-04-19 16:03:16 +01:00
parent 0212dc18d3
commit 6a4ee75ef2
15 changed files with 554 additions and 553 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

50
definitions/grib1/data.spectral_complex.def
View File

@ -6,42 +6,42 @@ alias numberOfBitsContainingEachPackedValue = bitsPerValue;
alias accuracy = bitsPerValue; alias accuracy = bitsPerValue;
# For grib1 -> grib2 # For grib1 -> grib2
#constant dataRepresentationTemplateNumber = 51; #constant dataRepresentationTemplateNumber = 51;
constant PUnset = -32767; constant PUnset = -32767;
unsigned[2] N : read_only,dump; # N is a pointer to the start of the packed data (i.e. gives octet number)
signed[2] P = PUnset; unsigned[2] N : read_only,dump;
signed[2] P = PUnset;
unsigned[1] JS=0 : dump; unsigned[1] JS=0 : dump;
unsigned[1] KS=0 : dump; unsigned[1] KS=0 : dump;
unsigned[1] MS=0 : dump; unsigned[1] MS=0 : dump;
alias subSetJ=JS; alias subSetJ=JS;
alias subSetK=KS; alias subSetK=KS;
alias subSetM=MS; alias subSetM=MS;
constant GRIBEXShBugPresent = 1; constant GRIBEXShBugPresent = 1;
if (gribex_mode_on()) { if (gribex_mode_on()) {
transient computeLaplacianOperator=0 : hidden; transient computeLaplacianOperator=0 : hidden;
} else { } else {
transient computeLaplacianOperator=1 : hidden; transient computeLaplacianOperator=1 : hidden;
} }
meta data.laplacianOperator scale(P,oneConstant,grib1divider,truncateLaplacian) : dump; meta data.laplacianOperator scale(P,oneConstant,grib1divider,truncateLaplacian) : dump;
meta laplacianOperatorIsSet evaluate(P != PUnset && !computeLaplacianOperator ); meta laplacianOperatorIsSet evaluate(P != PUnset && !computeLaplacianOperator);
if (localUsePresent) { if (localUsePresent) {
if (changed(localDefinitionNumber)) { if (changed(localDefinitionNumber)) {
transient TS = 0; transient TS = 0;
meta TScalc spectral_truncation(JS,KS,MS,TS) : read_only,hidden; meta TScalc spectral_truncation(JS,KS,MS,TS) : read_only,hidden;
meta Nassigned octect_number(N,4*TScalc) : hidden; meta Nassigned octet_number(N,4*TScalc) : hidden;
}
} }
}
position offsetBeforeData; position offsetBeforeData;
meta values data_g1complex_packing( meta values data_g1complex_packing(
section4Length, section4Length,
offsetBeforeData, offsetBeforeData,
offsetSection4, offsetSection4,
@ -69,9 +69,9 @@ constant PUnset = -32767;
halfByte, halfByte,
N,packingType,spectral_ieee,precision N,packingType,spectral_ieee,precision
) : dump; ) : dump;
meta data.packedValues data_sh_packed( meta data.packedValues data_sh_packed(
section4Length, section4Length,
offsetBeforeData, offsetBeforeData,
offsetSection4, offsetSection4,
@ -98,9 +98,9 @@ constant PUnset = -32767;
pentagonalResolutionParameterJ, pentagonalResolutionParameterJ,
pentagonalResolutionParameterK, pentagonalResolutionParameterK,
pentagonalResolutionParameterM pentagonalResolutionParameterM
) : read_only; ) : read_only;
meta data.unpackedValues data_sh_unpacked( meta data.unpackedValues data_sh_unpacked(
section4Length, section4Length,
offsetBeforeData, offsetBeforeData,
offsetSection4, offsetSection4,
@ -127,7 +127,7 @@ constant PUnset = -32767;
pentagonalResolutionParameterJ, pentagonalResolutionParameterJ,
pentagonalResolutionParameterK, pentagonalResolutionParameterK,
pentagonalResolutionParameterM pentagonalResolutionParameterM
) : read_only; ) : read_only;
meta packingError simple_packing_error(bitsPerValue,binaryScaleFactor,decimalScaleFactor,referenceValue,ibm) : no_copy; meta packingError simple_packing_error(bitsPerValue,binaryScaleFactor,decimalScaleFactor,referenceValue,ibm) : no_copy;
meta unpackedError simple_packing_error(zero,binaryScaleFactor,decimalScaleFactor,referenceValue,ibm) : no_copy; meta unpackedError simple_packing_error(zero,binaryScaleFactor,decimalScaleFactor,referenceValue,ibm) : no_copy;

40
definitions/grib1/data.spectral_ieee.def
View File

@ -6,38 +6,38 @@ alias numberOfBitsContainingEachPackedValue = bitsPerValue;
alias accuracy = bitsPerValue; alias accuracy = bitsPerValue;
# For grib1 -> grib2 # For grib1 -> grib2
#constant dataRepresentationTemplateNumber = 51; #constant dataRepresentationTemplateNumber = 51;
constant PUnset = -32767; constant PUnset = -32767;
unsigned[2] N : read_only,dump; # N is a pointer to the start of the packed data (i.e. gives octet number)
signed[2] P = PUnset; unsigned[2] N : read_only,dump;
signed[2] P = PUnset;
unsigned[1] JS=0 : dump; unsigned[1] JS=0 : dump;
unsigned[1] KS=0 : dump; unsigned[1] KS=0 : dump;
unsigned[1] MS=0 : dump; unsigned[1] MS=0 : dump;
alias subSetJ=JS; alias subSetJ=JS;
alias subSetK=KS; alias subSetK=KS;
alias subSetM=MS; alias subSetM=MS;
constant GRIBEXShBugPresent = 1; constant GRIBEXShBugPresent = 1;
transient computeLaplacianOperator=0; transient computeLaplacianOperator=0;
meta data.laplacianOperator scale(P,oneConstant,grib1divider,truncateLaplacian) : dump; meta data.laplacianOperator scale(P,oneConstant,grib1divider,truncateLaplacian) : dump;
meta laplacianOperatorIsSet evaluate(P != PUnset && !computeLaplacianOperator ); meta laplacianOperatorIsSet evaluate(P != PUnset && !computeLaplacianOperator );
if (localUsePresent) { if (localUsePresent) {
if (changed(localDefinitionNumber)) { if (changed(localDefinitionNumber)) {
transient TS = 0; transient TS = 0;
meta TScalc spectral_truncation(JS,KS,MS,TS) : read_only,hidden; meta TScalc spectral_truncation(JS,KS,MS,TS) : read_only,hidden;
meta Nassigned octect_number(N,4*TScalc) : hidden; meta Nassigned octet_number(N,4*TScalc) : hidden;
}
} }
}
position offsetBeforeData; position offsetBeforeData;
meta values data_g1complex_packing( meta values data_g1complex_packing(
section4Length, section4Length,
offsetBeforeData, offsetBeforeData,
offsetSection4, offsetSection4,
@ -67,7 +67,7 @@ constant PUnset = -32767;
N,packingType,spectral_ieee,precision N,packingType,spectral_ieee,precision
) : dump; ) : dump;
meta data.packedValues data_sh_packed( meta data.packedValues data_sh_packed(
section4Length, section4Length,
offsetBeforeData, offsetBeforeData,
offsetSection4, offsetSection4,
@ -96,7 +96,7 @@ constant PUnset = -32767;
pentagonalResolutionParameterM pentagonalResolutionParameterM
) : read_only; ) : read_only;
meta data.unpackedValues data_sh_unpacked( meta data.unpackedValues data_sh_unpacked(
section4Length, section4Length,
offsetBeforeData, offsetBeforeData,
offsetSection4, offsetSection4,

2
doxygen/keys.dox
View File

@ -44,7 +44,7 @@ jScansPositively
jPointsAreConsecutive jPointsAreConsecutive
alternativeRowScanning (available only for edition 2) alternativeRowScanning (available only for edition 2)
\endverbatim\n \endverbatim\n
will provide access to single bits of the scanning mode octect hiding will provide access to single bits of the scanning mode octet hiding
its structure from the user.\n its structure from the user.\n
The keys can also have some attributes as \e read \e only, which means that The keys can also have some attributes as \e read \e only, which means that
the key cannot be set (e.g. 7777 at the end of the message), or \e edition \e specific the key cannot be set (e.g. 7777 at the end of the message), or \e edition \e specific

2
examples/examples.dev/get_set.c
View File

@ -100,7 +100,7 @@ int main(int argc, char *argv[])
if (h) { if (h) {
/* dump key/values pairs according the option_flags and with /* dump key/values pairs according the option_flags and with
* the "serialize" style. Other available styles are: * the "serialize" style. Other available styles are:
* - "debug" Dump all keys with octect position * - "debug" Dump all keys with octet position
* - "c_code" Dump C code to build the grib file from scratch * - "c_code" Dump C code to build the grib file from scratch
*/ */
grib_dump_content(h,stdout,"serialize",option_flags,NULL); grib_dump_content(h,stdout,"serialize",option_flags,NULL);

2
src/CMakeLists.txt
View File

@ -152,7 +152,7 @@ list( APPEND eccodes_src_files
grib_accessor_class_long.c grib_accessor_class_long.c
grib_accessor_class_lookup.c grib_accessor_class_lookup.c
grib_accessor_class_octahedral_gaussian.c grib_accessor_class_octahedral_gaussian.c
grib_accessor_class_octect_number.c grib_accessor_class_octet_number.c
grib_accessor_class_headers_only.c grib_accessor_class_headers_only.c
grib_accessor_class_padding.c grib_accessor_class_padding.c
grib_accessor_class_pad.c grib_accessor_class_pad.c

2
src/Makefile.am
View File

@ -167,7 +167,7 @@ libeccodes_la_prototypes= \
grib_accessor_class_label.c \ grib_accessor_class_label.c \
grib_accessor_class_long.c \ grib_accessor_class_long.c \
grib_accessor_class_lookup.c \ grib_accessor_class_lookup.c \
grib_accessor_class_octect_number.c \ grib_accessor_class_octet_number.c \
grib_accessor_class_headers_only.c \ grib_accessor_class_headers_only.c \
grib_accessor_class_padding.c \ grib_accessor_class_padding.c \
grib_accessor_class_pad.c \ grib_accessor_class_pad.c \

2
src/accessor_class_hierarchy.txt
View File

@ -135,7 +135,7 @@ Generated by src/make_accessor_class_hierarchy_dirs.sh
|-----grib_accessor_class_number_of_points_gaussian |-----grib_accessor_class_number_of_points_gaussian
|-----grib_accessor_class_number_of_values |-----grib_accessor_class_number_of_values
|-----grib_accessor_class_octahedral_gaussian |-----grib_accessor_class_octahedral_gaussian
|-----grib_accessor_class_octect_number |-----grib_accessor_class_octet_number
|-----grib_accessor_class_rdbtime_guess_date |-----grib_accessor_class_rdbtime_guess_date
|-----grib_accessor_class_second_order_bits_per_value |-----grib_accessor_class_second_order_bits_per_value
|-----grib_accessor_class_signed |-----grib_accessor_class_signed

2
src/grib_accessor_class.h
View File

@ -154,7 +154,7 @@ extern grib_accessor_class* grib_accessor_class_number_of_points_gaussian;
extern grib_accessor_class* grib_accessor_class_number_of_values; extern grib_accessor_class* grib_accessor_class_number_of_values;
extern grib_accessor_class* grib_accessor_class_number_of_values_data_raw_packing; extern grib_accessor_class* grib_accessor_class_number_of_values_data_raw_packing;
extern grib_accessor_class* grib_accessor_class_octahedral_gaussian; extern grib_accessor_class* grib_accessor_class_octahedral_gaussian;
extern grib_accessor_class* grib_accessor_class_octect_number; extern grib_accessor_class* grib_accessor_class_octet_number;
extern grib_accessor_class* grib_accessor_class_offset_file; extern grib_accessor_class* grib_accessor_class_offset_file;
extern grib_accessor_class* grib_accessor_class_offset_values; extern grib_accessor_class* grib_accessor_class_offset_values;
extern grib_accessor_class* grib_accessor_class_pack_bufr_values; extern grib_accessor_class* grib_accessor_class_pack_bufr_values;

18
src/grib_accessor_class_octect_number.c → src/grib_accessor_class_octet_number.c
View File

@ -42,22 +42,22 @@ static int unpack_long(grib_accessor*, long* val, size_t* len);
static void init(grib_accessor*, const long, grib_arguments*); static void init(grib_accessor*, const long, grib_arguments*);
static void init_class(grib_accessor_class*); static void init_class(grib_accessor_class*);
typedef struct grib_accessor_octect_number typedef struct grib_accessor_octet_number
{ {
grib_accessor att; grib_accessor att;
/* Members defined in gen */ /* Members defined in gen */
/* Members defined in long */ /* Members defined in long */
/* Members defined in octect_number */ /* Members defined in octet_number */
const char* left; const char* left;
long right; long right;
} grib_accessor_octect_number; } grib_accessor_octet_number;
extern grib_accessor_class* grib_accessor_class_long; extern grib_accessor_class* grib_accessor_class_long;
static grib_accessor_class _grib_accessor_class_octect_number = { static grib_accessor_class _grib_accessor_class_octet_number = {
&grib_accessor_class_long, /* super */ &grib_accessor_class_long, /* super */
"octect_number", /* name */ "octet_number", /* name */
sizeof(grib_accessor_octect_number), /* size */ sizeof(grib_accessor_octet_number), /* size */
0, /* inited */ 0, /* inited */
&init_class, /* init_class */ &init_class, /* init_class */
&init, /* init */ &init, /* init */
@ -98,7 +98,7 @@ static grib_accessor_class _grib_accessor_class_octect_number = {
}; };
grib_accessor_class* grib_accessor_class_octect_number = &_grib_accessor_class_octect_number; grib_accessor_class* grib_accessor_class_octet_number = &_grib_accessor_class_octet_number;
static void init_class(grib_accessor_class* c) static void init_class(grib_accessor_class* c)
@ -139,7 +139,7 @@ static void init_class(grib_accessor_class* c)
static void init(grib_accessor* a, const long l, grib_arguments* c) static void init(grib_accessor* a, const long l, grib_arguments* c)
{ {
grib_accessor_octect_number* self = (grib_accessor_octect_number*)a; grib_accessor_octet_number* self = (grib_accessor_octet_number*)a;
int n = 0; int n = 0;
self->left = grib_arguments_get_name(grib_handle_of_accessor(a), c, n++); self->left = grib_arguments_get_name(grib_handle_of_accessor(a), c, n++);
@ -150,7 +150,7 @@ static void init(grib_accessor* a, const long l, grib_arguments* c)
static int unpack_long(grib_accessor* a, long* val, size_t* len) static int unpack_long(grib_accessor* a, long* val, size_t* len)
{ {
grib_accessor_octect_number* self = (grib_accessor_octect_number*)a; grib_accessor_octet_number* self = (grib_accessor_octet_number*)a;
int ret = 0; int ret = 0;
long offset; long offset;

965
src/grib_accessor_classes_hash.c
View File

File diff suppressed because it is too large Load Diff

2
src/grib_accessor_factory.h
View File

@ -153,7 +153,7 @@
{ "number_of_values", &grib_accessor_class_number_of_values, }, { "number_of_values", &grib_accessor_class_number_of_values, },
{ "number_of_values_data_raw_packing", &grib_accessor_class_number_of_values_data_raw_packing, }, { "number_of_values_data_raw_packing", &grib_accessor_class_number_of_values_data_raw_packing, },
{ "octahedral_gaussian", &grib_accessor_class_octahedral_gaussian, }, { "octahedral_gaussian", &grib_accessor_class_octahedral_gaussian, },
{ "octect_number", &grib_accessor_class_octect_number, }, { "octet_number", &grib_accessor_class_octet_number, },
{ "offset_file", &grib_accessor_class_offset_file, }, { "offset_file", &grib_accessor_class_offset_file, },
{ "offset_values", &grib_accessor_class_offset_values, }, { "offset_values", &grib_accessor_class_offset_values, },
{ "pack_bufr_values", &grib_accessor_class_pack_bufr_values, }, { "pack_bufr_values", &grib_accessor_class_pack_bufr_values, },

2
src/grib_accessor_factory_hash_list
View File

@ -154,7 +154,7 @@ number_of_points_gaussian, &grib_accessor_class_number_of_points_gaussian
number_of_values, &grib_accessor_class_number_of_values number_of_values, &grib_accessor_class_number_of_values
number_of_values_data_raw_packing, &grib_accessor_class_number_of_values_data_raw_packing number_of_values_data_raw_packing, &grib_accessor_class_number_of_values_data_raw_packing
octahedral_gaussian, &grib_accessor_class_octahedral_gaussian octahedral_gaussian, &grib_accessor_class_octahedral_gaussian
octect_number, &grib_accessor_class_octect_number octet_number, &grib_accessor_class_octet_number
offset_file, &grib_accessor_class_offset_file offset_file, &grib_accessor_class_offset_file
offset_values, &grib_accessor_class_offset_values offset_values, &grib_accessor_class_offset_values
pack_bufr_values, &grib_accessor_class_pack_bufr_values pack_bufr_values, &grib_accessor_class_pack_bufr_values

2
src/grib_api_prototypes.h
View File

@ -516,7 +516,7 @@ grib_box* grib_box_new(grib_handle* h, int* error);
/* grib_accessor_class_lookup.c */ /* grib_accessor_class_lookup.c */
/* grib_accessor_class_octect_number.c */ /* grib_accessor_class_octet_number.c */
/* grib_accessor_class_headers_only.c */ /* grib_accessor_class_headers_only.c */

2
windows/msvc/grib_api_lib/grib_api_lib.vcxproj
View File

@ -354,7 +354,7 @@
<ClCompile Include="..\..\..\src\grib_accessor_class_number_of_values.c" /> <ClCompile Include="..\..\..\src\grib_accessor_class_number_of_values.c" />
<ClCompile Include="..\..\..\src\grib_accessor_class_number_of_values_data_raw_packing.c" /> <ClCompile Include="..\..\..\src\grib_accessor_class_number_of_values_data_raw_packing.c" />
<ClCompile Include="..\..\..\src\grib_accessor_class_octahedral_gaussian.c" /> <ClCompile Include="..\..\..\src\grib_accessor_class_octahedral_gaussian.c" />
<ClCompile Include="..\..\..\src\grib_accessor_class_octect_number.c" /> <ClCompile Include="..\..\..\src\grib_accessor_class_octet_number.c" />
<ClCompile Include="..\..\..\src\grib_accessor_class_offset_file.c" /> <ClCompile Include="..\..\..\src\grib_accessor_class_offset_file.c" />
<ClCompile Include="..\..\..\src\grib_accessor_class_offset_values.c" /> <ClCompile Include="..\..\..\src\grib_accessor_class_offset_values.c" />
<ClCompile Include="..\..\..\src\grib_accessor_class_pack_bufr_values.c" /> <ClCompile Include="..\..\..\src\grib_accessor_class_pack_bufr_values.c" />

2
windows/msvc/grib_api_lib/grib_api_lib.vcxproj.filters
View File

@ -585,7 +585,7 @@
<ClCompile Include="..\..\..\src\grib_accessor_class_octahedral_gaussian.c"> <ClCompile Include="..\..\..\src\grib_accessor_class_octahedral_gaussian.c">
<Filter>Source Files</Filter> <Filter>Source Files</Filter>
</ClCompile> </ClCompile>
<ClCompile Include="..\..\..\src\grib_accessor_class_octect_number.c"> <ClCompile Include="..\..\..\src\grib_accessor_class_octet_number.c">
<Filter>Source Files</Filter> <Filter>Source Files</Filter>
</ClCompile> </ClCompile>
<ClCompile Include="..\..\..\src\grib_accessor_class_offset_file.c"> <ClCompile Include="..\..\..\src\grib_accessor_class_offset_file.c">