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

Refactoring

This commit is contained in:
Shahram Najm 2018-08-07 14:25:26 +01:00
parent a72e9bf75a
commit f2f9331914
4 changed files with 107 additions and 104 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/grib_iterator_class_gaussian_reduced.c
View File

@ -146,7 +146,7 @@ static int iterate_reduced_gaussian_subarea(grib_iterator* iter, grib_handle* h,
if (h->context->debug) {
const size_t np = count_subarea_points(h, get_reduced_row, pl, plsize, lon_first, lon_last);
printf("ECCODES DEBUG grib_iterator_class_gaussian_reduced: sub-area num points=%ld\n", np);
printf("ECCODES DEBUG grib_iterator_class_gaussian_reduced: sub-area num points=%ld\n", (long)np);
}
/*find starting latitude */
@ -282,7 +282,7 @@ static int init(grib_iterator* iter, grib_handle* h, grib_arguments* args)
iter->e=0;
if (h->context->debug) {
const size_t np = count_global_points(pl, plsize);
printf("ECCODES DEBUG grib_iterator_class_gaussian_reduced: global num points=%ld\n", np);
printf("ECCODES DEBUG grib_iterator_class_gaussian_reduced: global num points=%ld\n", (long)np);
}
for (j=0;j<plsize;j++) {

5
tools/grib_index_build.c
View File

@ -28,14 +28,15 @@ grib_option grib_options[]={
{"o:","output_index_file",
"\n\t\tOutput is written to output_index_file."
"\n\t\tIf an output index file is required and -o is not used, the"
" output index is written to gribidx\n",
" output index is written to 'gribidx'\n",
1,1,"gribidx"},
{"k:",0,0,0,1,0},
{"V",0,0,0,1,0},
{"T:",0,0,0,1,0},
{"M",0,0,0,1,0},
{"N",0,"Do not compress index."
"\n\t\tBy default the index is compressed to remove keys with only one value.\n",0,1,0}
"\n\t\tBy default the index is compressed to remove keys with only one value.\n",0,1,0
}
};
int compress_index;

1
tools/gts_ls.c
View File

@ -94,7 +94,6 @@ int grib_tool_new_handle_action(grib_runtime_options* options, grib_handle* h)
if( err != GRIB_SUCCESS && options->fail) exit(err);
}
/*new_handle="\n,";*/
return 0;
}

201
tools/metar_dump.c
View File

