From f3da045ba60f41343a509339f057e37312b0e1b9 Mon Sep 17 00:00:00 2001 From: Edward Hartnett Date: Mon, 15 Jan 2024 11:12:02 -0700 Subject: [PATCH] adding g2c_index test --- tests/run_index_tests.sh | 2 +- utils/g2c_index.c | 20 ++++++++++---------- 2 files changed, 11 insertions(+), 11 deletions(-) diff --git a/tests/run_index_tests.sh b/tests/run_index_tests.sh index 1429dd21..853b8405 100644 --- a/tests/run_index_tests.sh +++ b/tests/run_index_tests.sh @@ -10,7 +10,7 @@ echo "" echo "*** Running g2c_index test" # Read GRIB1 index. -../utils/g2c_index -v data/ref_gdaswave_2.grib1.idx g2c_index_gdaswave_2.grib1.idx.txt +../utils/g2c_index -v data/gdaswave.t00z.wcoast.0p16.f000.grib2 gdaswave.t00z.wcoast.0p16.f000.grib2.idx # Check against expected output. #diff -w g2c_degrib2_gdaswave.t00z.wcoast.0p16.f000.grib2.degrib2 data/ref_gdaswave.degrib2.txt diff --git a/utils/g2c_index.c b/utils/g2c_index.c index e1ccec6c..f26fbfde 100644 --- a/utils/g2c_index.c +++ b/utils/g2c_index.c @@ -30,8 +30,8 @@ main(int argc, char **argv) int index; int c; int p = 0; - /* int g2cid; */ - /* int ret; */ + int g2cid; + int ret; opterr = 0; @@ -69,16 +69,16 @@ main(int argc, char **argv) printf("g2c_index %s reading index file %s summarizing into %s.\n", G2C_VERSION, path[0], path[1]); /* Open the GRIB2 file. */ - /* if ((ret = g2c_open(path[0], G2C_NOWRITE, &g2cid))) */ - /* return ret; */ + if ((ret = g2c_open(path[0], G2C_NOWRITE, &g2cid))) + return ret; - /* /\* Write the degrib2 summary. *\/ */ - /* if ((ret = g2c_degrib2(g2cid, path[1]))) */ - /* return ret; */ + /* Write the index file. */ + if ((ret = g2c_write_index(g2cid, G2C_CLOBBER, path[1]))) + return ret; - /* /\* Close the file. *\/ */ - /* if ((ret = g2c_close(g2cid))) */ - /* return ret; */ + /* Close the file. */ + if ((ret = g2c_close(g2cid))) + return ret; /* Free memory. */ if (path[0])