From 33812aee4c55a406b4e41a06a5ae42a96fa72aa5 Mon Sep 17 00:00:00 2001 From: Allen Byrne Date: Mon, 11 Sep 2017 12:44:00 -0500 Subject: Fix merge typos --- tools/lib/h5diff_array.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/tools/lib/h5diff_array.c b/tools/lib/h5diff_array.c index 68a9575..32ce3db 100644 --- a/tools/lib/h5diff_array.c +++ b/tools/lib/h5diff_array.c @@ -1515,7 +1515,7 @@ static hsize_t diff_datum( } else if (per > options->percent && (double) ABS(temp1_float - temp2_float) > options->delta) { if (print_data(options)) { - print_pos(ph, 1, index, acc, pos, rank, dims, obj1, + print_pos(ph, 1, index, acc, pos, rank, dims, obj1, obj2); parallel_print(SPACES); parallel_print(F_FORMAT_P, (double) temp1_float, (double) temp2_float, (double) ABS(temp1_float - temp2_float), (double) ABS(1 - temp2_float / temp1_float)); @@ -2762,7 +2762,7 @@ static hsize_t diff_ldouble(unsigned char *mem1, if (print_data(options)) { print_pos(ph, 0, hyper_start + i, acc, pos, rank, dims, obj1, obj2); parallel_print(SPACES); - parallel_print(F_FORMAT, temp1_double, temp2_double, ABS(temp1_double - emp2_double)); + parallel_print(F_FORMAT, temp1_double, temp2_double, ABS(temp1_double - temp2_double)); } nfound++; @@ -3196,7 +3196,7 @@ static hsize_t diff_short(unsigned char *mem1, unsigned char *mem2, if (ABS(temp1_short-temp2_short) > options->delta) { if (print_data(options)) { - print_pos(ph, 0, hyper_start + i, acc, pos, rank, dims obj1, obj2); + print_pos(ph, 0, hyper_start + i, acc, pos, rank, dims, obj1, obj2); parallel_print(SPACES); parallel_print(I_FORMAT, temp1_short, temp2_short, ABS(temp1_short - temp2_short)); } -- cgit v0.12