2013-03-25 12:04:10 +00:00
|
|
|
/*
|
2020-01-28 14:32:34 +00:00
|
|
|
* (C) Copyright 2005- ECMWF.
|
2013-03-25 12:04:10 +00:00
|
|
|
*
|
|
|
|
* This software is licensed under the terms of the Apache Licence Version 2.0
|
|
|
|
* which can be obtained at http://www.apache.org/licenses/LICENSE-2.0.
|
|
|
|
*
|
|
|
|
* In applying this licence, ECMWF does not waive the privileges and immunities granted to it by
|
|
|
|
* virtue of its status as an intergovernmental organisation nor does it submit to any jurisdiction.
|
|
|
|
*/
|
|
|
|
|
|
|
|
#include "grib_tools.h"
|
|
|
|
|
2021-02-03 21:50:43 +00:00
|
|
|
grib_option grib_options[] = {
|
|
|
|
/* {id, args, help}, on, command_line, value*/
|
|
|
|
{ "r", 0, "Compare files in which the messages are not in the same order. This option is time expensive.\n", 0, 1, 0 },
|
|
|
|
{ "b:", 0, 0, 0, 1, 0 },
|
|
|
|
{ "e", 0, "Edition independent compare. It is used to compare GRIB edition 1 and 2.\n", 0, 1, 0 },
|
|
|
|
{ "2", 0, "Enable two-way comparison.\n", 0, 1, 0 },
|
|
|
|
{ "c:", 0, 0, 0, 1, 0 },
|
|
|
|
{ "S:", "start", "First field to be processed.\n", 0, 1, 0 },
|
|
|
|
{ "E:", "end", "Last field to be processed.\n", 0, 1, 0 },
|
|
|
|
{ "a", 0, "-c option modifier. The keys listed with the option -c will be added to the list of keys compared without -c.\n", 0, 1, 0 },
|
|
|
|
{ "H", 0, "Compare only message headers (everything except data and bitmap). Bit-by-bit compare on. Incompatible with -c option.\n", 0, 1, 0 },
|
|
|
|
{ "R:", 0, 0, 0, 1, 0 },
|
|
|
|
{ "A:", 0, 0, 0, 1, 0 },
|
|
|
|
{ "P", 0, "Compare data values using the packing error as tolerance.\n", 0, 1, 0 },
|
|
|
|
{ "T:", "factor", "Compare data values using factor multiplied by the tolerance specified in options -P -R -A.\n", 0, 1, 0 },
|
|
|
|
{ "w:", 0, 0, 0, 1, 0 },
|
|
|
|
{ "f", 0, 0, 0, 1, 0 },
|
|
|
|
{ "F", 0, 0, 1, 0, 0 },
|
|
|
|
{ "q", 0, 0, 1, 0, 0 },
|
|
|
|
{ "M", 0, 0, 1, 0, 0 },
|
|
|
|
{ "I", 0, 0, 1, 0, 0 },
|
|
|
|
{ "V", 0, 0, 0, 1, 0 },
|
|
|
|
{ "7", 0, 0, 0, 1, 0 },
|
|
|
|
{ "v", 0, 0, 0, 1, 0 }
|
|
|
|
};
|
|
|
|
int grib_options_count = sizeof(grib_options) / sizeof(grib_option);
|
2013-03-25 12:04:10 +00:00
|
|
|
|
2021-02-03 21:50:43 +00:00
|
|
|
const char* tool_description =
|
|
|
|
"Compare GRIB messages contained in two files."
|
|
|
|
"\n\tIf some differences are found it fails returning an error code."
|
|
|
|
"\n\tFloating-point values are compared exactly by default, different tolerances can be defined (see -P -A -R)."
|
|
|
|
"\n\tDefault behaviour: absolute error=0, bit-by-bit compare, same order in files.";
|
|
|
|
|
|
|
|
const char* tool_name = "grib_compare";
|
2023-01-04 21:16:24 +00:00
|
|
|
const char* tool_online_doc = "https://confluence.ecmwf.int/display/ECC/grib_compare";
|
2021-02-03 21:50:43 +00:00
|
|
|
const char* tool_usage = "[options] grib_file1 grib_file2";
|
2013-03-25 12:04:10 +00:00
|
|
|
|
2021-11-06 14:18:48 +00:00
|
|
|
typedef double (*compare_double_proc)(const double*, const double*, double);
|
2021-02-03 21:50:43 +00:00
|
|
|
static int compare_handles(grib_handle* h1, grib_handle* h2, grib_runtime_options* options);
|
2013-03-25 12:04:10 +00:00
|
|
|
|
|
|
|
typedef struct grib_error grib_error;
|
2020-01-22 13:10:59 +00:00
|
|
|
struct grib_error
|
|
|
|
{
|
2014-01-10 14:07:02 +00:00
|
|
|
char* key;
|
|
|
|
int count;
|
|
|
|
grib_error* next;
|
2013-03-25 12:04:10 +00:00
|
|
|
};
|
|
|
|
|
2019-08-12 15:00:15 +00:00
|
|
|
static grib_error* error_summary;
|
|
|
|
static compare_double_proc compare_double;
|
2020-01-22 13:10:59 +00:00
|
|
|
static double global_tolerance = 0;
|
|
|
|
static int packingCompare = 0;
|
2020-09-24 14:54:33 +00:00
|
|
|
static grib_string_list* blocklist = 0;
|
2020-01-22 13:10:59 +00:00
|
|
|
static int compareAbsolute = 1;
|
|
|
|
|
|
|
|
static int error = 0;
|
|
|
|
static int count = 0;
|
|
|
|
static int lastPrint = 0;
|
|
|
|
static int force = 0;
|
2018-03-13 15:48:00 +00:00
|
|
|
|
2018-03-13 15:56:11 +00:00
|
|
|
/* ECC-651: Boolean 'two_way' set to 1 when '-2' option used */
|
2020-01-22 13:10:59 +00:00
|
|
|
static int two_way = 0;
|
2018-03-13 15:56:11 +00:00
|
|
|
/* Boolean 'handles_swapped' relevant in 'two_way' mode:
|
2018-03-13 15:48:00 +00:00
|
|
|
* 0 means: h1 is first file, h2 is second file
|
|
|
|
* 1 means: h1 is second file, h2 is first file
|
|
|
|
*/
|
2020-01-22 13:10:59 +00:00
|
|
|
static int handles_swapped = 0;
|
2018-03-13 15:48:00 +00:00
|
|
|
|
2019-08-12 15:00:15 +00:00
|
|
|
static double maxAbsoluteError = 1e-19;
|
2020-01-22 13:10:59 +00:00
|
|
|
static int onlyListed = 1;
|
|
|
|
static int headerMode = 0;
|
|
|
|
static int morein1 = 0;
|
|
|
|
static int morein2 = 0;
|
2021-12-17 17:03:34 +00:00
|
|
|
static int listFromCommandLine = 0;
|
|
|
|
static int editionIndependent = 0;
|
2020-01-22 13:10:59 +00:00
|
|
|
static int verbose = 0;
|
|
|
|
static double tolerance_factor = 1;
|
2013-03-25 12:04:10 +00:00
|
|
|
|
2021-02-03 21:50:43 +00:00
|
|
|
static grib_handle* handle1 = NULL;
|
|
|
|
static int global_counter = 0;
|
|
|
|
static int theStart = -1;
|
|
|
|
static int theEnd = -1;
|
|
|
|
|
2021-04-29 15:54:04 +00:00
|
|
|
#define MINIMUM(x, y) ((x) < (y) ? (x) : (y))
|
|
|
|
|
2021-02-03 21:50:43 +00:00
|
|
|
GRIB_INLINE static int grib_inline_strcmp(const char* a, const char* b)
|
|
|
|
{
|
|
|
|
if (*a != *b)
|
|
|
|
return 1;
|
|
|
|
while ((*a != 0 && *b != 0) && *(a) == *(b)) {
|
|
|
|
a++;
|
|
|
|
b++;
|
|
|
|
}
|
|
|
|
return (*a == 0 && *b == 0) ? 0 : 1;
|
|
|
|
}
|
|
|
|
|
|
|
|
GRIB_INLINE static int grib_inline_rstrcmp(const char* a, const char* b)
|
|
|
|
{
|
|
|
|
const char* p = a;
|
|
|
|
const char* q = b;
|
|
|
|
while (*p != 0)
|
|
|
|
p++;
|
|
|
|
while (*q != 0)
|
|
|
|
q++;
|
|
|
|
q--;
|
|
|
|
p--;
|
|
|
|
if (*q != *p)
|
|
|
|
return 1;
|
|
|
|
while ((p != a && q != b) && *(p) == *(q)) {
|
|
|
|
p--;
|
|
|
|
q--;
|
|
|
|
}
|
|
|
|
return (q == b) ? 0 : 1;
|
|
|
|
}
|
|
|
|
|
2016-04-15 15:01:15 +00:00
|
|
|
/* Returns 0 when the values are considered the same */
|
2021-11-06 14:18:48 +00:00
|
|
|
static double compare_double_absolute(const double* a, const double* b, double tolerance)
|
2013-07-17 10:11:59 +00:00
|
|
|
{
|
2020-01-22 13:10:59 +00:00
|
|
|
double ret = 0;
|
|
|
|
double d = fabs(*a - *b);
|
2016-04-15 15:01:15 +00:00
|
|
|
if (d > tolerance) {
|
2020-01-22 13:10:59 +00:00
|
|
|
ret = d;
|
2014-01-10 14:07:02 +00:00
|
|
|
}
|
|
|
|
return ret;
|
|
|
|
/* return fabs(*a-*b) > *err ? fabs(*a-*b) : 0; */
|
2013-03-25 12:04:10 +00:00
|
|
|
}
|
|
|
|
|
2016-04-15 15:01:15 +00:00
|
|
|
/* Returns 0 when the values are considered the same */
|
2021-11-06 14:18:48 +00:00
|
|
|
static double compare_double_relative(const double* a, const double* b, double tolerance)
|
2013-07-17 10:11:59 +00:00
|
|
|
{
|
2014-01-10 14:07:02 +00:00
|
|
|
double relativeError;
|
2013-03-25 12:04:10 +00:00
|
|
|
|
2020-01-22 13:10:59 +00:00
|
|
|
if (fabs(*a) <= maxAbsoluteError || fabs(*b) <= maxAbsoluteError)
|
|
|
|
relativeError = fabs(*a - *b);
|
2014-01-10 14:07:02 +00:00
|
|
|
else if (fabs(*b) > fabs(*a))
|
2020-01-22 13:10:59 +00:00
|
|
|
relativeError = fabs((*a - *b) / *b);
|
2014-01-10 14:07:02 +00:00
|
|
|
else
|
2020-01-22 13:10:59 +00:00
|
|
|
relativeError = fabs((*a - *b) / *a);
|
2013-03-25 12:04:10 +00:00
|
|
|
|
2016-04-15 15:01:15 +00:00
|
|
|
return relativeError > tolerance ? relativeError : 0;
|
2013-03-25 12:04:10 +00:00
|
|
|
}
|
|
|
|
|
2020-09-24 14:54:33 +00:00
|
|
|
static int blocklisted(const char* name)
|
2013-07-17 10:11:59 +00:00
|
|
|
{
|
2020-09-24 14:54:33 +00:00
|
|
|
grib_string_list* b = blocklist;
|
2014-01-10 14:07:02 +00:00
|
|
|
while (b) {
|
2014-11-06 16:11:03 +00:00
|
|
|
Assert(b->value);
|
2020-01-22 13:10:59 +00:00
|
|
|
if (!strcmp(name, b->value))
|
2014-01-10 14:07:02 +00:00
|
|
|
return 1;
|
2020-01-22 13:10:59 +00:00
|
|
|
b = b->next;
|
2014-01-10 14:07:02 +00:00
|
|
|
}
|
|
|
|
return 0;
|
2013-03-25 12:04:10 +00:00
|
|
|
}
|
|
|
|
|
2020-01-22 13:10:59 +00:00
|
|
|
static double relative_error(double a, double b, double err)
|
2013-07-17 10:11:59 +00:00
|
|
|
{
|
2014-01-10 14:07:02 +00:00
|
|
|
double relativeError;
|
2013-03-25 12:04:10 +00:00
|
|
|
|
2020-01-22 13:10:59 +00:00
|
|
|
if (fabs(a) <= maxAbsoluteError || fabs(b) <= maxAbsoluteError)
|
|
|
|
relativeError = fabs(a - b);
|
2014-01-10 14:07:02 +00:00
|
|
|
else if (fabs(b) > fabs(a))
|
2020-01-22 13:10:59 +00:00
|
|
|
relativeError = fabs((a - b) / b);
|
2014-01-10 14:07:02 +00:00
|
|
|
else
|
2020-01-22 13:10:59 +00:00
|
|
|
relativeError = fabs((a - b) / a);
|
2013-03-25 12:04:10 +00:00
|
|
|
|
2020-01-22 13:10:59 +00:00
|
|
|
return relativeError;
|
2013-03-25 12:04:10 +00:00
|
|
|
}
|
|
|
|
|
2020-01-22 13:10:59 +00:00
|
|
|
int main(int argc, char* argv[])
|
2013-07-17 10:11:59 +00:00
|
|
|
{
|
2020-01-22 13:10:59 +00:00
|
|
|
return grib_tool(argc, argv);
|
2013-07-17 10:11:59 +00:00
|
|
|
}
|
2013-03-25 12:04:10 +00:00
|
|
|
|
2013-07-17 10:11:59 +00:00
|
|
|
int grib_tool_before_getopt(grib_runtime_options* options)
|
|
|
|
{
|
2014-01-10 14:07:02 +00:00
|
|
|
return 0;
|
2013-03-25 12:04:10 +00:00
|
|
|
}
|
|
|
|
|
2013-07-17 10:11:59 +00:00
|
|
|
int grib_tool_init(grib_runtime_options* options)
|
|
|
|
{
|
2022-06-30 15:52:04 +00:00
|
|
|
int ret = 0;
|
2020-01-22 13:10:59 +00:00
|
|
|
int nfiles = 1;
|
|
|
|
const char orderby[] = "md5Headers";
|
|
|
|
grib_context* context = grib_context_get_default();
|
2014-01-10 14:07:02 +00:00
|
|
|
|
2020-01-22 13:10:59 +00:00
|
|
|
options->strict = 1;
|
2014-01-10 14:07:02 +00:00
|
|
|
if (grib_options_on("S:"))
|
2020-01-22 13:10:59 +00:00
|
|
|
theStart = atoi(grib_options_get_option("S:"));
|
2014-01-10 14:07:02 +00:00
|
|
|
|
|
|
|
if (grib_options_on("E:"))
|
2020-01-22 13:10:59 +00:00
|
|
|
theEnd = atoi(grib_options_get_option("E:"));
|
2014-01-10 14:07:02 +00:00
|
|
|
|
2020-01-22 13:10:59 +00:00
|
|
|
if (grib_options_on("f"))
|
|
|
|
force = 1;
|
|
|
|
else
|
|
|
|
force = 0;
|
2014-01-10 14:07:02 +00:00
|
|
|
|
2020-01-22 13:10:59 +00:00
|
|
|
if (grib_options_on("2"))
|
|
|
|
two_way = 1;
|
|
|
|
else
|
|
|
|
two_way = 0;
|
2018-03-13 15:48:00 +00:00
|
|
|
|
2014-01-10 14:07:02 +00:00
|
|
|
verbose = grib_options_on("v");
|
|
|
|
|
2020-01-22 13:10:59 +00:00
|
|
|
listFromCommandLine = 0;
|
2014-01-10 14:07:02 +00:00
|
|
|
if (grib_options_on("c:") || grib_options_on("e"))
|
2020-01-22 13:10:59 +00:00
|
|
|
listFromCommandLine = 1;
|
2014-01-10 14:07:02 +00:00
|
|
|
|
2021-12-17 17:03:34 +00:00
|
|
|
if (grib_options_on("e"))
|
|
|
|
editionIndependent = 1;
|
|
|
|
|
2020-01-22 13:10:59 +00:00
|
|
|
if (grib_options_on("a"))
|
|
|
|
onlyListed = 0;
|
|
|
|
else
|
|
|
|
onlyListed = 1;
|
2014-01-10 14:07:02 +00:00
|
|
|
|
2020-01-22 13:10:59 +00:00
|
|
|
if (grib_options_on("H"))
|
|
|
|
headerMode = 1;
|
|
|
|
else
|
|
|
|
headerMode = 0;
|
2014-01-10 14:07:02 +00:00
|
|
|
|
|
|
|
if (grib_options_on("H") && grib_options_on("c:")) {
|
|
|
|
printf("Error: -H and -c options are incompatible. Choose one of the two please.\n");
|
|
|
|
exit(1);
|
|
|
|
}
|
|
|
|
if (grib_options_on("a") && !grib_options_on("c:")) {
|
|
|
|
printf("Error: -a option requires -c option. Please define a list of keys with the -c option.\n");
|
|
|
|
exit(1);
|
|
|
|
}
|
|
|
|
|
|
|
|
if (grib_options_on("b:")) {
|
2022-06-30 15:52:04 +00:00
|
|
|
int i;
|
2020-01-22 13:10:59 +00:00
|
|
|
grib_string_list* next = 0;
|
2020-09-24 14:54:33 +00:00
|
|
|
blocklist = (grib_string_list*)grib_context_malloc_clear(context, sizeof(grib_string_list));
|
|
|
|
blocklist->value = grib_context_strdup(context, options->set_values[0].name);
|
|
|
|
next = blocklist;
|
2020-01-22 13:10:59 +00:00
|
|
|
for (i = 1; i < options->set_values_count; i++) {
|
|
|
|
next->next = (grib_string_list*)grib_context_malloc_clear(context, sizeof(grib_string_list));
|
|
|
|
next->next->value = grib_context_strdup(context, options->set_values[i].name);
|
|
|
|
next = next->next;
|
2014-01-10 14:07:02 +00:00
|
|
|
}
|
2020-09-24 14:54:33 +00:00
|
|
|
context->blocklist = blocklist;
|
2014-01-10 14:07:02 +00:00
|
|
|
}
|
|
|
|
|
2022-02-16 12:41:54 +00:00
|
|
|
/* Check 1st file is not a directory */
|
|
|
|
exit_if_input_is_directory(tool_name, options->infile_extra->name);
|
|
|
|
|
2014-01-10 14:07:02 +00:00
|
|
|
if (grib_options_on("r")) {
|
2022-06-30 09:28:48 +00:00
|
|
|
const char* filename[1];
|
2021-01-15 20:08:50 +00:00
|
|
|
filename[0] = options->infile_extra->name; /* First file */
|
2020-01-22 13:10:59 +00:00
|
|
|
options->random = 1;
|
2022-12-27 12:36:19 +00:00
|
|
|
/* Setting 'orderby' will cause the second file to also be read as a sorted fieldset
|
|
|
|
* See file: grib_tool.c function: grib_tool
|
|
|
|
*/
|
2020-01-22 13:10:59 +00:00
|
|
|
options->orderby = strdup(orderby);
|
|
|
|
options->idx = grib_fieldset_new_from_files(context, filename,
|
|
|
|
nfiles, 0, 0, 0, orderby, &ret);
|
2014-01-10 14:07:02 +00:00
|
|
|
if (ret) {
|
2019-02-28 11:25:20 +00:00
|
|
|
fprintf(stderr, "Unable to create index for input file %s (%s)",
|
2020-01-22 13:10:59 +00:00
|
|
|
options->infile_extra->name, grib_get_error_message(ret));
|
2014-01-10 14:07:02 +00:00
|
|
|
exit(ret);
|
|
|
|
}
|
2020-01-22 13:10:59 +00:00
|
|
|
}
|
|
|
|
else {
|
|
|
|
options->random = 0;
|
|
|
|
options->infile_extra->file = fopen(options->infile_extra->name, "r");
|
2014-01-10 14:07:02 +00:00
|
|
|
|
|
|
|
if (!options->infile_extra->file) {
|
|
|
|
perror(options->infile_extra->name);
|
|
|
|
exit(1);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2020-01-22 13:10:59 +00:00
|
|
|
global_tolerance = 0;
|
|
|
|
compare_double = &compare_double_absolute;
|
2014-01-10 14:07:02 +00:00
|
|
|
if (grib_options_on("R:")) {
|
2022-06-30 15:52:04 +00:00
|
|
|
int i;
|
2020-01-22 13:10:59 +00:00
|
|
|
global_tolerance = 0;
|
|
|
|
for (i = 0; i < options->tolerance_count; i++) {
|
|
|
|
if (!strcmp((options->tolerance[i]).name, "all")) {
|
|
|
|
global_tolerance = (options->tolerance[i]).double_value;
|
2014-01-10 14:07:02 +00:00
|
|
|
break;
|
|
|
|
}
|
2020-01-22 13:10:59 +00:00
|
|
|
if (!strcmp((options->tolerance[i]).name, "global")) {
|
|
|
|
global_tolerance = (options->tolerance[i]).double_value;
|
2014-01-10 14:07:02 +00:00
|
|
|
break;
|
|
|
|
}
|
|
|
|
}
|
2020-01-22 13:10:59 +00:00
|
|
|
compare_double = &compare_double_relative;
|
|
|
|
compareAbsolute = 0;
|
2014-01-10 14:07:02 +00:00
|
|
|
}
|
2020-01-22 13:10:59 +00:00
|
|
|
if (grib_options_on("A:")) {
|
2016-03-01 14:44:08 +00:00
|
|
|
const char* absTolStr = grib_options_get_option("A:");
|
2020-01-22 13:10:59 +00:00
|
|
|
char* endPtr = NULL; /* for error handling */
|
2014-01-10 14:07:02 +00:00
|
|
|
if (grib_options_on("R:")) {
|
2020-01-22 13:10:59 +00:00
|
|
|
maxAbsoluteError = strtod(absTolStr, &endPtr);
|
2016-03-01 14:44:08 +00:00
|
|
|
if (*endPtr) {
|
|
|
|
fprintf(stderr, "Invalid absolute error: '%s'\n", absTolStr);
|
|
|
|
exit(1);
|
|
|
|
}
|
2020-01-22 13:10:59 +00:00
|
|
|
}
|
|
|
|
else {
|
|
|
|
compare_double = &compare_double_absolute;
|
|
|
|
global_tolerance = strtod(absTolStr, &endPtr);
|
2016-03-01 14:44:08 +00:00
|
|
|
if (*endPtr) {
|
|
|
|
fprintf(stderr, "Invalid absolute error: '%s'\n", absTolStr);
|
|
|
|
exit(1);
|
|
|
|
}
|
2014-01-10 14:07:02 +00:00
|
|
|
}
|
|
|
|
}
|
|
|
|
if (grib_options_on("P")) {
|
2020-01-22 13:10:59 +00:00
|
|
|
packingCompare = 1;
|
2016-04-15 17:36:06 +00:00
|
|
|
/* GRIB-972: Do not change the comparator yet. Not all GRIBs have packingError key! */
|
|
|
|
/*compare_double= &compare_double_absolute;*/
|
2014-01-10 14:07:02 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
if (grib_options_on("T:"))
|
2022-04-06 12:22:24 +00:00
|
|
|
tolerance_factor = atof(grib_options_get_option("T:"));
|
2013-03-25 12:04:10 +00:00
|
|
|
|
2013-07-17 10:11:59 +00:00
|
|
|
if (grib_options_on("R:")) {
|
2020-01-22 13:10:59 +00:00
|
|
|
char* sarg = grib_options_get_option("R:");
|
|
|
|
options->tolerance_count = MAX_KEYS;
|
2020-07-17 14:37:57 +00:00
|
|
|
ret = parse_keyval_string(tool_name, sarg, 1, GRIB_TYPE_DOUBLE, options->tolerance, &(options->tolerance_count));
|
2013-07-17 10:11:59 +00:00
|
|
|
if (ret == GRIB_INVALID_ARGUMENT) {
|
|
|
|
usage();
|
|
|
|
exit(1);
|
|
|
|
}
|
|
|
|
}
|
2013-03-25 12:04:10 +00:00
|
|
|
|
2015-07-17 10:23:43 +00:00
|
|
|
{
|
|
|
|
/* Check for 2nd file being a directory. If so, we assume user is comparing to a file */
|
|
|
|
/* with the same name as first file in that directory */
|
|
|
|
grib_tools_file* infile = options->infile; /* the 2nd file in comparison */
|
|
|
|
if (infile) {
|
2019-12-27 11:38:59 +00:00
|
|
|
if (path_is_directory(infile->name)) {
|
2015-07-17 10:23:43 +00:00
|
|
|
/* Take the filename of the 1st file and append to dir */
|
|
|
|
char bufr[2048] = {0,};
|
|
|
|
/* options->infile_extra->name is the 1st file */
|
2022-11-10 19:18:43 +00:00
|
|
|
snprintf(bufr, sizeof(bufr), "%s%c%s",
|
2020-01-22 13:10:59 +00:00
|
|
|
infile->name,
|
2015-07-27 12:27:03 +00:00
|
|
|
get_dir_separator_char(),
|
|
|
|
extract_filename(options->infile_extra->name));
|
2015-07-17 10:23:43 +00:00
|
|
|
infile->name = strdup(bufr);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2014-01-10 14:07:02 +00:00
|
|
|
return 0;
|
2013-03-25 12:04:10 +00:00
|
|
|
}
|
|
|
|
|
2020-01-22 13:10:59 +00:00
|
|
|
int grib_tool_new_filename_action(grib_runtime_options* options, const char* file)
|
|
|
|
{
|
2014-01-10 14:07:02 +00:00
|
|
|
return 0;
|
2013-03-25 12:04:10 +00:00
|
|
|
}
|
2020-01-22 13:10:59 +00:00
|
|
|
int grib_tool_new_file_action(grib_runtime_options* options, grib_tools_file* file)
|
|
|
|
{
|
2014-01-10 14:07:02 +00:00
|
|
|
return 0;
|
2013-03-25 12:04:10 +00:00
|
|
|
}
|
|
|
|
|
2013-07-17 10:11:59 +00:00
|
|
|
static void printInfo(grib_handle* h)
|
|
|
|
{
|
2020-01-22 13:10:59 +00:00
|
|
|
char shortName[254] = {0,};
|
|
|
|
char levelType[254] = {0,};
|
|
|
|
char level[254] = {0,};
|
|
|
|
char paramId[254] = {0,};
|
|
|
|
char packingType[254] = {0,};
|
|
|
|
char gridType[254] = {0,};
|
|
|
|
char identifier[254] = {0,};
|
|
|
|
size_t len = 254;
|
|
|
|
char stepRange[254] = {0,};
|
|
|
|
if (lastPrint == count)
|
|
|
|
return;
|
2014-01-10 14:07:02 +00:00
|
|
|
|
2020-01-22 13:10:59 +00:00
|
|
|
len = 254;
|
|
|
|
grib_get_string(h, "shortName", shortName, &len);
|
|
|
|
len = 254;
|
|
|
|
grib_get_string(h, "stepRange", stepRange, &len);
|
|
|
|
len = 254;
|
|
|
|
grib_get_string(h, "levelType", levelType, &len);
|
|
|
|
len = 254;
|
|
|
|
grib_get_string(h, "level", level, &len);
|
|
|
|
len = 254;
|
|
|
|
grib_get_string(h, "paramId", paramId, &len);
|
|
|
|
len = 254;
|
|
|
|
grib_get_string(h, "packingType", packingType, &len);
|
|
|
|
len = 254;
|
|
|
|
grib_get_string(h, "gridType", gridType, &len);
|
|
|
|
len = 254;
|
|
|
|
grib_get_string(h, "identifier", identifier, &len);
|
2013-03-25 12:04:10 +00:00
|
|
|
|
2020-01-22 13:10:59 +00:00
|
|
|
printf("\n-- %s #%d -- shortName=%s paramId=%s stepRange=%s levelType=%s level=%s packingType=%s gridType=%s --\n",
|
|
|
|
identifier, count, shortName, paramId, stepRange, levelType, level, packingType, gridType);
|
|
|
|
lastPrint = count;
|
2013-03-25 12:04:10 +00:00
|
|
|
}
|
|
|
|
|
2020-01-22 13:10:59 +00:00
|
|
|
static void print_index_key_values(grib_index* index, int counter)
|
2013-07-17 10:11:59 +00:00
|
|
|
{
|
2020-01-22 13:10:59 +00:00
|
|
|
grib_index_key* keys = index->keys;
|
|
|
|
printf("== %d == ", counter);
|
2014-01-10 14:07:02 +00:00
|
|
|
while (keys) {
|
2020-01-22 13:10:59 +00:00
|
|
|
printf("%s=%s ", keys->name, keys->value);
|
|
|
|
keys = keys->next;
|
2014-01-10 14:07:02 +00:00
|
|
|
}
|
|
|
|
printf("\n");
|
2013-03-25 12:04:10 +00:00
|
|
|
}
|
2013-07-17 10:11:59 +00:00
|
|
|
|
2021-02-03 21:50:43 +00:00
|
|
|
/* Note: the grib_handle 'handle2' here is from the 2nd file */
|
|
|
|
int grib_tool_new_handle_action(grib_runtime_options* options, grib_handle* handle2)
|
2013-07-17 10:11:59 +00:00
|
|
|
{
|
2020-01-22 13:10:59 +00:00
|
|
|
int err = 0;
|
2014-01-10 14:07:02 +00:00
|
|
|
count++;
|
|
|
|
|
|
|
|
if (options->through_index) {
|
2020-01-22 13:10:59 +00:00
|
|
|
grib_index* idx1 = options->index1;
|
|
|
|
verbose = 0;
|
2018-01-03 16:41:06 +00:00
|
|
|
global_counter++;
|
2014-01-10 14:07:02 +00:00
|
|
|
|
2020-01-22 13:10:59 +00:00
|
|
|
if (theStart > 0 && global_counter < theStart)
|
|
|
|
return 0;
|
|
|
|
if (theEnd > 0 && global_counter > theEnd) {
|
|
|
|
options->stop = 1;
|
2014-01-10 14:07:02 +00:00
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
2021-02-03 21:50:43 +00:00
|
|
|
grib_index_search_same(idx1, handle2);
|
2021-01-15 20:08:50 +00:00
|
|
|
handle1 = grib_handle_new_from_index(idx1, &err);
|
2014-01-10 14:07:02 +00:00
|
|
|
if (options->verbose) {
|
2020-01-22 13:10:59 +00:00
|
|
|
off_t offset = 0;
|
|
|
|
char* filename = grib_get_field_file(options->index2, &offset);
|
|
|
|
printf("file1=\"%s\" ", filename);
|
|
|
|
filename = grib_get_field_file(options->index1, &offset);
|
|
|
|
printf("file2=\"%s\" \n", filename);
|
|
|
|
print_index_key_values(options->index1, global_counter);
|
2014-01-10 14:07:02 +00:00
|
|
|
}
|
|
|
|
|
2021-01-15 20:08:50 +00:00
|
|
|
if (!handle1) {
|
2014-01-10 14:07:02 +00:00
|
|
|
if (!options->verbose)
|
2020-01-22 13:10:59 +00:00
|
|
|
print_index_key_values(idx1, global_counter);
|
|
|
|
printf("====== NOT FOUND in %s\n", options->infile->name);
|
2014-01-10 14:07:02 +00:00
|
|
|
}
|
|
|
|
|
2021-01-15 20:08:50 +00:00
|
|
|
if (!handle1 || err != GRIB_SUCCESS) {
|
2014-01-10 14:07:02 +00:00
|
|
|
morein1++;
|
2021-01-15 20:08:50 +00:00
|
|
|
if (handle1)
|
|
|
|
grib_handle_delete(handle1);
|
2014-01-10 14:07:02 +00:00
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
2021-02-03 21:50:43 +00:00
|
|
|
if (compare_handles(handle2, handle1, options)) {
|
2014-01-10 14:07:02 +00:00
|
|
|
error++;
|
2021-01-15 20:08:50 +00:00
|
|
|
if (!force) exit(1);
|
2014-01-10 14:07:02 +00:00
|
|
|
}
|
|
|
|
|
2021-01-15 20:08:50 +00:00
|
|
|
grib_handle_delete(handle1);
|
2014-01-10 14:07:02 +00:00
|
|
|
|
|
|
|
return 0;
|
2020-01-22 13:10:59 +00:00
|
|
|
}
|
|
|
|
else if (options->random)
|
2021-01-15 20:08:50 +00:00
|
|
|
handle1 = grib_fieldset_next_handle(options->idx, &err);
|
2014-01-10 14:07:02 +00:00
|
|
|
else
|
2021-02-03 21:50:43 +00:00
|
|
|
handle1 = grib_handle_new_from_file(handle2->context, options->infile_extra->file, &err);
|
2014-01-10 14:07:02 +00:00
|
|
|
|
2021-01-15 20:08:50 +00:00
|
|
|
if (!handle1 || err != GRIB_SUCCESS) {
|
2014-01-10 14:07:02 +00:00
|
|
|
morein2++;
|
2021-01-15 20:08:50 +00:00
|
|
|
if (handle1)
|
|
|
|
grib_handle_delete(handle1);
|
2014-01-10 14:07:02 +00:00
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
2021-02-03 21:50:43 +00:00
|
|
|
if (compare_handles(handle1, handle2, options)) {
|
2014-01-10 14:07:02 +00:00
|
|
|
error++;
|
2018-03-13 15:48:00 +00:00
|
|
|
if (!two_way) {
|
|
|
|
/* If two_way mode: Don't exit yet. Show further differences */
|
2021-01-15 20:08:50 +00:00
|
|
|
if (!force) exit(1);
|
2018-03-13 15:48:00 +00:00
|
|
|
}
|
|
|
|
}
|
|
|
|
if (two_way) {
|
2018-03-13 15:56:11 +00:00
|
|
|
/* ECC-651 and ECC-431 */
|
2018-03-13 15:48:00 +00:00
|
|
|
handles_swapped = 1;
|
2021-02-03 21:50:43 +00:00
|
|
|
if (compare_handles(handle2, handle1, options)) {
|
2018-03-13 15:48:00 +00:00
|
|
|
error++;
|
2021-01-15 20:08:50 +00:00
|
|
|
if (!force) exit(1);
|
2020-01-22 13:10:59 +00:00
|
|
|
}
|
|
|
|
else {
|
2018-03-13 15:48:00 +00:00
|
|
|
if (error) {
|
|
|
|
/* Error from first pass */
|
2021-01-15 20:08:50 +00:00
|
|
|
if (!force) exit(1);
|
2018-03-13 15:48:00 +00:00
|
|
|
}
|
|
|
|
}
|
2014-01-10 14:07:02 +00:00
|
|
|
}
|
|
|
|
|
2021-01-15 20:08:50 +00:00
|
|
|
grib_handle_delete(handle1);
|
2014-01-10 14:07:02 +00:00
|
|
|
|
|
|
|
return 0;
|
2013-03-25 12:04:10 +00:00
|
|
|
}
|
|
|
|
|
2013-07-17 10:11:59 +00:00
|
|
|
int grib_tool_skip_handle(grib_runtime_options* options, grib_handle* h)
|
|
|
|
{
|
2020-01-22 13:10:59 +00:00
|
|
|
int err = 0;
|
|
|
|
if (!options->through_index && !options->random) {
|
2021-01-15 20:08:50 +00:00
|
|
|
handle1 = grib_handle_new_from_file(h->context, options->infile_extra->file, &err);
|
2013-03-25 12:04:10 +00:00
|
|
|
|
2021-01-15 20:08:50 +00:00
|
|
|
if (!handle1 || err != GRIB_SUCCESS)
|
2014-01-10 14:07:02 +00:00
|
|
|
morein2++;
|
2013-03-25 12:04:10 +00:00
|
|
|
|
2021-01-15 20:08:50 +00:00
|
|
|
grib_handle_delete(handle1);
|
2014-01-10 14:07:02 +00:00
|
|
|
}
|
2013-03-25 12:04:10 +00:00
|
|
|
|
2014-01-10 14:07:02 +00:00
|
|
|
grib_handle_delete(h);
|
|
|
|
count++;
|
2013-03-25 12:04:10 +00:00
|
|
|
|
2014-01-10 14:07:02 +00:00
|
|
|
return 0;
|
2013-03-25 12:04:10 +00:00
|
|
|
}
|
|
|
|
|
2020-01-22 13:10:59 +00:00
|
|
|
void grib_tool_print_key_values(grib_runtime_options* options, grib_handle* h)
|
2013-07-17 10:11:59 +00:00
|
|
|
{
|
2020-01-22 13:10:59 +00:00
|
|
|
grib_print_key_values(options, h);
|
2013-03-25 12:04:10 +00:00
|
|
|
}
|
|
|
|
|
2013-07-17 10:11:59 +00:00
|
|
|
int grib_tool_finalise_action(grib_runtime_options* options)
|
|
|
|
{
|
2020-01-22 13:10:59 +00:00
|
|
|
grib_error* e = error_summary;
|
|
|
|
int err = 0;
|
|
|
|
grib_context* c = grib_context_get_default();
|
2014-01-10 14:07:02 +00:00
|
|
|
|
|
|
|
/*if (grib_options_on("w:")) return 0;*/
|
|
|
|
|
2021-01-15 20:08:50 +00:00
|
|
|
while ((handle1 = grib_handle_new_from_file(c, options->infile_extra->file, &err))) {
|
2014-01-10 14:07:02 +00:00
|
|
|
morein1++;
|
2022-06-30 15:52:04 +00:00
|
|
|
grib_handle_delete(handle1);
|
2014-01-10 14:07:02 +00:00
|
|
|
}
|
2019-05-10 12:05:35 +00:00
|
|
|
|
2020-01-22 13:10:59 +00:00
|
|
|
error += morein1 + morein2;
|
2019-05-10 12:05:35 +00:00
|
|
|
if (error) {
|
|
|
|
printf("\n## ERRORS SUMMARY #######\n");
|
|
|
|
}
|
|
|
|
|
2020-01-22 13:10:59 +00:00
|
|
|
if (morein1 > 0) {
|
2014-01-10 14:07:02 +00:00
|
|
|
printf("##\n## Different number of messages \n");
|
2020-01-22 13:10:59 +00:00
|
|
|
printf("## %d more messages in %s than in %s\n", morein1,
|
|
|
|
options->infile_extra->name, options->infile->name);
|
2014-01-10 14:07:02 +00:00
|
|
|
}
|
|
|
|
|
2020-01-22 13:10:59 +00:00
|
|
|
if (morein2 > 0) {
|
2014-01-10 14:07:02 +00:00
|
|
|
printf("##\n## Different number of messages \n");
|
2020-01-22 13:10:59 +00:00
|
|
|
printf("## %d more messages in %s than in %s\n", morein2,
|
|
|
|
options->infile->name, options->infile_extra->name);
|
2014-01-10 14:07:02 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
if (error) {
|
|
|
|
printf("##\n## Summary of different key values \n");
|
|
|
|
while (e) {
|
2020-01-22 13:10:59 +00:00
|
|
|
printf("## %s ( %d different )\n", e->key, e->count);
|
|
|
|
e = e->next;
|
2014-01-10 14:07:02 +00:00
|
|
|
}
|
|
|
|
|
2020-01-22 13:10:59 +00:00
|
|
|
printf("##\n## %d different messages out of %d\n\n", error, count);
|
2014-01-10 14:07:02 +00:00
|
|
|
}
|
|
|
|
if (options->through_index) {
|
|
|
|
grib_index_delete(options->index1);
|
|
|
|
grib_index_delete(options->index2);
|
|
|
|
}
|
|
|
|
|
2021-01-15 20:08:50 +00:00
|
|
|
if (error != 0) exit(1);
|
2014-01-10 14:07:02 +00:00
|
|
|
return 0;
|
2013-03-25 12:04:10 +00:00
|
|
|
}
|
|
|
|
|
2020-01-22 13:10:59 +00:00
|
|
|
static void save_error(grib_context* c, const char* key)
|
2013-07-17 10:11:59 +00:00
|
|
|
{
|
2020-01-22 13:10:59 +00:00
|
|
|
grib_error* e = 0;
|
|
|
|
grib_error* next = 0;
|
|
|
|
int saved = 0;
|
2014-01-10 14:07:02 +00:00
|
|
|
|
|
|
|
if (!error_summary) {
|
2020-01-22 13:10:59 +00:00
|
|
|
error_summary = (grib_error*)grib_context_malloc_clear(c, sizeof(grib_error));
|
|
|
|
error_summary->count = 1;
|
|
|
|
error_summary->key = grib_context_strdup(c, key);
|
2014-01-10 14:07:02 +00:00
|
|
|
return;
|
|
|
|
}
|
|
|
|
|
2020-01-22 13:10:59 +00:00
|
|
|
e = error_summary;
|
|
|
|
next = e;
|
2014-01-10 14:07:02 +00:00
|
|
|
|
|
|
|
while (next) {
|
2020-01-22 13:10:59 +00:00
|
|
|
if (!strcmp(next->key, key)) {
|
2014-01-10 14:07:02 +00:00
|
|
|
next->count++;
|
2020-01-22 13:10:59 +00:00
|
|
|
saved = 1;
|
2014-01-10 14:07:02 +00:00
|
|
|
break;
|
|
|
|
}
|
2020-01-22 13:10:59 +00:00
|
|
|
e = next;
|
|
|
|
next = next->next;
|
2014-01-10 14:07:02 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
if (!saved) {
|
2020-01-22 13:10:59 +00:00
|
|
|
e->next = (grib_error*)grib_context_malloc_clear(c, sizeof(grib_error));
|
|
|
|
e->next->count = 1;
|
|
|
|
e->next->key = grib_context_strdup(c, key);
|
2014-01-10 14:07:02 +00:00
|
|
|
}
|
2013-03-25 12:04:10 +00:00
|
|
|
}
|
|
|
|
|
2020-01-22 13:10:59 +00:00
|
|
|
static int test_bit(long a, long b)
|
|
|
|
{
|
|
|
|
return a & (1 << b);
|
|
|
|
}
|
2019-07-24 17:19:36 +00:00
|
|
|
|
|
|
|
/* If the accessor represents a codeflag key, then return its binary rep in 'result' */
|
|
|
|
static int codeflag_to_bitstr(grib_accessor* a, long val, char* result)
|
|
|
|
{
|
2020-01-22 13:10:59 +00:00
|
|
|
if (a && grib_inline_strcmp(a->cclass->name, "codeflag") == 0) {
|
2019-07-24 17:19:36 +00:00
|
|
|
long i;
|
2020-01-22 13:10:59 +00:00
|
|
|
const long bytelen = a->length * 8;
|
|
|
|
for (i = 0; i < bytelen; i++) {
|
|
|
|
if (test_bit(val, bytelen - i - 1))
|
|
|
|
*result = '1';
|
|
|
|
else
|
|
|
|
*result = '0';
|
2019-07-24 17:19:36 +00:00
|
|
|
result++;
|
|
|
|
}
|
|
|
|
return GRIB_SUCCESS;
|
|
|
|
}
|
|
|
|
return GRIB_INVALID_TYPE;
|
|
|
|
}
|
|
|
|
|
2020-01-22 13:10:59 +00:00
|
|
|
static int compare_values(grib_runtime_options* options, grib_handle* h1, grib_handle* h2, const char* name, int type)
|
2013-07-17 10:11:59 +00:00
|
|
|
{
|
2014-01-10 14:07:02 +00:00
|
|
|
size_t len1 = 0;
|
|
|
|
size_t len2 = 0;
|
2020-01-22 13:10:59 +00:00
|
|
|
int err = 0, i = 0;
|
2014-01-10 14:07:02 +00:00
|
|
|
int err1;
|
|
|
|
int err2;
|
2020-01-22 13:10:59 +00:00
|
|
|
int type1, type2;
|
2014-01-10 14:07:02 +00:00
|
|
|
int countdiff;
|
2020-01-22 13:10:59 +00:00
|
|
|
int isangle = 0;
|
|
|
|
int isMissing1, isMissing2;
|
2014-01-10 14:07:02 +00:00
|
|
|
|
2020-01-22 13:10:59 +00:00
|
|
|
char *sval1 = NULL, *sval2 = NULL;
|
|
|
|
unsigned char *uval1 = NULL, *uval2 = NULL;
|
2014-01-10 14:07:02 +00:00
|
|
|
double *dval1 = NULL, *dval2 = NULL;
|
|
|
|
long *lval1 = NULL, *lval2 = NULL;
|
2020-01-22 13:10:59 +00:00
|
|
|
double maxdiff = 0;
|
|
|
|
double packingError1 = 0, packingError2 = 0;
|
|
|
|
double value_tolerance = 0;
|
|
|
|
grib_context* c = h1->context;
|
|
|
|
const char* first_str = (handles_swapped == 0 ? "1st" : "2nd");
|
|
|
|
const char* second_str = (handles_swapped == 0 ? "2nd" : "1st");
|
|
|
|
|
|
|
|
type1 = type;
|
|
|
|
type2 = type;
|
|
|
|
if (verbose)
|
|
|
|
printf(" comparing %s", name);
|
2014-01-10 14:07:02 +00:00
|
|
|
|
2020-09-24 14:54:33 +00:00
|
|
|
/* If key was blocklisted, then we should not have got here */
|
2023-06-26 20:21:07 +00:00
|
|
|
DEBUG_ASSERT(!blocklisted(name));
|
2016-04-08 10:01:25 +00:00
|
|
|
|
2020-01-22 13:10:59 +00:00
|
|
|
if (type1 == GRIB_TYPE_UNDEFINED && (err = grib_get_native_type(h1, name, &type1)) != GRIB_SUCCESS) {
|
2014-01-10 14:07:02 +00:00
|
|
|
printInfo(h1);
|
2020-01-22 13:10:59 +00:00
|
|
|
printf("Oops... cannot get type of [%s] in %s field: %s\n", name, first_str, grib_get_error_message(err));
|
|
|
|
save_error(c, name);
|
2014-01-10 14:07:02 +00:00
|
|
|
return err;
|
|
|
|
}
|
|
|
|
|
2020-01-22 13:10:59 +00:00
|
|
|
if (type2 == GRIB_TYPE_UNDEFINED && (err = grib_get_native_type(h2, name, &type2)) != GRIB_SUCCESS) {
|
|
|
|
if (err == GRIB_NOT_FOUND) {
|
2014-01-10 14:07:02 +00:00
|
|
|
printInfo(h1);
|
2020-01-22 13:10:59 +00:00
|
|
|
printf("[%s] not found in %s field\n", name, second_str);
|
|
|
|
save_error(c, name);
|
2014-01-10 14:07:02 +00:00
|
|
|
return err;
|
|
|
|
}
|
|
|
|
printInfo(h1);
|
2020-01-22 13:10:59 +00:00
|
|
|
printf("Oops... cannot get type of [%s] in %s field: %s\n", name, second_str, grib_get_error_message(err));
|
|
|
|
save_error(c, name);
|
2014-01-10 14:07:02 +00:00
|
|
|
return err;
|
|
|
|
}
|
|
|
|
|
2018-03-13 15:48:00 +00:00
|
|
|
/* if(type1 != type2) {
|
|
|
|
printInfo(h1);
|
|
|
|
printf("Warning, [%s] has different types: 1st field: [%s], 2nd field: [%s]\n",
|
|
|
|
name,grib_get_type_name(type1),grib_get_type_name(type2));
|
2022-12-07 19:38:35 +00:00
|
|
|
return GRIB_TYPE_MISMATCH;
|
2018-03-13 15:48:00 +00:00
|
|
|
}
|
2014-01-10 14:07:02 +00:00
|
|
|
*/
|
|
|
|
|
2020-01-22 13:10:59 +00:00
|
|
|
if (type1 == GRIB_TYPE_LABEL)
|
2014-01-10 14:07:02 +00:00
|
|
|
return err;
|
|
|
|
|
2020-01-22 13:10:59 +00:00
|
|
|
if (type1 == GRIB_TYPE_SECTION)
|
2014-01-10 14:07:02 +00:00
|
|
|
return err;
|
|
|
|
|
|
|
|
|
2020-01-22 13:10:59 +00:00
|
|
|
if ((err = grib_get_size(h1, name, &len1)) != GRIB_SUCCESS) {
|
2014-01-10 14:07:02 +00:00
|
|
|
printInfo(h1);
|
2020-01-22 13:10:59 +00:00
|
|
|
printf("Oops... cannot get size of [%s] in %s field: %s\n", name, first_str, grib_get_error_message(err));
|
|
|
|
save_error(c, name);
|
2014-01-10 14:07:02 +00:00
|
|
|
return err;
|
|
|
|
}
|
|
|
|
|
2020-01-22 13:10:59 +00:00
|
|
|
if ((err = grib_get_size(h2, name, &len2)) != GRIB_SUCCESS) {
|
|
|
|
if (err == GRIB_NOT_FOUND) {
|
2014-01-10 14:07:02 +00:00
|
|
|
printInfo(h1);
|
2020-01-22 13:10:59 +00:00
|
|
|
printf("[%s] not found in %s field\n", name, second_str);
|
|
|
|
save_error(c, name);
|
2014-01-10 14:07:02 +00:00
|
|
|
return err;
|
|
|
|
}
|
|
|
|
|
|
|
|
printInfo(h1);
|
2020-01-22 13:10:59 +00:00
|
|
|
printf("Oops... cannot get size of [%s] in %s field: %s\n", name, second_str, grib_get_error_message(err));
|
|
|
|
save_error(c, name);
|
2014-01-10 14:07:02 +00:00
|
|
|
return err;
|
|
|
|
}
|
|
|
|
|
2018-03-13 15:48:00 +00:00
|
|
|
if (handles_swapped) {
|
|
|
|
/* Comparing a second time with handles swapped. Do not compare keys common to both handles */
|
|
|
|
return GRIB_SUCCESS;
|
|
|
|
}
|
|
|
|
|
|
|
|
/* if(len1 != len2 && type1 != GRIB_TYPE_STRING) {
|
|
|
|
printInfo(h1);
|
|
|
|
printf("[%s] has different size: 1st field: %ld, 2nd field: %ld\n",name,(long)len1,(long)len2);
|
|
|
|
save_error(c,name);
|
|
|
|
return GRIB_COUNT_MISMATCH;
|
|
|
|
}
|
2014-01-10 14:07:02 +00:00
|
|
|
*/
|
|
|
|
|
2020-01-22 13:10:59 +00:00
|
|
|
isMissing1 = ((grib_is_missing(h1, name, &err1) == 1) && (err1 == 0)) ? 1 : 0;
|
|
|
|
isMissing2 = ((grib_is_missing(h2, name, &err2) == 1) && (err2 == 0)) ? 1 : 0;
|
2014-01-10 14:07:02 +00:00
|
|
|
|
2020-01-22 13:10:59 +00:00
|
|
|
if ((isMissing1 == 1) && (isMissing2 == 1)) {
|
|
|
|
if (verbose)
|
|
|
|
printf(" is set to missing in both fields\n");
|
2014-01-10 14:07:02 +00:00
|
|
|
return GRIB_SUCCESS;
|
|
|
|
}
|
|
|
|
|
2020-01-22 13:10:59 +00:00
|
|
|
if (isMissing1 == 1) {
|
|
|
|
if (verbose)
|
|
|
|
printf(" is set to missing in %s field\n", first_str);
|
2014-01-10 14:07:02 +00:00
|
|
|
printInfo(h1);
|
2022-12-13 16:21:42 +00:00
|
|
|
printf("%s is set to missing in %s field but is not missing in %s field\n", name, first_str, second_str);
|
2014-01-10 14:07:02 +00:00
|
|
|
err1 = GRIB_VALUE_MISMATCH;
|
2020-01-22 13:10:59 +00:00
|
|
|
save_error(c, name);
|
2014-01-10 14:07:02 +00:00
|
|
|
return GRIB_VALUE_MISMATCH;
|
|
|
|
}
|
|
|
|
|
2020-01-22 13:10:59 +00:00
|
|
|
if (isMissing2 == 1) {
|
|
|
|
if (verbose)
|
|
|
|
printf(" is set to missing in %s field\n", first_str);
|
2014-01-10 14:07:02 +00:00
|
|
|
printInfo(h1);
|
2022-12-13 16:21:42 +00:00
|
|
|
printf("%s is set to missing in %s field but is not missing in %s field\n", name, second_str, first_str);
|
2014-01-10 14:07:02 +00:00
|
|
|
err1 = GRIB_VALUE_MISMATCH;
|
2020-01-22 13:10:59 +00:00
|
|
|
save_error(c, name);
|
2014-01-10 14:07:02 +00:00
|
|
|
return GRIB_VALUE_MISMATCH;
|
|
|
|
}
|
|
|
|
|
2020-01-22 13:10:59 +00:00
|
|
|
switch (type1) {
|
|
|
|
case GRIB_TYPE_STRING:
|
|
|
|
if (verbose)
|
|
|
|
printf(" as string\n");
|
|
|
|
grib_get_string_length(h1, name, &len1);
|
|
|
|
grib_get_string_length(h2, name, &len2);
|
|
|
|
sval1 = (char*)grib_context_malloc(h1->context, len1 * sizeof(char));
|
|
|
|
sval2 = (char*)grib_context_malloc(h2->context, len2 * sizeof(char));
|
2014-01-10 14:07:02 +00:00
|
|
|
|
2020-01-22 13:10:59 +00:00
|
|
|
if ((err1 = grib_get_string(h1, name, sval1, &len1)) != GRIB_SUCCESS) {
|
|
|
|
printInfo(h1);
|
|
|
|
printf("Oops... cannot get string value of [%s] in %s field: %s\n",
|
|
|
|
name, first_str, grib_get_error_message(err1));
|
|
|
|
save_error(c, name);
|
|
|
|
}
|
2014-01-10 14:07:02 +00:00
|
|
|
|
2020-01-22 13:10:59 +00:00
|
|
|
if ((err2 = grib_get_string(h2, name, sval2, &len2)) != GRIB_SUCCESS) {
|
2014-01-10 14:07:02 +00:00
|
|
|
printInfo(h1);
|
2020-01-22 13:10:59 +00:00
|
|
|
printf("Oops... cannot get string value of [%s] in %s field: %s\n",
|
|
|
|
name, second_str, grib_get_error_message(err2));
|
|
|
|
save_error(c, name);
|
2014-01-10 14:07:02 +00:00
|
|
|
}
|
2020-01-22 13:10:59 +00:00
|
|
|
|
|
|
|
if (err1 == GRIB_SUCCESS && err2 == GRIB_SUCCESS) {
|
|
|
|
if (grib_inline_strcmp(sval1, sval2) != 0) {
|
|
|
|
printInfo(h1);
|
|
|
|
printf("string [%s]: [%s] != [%s]\n",
|
|
|
|
name, sval1, sval2);
|
|
|
|
err1 = GRIB_VALUE_MISMATCH;
|
|
|
|
save_error(c, name);
|
|
|
|
}
|
|
|
|
else {
|
|
|
|
/* ECC-136: string reps are the same, but integer values may not be */
|
|
|
|
/* Note: Do not do this during edition-independent compare! */
|
|
|
|
if (!listFromCommandLine) {
|
|
|
|
long v1, v2;
|
|
|
|
if (grib_get_long(h1, name, &v1) == GRIB_SUCCESS &&
|
|
|
|
grib_get_long(h2, name, &v2) == GRIB_SUCCESS) {
|
|
|
|
if (v1 != v2) {
|
|
|
|
printInfo(h1);
|
|
|
|
save_error(c, name);
|
|
|
|
err1 = GRIB_VALUE_MISMATCH;
|
|
|
|
printf("long [%s]: [%ld] != [%ld]\n", name, v1, v2);
|
|
|
|
}
|
2019-06-14 13:31:37 +00:00
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
2014-01-10 14:07:02 +00:00
|
|
|
|
2020-01-22 13:10:59 +00:00
|
|
|
grib_context_free(h1->context, sval1);
|
|
|
|
grib_context_free(h2->context, sval2);
|
2014-01-10 14:07:02 +00:00
|
|
|
|
2020-01-22 13:10:59 +00:00
|
|
|
if (err1)
|
|
|
|
return err1;
|
|
|
|
if (err2)
|
|
|
|
return err2;
|
2014-01-10 14:07:02 +00:00
|
|
|
|
2020-01-22 13:10:59 +00:00
|
|
|
break;
|
2014-01-10 14:07:02 +00:00
|
|
|
|
2020-01-22 13:10:59 +00:00
|
|
|
case GRIB_TYPE_LONG:
|
|
|
|
if (verbose)
|
|
|
|
printf(" as long\n");
|
2014-01-10 14:07:02 +00:00
|
|
|
|
2020-01-22 13:10:59 +00:00
|
|
|
lval1 = (long*)grib_context_malloc(h1->context, len1 * sizeof(long));
|
|
|
|
lval2 = (long*)grib_context_malloc(h2->context, len2 * sizeof(long));
|
2014-01-10 14:07:02 +00:00
|
|
|
|
2020-01-22 13:10:59 +00:00
|
|
|
if ((err1 = grib_get_long_array(h1, name, lval1, &len1)) != GRIB_SUCCESS) {
|
|
|
|
printInfo(h1);
|
|
|
|
printf("Oops... cannot get long value of [%s] in %s field: %s\n",
|
|
|
|
name, first_str, grib_get_error_message(err1));
|
|
|
|
save_error(c, name);
|
|
|
|
}
|
2014-01-10 14:07:02 +00:00
|
|
|
|
2020-01-22 13:10:59 +00:00
|
|
|
if ((err2 = grib_get_long_array(h2, name, lval2, &len2)) != GRIB_SUCCESS) {
|
|
|
|
printInfo(h1);
|
|
|
|
printf("Oops... cannot get long value of [%s] in %s field: %s\n",
|
|
|
|
name, second_str, grib_get_error_message(err2));
|
|
|
|
save_error(c, name);
|
|
|
|
}
|
2014-01-10 14:07:02 +00:00
|
|
|
|
2020-01-22 13:10:59 +00:00
|
|
|
if (err1 == GRIB_SUCCESS && err2 == GRIB_SUCCESS && len1 != len2) {
|
2014-01-10 14:07:02 +00:00
|
|
|
printInfo(h1);
|
2022-12-21 15:07:48 +00:00
|
|
|
printf("Different size for \"%s\" [%zu] [%zu]\n", name, len1, len2);
|
2020-01-22 13:10:59 +00:00
|
|
|
save_error(c, name);
|
|
|
|
}
|
|
|
|
if (err1 == GRIB_SUCCESS && err2 == GRIB_SUCCESS && len1 == len2) {
|
|
|
|
countdiff = 0;
|
|
|
|
for (i = 0; i < len1; i++)
|
|
|
|
if (lval1[i] != lval2[i])
|
|
|
|
countdiff++;
|
|
|
|
|
|
|
|
if (countdiff) {
|
|
|
|
printInfo(h1);
|
|
|
|
save_error(c, name);
|
|
|
|
err1 = GRIB_VALUE_MISMATCH;
|
|
|
|
if (len1 == 1) {
|
|
|
|
char buf1[128] = {0,}; /* buffers to store the binary representation of codeflags */
|
|
|
|
char buf2[128] = {0,};
|
|
|
|
grib_accessor* acc1 = grib_find_accessor(h1, name);
|
|
|
|
grib_accessor* acc2 = grib_find_accessor(h2, name);
|
|
|
|
printf("long [%s]: [%ld] != [%ld]", name, *lval1, *lval2);
|
|
|
|
if (codeflag_to_bitstr(acc1, *lval1, buf1) == GRIB_SUCCESS && codeflag_to_bitstr(acc2, *lval2, buf2) == GRIB_SUCCESS) {
|
|
|
|
printf(" ([%s] != [%s])", buf1, buf2);
|
|
|
|
}
|
|
|
|
printf("\n");
|
|
|
|
}
|
|
|
|
else {
|
2022-12-21 15:07:48 +00:00
|
|
|
printf("long [%s] %d out of %zu different\n", name, countdiff, len1);
|
2019-07-24 17:19:36 +00:00
|
|
|
}
|
|
|
|
}
|
2014-01-10 14:07:02 +00:00
|
|
|
}
|
|
|
|
|
2020-01-22 13:10:59 +00:00
|
|
|
grib_context_free(h1->context, lval1);
|
|
|
|
grib_context_free(h2->context, lval2);
|
|
|
|
|
|
|
|
if (err1)
|
|
|
|
return err1;
|
|
|
|
if (err2)
|
|
|
|
return err2;
|
|
|
|
break;
|
|
|
|
|
|
|
|
case GRIB_TYPE_DOUBLE:
|
|
|
|
if (verbose)
|
|
|
|
printf(" as double\n");
|
|
|
|
dval1 = (double*)grib_context_malloc(h1->context, len1 * sizeof(double));
|
|
|
|
dval2 = (double*)grib_context_malloc(h2->context, len2 * sizeof(double));
|
|
|
|
|
|
|
|
isangle = 0;
|
|
|
|
value_tolerance = global_tolerance;
|
|
|
|
if (!grib_inline_strcmp(name, "packedValues") || !grib_inline_strcmp(name, "values") || !grib_inline_strcmp(name, "codedValues")) {
|
|
|
|
packingError1 = 0;
|
|
|
|
packingError2 = 0;
|
|
|
|
err1 = grib_get_double(h1, "packingError", &packingError1);
|
|
|
|
err2 = grib_get_double(h2, "packingError", &packingError2);
|
|
|
|
if (packingCompare && !err1 && !err2) {
|
|
|
|
/* packingError specified by user and message supports it */
|
|
|
|
/* GRIB-972: Not all GRIBs have packingError key! */
|
|
|
|
value_tolerance = packingError1 > packingError2 ? packingError1 : packingError2;
|
|
|
|
compare_double = &compare_double_absolute;
|
|
|
|
compareAbsolute = 1;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
else if (!grib_inline_strcmp(name, "unpackedValues")) {
|
|
|
|
packingError1 = 0;
|
|
|
|
packingError2 = 0;
|
|
|
|
err1 = grib_get_double(h1, "unpackedError", &packingError1);
|
|
|
|
err2 = grib_get_double(h2, "unpackedError", &packingError2);
|
|
|
|
if (packingCompare && !err1 && !err2) {
|
|
|
|
/* packingError specified by user and message supports it */
|
|
|
|
/* GRIB-972: Not all GRIBs have unpackedError key! */
|
|
|
|
value_tolerance = packingError1 > packingError2 ? packingError1 : packingError2;
|
|
|
|
compare_double = &compare_double_absolute;
|
|
|
|
compareAbsolute = 1;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
else if (!grib_inline_rstrcmp(name, "InDegrees")) {
|
|
|
|
packingError1 = 0.0005;
|
|
|
|
packingError2 = 0.0005;
|
|
|
|
isangle = 1;
|
2023-01-15 15:03:59 +00:00
|
|
|
/* value_tolerance = packingError1 > packingError2 ? packingError1 : packingError2; */
|
|
|
|
value_tolerance = packingError1;
|
2016-04-15 17:36:06 +00:00
|
|
|
}
|
2020-01-22 13:10:59 +00:00
|
|
|
else if (!grib_inline_strcmp(name, "referenceValue")) {
|
|
|
|
packingError1 = 0;
|
|
|
|
packingError2 = 0;
|
|
|
|
err1 = grib_get_double(h1, "referenceValueError", &packingError1);
|
|
|
|
err2 = grib_get_double(h2, "referenceValueError", &packingError2);
|
2023-01-15 15:22:40 +00:00
|
|
|
if (!err1 && !err2) {
|
|
|
|
value_tolerance = packingError1 > packingError2 ? packingError1 : packingError2;
|
|
|
|
}
|
2016-04-15 17:36:06 +00:00
|
|
|
}
|
2014-01-10 14:07:02 +00:00
|
|
|
|
2020-01-22 13:10:59 +00:00
|
|
|
if (!compareAbsolute) {
|
|
|
|
int all_specified = 0; /* =1 if relative comparison with "all" specified */
|
|
|
|
for (i = 0; i < options->tolerance_count; i++) {
|
|
|
|
if (!strcmp((options->tolerance[i]).name, "all")) {
|
|
|
|
all_specified = 1;
|
|
|
|
value_tolerance = (options->tolerance[i]).double_value;
|
2016-10-12 13:39:58 +00:00
|
|
|
break;
|
|
|
|
}
|
|
|
|
}
|
2020-01-22 13:10:59 +00:00
|
|
|
if (!all_specified) {
|
|
|
|
for (i = 0; i < options->tolerance_count; i++) {
|
|
|
|
if (!strcmp((options->tolerance[i]).name, name)) {
|
|
|
|
value_tolerance = (options->tolerance[i]).double_value;
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
2016-10-12 13:39:58 +00:00
|
|
|
}
|
2014-01-10 14:07:02 +00:00
|
|
|
|
2020-01-22 13:10:59 +00:00
|
|
|
if ((err1 = grib_get_double_array(h1, name, dval1, &len1)) != GRIB_SUCCESS) {
|
|
|
|
printInfo(h1);
|
|
|
|
printf("Oops... cannot get double value of [%s] in %s field: %s\n",
|
|
|
|
name, first_str, grib_get_error_message(err1));
|
|
|
|
save_error(c, name);
|
|
|
|
}
|
2014-01-10 14:07:02 +00:00
|
|
|
|
2020-01-22 13:10:59 +00:00
|
|
|
if ((err2 = grib_get_double_array(h2, name, dval2, &len2)) != GRIB_SUCCESS) {
|
|
|
|
printInfo(h1);
|
|
|
|
printf("Oops... cannot get double value of [%s] in %s field: %s\n",
|
|
|
|
name, second_str, grib_get_error_message(err2));
|
|
|
|
save_error(c, name);
|
2014-01-10 14:07:02 +00:00
|
|
|
}
|
2020-01-22 13:10:59 +00:00
|
|
|
|
|
|
|
if (err1 == GRIB_SUCCESS && err2 == GRIB_SUCCESS && len1 != len2) {
|
|
|
|
printInfo(h1);
|
2022-12-21 15:07:48 +00:00
|
|
|
printf("Different size for \"%s\" [%zu] [%zu]\n", name, len1, len2);
|
2020-01-22 13:10:59 +00:00
|
|
|
save_error(c, name);
|
2016-04-20 13:17:22 +00:00
|
|
|
}
|
2020-01-22 13:10:59 +00:00
|
|
|
if (err1 == GRIB_SUCCESS && err2 == GRIB_SUCCESS && len1 == len2) {
|
|
|
|
int imaxdiff;
|
|
|
|
double diff;
|
|
|
|
double *pv1, *pv2, dnew1, dnew2;
|
|
|
|
maxdiff = 0;
|
|
|
|
imaxdiff = 0;
|
|
|
|
countdiff = 0;
|
|
|
|
pv1 = dval1;
|
|
|
|
pv2 = dval2;
|
|
|
|
if (isangle) {
|
|
|
|
dnew1 = *dval1;
|
|
|
|
dnew2 = *dval2;
|
|
|
|
pv1 = &dnew1;
|
|
|
|
pv2 = &dnew2;
|
|
|
|
if (*dval1 < 0)
|
|
|
|
dnew1 += 360.0;
|
|
|
|
if (*dval2 < 0)
|
|
|
|
dnew2 += 360.0;
|
|
|
|
if (*dval1 > 360)
|
|
|
|
dnew1 -= 360.0;
|
|
|
|
if (*dval2 > 360)
|
|
|
|
dnew2 -= 360.0;
|
|
|
|
}
|
|
|
|
value_tolerance *= tolerance_factor;
|
|
|
|
if (verbose) {
|
|
|
|
printf(" (%d values) tolerance=%g \t", (int)len1, value_tolerance);
|
|
|
|
if (compare_double == &compare_double_absolute)
|
|
|
|
printf("using compare_double_absolute");
|
|
|
|
if (compare_double == &compare_double_relative)
|
|
|
|
printf("using compare_double_relative");
|
|
|
|
printf("\n");
|
|
|
|
}
|
|
|
|
for (i = 0; i < len1; i++) {
|
|
|
|
if ((diff = compare_double(pv1++, pv2++, value_tolerance)) != 0) {
|
|
|
|
countdiff++;
|
|
|
|
if (maxdiff < diff) {
|
|
|
|
maxdiff = diff;
|
|
|
|
imaxdiff = i;
|
|
|
|
}
|
|
|
|
err1 = GRIB_VALUE_MISMATCH;
|
|
|
|
}
|
2014-01-10 14:07:02 +00:00
|
|
|
}
|
|
|
|
|
2020-01-22 13:10:59 +00:00
|
|
|
if (countdiff) {
|
|
|
|
printInfo(h1);
|
|
|
|
save_error(c, name);
|
|
|
|
if (len1 > 1) {
|
2022-12-21 15:07:48 +00:00
|
|
|
printf("double [%s]: %d out of %zu different\n", name, countdiff, len1);
|
2020-01-22 13:10:59 +00:00
|
|
|
if (compareAbsolute)
|
|
|
|
printf(" max");
|
|
|
|
printf(" absolute diff. = %.16e,", fabs(dval1[imaxdiff] - dval2[imaxdiff]));
|
|
|
|
if (!compareAbsolute)
|
|
|
|
printf(" max");
|
|
|
|
printf(" relative diff. = %g", relative_error(dval1[imaxdiff], dval2[imaxdiff], value_tolerance));
|
|
|
|
printf("\n\tmax diff. element %d: %.20e %.20e",
|
|
|
|
imaxdiff, dval1[imaxdiff], dval2[imaxdiff]);
|
|
|
|
printf("\n\ttolerance=%.16e", value_tolerance);
|
|
|
|
if (packingError2 != 0 || packingError1 != 0)
|
|
|
|
printf(" packingError: [%g] [%g]", packingError1, packingError2);
|
|
|
|
|
|
|
|
if (!grib_inline_strcmp(name, "packedValues") || !grib_inline_strcmp(name, "values") || !grib_inline_strcmp(name, "codedValues")) {
|
|
|
|
double max1 = 0, min1 = 0, max2 = 0, min2 = 0;
|
|
|
|
/* Note: some packings like spectral do not have min,max */
|
|
|
|
if (grib_get_double(h1, "max", &max1) == GRIB_SUCCESS &&
|
|
|
|
grib_get_double(h1, "min", &min1) == GRIB_SUCCESS &&
|
|
|
|
grib_get_double(h2, "max", &max2) == GRIB_SUCCESS &&
|
|
|
|
grib_get_double(h2, "min", &min2) == GRIB_SUCCESS) {
|
|
|
|
printf("\n\tvalues max= [%g] [%g] min= [%g] [%g]", max1, max2, min1, min2);
|
|
|
|
}
|
2014-08-19 13:06:29 +00:00
|
|
|
}
|
2020-01-22 13:10:59 +00:00
|
|
|
printf("\n");
|
|
|
|
}
|
|
|
|
else {
|
|
|
|
printf("double [%s]: [%.20e] != [%.20e]\n",
|
|
|
|
name, dval1[0], dval2[0]);
|
|
|
|
printf("\tabsolute diff. = %g,", fabs(dval1[0] - dval2[0]));
|
|
|
|
printf(" relative diff. = %g\n", relative_error(dval1[0], dval2[0], value_tolerance));
|
|
|
|
printf("\ttolerance=%g\n", value_tolerance);
|
2014-01-10 14:07:02 +00:00
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2020-01-22 13:10:59 +00:00
|
|
|
grib_context_free(h1->context, dval1);
|
|
|
|
grib_context_free(h2->context, dval2);
|
2014-01-10 14:07:02 +00:00
|
|
|
|
2020-01-22 13:10:59 +00:00
|
|
|
if (err1)
|
|
|
|
return err1;
|
|
|
|
if (err2)
|
|
|
|
return err2;
|
|
|
|
break;
|
2014-01-10 14:07:02 +00:00
|
|
|
|
2020-01-22 13:10:59 +00:00
|
|
|
case GRIB_TYPE_BYTES:
|
|
|
|
if (verbose)
|
|
|
|
printf(" as bytes\n");
|
|
|
|
if (len1 < 2)
|
|
|
|
len1 = 512;
|
|
|
|
if (len2 < 2)
|
|
|
|
len2 = 512;
|
|
|
|
uval1 = (unsigned char*)grib_context_malloc(h1->context, len1 * sizeof(unsigned char));
|
|
|
|
uval2 = (unsigned char*)grib_context_malloc(h2->context, len2 * sizeof(unsigned char));
|
|
|
|
|
|
|
|
if ((err1 = grib_get_bytes(h1, name, uval1, &len1)) != GRIB_SUCCESS) {
|
|
|
|
printInfo(h1);
|
|
|
|
save_error(c, name);
|
|
|
|
printf("Oops... cannot get bytes value of [%s] in %s field: %s\n",
|
|
|
|
name, first_str, grib_get_error_message(err1));
|
|
|
|
}
|
2014-01-10 14:07:02 +00:00
|
|
|
|
2020-01-22 13:10:59 +00:00
|
|
|
if ((err2 = grib_get_bytes(h2, name, uval2, &len2)) != GRIB_SUCCESS) {
|
|
|
|
printInfo(h1);
|
|
|
|
save_error(c, name);
|
|
|
|
printf("Oops... cannot get bytes value of [%s] in %s field: %s\n",
|
|
|
|
name, second_str, grib_get_error_message(err2));
|
|
|
|
}
|
2014-01-10 14:07:02 +00:00
|
|
|
|
2020-01-22 13:10:59 +00:00
|
|
|
if (err1 == GRIB_SUCCESS && err2 == GRIB_SUCCESS) {
|
2021-04-29 15:54:04 +00:00
|
|
|
const size_t len_min = MINIMUM(len1, len2);
|
|
|
|
if (memcmp(uval1, uval2, len_min) != 0) {
|
2023-01-15 15:22:40 +00:00
|
|
|
for (i = 0; i < len_min; i++) {
|
2020-01-22 13:10:59 +00:00
|
|
|
if (uval1[i] != uval2[i]) {
|
|
|
|
printInfo(h1);
|
|
|
|
save_error(c, name);
|
2021-04-29 15:54:04 +00:00
|
|
|
if (len_min == 1)
|
2020-01-22 13:10:59 +00:00
|
|
|
printf("[%s] byte values are different: [%02x] and [%02x]\n",
|
|
|
|
name, uval1[i], uval2[i]);
|
|
|
|
else
|
|
|
|
printf("[%s] byte value %d of %ld is different: [%02x] and [%02x]\n",
|
2021-04-29 15:54:04 +00:00
|
|
|
name, i, (long)len_min, uval1[i], uval2[i]);
|
2014-01-10 14:07:02 +00:00
|
|
|
|
2020-01-22 13:10:59 +00:00
|
|
|
err1 = GRIB_VALUE_MISMATCH;
|
|
|
|
break;
|
|
|
|
}
|
2023-01-15 15:22:40 +00:00
|
|
|
}
|
2020-01-22 13:10:59 +00:00
|
|
|
err1 = GRIB_VALUE_MISMATCH;
|
|
|
|
}
|
2014-01-10 14:07:02 +00:00
|
|
|
}
|
|
|
|
|
2020-01-22 13:10:59 +00:00
|
|
|
grib_context_free(h1->context, uval1);
|
|
|
|
grib_context_free(h2->context, uval2);
|
2014-01-10 14:07:02 +00:00
|
|
|
|
2020-01-22 13:10:59 +00:00
|
|
|
if (err1)
|
|
|
|
return err1;
|
|
|
|
if (err2)
|
|
|
|
return err2;
|
|
|
|
break;
|
2014-01-10 14:07:02 +00:00
|
|
|
|
2020-01-22 13:10:59 +00:00
|
|
|
case GRIB_TYPE_LABEL:
|
|
|
|
if (verbose)
|
|
|
|
printf(" as label\n");
|
|
|
|
break;
|
2014-01-10 14:07:02 +00:00
|
|
|
|
2020-01-22 13:10:59 +00:00
|
|
|
default:
|
|
|
|
if (verbose)
|
|
|
|
printf("\n");
|
|
|
|
printInfo(h1);
|
|
|
|
save_error(c, name);
|
|
|
|
printf("Cannot compare [%s], unsupported type %d\n", name, type1);
|
|
|
|
return GRIB_UNABLE_TO_COMPARE_ACCESSORS;
|
2014-01-10 14:07:02 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
return GRIB_SUCCESS;
|
2013-03-25 12:04:10 +00:00
|
|
|
}
|
|
|
|
|
2020-01-22 13:10:59 +00:00
|
|
|
static int compare_handles(grib_handle* h1, grib_handle* h2, grib_runtime_options* options)
|
2013-03-25 12:04:10 +00:00
|
|
|
{
|
2020-01-22 13:10:59 +00:00
|
|
|
int err = 0;
|
|
|
|
int i = 0;
|
|
|
|
const char* name = NULL;
|
|
|
|
grib_keys_iterator* iter = NULL;
|
2022-12-27 13:19:33 +00:00
|
|
|
grib_context* context = handle1->context;
|
2014-01-10 14:07:02 +00:00
|
|
|
|
|
|
|
/* mask only if no -c option or headerMode (-H)*/
|
2020-09-24 14:54:33 +00:00
|
|
|
if (blocklist && (!listFromCommandLine || headerMode)) {
|
2016-04-08 10:01:25 +00:00
|
|
|
/* See ECC-245, GRIB-573, GRIB-915: Do not change handles in memory */
|
2020-09-24 14:54:33 +00:00
|
|
|
/* grib_string_list* nextb=blocklist;
|
2014-01-10 14:07:02 +00:00
|
|
|
while (nextb) {
|
|
|
|
grib_clear(h1,nextb->value);
|
|
|
|
grib_clear(h2,nextb->value);
|
|
|
|
nextb=nextb->next;
|
2016-04-08 10:01:25 +00:00
|
|
|
} */
|
2014-01-10 14:07:02 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
if (headerMode) {
|
2020-01-22 13:10:59 +00:00
|
|
|
const void *msg1 = NULL, *msg2 = NULL;
|
|
|
|
size_t size1 = 0, size2 = 0;
|
2014-01-10 14:07:02 +00:00
|
|
|
grib_handle *h11, *h22;
|
2020-01-22 13:10:59 +00:00
|
|
|
GRIB_CHECK_NOLINE(grib_get_message_headers(h1, &msg1, &size1), 0);
|
|
|
|
GRIB_CHECK_NOLINE(grib_get_message_headers(h2, &msg2, &size2), 0);
|
|
|
|
if (size1 == size2 && !memcmp(msg1, msg2, size1))
|
2014-01-10 14:07:02 +00:00
|
|
|
return 0;
|
|
|
|
|
2020-01-22 13:10:59 +00:00
|
|
|
err = 0;
|
|
|
|
h11 = grib_handle_new_from_partial_message(h1->context, msg1, size1);
|
|
|
|
h22 = grib_handle_new_from_partial_message(h1->context, msg2, size2);
|
2014-01-10 14:07:02 +00:00
|
|
|
|
2020-01-22 13:10:59 +00:00
|
|
|
iter = grib_keys_iterator_new(h11, GRIB_KEYS_ITERATOR_SKIP_COMPUTED, NULL);
|
2014-01-10 14:07:02 +00:00
|
|
|
|
|
|
|
if (!iter) {
|
2022-12-27 13:19:33 +00:00
|
|
|
grib_context_log(context, GRIB_LOG_ERROR, "unable to create the GRIB keys iterator");
|
2014-01-10 14:07:02 +00:00
|
|
|
exit(1);
|
|
|
|
}
|
|
|
|
|
2020-01-22 13:10:59 +00:00
|
|
|
while (grib_keys_iterator_next(iter)) {
|
|
|
|
name = grib_keys_iterator_get_name(iter);
|
2014-01-10 14:07:02 +00:00
|
|
|
/*printf("----- comparing %s\n",name);*/
|
|
|
|
|
2020-09-24 14:54:33 +00:00
|
|
|
if (blocklisted(name))
|
2020-01-22 13:10:59 +00:00
|
|
|
continue;
|
|
|
|
if (compare_values(options, h11, h22, name, GRIB_TYPE_UNDEFINED))
|
|
|
|
err++;
|
2014-01-10 14:07:02 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
grib_keys_iterator_delete(iter);
|
|
|
|
grib_handle_delete(h11);
|
|
|
|
grib_handle_delete(h22);
|
|
|
|
return err;
|
|
|
|
}
|
|
|
|
|
2020-01-22 13:10:59 +00:00
|
|
|
if (listFromCommandLine && onlyListed) {
|
|
|
|
for (i = 0; i < options->compare_count; i++) {
|
2020-09-24 14:54:33 +00:00
|
|
|
if (blocklisted(options->compare[i].name))
|
2020-01-22 13:10:59 +00:00
|
|
|
continue;
|
2014-01-10 14:07:02 +00:00
|
|
|
if (options->compare[i].type == GRIB_NAMESPACE) {
|
2021-10-13 15:32:34 +00:00
|
|
|
int num_keys_in_namespace = 0;
|
2020-01-22 13:10:59 +00:00
|
|
|
iter = grib_keys_iterator_new(h1, 0, options->compare[i].name);
|
2014-01-10 14:07:02 +00:00
|
|
|
if (!iter) {
|
2021-10-13 15:32:34 +00:00
|
|
|
printf("ERROR: unable to get keys iterator for namespace \"%s\".\n", options->compare[i].name);
|
2014-01-10 14:07:02 +00:00
|
|
|
exit(1);
|
|
|
|
}
|
2020-01-22 13:10:59 +00:00
|
|
|
while (grib_keys_iterator_next(iter)) {
|
|
|
|
name = grib_keys_iterator_get_name(iter);
|
2021-10-13 15:32:34 +00:00
|
|
|
num_keys_in_namespace++;
|
2014-01-10 14:07:02 +00:00
|
|
|
|
2020-09-24 14:54:33 +00:00
|
|
|
if (blocklisted(name))
|
2020-01-22 13:10:59 +00:00
|
|
|
continue;
|
|
|
|
if (compare_values(options, h1, h2, name, GRIB_TYPE_UNDEFINED))
|
|
|
|
err++;
|
2014-01-10 14:07:02 +00:00
|
|
|
}
|
|
|
|
grib_keys_iterator_delete(iter);
|
2021-12-17 17:03:34 +00:00
|
|
|
if (num_keys_in_namespace == 0 && !editionIndependent) {
|
2021-10-13 15:32:34 +00:00
|
|
|
printf("ERROR: namespace \"%s\" does not contain any key.\n", options->compare[i].name);
|
|
|
|
}
|
2020-01-22 13:10:59 +00:00
|
|
|
}
|
|
|
|
else {
|
|
|
|
if (compare_values(options, h1, h2, options->compare[i].name, options->compare[i].type))
|
2014-01-10 14:07:02 +00:00
|
|
|
err++;
|
|
|
|
}
|
|
|
|
}
|
2020-01-22 13:10:59 +00:00
|
|
|
}
|
|
|
|
else {
|
|
|
|
const void *msg1 = NULL, *msg2 = NULL;
|
|
|
|
size_t size1 = 0, size2 = 0;
|
|
|
|
GRIB_CHECK_NOLINE(grib_get_message(h1, &msg1, &size1), 0);
|
|
|
|
GRIB_CHECK_NOLINE(grib_get_message(h2, &msg2, &size2), 0);
|
|
|
|
if (size1 == size2 && !memcmp(msg1, msg2, size1))
|
2014-01-10 14:07:02 +00:00
|
|
|
return 0;
|
|
|
|
|
2020-01-22 13:10:59 +00:00
|
|
|
iter = grib_keys_iterator_new(h1, GRIB_KEYS_ITERATOR_SKIP_COMPUTED, NULL);
|
2014-01-10 14:07:02 +00:00
|
|
|
|
|
|
|
if (!iter) {
|
2016-04-08 10:01:25 +00:00
|
|
|
printf("ERROR: unable to get keys iterator\n");
|
2014-01-10 14:07:02 +00:00
|
|
|
exit(1);
|
|
|
|
}
|
|
|
|
|
2020-01-22 13:10:59 +00:00
|
|
|
while (grib_keys_iterator_next(iter)) {
|
|
|
|
name = grib_keys_iterator_get_name(iter);
|
2014-01-10 14:07:02 +00:00
|
|
|
/*printf("----- comparing %s\n",name);*/
|
|
|
|
|
2020-09-24 14:54:33 +00:00
|
|
|
if (blocklisted(name))
|
2020-01-22 13:10:59 +00:00
|
|
|
continue;
|
|
|
|
if (compare_values(options, h1, h2, name, GRIB_TYPE_UNDEFINED))
|
|
|
|
err++;
|
2014-01-10 14:07:02 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
grib_keys_iterator_delete(iter);
|
|
|
|
|
2020-01-22 13:10:59 +00:00
|
|
|
if (listFromCommandLine) {
|
|
|
|
for (i = 0; i < options->compare_count; i++) {
|
2020-09-24 14:54:33 +00:00
|
|
|
if (blocklisted(options->compare[i].name))
|
2020-01-22 13:10:59 +00:00
|
|
|
continue;
|
2014-01-10 14:07:02 +00:00
|
|
|
if (options->compare[i].type == GRIB_NAMESPACE) {
|
2020-01-22 13:10:59 +00:00
|
|
|
iter = grib_keys_iterator_new(h1, 0, options->compare[i].name);
|
2014-01-10 14:07:02 +00:00
|
|
|
if (!iter) {
|
2020-01-22 13:10:59 +00:00
|
|
|
printf("ERROR: unable to get iterator for %s\n", options->compare[i].name);
|
2014-01-10 14:07:02 +00:00
|
|
|
exit(1);
|
|
|
|
}
|
2020-01-22 13:10:59 +00:00
|
|
|
while (grib_keys_iterator_next(iter)) {
|
|
|
|
name = grib_keys_iterator_get_name(iter);
|
2014-01-10 14:07:02 +00:00
|
|
|
/*printf("----- comparing %s\n",name);*/
|
|
|
|
|
2020-09-24 14:54:33 +00:00
|
|
|
if (blocklisted(name))
|
2020-01-22 13:10:59 +00:00
|
|
|
continue;
|
|
|
|
if (compare_values(options, h1, h2, name, GRIB_TYPE_UNDEFINED))
|
|
|
|
err++;
|
2014-01-10 14:07:02 +00:00
|
|
|
}
|
|
|
|
grib_keys_iterator_delete(iter);
|
2020-01-22 13:10:59 +00:00
|
|
|
}
|
|
|
|
else {
|
|
|
|
if (compare_values(options, h1, h2, options->compare[i].name, options->compare[i].type))
|
2014-01-10 14:07:02 +00:00
|
|
|
err++;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
return err;
|
2013-03-25 12:04:10 +00:00
|
|
|
}
|
2015-05-01 09:04:58 +00:00
|
|
|
|
2016-08-30 12:45:02 +00:00
|
|
|
int grib_no_handle_action(grib_runtime_options* options, int err)
|
2016-04-08 10:01:25 +00:00
|
|
|
{
|
2020-01-22 13:10:59 +00:00
|
|
|
fprintf(dump_file, "\t\t\"ERROR: unreadable message\"\n");
|
2016-04-08 10:01:25 +00:00
|
|
|
return 0;
|
2015-05-01 09:04:58 +00:00
|
|
|
}
|