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

ECC-1699: Dump

This commit is contained in:
Shahram Najm 2023-12-05 13:02:27 +00:00
parent 3cb61d994f
commit 161a048488
11 changed files with 63 additions and 37 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/bufr_util.cc
View File

@ -1134,3 +1134,11 @@ int codes_bufr_key_is_coordinate(const grib_handle* h, const char* key, int* err
*err = GRIB_SUCCESS; *err = GRIB_SUCCESS;
return ((acc->flags & GRIB_ACCESSOR_FLAG_BUFR_COORD) != 0); return ((acc->flags & GRIB_ACCESSOR_FLAG_BUFR_COORD) != 0);
} }
int codes_bufr_key_exclude_from_dump(const char* key)
{
if (strstr(key, "percentConfidence->percentConfidence->percentConfidence->percentConfidence->percentConfidence")) {
return 1;
}
return 0;
}

1
src/eccodes_prototypes.h
View File

@ -1382,6 +1382,7 @@ int codes_bufr_extract_headers_malloc(grib_context* c, const char* filename, cod
int codes_bufr_header_get_string(codes_bufr_header* bh, const char* key, char* val, size_t* len); int codes_bufr_header_get_string(codes_bufr_header* bh, const char* key, char* val, size_t* len);
int codes_bufr_key_is_header(const grib_handle* h, const char* key, int* err); int codes_bufr_key_is_header(const grib_handle* h, const char* key, int* err);
int codes_bufr_key_is_coordinate(const grib_handle* h, const char* key, int* err); int codes_bufr_key_is_coordinate(const grib_handle* h, const char* key, int* err);
int codes_bufr_key_exclude_from_dump(const char* key);
/* string_util.cc*/ /* string_util.cc*/
int strcmp_nocase(const char* s1, const char* s2); int strcmp_nocase(const char* s1, const char* s2);

18
src/grib_dumper_class_bufr_decode_C.cc
View File

@ -326,11 +326,13 @@ static void dump_long(grib_dumper* d, grib_accessor* a, const char* comment)
} }
else { else {
r = compute_bufr_key_rank(h, self->keys, a->name); r = compute_bufr_key_rank(h, self->keys, a->name);
if (!grib_is_missing_long(a, value)) { if (!codes_bufr_key_exclude_from_dump(a->name)) {
if (r != 0) if (!grib_is_missing_long(a, value)) {
fprintf(self->dumper.out, " CODES_CHECK(codes_get_long(h, \"#%d#%s\", &iVal), 0);\n", r, a->name); if (r != 0)
else fprintf(self->dumper.out, " CODES_CHECK(codes_get_long(h, \"#%d#%s\", &iVal), 0);\n", r, a->name);
fprintf(self->dumper.out, " CODES_CHECK(codes_get_long(h, \"%s\", &iVal), 0);\n", a->name); else
fprintf(self->dumper.out, " CODES_CHECK(codes_get_long(h, \"%s\", &iVal), 0);\n", a->name);
}
} }
} }
@ -388,8 +390,10 @@ static void dump_long_attribute(grib_dumper* d, grib_accessor* a, const char* pr
} }
else { else {
/* int r=compute_bufr_key_rank(h,self->keys,a->name); */ /* int r=compute_bufr_key_rank(h,self->keys,a->name); */
if (!grib_is_missing_long(a, value)) { if (!codes_bufr_key_exclude_from_dump(prefix)) {
fprintf(self->dumper.out, " CODES_CHECK(codes_get_long(h, \"%s->%s\", &iVal), 0);\n", prefix, a->name); if (!grib_is_missing_long(a, value)) {
fprintf(self->dumper.out, " CODES_CHECK(codes_get_long(h, \"%s->%s\", &iVal), 0);\n", prefix, a->name);
}
} }
} }

5
src/grib_dumper_class_bufr_decode_filter.cc
View File

