commit 34d99c1d308db9e105983d833a46570b56aecf56
parent 93cc62797bd3d4e4af98effd1e7f98cc9cc372e9
Author: Christophe Coustet <christophe.coustet@meso-star.com>
Date: Wed, 13 Jul 2016 14:45:38 +0200
Rename circum solar related stuff to buie.
As it is the name of the model we use.
Diffstat:
5 files changed, 24 insertions(+), 24 deletions(-)
diff --git a/src/ssol.h b/src/ssol.h
@@ -471,7 +471,7 @@ ssol_sun_create_pillbox
* From the paper "Sunshape distributions for terrestrial solar simulations".
* D. Buie, A.G. Monger, C.J. Dey */
SSOL_API res_T
-ssol_sun_create_circumsolar_ratio
+ssol_sun_create_buie
(struct ssol_device* dev,
struct ssol_sun** sun);
@@ -501,9 +501,9 @@ ssol_sun_set_pillbox_aperture
const double angle); /* In radian */
SSOL_API res_T
-ssol_sun_set_circumsolar_ratio
+ssol_sun_set_buie_param
(struct ssol_sun* sun,
- const double ratio); /* In [0, 1] */
+ const double param); /* In ]0, 1[ */
END_DECLS
diff --git a/src/ssol_solver.c b/src/ssol_solver.c
@@ -194,7 +194,7 @@ set_sun_distributions
res = ranst_sun_dir_pillbox_setup
(data->sun_dir_ran, sun->data.pillbox.aperture, sun->direction);
break;
- case SUN_CSR:
+ case SUN_BUIE:
res = ranst_sun_dir_buie_setup
(data->sun_dir_ran, sun->data.csr.ratio, sun->direction);
break;
diff --git a/src/ssol_sun.c b/src/ssol_sun.c
@@ -89,10 +89,10 @@ ssol_sun_create_pillbox(struct ssol_device* dev, struct ssol_sun** out_sun)
}
res_T
-ssol_sun_create_circumsolar_ratio
+ssol_sun_create_buie
(struct ssol_device* dev, struct ssol_sun** out_sun)
{
- return sun_create(dev, out_sun, SUN_CSR);
+ return sun_create(dev, out_sun, SUN_BUIE);
}
res_T
@@ -147,14 +147,14 @@ ssol_sun_set_pillbox_aperture
}
res_T
-ssol_sun_set_circumsolar_ratio
+ssol_sun_set_buie_param
(struct ssol_sun* sun,
const double ratio)
{
if(!sun
|| ratio <= 0
|| ratio >= 1
- || sun->type != SUN_CSR)
+ || sun->type != SUN_BUIE)
return RES_BAD_ARG;
sun->data.csr.ratio = ratio;
return RES_OK;
diff --git a/src/ssol_sun_c.h b/src/ssol_sun_c.h
@@ -22,7 +22,7 @@
enum sun_type {
SUN_DIRECTIONAL,
SUN_PILLBOX,
- SUN_CSR
+ SUN_BUIE
};
struct pillbox {
diff --git a/src/test_ssol_sun.c b/src/test_ssol_sun.c
@@ -63,10 +63,10 @@ main(int argc, char** argv)
CHECK(ssol_sun_set_pillbox_aperture(sun, 999), RES_BAD_ARG);
CHECK(ssol_sun_set_pillbox_aperture(sun, 0.1), RES_BAD_ARG);
- CHECK(ssol_sun_set_circumsolar_ratio(NULL, 0.1), RES_BAD_ARG);
- CHECK(ssol_sun_set_circumsolar_ratio(sun, -0.1), RES_BAD_ARG);
- CHECK(ssol_sun_set_circumsolar_ratio(sun, 999), RES_BAD_ARG);
- CHECK(ssol_sun_set_circumsolar_ratio(sun, 0.1), RES_BAD_ARG);
+ CHECK(ssol_sun_set_buie_param(NULL, 0.1), RES_BAD_ARG);
+ CHECK(ssol_sun_set_buie_param(sun, -0.1), RES_BAD_ARG);
+ CHECK(ssol_sun_set_buie_param(sun, 999), RES_BAD_ARG);
+ CHECK(ssol_sun_set_buie_param(sun, 0.1), RES_BAD_ARG);
CHECK(ssol_sun_ref_put(sun), RES_OK);
@@ -93,16 +93,16 @@ main(int argc, char** argv)
CHECK(ssol_sun_set_pillbox_aperture(sun, 999), RES_BAD_ARG);
CHECK(ssol_sun_set_pillbox_aperture(sun, 0.1), RES_OK);
- CHECK(ssol_sun_set_circumsolar_ratio(NULL, 0.1), RES_BAD_ARG);
- CHECK(ssol_sun_set_circumsolar_ratio(sun, -0.1), RES_BAD_ARG);
- CHECK(ssol_sun_set_circumsolar_ratio(sun, 999), RES_BAD_ARG);
- CHECK(ssol_sun_set_circumsolar_ratio(sun, 0.1), RES_BAD_ARG);
+ CHECK(ssol_sun_set_buie_param(NULL, 0.1), RES_BAD_ARG);
+ CHECK(ssol_sun_set_buie_param(sun, -0.1), RES_BAD_ARG);
+ CHECK(ssol_sun_set_buie_param(sun, 999), RES_BAD_ARG);
+ CHECK(ssol_sun_set_buie_param(sun, 0.1), RES_BAD_ARG);
CHECK(ssol_sun_ref_put(sun), RES_OK);
- CHECK(ssol_sun_create_circumsolar_ratio(NULL, &sun), RES_BAD_ARG);
- CHECK(ssol_sun_create_circumsolar_ratio(dev, NULL), RES_BAD_ARG);
- CHECK(ssol_sun_create_circumsolar_ratio(dev, &sun), RES_OK);
+ CHECK(ssol_sun_create_buie(NULL, &sun), RES_BAD_ARG);
+ CHECK(ssol_sun_create_buie(dev, NULL), RES_BAD_ARG);
+ CHECK(ssol_sun_create_buie(dev, &sun), RES_OK);
CHECK(ssol_sun_ref_get(NULL), RES_BAD_ARG);
CHECK(ssol_sun_ref_get(sun), RES_OK);
@@ -123,10 +123,10 @@ main(int argc, char** argv)
CHECK(ssol_sun_set_pillbox_aperture(sun, 999), RES_BAD_ARG);
CHECK(ssol_sun_set_pillbox_aperture(sun, 0.1), RES_BAD_ARG);
- CHECK(ssol_sun_set_circumsolar_ratio(NULL, 0.1), RES_BAD_ARG);
- CHECK(ssol_sun_set_circumsolar_ratio(sun, -0.1), RES_BAD_ARG);
- CHECK(ssol_sun_set_circumsolar_ratio(sun, 999), RES_BAD_ARG);
- CHECK(ssol_sun_set_circumsolar_ratio(sun, 0.1), RES_OK);
+ CHECK(ssol_sun_set_buie_param(NULL, 0.1), RES_BAD_ARG);
+ CHECK(ssol_sun_set_buie_param(sun, -0.1), RES_BAD_ARG);
+ CHECK(ssol_sun_set_buie_param(sun, 999), RES_BAD_ARG);
+ CHECK(ssol_sun_set_buie_param(sun, 0.1), RES_OK);
CHECK(ssol_sun_ref_put(sun), RES_OK);