rnsf

Define and load a phase function data format
git clone git://git.meso-star.fr/rnsf.git
Log | Files | Refs | README | LICENSE

commit 0b89de5bb1130f3af4f424cd10e1718c5a879b90
parent 3a54cdffad7d28f89bfc11166029b88547cb185f
Author: Vincent Forest <vincent.forest@meso-star.com>
Date:   Thu,  7 Jul 2022 11:21:34 +0200

Fix loading tests

Diffstat:
Msrc/test_rnsf_bands.c | 86++++++++++++++++++++++++++++++++++++++++----------------------------------------
Msrc/test_rnsf_wlens.c | 110++++++++++++++++++++++++++++++++++++++++----------------------------------------
2 files changed, 98 insertions(+), 98 deletions(-)

diff --git a/src/test_rnsf_bands.c b/src/test_rnsf_bands.c @@ -34,13 +34,13 @@ test_load1(struct rnsf* rnsf) FILE* fp = NULL; const char* filename = "test_file_bands.rnsf"; const struct rnsf_phase_fn* phase = NULL; - struct rnsf_phase_fn_hg hg = RNSF_PHASE_FN_HG_NULL; + struct rnsf_phase_fn_hg HG = RNSF_PHASE_FN_HG_NULL; CHK(fp = fopen(filename, "w+")); fprintf(fp, "# Comment\n"); fprintf(fp, "bands 1\n"); fprintf(fp, "\n"); - fprintf(fp, "200.1 280.3 hg 0\n"); + fprintf(fp, "200.1 280.3 HG 0\n"); rewind(fp); CHK(rnsf_load_stream(NULL, fp, filename) == RES_BAD_ARG); @@ -59,12 +59,12 @@ test_load1(struct rnsf* rnsf) CHK(phase = rnsf_get_phase_fn(rnsf, 0)); CHK(rnsf_phase_fn_get_type(phase) == RNSF_PHASE_FN_HG); - CHK(rnsf_phase_fn_get_hg(NULL, &hg) == RES_BAD_ARG); + CHK(rnsf_phase_fn_get_hg(NULL, &HG) == RES_BAD_ARG); CHK(rnsf_phase_fn_get_hg(phase, NULL) == RES_BAD_ARG); - CHK(rnsf_phase_fn_get_hg(phase, &hg) == RES_OK); - CHK(hg.wavelengths[0] == 200.1); - CHK(hg.wavelengths[1] == 280.3); - CHK(hg.g == 0); + CHK(rnsf_phase_fn_get_hg(phase, &HG) == RES_OK); + CHK(HG.wavelengths[0] == 200.1); + CHK(HG.wavelengths[1] == 280.3); + CHK(HG.g == 0); CHK(fclose(fp) == 0); } @@ -72,7 +72,7 @@ static void test_load2(struct rnsf* rnsf) { struct rnsf_phase_fn_discrete discrete = RNSF_PHASE_FN_DISCRETE_NULL; - struct rnsf_phase_fn_hg hg = RNSF_PHASE_FN_HG_NULL; + struct rnsf_phase_fn_hg HG = RNSF_PHASE_FN_HG_NULL; FILE* fp = NULL; const struct rnsf_phase_fn* phase = NULL; @@ -85,16 +85,16 @@ test_load2(struct rnsf* rnsf) CHK(fp = tmpfile()); fprintf(fp, "bands 5\n"); - fprintf(fp, "100 200 hg -0.3\n"); - fprintf(fp, "200 300 hg 0.4\n"); - fprintf(fp, "300 400 hg 0.5\n"); + fprintf(fp, "100 200 HG -0.3\n"); + fprintf(fp, "200 300 HG 0.4\n"); + fprintf(fp, "300 400 HG 0.5\n"); fprintf(fp, "850 875.123 discrete 5\n"); fprintf(fp, " 0 0.3\n"); fprintf(fp, " %.9g 0.3\n", PI/4.0); fprintf(fp, " %.9g 0.3\n", PI/2.0); fprintf(fp, " %.9g 0.3\n", 3*PI/4.0); fprintf(fp, " 3.14159 0.3\n"); - fprintf(fp, "900 900 hg -0.1\n"); + fprintf(fp, "900 900 HG -0.1\n"); rewind(fp); CHK(rnsf_load_stream(rnsf, fp, NULL) == RES_OK); @@ -103,25 +103,25 @@ test_load2(struct rnsf* rnsf) CHK(phase = rnsf_get_phase_fn(rnsf, 0)); CHK(rnsf_phase_fn_get_type(phase) == RNSF_PHASE_FN_HG); CHK(rnsf_phase_fn_get_discrete(phase, &discrete) == RES_BAD_ARG); - CHK(rnsf_phase_fn_get_hg(phase, &hg) == RES_OK); - CHK(hg.wavelengths[0] == 100 && hg.wavelengths[1] == 200); - CHK(hg.g == -0.3); + CHK(rnsf_phase_fn_get_hg(phase, &HG) == RES_OK); + CHK(HG.wavelengths[0] == 100 && HG.wavelengths[1] == 200); + CHK(HG.g == -0.3); CHK(phase = rnsf_get_phase_fn(rnsf, 1)); CHK(rnsf_phase_fn_get_type(phase) == RNSF_PHASE_FN_HG); - CHK(rnsf_phase_fn_get_hg(phase, &hg) == RES_OK); - CHK(hg.wavelengths[0] == 200 && hg.wavelengths[1] == 300); - CHK(hg.g == 0.4); + CHK(rnsf_phase_fn_get_hg(phase, &HG) == RES_OK); + CHK(HG.wavelengths[0] == 200 && HG.wavelengths[1] == 300); + CHK(HG.g == 0.4); CHK(phase = rnsf_get_phase_fn(rnsf, 2)); CHK(rnsf_phase_fn_get_type(phase) == RNSF_PHASE_FN_HG); - CHK(rnsf_phase_fn_get_hg(phase, &hg) == RES_OK); - CHK(hg.wavelengths[0] == 300 && hg.wavelengths[1] == 400); - CHK(hg.g == 0.5); + CHK(rnsf_phase_fn_get_hg(phase, &HG) == RES_OK); + CHK(HG.wavelengths[0] == 300 && HG.wavelengths[1] == 400); + CHK(HG.g == 0.5); CHK(phase = rnsf_get_phase_fn(rnsf, 3)); CHK(rnsf_phase_fn_get_type(phase) == RNSF_PHASE_FN_DISCRETE); - CHK(rnsf_phase_fn_get_hg(phase, &hg) == RES_BAD_ARG); + CHK(rnsf_phase_fn_get_hg(phase, &HG) == RES_BAD_ARG); CHK(rnsf_phase_fn_get_discrete(NULL, &discrete) == RES_BAD_ARG); CHK(rnsf_phase_fn_get_discrete(phase, NULL) == RES_BAD_ARG); CHK(rnsf_phase_fn_get_discrete(phase, &discrete) == RES_OK); @@ -141,9 +141,9 @@ test_load2(struct rnsf* rnsf) CHK(phase = rnsf_get_phase_fn(rnsf, 4)); CHK(rnsf_phase_fn_get_type(phase) == RNSF_PHASE_FN_HG); - CHK(rnsf_phase_fn_get_hg(phase, &hg) == RES_OK); - CHK(hg.wavelengths[0] == 900 && hg.wavelengths[1] == 900); - CHK(hg.g == -0.1); + CHK(rnsf_phase_fn_get_hg(phase, &HG) == RES_OK); + CHK(HG.wavelengths[0] == 900 && HG.wavelengths[1] == 900); + CHK(HG.g == -0.1); CHK(fclose(fp) == 0); } @@ -170,8 +170,8 @@ test_fetch(struct rnsf* rnsf) CHK(fp = tmpfile()); fprintf(fp, "bands 2\n"); - fprintf(fp, "200 300 hg 0.0\n"); - fprintf(fp, "300 400 hg 0.1\n"); + fprintf(fp, "200 300 HG 0.0\n"); + fprintf(fp, "300 400 HG 0.1\n"); rewind(fp); CHK(rnsf_load_stream(rnsf, fp, NULL) == RES_OK); CHK(fclose(fp) == 0); @@ -187,9 +187,9 @@ test_fetch(struct rnsf* rnsf) CHK(fp = tmpfile()); fprintf(fp, "bands 4\n"); - fprintf(fp, "100 150 hg 0\n"); - fprintf(fp, "200 200 hg 1\n"); - fprintf(fp, "300 400 hg -1\n"); + fprintf(fp, "100 150 HG 0\n"); + fprintf(fp, "200 200 HG 1\n"); + fprintf(fp, "300 400 HG -1\n"); fprintf(fp, "400 401 discrete 4\n"); fprintf(fp, " 0 1\n"); fprintf(fp, " 0.5 1\n"); @@ -223,7 +223,7 @@ test_load_fail(struct rnsf* rnsf) /* Invalid keyword */ CHK(fp = tmpfile()); fprintf(fp, "bandes 1\n"); - fprintf(fp, "380 780 hg 0.5\n"); + fprintf(fp, "380 780 HG 0.5\n"); rewind(fp); CHK(rnsf_load_stream(rnsf, fp, NULL) == RES_BAD_ARG); CHK(fclose(fp) == 0); @@ -231,7 +231,7 @@ test_load_fail(struct rnsf* rnsf) /* No band count */ CHK(fp = tmpfile()); fprintf(fp, "bands\n"); - fprintf(fp, "380 780 hg 0.5\n"); + fprintf(fp, "380 780 HG 0.5\n"); rewind(fp); CHK(rnsf_load_stream(rnsf, fp, NULL) == RES_BAD_ARG); CHK(fclose(fp) == 0); @@ -239,7 +239,7 @@ test_load_fail(struct rnsf* rnsf) /* Missing a band definition */ CHK(fp = tmpfile()); fprintf(fp, "bands 2\n"); - fprintf(fp, "380 780 hg 0.5\n"); + fprintf(fp, "380 780 HG 0.5\n"); rewind(fp); CHK(rnsf_load_stream(rnsf, fp, NULL) == RES_BAD_ARG); CHK(fclose(fp) == 0); @@ -247,7 +247,7 @@ test_load_fail(struct rnsf* rnsf) /* Invalid wavelengths */ CHK(fp = tmpfile()); fprintf(fp, "bands 1\n"); - fprintf(fp, "-380 780 hg 0.5\n"); + fprintf(fp, "-380 780 HG 0.5\n"); rewind(fp); CHK(rnsf_load_stream(rnsf, fp, NULL) == RES_BAD_ARG); CHK(fclose(fp) == 0); @@ -255,7 +255,7 @@ test_load_fail(struct rnsf* rnsf) /* Missing a band boundary */ CHK(fp = tmpfile()); fprintf(fp, "bands 1\n"); - fprintf(fp, "380 hg 0.5\n"); + fprintf(fp, "380 HG 0.5\n"); rewind(fp); CHK(rnsf_load_stream(rnsf, fp, NULL) == RES_BAD_ARG); CHK(fclose(fp) == 0); @@ -271,7 +271,7 @@ test_load_fail(struct rnsf* rnsf) /* Invalid asymmetric param */ CHK(fp = tmpfile()); fprintf(fp, "bands 1\n"); - fprintf(fp, "380 780 hg 1.01\n"); + fprintf(fp, "380 780 HG 1.01\n"); rewind(fp); CHK(rnsf_load_stream(rnsf, fp, NULL) == RES_BAD_ARG); CHK(fclose(fp) == 0); @@ -279,7 +279,7 @@ test_load_fail(struct rnsf* rnsf) /* Additional parameters. Print a warning */ CHK(fp = tmpfile()); fprintf(fp, "bands 1 additional_text\n"); - fprintf(fp, "380 780 hg 1.0\n"); + fprintf(fp, "380 780 HG 1.0\n"); rewind(fp); CHK(rnsf_load_stream(rnsf, fp, NULL) == RES_OK); CHK(fclose(fp) == 0); @@ -287,8 +287,8 @@ test_load_fail(struct rnsf* rnsf) /* Unsorted phase functions */ CHK(fp = tmpfile()); fprintf(fp, "bands 2\n"); - fprintf(fp, "380 400 hg 1.0\n"); - fprintf(fp, "280 300 hg 0.0\n"); + fprintf(fp, "380 400 HG 1.0\n"); + fprintf(fp, "280 300 HG 0.0\n"); rewind(fp); CHK(rnsf_load_stream(rnsf, fp, NULL) == RES_BAD_ARG); CHK(fclose(fp) == 0); @@ -296,8 +296,8 @@ test_load_fail(struct rnsf* rnsf) /* Phase functions overlap */ CHK(fp = tmpfile()); fprintf(fp, "bands 2\n"); - fprintf(fp, "280 400 hg 1.0\n"); - fprintf(fp, "300 480 hg 0.0\n"); + fprintf(fp, "280 400 HG 1.0\n"); + fprintf(fp, "300 480 HG 0.0\n"); rewind(fp); CHK(rnsf_load_stream(rnsf, fp, NULL) == RES_BAD_ARG); CHK(fclose(fp) == 0); @@ -305,8 +305,8 @@ test_load_fail(struct rnsf* rnsf) /* Phase functions overlap */ CHK(fp = tmpfile()); fprintf(fp, "bands 2\n"); - fprintf(fp, "280 280 hg 1.0\n"); - fprintf(fp, "280 280 hg 0.0\n"); + fprintf(fp, "280 280 HG 1.0\n"); + fprintf(fp, "280 280 HG 0.0\n"); rewind(fp); CHK(rnsf_load_stream(rnsf, fp, NULL) == RES_BAD_ARG); CHK(fclose(fp) == 0); diff --git a/src/test_rnsf_wlens.c b/src/test_rnsf_wlens.c @@ -32,7 +32,7 @@ static void test_load(struct rnsf* rnsf) { struct rnsf_phase_fn_discrete discrete = RNSF_PHASE_FN_DISCRETE_NULL; - struct rnsf_phase_fn_hg hg = RNSF_PHASE_FN_HG_NULL; + struct rnsf_phase_fn_hg HG = RNSF_PHASE_FN_HG_NULL; const struct rnsf_phase_fn* phase = NULL; FILE* fp = NULL; @@ -47,7 +47,7 @@ test_load(struct rnsf* rnsf) fprintf(fp, "# Comment\n"); fprintf(fp, "wavelengths 1\n"); fprintf(fp, "\n"); - fprintf(fp, "200.1 hg 0\n"); + fprintf(fp, "200.1 HG 0\n"); rewind(fp); CHK(rnsf_load_stream(rnsf, fp, NULL) == RES_OK); @@ -56,10 +56,10 @@ test_load(struct rnsf* rnsf) CHK(phase = rnsf_get_phase_fn(rnsf, 0)); CHK(rnsf_phase_fn_get_type(phase) == RNSF_PHASE_FN_HG); - CHK(rnsf_phase_fn_get_hg(phase, &hg) == RES_OK); - CHK(hg.wavelengths[0] == 200.1); - CHK(hg.wavelengths[1] == 200.1); - CHK(hg.g == 0); + CHK(rnsf_phase_fn_get_hg(phase, &HG) == RES_OK); + CHK(HG.wavelengths[0] == 200.1); + CHK(HG.wavelengths[1] == 200.1); + CHK(HG.g == 0); CHK(fclose(fp) == 0); CHK(fp = tmpfile()); @@ -86,13 +86,13 @@ test_load(struct rnsf* rnsf) fprintf(fp, " %g %.9g\n", PI, 1.0/(4.0*PI)); fprintf(fp, "\n"); fprintf(fp, "# Long waves\n"); - fprintf(fp, "1100 hg -0.1\n"); - fprintf(fp, "1300 hg 0.57\n"); - fprintf(fp, "1400 hg 0.4\n"); - fprintf(fp, "2100 hg 0.3\n"); - fprintf(fp, "2500 hg -0.9\n"); - fprintf(fp, "2900 hg -0.4\n"); - fprintf(fp, "100000 hg 0.0\n"); + fprintf(fp, "1100 HG -0.1\n"); + fprintf(fp, "1300 HG 0.57\n"); + fprintf(fp, "1400 HG 0.4\n"); + fprintf(fp, "2100 HG 0.3\n"); + fprintf(fp, "2500 HG -0.9\n"); + fprintf(fp, "2900 HG -0.4\n"); + fprintf(fp, "100000 HG 0.0\n"); rewind(fp); CHK(rnsf_load_stream(rnsf, fp, NULL) == RES_OK); @@ -141,52 +141,52 @@ test_load(struct rnsf* rnsf) CHK(phase = rnsf_get_phase_fn(rnsf, 3)); CHK(rnsf_phase_fn_get_type(phase) == RNSF_PHASE_FN_HG); - CHK(rnsf_phase_fn_get_hg(phase, &hg) == RES_OK); - CHK(hg.wavelengths[0] == 1100); - CHK(hg.wavelengths[1] == 1100); - CHK(hg.g == -0.1); + CHK(rnsf_phase_fn_get_hg(phase, &HG) == RES_OK); + CHK(HG.wavelengths[0] == 1100); + CHK(HG.wavelengths[1] == 1100); + CHK(HG.g == -0.1); CHK(phase = rnsf_get_phase_fn(rnsf, 4)); CHK(rnsf_phase_fn_get_type(phase) == RNSF_PHASE_FN_HG); - CHK(rnsf_phase_fn_get_hg(phase, &hg) == RES_OK); - CHK(hg.wavelengths[0] == 1300); - CHK(hg.wavelengths[1] == 1300); - CHK(hg.g == 0.57); + CHK(rnsf_phase_fn_get_hg(phase, &HG) == RES_OK); + CHK(HG.wavelengths[0] == 1300); + CHK(HG.wavelengths[1] == 1300); + CHK(HG.g == 0.57); CHK(phase = rnsf_get_phase_fn(rnsf, 5)); CHK(rnsf_phase_fn_get_type(phase) == RNSF_PHASE_FN_HG); - CHK(rnsf_phase_fn_get_hg(phase, &hg) == RES_OK); - CHK(hg.wavelengths[0] == 1400); - CHK(hg.wavelengths[1] == 1400); - CHK(hg.g == 0.4); + CHK(rnsf_phase_fn_get_hg(phase, &HG) == RES_OK); + CHK(HG.wavelengths[0] == 1400); + CHK(HG.wavelengths[1] == 1400); + CHK(HG.g == 0.4); CHK(phase = rnsf_get_phase_fn(rnsf, 6)); CHK(rnsf_phase_fn_get_type(phase) == RNSF_PHASE_FN_HG); - CHK(rnsf_phase_fn_get_hg(phase, &hg) == RES_OK); - CHK(hg.wavelengths[0] == 2100); - CHK(hg.wavelengths[1] == 2100); - CHK(hg.g == 0.3); + CHK(rnsf_phase_fn_get_hg(phase, &HG) == RES_OK); + CHK(HG.wavelengths[0] == 2100); + CHK(HG.wavelengths[1] == 2100); + CHK(HG.g == 0.3); CHK(phase = rnsf_get_phase_fn(rnsf, 7)); CHK(rnsf_phase_fn_get_type(phase) == RNSF_PHASE_FN_HG); - CHK(rnsf_phase_fn_get_hg(phase, &hg) == RES_OK); - CHK(hg.wavelengths[0] == 2500); - CHK(hg.wavelengths[1] == 2500); - CHK(hg.g == -0.9); + CHK(rnsf_phase_fn_get_hg(phase, &HG) == RES_OK); + CHK(HG.wavelengths[0] == 2500); + CHK(HG.wavelengths[1] == 2500); + CHK(HG.g == -0.9); CHK(phase = rnsf_get_phase_fn(rnsf, 8)); CHK(rnsf_phase_fn_get_type(phase) == RNSF_PHASE_FN_HG); - CHK(rnsf_phase_fn_get_hg(phase, &hg) == RES_OK); - CHK(hg.wavelengths[0] == 2900); - CHK(hg.wavelengths[1] == 2900); - CHK(hg.g == -0.4); + CHK(rnsf_phase_fn_get_hg(phase, &HG) == RES_OK); + CHK(HG.wavelengths[0] == 2900); + CHK(HG.wavelengths[1] == 2900); + CHK(HG.g == -0.4); CHK(phase = rnsf_get_phase_fn(rnsf, 9)); CHK(rnsf_phase_fn_get_type(phase) == RNSF_PHASE_FN_HG); - CHK(rnsf_phase_fn_get_hg(phase, &hg) == RES_OK); - CHK(hg.wavelengths[0] == 100000); - CHK(hg.wavelengths[1] == 100000); - CHK(hg.g == 0); + CHK(rnsf_phase_fn_get_hg(phase, &HG) == RES_OK); + CHK(HG.wavelengths[0] == 100000); + CHK(HG.wavelengths[1] == 100000); + CHK(HG.g == 0); CHK(fclose(fp) == 0); } @@ -207,8 +207,8 @@ test_fetch(struct rnsf* rnsf) CHK(fp = tmpfile()); fprintf(fp, "wavelengths 2\n"); - fprintf(fp, "200 hg 0\n"); - fprintf(fp, "300 hg 0\n"); + fprintf(fp, "200 HG 0\n"); + fprintf(fp, "300 HG 0\n"); rewind(fp); CHK(rnsf_load_stream(rnsf, fp, NULL) == RES_OK); CHK(fclose(fp) == 0); @@ -230,9 +230,9 @@ test_fetch(struct rnsf* rnsf) CHK(fp = tmpfile()); fprintf(fp, "wavelengths 4\n"); - fprintf(fp, "100 hg 0\n"); - fprintf(fp, "200 hg 1\n"); - fprintf(fp, "300 hg -1\n"); + fprintf(fp, "100 HG 0\n"); + fprintf(fp, "200 HG 1\n"); + fprintf(fp, "300 HG -1\n"); fprintf(fp, "400 discrete 4\n"); fprintf(fp, " 0 1\n"); fprintf(fp, " 0.5 1\n"); @@ -264,7 +264,7 @@ test_load_failure(struct rnsf* rnsf) /* No wavelength count */ CHK(fp = tmpfile()); fprintf(fp, "wavelengths\n"); - fprintf(fp, "380 hg 0.5\n"); + fprintf(fp, "380 HG 0.5\n"); rewind(fp); CHK(rnsf_load_stream(rnsf, fp, NULL) == RES_BAD_ARG); CHK(fclose(fp) == 0); @@ -272,7 +272,7 @@ test_load_failure(struct rnsf* rnsf) /* Missing a phase function */ CHK(fp = tmpfile()); fprintf(fp, "wavelengths 2\n"); - fprintf(fp, "380 hg 0.5\n"); + fprintf(fp, "380 HG 0.5\n"); rewind(fp); CHK(rnsf_load_stream(rnsf, fp, NULL) == RES_BAD_ARG); CHK(fclose(fp) == 0); @@ -280,7 +280,7 @@ test_load_failure(struct rnsf* rnsf) /* Invalid wavelength */ CHK(fp = tmpfile()); fprintf(fp, "wavelengths 1\n"); - fprintf(fp, "-380 hg 0.5\n"); + fprintf(fp, "-380 HG 0.5\n"); rewind(fp); CHK(rnsf_load_stream(rnsf, fp, NULL) == RES_BAD_ARG); CHK(fclose(fp) == 0); @@ -288,8 +288,8 @@ test_load_failure(struct rnsf* rnsf) /* Unsorted phase functions */ CHK(fp = tmpfile()); fprintf(fp, "wavelengths 2\n"); - fprintf(fp, "380 hg 0.5\n"); - fprintf(fp, "280 hg 0.0\n"); + fprintf(fp, "380 HG 0.5\n"); + fprintf(fp, "280 HG 0.0\n"); rewind(fp); CHK(rnsf_load_stream(rnsf, fp, NULL) == RES_BAD_ARG); CHK(fclose(fp) == 0); @@ -297,8 +297,8 @@ test_load_failure(struct rnsf* rnsf) /* Phase functions overlap */ CHK(fp = tmpfile()); fprintf(fp, "wavelengths 2\n"); - fprintf(fp, "280 hg 0.5\n"); - fprintf(fp, "280 hg 0.0\n"); + fprintf(fp, "280 HG 0.5\n"); + fprintf(fp, "280 HG 0.0\n"); rewind(fp); CHK(rnsf_load_stream(rnsf, fp, NULL) == RES_BAD_ARG); CHK(fclose(fp) == 0); @@ -306,8 +306,8 @@ test_load_failure(struct rnsf* rnsf) /* Additional text. Print a warning */ CHK(fp = tmpfile()); fprintf(fp, "wavelengths 2 additional_text\n"); - fprintf(fp, "280 hg 0.5\n"); - fprintf(fp, "380 hg 0.0\n"); + fprintf(fp, "280 HG 0.5\n"); + fprintf(fp, "380 HG 0.0\n"); rewind(fp); CHK(rnsf_load_stream(rnsf, fp, NULL) == RES_OK); CHK(fclose(fp) == 0);