From 2b98e8a40d8b87f8aece711c4fefac7a5297a821 Mon Sep 17 00:00:00 2001 From: Shahram Najm Date: Tue, 2 Feb 2021 18:25:49 +0000 Subject: [PATCH] ECC-1197: grib_get_data: Words on the first line should be separated by spaces not commas --- data/scan_x_regular_ll_5_4_good.dump | 2 +- data/scan_x_regular_ll_5_7_good.dump | 2 +- data/scan_x_regular_ll_8_4_good.dump | 2 +- data/scan_x_regular_ll_8_7_good.dump | 2 +- data/scan_x_rotated_ll_5_4_good.dump | 2 +- data/scan_x_rotated_ll_5_7_good.dump | 2 +- data/scan_x_rotated_ll_8_4_good.dump | 2 +- data/scan_x_rotated_ll_8_7_good.dump | 2 +- data/scan_y_regular_ll_5_4_good.dump | 2 +- data/scan_y_regular_ll_5_7_good.dump | 2 +- data/scan_y_regular_ll_8_4_good.dump | 2 +- data/scan_y_regular_ll_8_7_good.dump | 2 +- data/scan_y_rotated_ll_5_4_good.dump | 2 +- data/scan_y_rotated_ll_5_7_good.dump | 2 +- data/scan_y_rotated_ll_8_4_good.dump | 2 +- data/scan_y_rotated_ll_8_7_good.dump | 2 +- tests/grib_iterator.sh | 2 +- tests/grib_lamb_az_eq_area.ref | 2 +- tools/grib_get_data.c | 2 +- 19 files changed, 19 insertions(+), 19 deletions(-) diff --git a/data/scan_x_regular_ll_5_4_good.dump b/data/scan_x_regular_ll_5_4_good.dump index 66efea3b9..599046679 100644 --- a/data/scan_x_regular_ll_5_4_good.dump +++ b/data/scan_x_regular_ll_5_4_good.dump @@ -1,4 +1,4 @@ -Latitude, Longitude, Value +Latitude Longitude Value 20.000 24.000 5 20.000 23.000 4 20.000 22.000 3 diff --git a/data/scan_x_regular_ll_5_7_good.dump b/data/scan_x_regular_ll_5_7_good.dump index d34e8db24..46f0d79c3 100644 --- a/data/scan_x_regular_ll_5_7_good.dump +++ b/data/scan_x_regular_ll_5_7_good.dump @@ -1,4 +1,4 @@ -Latitude, Longitude, Value +Latitude Longitude Value 20.000 24.000 5 20.000 23.000 4 20.000 22.000 3 diff --git a/data/scan_x_regular_ll_8_4_good.dump b/data/scan_x_regular_ll_8_4_good.dump index bff032c3e..39037b47c 100644 --- a/data/scan_x_regular_ll_8_4_good.dump +++ b/data/scan_x_regular_ll_8_4_good.dump @@ -1,4 +1,4 @@ -Latitude, Longitude, Value +Latitude Longitude Value 20.000 27.000 8 20.000 26.000 7 20.000 25.000 6 diff --git a/data/scan_x_regular_ll_8_7_good.dump b/data/scan_x_regular_ll_8_7_good.dump index c7ebdeec6..ca83e716e 100644 --- a/data/scan_x_regular_ll_8_7_good.dump +++ b/data/scan_x_regular_ll_8_7_good.dump @@ -1,4 +1,4 @@ -Latitude, Longitude, Value +Latitude Longitude Value 20.000 27.000 8 20.000 26.000 7 20.000 25.000 6 diff --git a/data/scan_x_rotated_ll_5_4_good.dump b/data/scan_x_rotated_ll_5_4_good.dump index 77a4e5d61..defcc9e07 100644 --- a/data/scan_x_rotated_ll_5_4_good.dump +++ b/data/scan_x_rotated_ll_5_4_good.dump @@ -1,4 +1,4 @@ -Latitude, Longitude, Value +Latitude Longitude Value 59.143 131.824 5 59.882 132.969 4 60.606 134.175 3 diff --git a/data/scan_x_rotated_ll_5_7_good.dump b/data/scan_x_rotated_ll_5_7_good.dump index 54985ef5d..8af270566 100644 --- a/data/scan_x_rotated_ll_5_7_good.dump +++ b/data/scan_x_rotated_ll_5_7_good.dump @@ -1,4 +1,4 @@ -Latitude, Longitude, Value +Latitude Longitude Value 59.143 131.824 5 59.882 132.969 4 60.606 134.175 3 diff --git a/data/scan_x_rotated_ll_8_4_good.dump b/data/scan_x_rotated_ll_8_4_good.dump index f7ab7ec97..5a2a5682e 100644 --- a/data/scan_x_rotated_ll_8_4_good.dump +++ b/data/scan_x_rotated_ll_8_4_good.dump @@ -1,4 +1,4 @@ -Latitude, Longitude, Value +Latitude Longitude Value 56.853 128.720 8 57.628 129.702 7 58.392 130.736 6 diff --git a/data/scan_x_rotated_ll_8_7_good.dump b/data/scan_x_rotated_ll_8_7_good.dump index 661b6c972..74cc5de43 100644 --- a/data/scan_x_rotated_ll_8_7_good.dump +++ b/data/scan_x_rotated_ll_8_7_good.dump @@ -1,4 +1,4 @@ -Latitude, Longitude, Value +Latitude Longitude Value 56.853 128.720 8 57.628 129.702 7 58.392 130.736 6 diff --git a/data/scan_y_regular_ll_5_4_good.dump b/data/scan_y_regular_ll_5_4_good.dump index dcccfb8a3..3e43e4b33 100644 --- a/data/scan_y_regular_ll_5_4_good.dump +++ b/data/scan_y_regular_ll_5_4_good.dump @@ -1,4 +1,4 @@ -Latitude, Longitude, Value +Latitude Longitude Value 17.000 20.000 16 17.000 21.000 17 17.000 22.000 18 diff --git a/data/scan_y_regular_ll_5_7_good.dump b/data/scan_y_regular_ll_5_7_good.dump index 8d5be97b9..0637dcc57 100644 --- a/data/scan_y_regular_ll_5_7_good.dump +++ b/data/scan_y_regular_ll_5_7_good.dump @@ -1,4 +1,4 @@ -Latitude, Longitude, Value +Latitude Longitude Value 14.000 20.000 31 14.000 21.000 32 14.000 22.000 33 diff --git a/data/scan_y_regular_ll_8_4_good.dump b/data/scan_y_regular_ll_8_4_good.dump index 7b2ca02fc..6e9b3e792 100644 --- a/data/scan_y_regular_ll_8_4_good.dump +++ b/data/scan_y_regular_ll_8_4_good.dump @@ -1,4 +1,4 @@ -Latitude, Longitude, Value +Latitude Longitude Value 17.000 20.000 25 17.000 21.000 26 17.000 22.000 27 diff --git a/data/scan_y_regular_ll_8_7_good.dump b/data/scan_y_regular_ll_8_7_good.dump index e225cd92a..a7bffbfac 100644 --- a/data/scan_y_regular_ll_8_7_good.dump +++ b/data/scan_y_regular_ll_8_7_good.dump @@ -1,4 +1,4 @@ -Latitude, Longitude, Value +Latitude Longitude Value 14.000 20.000 49 14.000 21.000 50 14.000 22.000 51 diff --git a/data/scan_y_rotated_ll_5_4_good.dump b/data/scan_y_rotated_ll_5_4_good.dump index a1dd2205b..7127c3ffe 100644 --- a/data/scan_y_rotated_ll_5_4_good.dump +++ b/data/scan_y_rotated_ll_5_4_good.dump @@ -1,4 +1,4 @@ -Latitude, Longitude, Value +Latitude Longitude Value 63.979 131.793 16 63.226 130.468 17 62.458 129.219 18 diff --git a/data/scan_y_rotated_ll_5_7_good.dump b/data/scan_y_rotated_ll_5_7_good.dump index 7c547d75e..80d0f3187 100644 --- a/data/scan_y_rotated_ll_5_7_good.dump +++ b/data/scan_y_rotated_ll_5_7_good.dump @@ -1,4 +1,4 @@ -Latitude, Longitude, Value +Latitude Longitude Value 65.752 126.092 31 64.938 124.828 32 64.111 123.647 33 diff --git a/data/scan_y_rotated_ll_8_4_good.dump b/data/scan_y_rotated_ll_8_4_good.dump index 8627db057..aa3e69861 100644 --- a/data/scan_y_rotated_ll_8_4_good.dump +++ b/data/scan_y_rotated_ll_8_4_good.dump @@ -1,4 +1,4 @@ -Latitude, Longitude, Value +Latitude Longitude Value 63.979 131.793 25 63.226 130.468 26 62.458 129.219 27 diff --git a/data/scan_y_rotated_ll_8_7_good.dump b/data/scan_y_rotated_ll_8_7_good.dump index cf6cc9412..93b275e55 100644 --- a/data/scan_y_rotated_ll_8_7_good.dump +++ b/data/scan_y_rotated_ll_8_7_good.dump @@ -1,4 +1,4 @@ -Latitude, Longitude, Value +Latitude Longitude Value 65.752 126.092 49 64.938 124.828 50 64.111 123.647 51 diff --git a/tests/grib_iterator.sh b/tests/grib_iterator.sh index 16db96621..a359ad4a4 100755 --- a/tests/grib_iterator.sh +++ b/tests/grib_iterator.sh @@ -23,7 +23,7 @@ files="reduced_latlon_surface.grib1 \ for f in $files; do file=${data_dir}/$f - # Must exclude the first line of grib_get_data which is "Latitude, Longitude, Value" + # Must exclude the first line of grib_get_data which is "Latitude Longitude Value" iterator_count=`${tools_dir}/grib_get_data -m 9999:missing -f -p centre -F "%g" -w count=1 $file | grep -v Lat |wc -l ` numberOfPoints=`${tools_dir}/grib_get -w count=1 -p numberOfPoints $file` [ $numberOfPoints = ${iterator_count} ] diff --git a/tests/grib_lamb_az_eq_area.ref b/tests/grib_lamb_az_eq_area.ref index d1082d08c..166dc4d85 100644 --- a/tests/grib_lamb_az_eq_area.ref +++ b/tests/grib_lamb_az_eq_area.ref @@ -1,4 +1,4 @@ -Latitude, Longitude, Value +Latitude Longitude Value 67.575 326.506 2.0000000000e+00 67.601 326.601 2.0000000000e+00 67.626 326.696 2.0000000000e+00 diff --git a/tools/grib_get_data.c b/tools/grib_get_data.c index 61db62751..0960cb0cb 100644 --- a/tools/grib_get_data.c +++ b/tools/grib_get_data.c @@ -188,7 +188,7 @@ int grib_tool_new_handle_action(grib_runtime_options* options, grib_handle* h) } if (iter) - fprintf(dump_file, "Latitude, Longitude, "); + fprintf(dump_file, "Latitude Longitude "); fprintf(dump_file, "Value");