htmie

Optical properties of water droplets
git clone git://git.meso-star.fr/htmie.git
Log | Files | Refs | README | LICENSE

commit ea184c6a8fcd93245ec80870294c93fae1e29158
parent f7c61dc7578587398bc3e3137f4dde55fd7ad355
Author: Vincent Forest <vincent.forest@meso-star.com>
Date:   Wed, 11 Oct 2023 09:47:52 +0200

Delete unnecessary tests in test_htmie_load

Do not check rmod and smod variables, which are neither required by the
htmie format nor read by the htmie library.

Diffstat:
MMakefile | 4+---
Msrc/test_htmie_load.c | 16----------------
2 files changed, 1 insertion(+), 19 deletions(-)

diff --git a/Makefile b/Makefile @@ -124,9 +124,7 @@ TEST_MIE_LUT_VARS =\ $(TEST_MIE_LUT)_g\ $(TEST_MIE_LUT)_lambda\ $(TEST_MIE_LUT)_macs\ - $(TEST_MIE_LUT)_mscs\ - $(TEST_MIE_LUT)_rmod\ - $(TEST_MIE_LUT)_smod + $(TEST_MIE_LUT)_mscs PKG_CONFIG_LOCAL = PKG_CONFIG_PATH="./:$${PKG_CONFIG_PATH}" $(PKG_CONFIG) HTMIE_CFLAGS = $$($(PKG_CONFIG_LOCAL) $(PCFLAGS) --cflags htmie-local.pc) diff --git a/src/test_htmie_load.c b/src/test_htmie_load.c @@ -279,7 +279,6 @@ main(int argc, char** argv) char* p = NULL; FILE* fp = NULL; struct htmie* htmie = NULL; - double rmod, smod; size_t i; if(argc < 3) { @@ -314,20 +313,6 @@ main(int argc, char** argv) CHK(fscanf(fp, "%*g") == EOF); CHK(fclose(fp) == 0); - /* Read rmod */ - CHK((size_t)snprintf(buf, sizeof(buf), "%s/%s_rmod", path, base)<sizeof(buf)); - CHK(fp = fopen(buf, "r")); - CHK(fscanf(fp, "%lg", &rmod) == 1); - CHK(fscanf(fp, "%*g") == EOF); - CHK(fclose(fp) == 0); - - /* Read smod */ - CHK((size_t)snprintf(buf, sizeof(buf), "%s/%s_smod", path, base)<sizeof(buf)); - CHK(fp = fopen(buf, "r")); - CHK(fscanf(fp, "%lg", &smod) == 1); - CHK(fscanf(fp, "%*g") == EOF); - CHK(fclose(fp) == 0); - /* Check absorption cross sections */ CHK((size_t)snprintf(buf, sizeof(buf), "%s/%s_macs", path, base)<sizeof(buf)); CHK(fp = fopen(buf, "r")); @@ -363,7 +348,6 @@ main(int argc, char** argv) CHK(fscanf(fp, "%*g") == EOF); CHK(fclose(fp) == 0); - test_fetch(htmie); test_bounds(htmie); test_avg(htmie);