@ -322,8 +322,9 @@ static void dump_long_attribute(grib_dumper* d, grib_accessor* a, const char* pr
return; return;
self->empty = 0; self->empty = 0;
fprintf(self->dumper.out, "print \"%s->%s = [%s->%s]\";\n", prefix, a->name, prefix, a->name); if (!codes_bufr_key_exclude_from_dump(prefix)) {
fprintf(self->dumper.out, "print \"%s->%s = [%s->%s]\";\n", prefix, a->name, prefix, a->name);
}
if (self->isLeaf == 0) { if (self->isLeaf == 0) {
char* prefix1 = (char*)grib_context_malloc_clear(c, sizeof(char) * (strlen(a->name) + strlen(prefix) + 5)); char* prefix1 = (char*)grib_context_malloc_clear(c, sizeof(char) * (strlen(a->name) + strlen(prefix) + 5));
snprintf(prefix1, 1024, "%s->%s", prefix, a->name); snprintf(prefix1, 1024, "%s->%s", prefix, a->name);

6
src/grib_dumper_class_bufr_decode_fortran.cc
View File

@ -347,8 +347,10 @@ static void dump_long_attribute(grib_dumper* d, grib_accessor* a, const char* pr
fprintf(self->dumper.out, " call codes_get(ibufr, '%s->%s', iValues)\n", prefix, a->name); fprintf(self->dumper.out, " call codes_get(ibufr, '%s->%s', iValues)\n", prefix, a->name);
} }
else { else {
if (!grib_is_missing_long(a, value)) { if (!codes_bufr_key_exclude_from_dump(prefix)) {
fprintf(self->dumper.out, " call codes_get(ibufr, '%s->%s', iVal)\n", prefix, a->name); if (!grib_is_missing_long(a, value)) {
fprintf(self->dumper.out, " call codes_get(ibufr, '%s->%s', iVal)\n", prefix, a->name);
}
} }
} }

6
src/grib_dumper_class_bufr_decode_python.cc
View File

@ -359,8 +359,10 @@ static void dump_long_attribute(grib_dumper* d, grib_accessor* a, const char* pr
fprintf(self->dumper.out, " iVals = codes_get_array(ibufr, '%s->%s')\n", prefix, a->name); fprintf(self->dumper.out, " iVals = codes_get_array(ibufr, '%s->%s')\n", prefix, a->name);
} }
else { else {
if (!grib_is_missing_long(a, value)) { if (!codes_bufr_key_exclude_from_dump(prefix)) {
fprintf(self->dumper.out, " iVal = codes_get(ibufr, '%s->%s')\n", prefix, a->name); if (!grib_is_missing_long(a, value)) {
fprintf(self->dumper.out, " iVal = codes_get(ibufr, '%s->%s')\n", prefix, a->name);
}
} }
} }

10
src/grib_dumper_class_bufr_encode_C.cc
View File

@ -524,10 +524,12 @@ static void dump_long_attribute(grib_dumper* d, grib_accessor* a, const char* pr
fprintf(self->dumper.out, " CODES_CHECK(codes_set_long_array(h, \"%s->%s\", ivalues, size), 0);\n", prefix, a->name); fprintf(self->dumper.out, " CODES_CHECK(codes_set_long_array(h, \"%s->%s\", ivalues, size), 0);\n", prefix, a->name);
} }
else { else {
char* sval = lval_to_string(c, value); if (!codes_bufr_key_exclude_from_dump(prefix)) {
fprintf(self->dumper.out, " CODES_CHECK(codes_set_long(h, \"%s->%s\", ", prefix, a->name); char* sval = lval_to_string(c, value);
fprintf(self->dumper.out, "%s), 0);\n", sval); fprintf(self->dumper.out, " CODES_CHECK(codes_set_long(h, \"%s->%s\", ", prefix, a->name);
grib_context_free(c, sval); fprintf(self->dumper.out, "%s), 0);\n", sval);
grib_context_free(c, sval);
}
} }
if (self->isLeaf == 0) { if (self->isLeaf == 0) {

8
src/grib_dumper_class_bufr_encode_filter.cc
View File

@ -451,9 +451,11 @@ static void dump_long_attribute(grib_dumper* d, grib_accessor* a, const char* pr
} }
else { else {
/* int r=compute_bufr_key_rank(h,self->keys,a->name); */ /* int r=compute_bufr_key_rank(h,self->keys,a->name); */
if (!grib_is_missing_long(a, value)) { if (!codes_bufr_key_exclude_from_dump(prefix)) {
fprintf(self->dumper.out, "set %s->%s = ", prefix, a->name); if (!grib_is_missing_long(a, value)) {
fprintf(self->dumper.out, "%ld ;\n", value); fprintf(self->dumper.out, "set %s->%s = ", prefix, a->name);
fprintf(self->dumper.out, "%ld ;\n", value);
}
} }
} }

10
src/grib_dumper_class_bufr_encode_fortran.cc
View File

@ -573,10 +573,12 @@ static void dump_long_attribute(grib_dumper* d, grib_accessor* a, const char* pr
fprintf(self->dumper.out, " call codes_set(ibufr,'%s->%s' &\n,ivalues)\n", pref, a->name); fprintf(self->dumper.out, " call codes_set(ibufr,'%s->%s' &\n,ivalues)\n", pref, a->name);
} }
else { else {
char* sval = lval_to_string(c, value); if (!codes_bufr_key_exclude_from_dump(prefix)) {
fprintf(self->dumper.out, " call codes_set(ibufr,'%s->%s'&\n,", pref, a->name); char* sval = lval_to_string(c, value);
fprintf(self->dumper.out, "%s)\n", sval); fprintf(self->dumper.out, " call codes_set(ibufr,'%s->%s'&\n,", pref, a->name);
grib_context_free(c, sval); fprintf(self->dumper.out, "%s)\n", sval);
grib_context_free(c, sval);
}
} }
if (self->isLeaf == 0) { if (self->isLeaf == 0) {

10
src/grib_dumper_class_bufr_encode_python.cc
View File

@ -519,10 +519,12 @@ static void dump_long_attribute(grib_dumper* d, grib_accessor* a, const char* pr
fprintf(self->dumper.out, " codes_set_array(ibufr, '%s->%s', ivalues)\n", prefix, a->name); fprintf(self->dumper.out, " codes_set_array(ibufr, '%s->%s', ivalues)\n", prefix, a->name);
} }
else { else {
char* sval = lval_to_string(c, value); if (!codes_bufr_key_exclude_from_dump(prefix)) {
fprintf(self->dumper.out, " codes_set(ibufr, '%s->%s', ", prefix, a->name); char* sval = lval_to_string(c, value);
fprintf(self->dumper.out, "%s)\n", sval); fprintf(self->dumper.out, " codes_set(ibufr, '%s->%s', ", prefix, a->name);
grib_context_free(c, sval); fprintf(self->dumper.out, "%s)\n", sval);
grib_context_free(c, sval);
}
} }
if (self->isLeaf == 0) { if (self->isLeaf == 0) {

18
src/grib_dumper_class_bufr_simple.cc
View File

@ -466,19 +466,19 @@ static void dump_long_attribute(grib_dumper* d, grib_accessor* a, const char* pr
} }
else { else {
/* int r=compute_bufr_key_rank(h,self->keys,a->name); */ /* int r=compute_bufr_key_rank(h,self->keys,a->name); */
if (!grib_is_missing_long(a, value)) { if (!codes_bufr_key_exclude_from_dump(prefix)) {
fprintf(self->dumper.out, "%s->%s = ", prefix, a->name); if (!grib_is_missing_long(a, value)) {
fprintf(self->dumper.out, "%ld\n", value); fprintf(self->dumper.out, "%s->%s = ", prefix, a->name);
} fprintf(self->dumper.out, "%ld\n", value);
else { }
fprintf(self->dumper.out, "%s->%s = MISSING\n", prefix, a->name); else {
fprintf(self->dumper.out, "%s->%s = MISSING\n", prefix, a->name);
}
} }
} }
if (self->isLeaf == 0) { if (self->isLeaf == 0) {
char* prefix1; char* prefix1 = (char*)grib_context_malloc_clear(c, sizeof(char) * (strlen(a->name) + strlen(prefix) + 5));
prefix1 = (char*)grib_context_malloc_clear(c, sizeof(char) * (strlen(a->name) + strlen(prefix) + 5));
snprintf(prefix1, 1024, "%s->%s", prefix, a->name); snprintf(prefix1, 1024, "%s->%s", prefix, a->name);
dump_attributes(d, a, prefix1); dump_attributes(d, a, prefix1);