@ -42,119 +42,122 @@ const char* grib_tool_usage="[options] file file ...";
int grib_options_count=sizeof(grib_options)/sizeof(grib_option);
/**
* metar_dump
*/
int main(int argc, char *argv[]) { return grib_tool(argc,argv);}
int grib_tool_before_getopt(grib_runtime_options* options) {
return 0;
int main(int argc, char *argv[])
{
return grib_tool(argc,argv);
}
int grib_tool_init(grib_runtime_options* options) {
int opt=grib_options_on("C")+grib_options_on("O")+grib_options_on("D");
options->dump_mode = "default";
if (opt > 1) {
printf("%s: simultaneous O/D options not allowed\n",grib_tool_name);
exit(1);
}
if (grib_options_on("O")) {
options->dump_mode = "wmo";
options->dump_flags = GRIB_DUMP_FLAG_CODED
| GRIB_DUMP_FLAG_OCTECT
| GRIB_DUMP_FLAG_VALUES
| GRIB_DUMP_FLAG_READ_ONLY;
}
if (grib_options_on("D")) {
options->dump_mode = "debug";
options->dump_flags = GRIB_DUMP_FLAG_VALUES
| GRIB_DUMP_FLAG_READ_ONLY;
}
if (grib_options_on("J")) {
options->dump_mode = "json";
options->dump_flags = GRIB_DUMP_FLAG_VALUES
| GRIB_DUMP_FLAG_READ_ONLY;
}
if (grib_options_on("X")) {
options->dump_mode = "xml";
options->dump_flags = GRIB_DUMP_FLAG_VALUES
| GRIB_DUMP_FLAG_READ_ONLY;
}
if (grib_options_on("a"))
options->dump_flags |= GRIB_DUMP_FLAG_ALIASES;
if (grib_options_on("t"))
options->dump_flags |= GRIB_DUMP_FLAG_TYPE;
if (grib_options_on("H"))
options->dump_flags |= GRIB_DUMP_FLAG_HEXADECIMAL;
if (grib_options_on("d"))
options->dump_flags |= GRIB_DUMP_FLAG_ALL_DATA;
return 0;
int grib_tool_before_getopt(grib_runtime_options* options)
{
return 0;
}
int grib_tool_new_filename_action(grib_runtime_options* options,const char* file) {
return 0;
int grib_tool_init(grib_runtime_options* options)
{
int opt=grib_options_on("C")+grib_options_on("O")+grib_options_on("D");
options->dump_mode = "default";
if (opt > 1) {
printf("%s: simultaneous O/D options not allowed\n",grib_tool_name);
exit(1);
}
if (grib_options_on("O")) {
options->dump_mode = "wmo";
options->dump_flags = GRIB_DUMP_FLAG_CODED
| GRIB_DUMP_FLAG_OCTECT
| GRIB_DUMP_FLAG_VALUES
| GRIB_DUMP_FLAG_READ_ONLY;
}
if (grib_options_on("D")) {
options->dump_mode = "debug";
options->dump_flags = GRIB_DUMP_FLAG_VALUES | GRIB_DUMP_FLAG_READ_ONLY;
}
if (grib_options_on("J")) {
options->dump_mode = "json";
options->dump_flags = GRIB_DUMP_FLAG_VALUES | GRIB_DUMP_FLAG_READ_ONLY;
}
if (grib_options_on("X")) {
options->dump_mode = "xml";
options->dump_flags = GRIB_DUMP_FLAG_VALUES | GRIB_DUMP_FLAG_READ_ONLY;
}
if (grib_options_on("a"))
options->dump_flags |= GRIB_DUMP_FLAG_ALIASES;
if (grib_options_on("t"))
options->dump_flags |= GRIB_DUMP_FLAG_TYPE;
if (grib_options_on("H"))
options->dump_flags |= GRIB_DUMP_FLAG_HEXADECIMAL;
if (grib_options_on("d"))
options->dump_flags |= GRIB_DUMP_FLAG_ALL_DATA;
return 0;
}
int grib_tool_new_file_action(grib_runtime_options* options,grib_tools_file* file) {
char tmp[1024];
if (!options->current_infile->name) return 0;
sprintf(tmp,"FILE: %s ",options->current_infile->name);
if (!grib_options_on("C") && !grib_options_on("J") && !grib_options_on("X") )
fprintf(stdout,"***** %s\n",tmp);
return 0;
int grib_tool_new_filename_action(grib_runtime_options* options,const char* file)
{
return 0;
}
int grib_tool_new_handle_action(grib_runtime_options* options, grib_handle* h) {
long length=0;
char tmp[1024];
char identifier[100];
size_t idlen=100;
int i;
if (grib_get_long(h,"totalLength",&length) != GRIB_SUCCESS)
length=-9999;
for (i=0;i<options->print_keys_count;i++)
grib_set_flag(h,options->print_keys[i].name,GRIB_ACCESSOR_FLAG_DUMP);
sprintf(tmp,"MESSAGE %d ( length=%ld )",options->handle_count,length);
if (!grib_options_on("C") && !grib_options_on("X") && !grib_options_on("J") )
fprintf(stdout,"#============== %-38s ==============\n",tmp);
if (!strcmp(options->dump_mode,"default")) {
GRIB_CHECK_NOLINE(grib_get_string(h,"identifier",identifier,&idlen),0);
printf("%s {\n",identifier);
}
grib_dump_content(h,stdout,options->dump_mode,options->dump_flags,0);
if (!strcmp(options->dump_mode,"default"))
printf("}\n");
return 0;
int grib_tool_new_file_action(grib_runtime_options* options,grib_tools_file* file)
{
char tmp[1024];
if (!options->current_infile->name) return 0;
sprintf(tmp,"FILE: %s ",options->current_infile->name);
if (!grib_options_on("C") && !grib_options_on("J") && !grib_options_on("X") )
fprintf(stdout,"***** %s\n",tmp);
return 0;
}
int grib_tool_skip_handle(grib_runtime_options* options, grib_handle* h) {
grib_handle_delete(h);
return 0;
int grib_tool_new_handle_action(grib_runtime_options* options, grib_handle* h)
{
long length=0;
char tmp[1024];
char identifier[100];
size_t idlen=100;
int i;
if (grib_get_long(h,"totalLength",&length) != GRIB_SUCCESS)
length=-9999;
for (i=0;i<options->print_keys_count;i++)
grib_set_flag(h,options->print_keys[i].name,GRIB_ACCESSOR_FLAG_DUMP);
sprintf(tmp,"MESSAGE %d ( length=%ld )",options->handle_count,length);
if (!grib_options_on("C") && !grib_options_on("X") && !grib_options_on("J") )
fprintf(stdout,"#============== %-38s ==============\n",tmp);
if (!strcmp(options->dump_mode,"default")) {
GRIB_CHECK_NOLINE(grib_get_string(h,"identifier",identifier,&idlen),0);
printf("%s {\n",identifier);
}
grib_dump_content(h,stdout,options->dump_mode,options->dump_flags,0);
if (!strcmp(options->dump_mode,"default"))
printf("}\n");
return 0;
}
void grib_tool_print_key_values(grib_runtime_options* options,grib_handle* h) {
grib_print_key_values(options,h);
int grib_tool_skip_handle(grib_runtime_options* options, grib_handle* h)
{
grib_handle_delete(h);
return 0;
}
int grib_tool_finalise_action(grib_runtime_options* options) {
return 0;
void grib_tool_print_key_values(grib_runtime_options* options,grib_handle* h)
{
grib_print_key_values(options,h);
}
int grib_tool_finalise_action(grib_runtime_options* options)
{
return 0;
}
int grib_no_handle_action(grib_runtime_options* options, int err)