commit 1a6e68c86d7ce2b7200675b2e40a9fdb50855253
parent e09e74fa5b8e5e427a7b132f982a385f2ca250ba
Author: Christophe Coustet <christophe.coustet@meso-star.com>
Date: Fri, 22 Sep 2017 15:09:04 +0200
Merge branch 'feature_extinction' into develop
Diffstat:
18 files changed, 91 insertions(+), 91 deletions(-)
diff --git a/src/parser/solparser_atmosphere.c b/src/parser/solparser_atmosphere.c
@@ -28,7 +28,7 @@ parse_atmosphere
yaml_node_t* atm,
struct solparser_atmosphere** out_solatm)
{
- enum { ABSORPTION };
+ enum { EXTINCTION };
struct solparser_atmosphere* solatm = NULL;
int mask = 0; /* Register the parsed attributes */
intptr_t i, n;
@@ -77,10 +77,10 @@ parse_atmosphere
} \
mask |= BIT(Flag); \
} (void)0
- if(!strcmp((char*)key->data.scalar.value, "absorption")) {
- SETUP_MASK(ABSORPTION, "absorption");
+ if(!strcmp((char*)key->data.scalar.value, "extinction")) {
+ SETUP_MASK(EXTINCTION, "extinction");
res = parse_mtl_data
- (parser, doc, val, 0, 1, &solatm->absorption);
+ (parser, doc, val, 0, 1, &solatm->extinction);
} else {
log_err(parser, key, "unknown atmosphere parameter `%s'.\n",
key->data.scalar.value);
@@ -100,7 +100,7 @@ parse_atmosphere
res = RES_BAD_ARG; \
goto error; \
} (void)0
- CHECK_PARAM(ABSORPTION, "absorption");
+ CHECK_PARAM(EXTINCTION, "extinction");
#undef CHECK_PARAM
exit:
diff --git a/src/parser/solparser_atmosphere.h b/src/parser/solparser_atmosphere.h
@@ -19,7 +19,7 @@
#include "solparser_mtl_data.h"
struct solparser_atmosphere {
- struct solparser_mtl_data absorption;
+ struct solparser_mtl_data extinction;
};
static INLINE void
diff --git a/src/parser/solparser_medium.c b/src/parser/solparser_medium.c
@@ -28,7 +28,7 @@ parse_medium
yaml_node_t* medium,
struct solparser_medium_id* out_imedium)
{
- enum { ABSORPTION, REFRACTIVE_INDEX };
+ enum { EXTINCTION, REFRACTIVE_INDEX };
struct solparser_medium* mdm = NULL;
size_t* pimedium = NULL;
size_t imedium = SIZE_MAX;
@@ -81,9 +81,9 @@ parse_medium
} \
mask |= BIT(Flag); \
} (void)0
- if(!strcmp((char*)key->data.scalar.value, "absorption")) {
- SETUP_MASK(ABSORPTION, "absorption");
- res = parse_mtl_data(parser, doc, val, 0, DBL_MAX, &mdm->absorption);
+ if(!strcmp((char*)key->data.scalar.value, "extinction")) {
+ SETUP_MASK(EXTINCTION, "extinction");
+ res = parse_mtl_data(parser, doc, val, 0, DBL_MAX, &mdm->extinction);
} else if(!strcmp((char*)key->data.scalar.value, "refractive_index")) {
SETUP_MASK(REFRACTIVE_INDEX, "refractive_index");
res = parse_mtl_data
@@ -107,7 +107,7 @@ parse_medium
res = RES_BAD_ARG; \
goto error; \
} (void)0
- CHECK_PARAM(ABSORPTION, "absorption");
+ CHECK_PARAM(EXTINCTION, "absorption");
CHECK_PARAM(REFRACTIVE_INDEX, "refractive_index");
#undef CHECK_PARAM
diff --git a/src/parser/solparser_medium.h b/src/parser/solparser_medium.h
@@ -21,7 +21,7 @@
struct solparser_medium {
struct solparser_mtl_data refractive_index;
- struct solparser_mtl_data absorption;
+ struct solparser_mtl_data extinction;
};
struct solparser_medium_id { size_t i; };
diff --git a/src/parser/test_solparser2.c b/src/parser/test_solparser2.c
@@ -101,7 +101,7 @@ main(int argc, char** argv)
fprintf(stream, " dni: 1\n");
fprintf(stream, " spectrum: [ { wavelength: 1, data: 1} ]\n");
fprintf(stream, "- atmosphere:\n");
- fprintf(stream, " absorption: 0\n");
+ fprintf(stream, " extinction: 0\n");
rewind(stream);
CHECK(solparser_setup(parser, NULL, stream), RES_OK);
diff --git a/src/parser/test_solparser3.c b/src/parser/test_solparser3.c
@@ -43,7 +43,7 @@ static const char* input[] = {
" dni: 1\n",
" spectrum: [{wavelength: 1, data: 1}]\n",
"- atmosphere:\n",
- " absorption: [{wavelength: 1, data: 1}]\n",
+ " extinction: [{wavelength: 1, data: 1}]\n",
"- entity:\n",
" name: entity0\n",
" primary: 0\n",
diff --git a/src/parser/test_solparser7.c b/src/parser/test_solparser7.c
@@ -54,13 +54,13 @@ main(int argc, char** argv)
fprintf(stream, " thickness: 0.123\n");
fprintf(stream, " medium_i: &outside\n");
fprintf(stream, " refractive_index: 1\n");
- fprintf(stream, " absorption: 0\n");
+ fprintf(stream, " extinction: 0\n");
fprintf(stream, " medium_t: &inside\n");
fprintf(stream, " refractive_index: \n");
fprintf(stream, " - {wavelength: 1.2, data: 2.3}\n");
fprintf(stream, " - {wavelength: 4.5, data: 6.7}\n");
fprintf(stream, " - {wavelength: 0.5, data: 0.25}\n");
- fprintf(stream, " absorption:\n");
+ fprintf(stream, " extinction:\n");
fprintf(stream, " - {wavelength: 3, data: 3}\n");
fprintf(stream, " - {wavelength: 1, data: 1}\n");
fprintf(stream, " - {wavelength: 5, data: 5}\n");
@@ -98,8 +98,8 @@ main(int argc, char** argv)
medium = solparser_get_medium(parser, thin->medium_i);
CHECK(medium->refractive_index.type, SOLPARSER_MTL_DATA_REAL);
CHECK(medium->refractive_index.value.real, 1);
- CHECK(medium->absorption.type, SOLPARSER_MTL_DATA_REAL);
- CHECK(medium->absorption.value.real, 0);
+ CHECK(medium->extinction.type, SOLPARSER_MTL_DATA_REAL);
+ CHECK(medium->extinction.value.real, 0);
medium = solparser_get_medium(parser, thin->medium_t);
CHECK(medium->refractive_index.type, SOLPARSER_MTL_DATA_SPECTRUM);
@@ -112,8 +112,8 @@ main(int argc, char** argv)
CHECK(darray_spectrum_data_cdata_get(&spectrum->data)[1].data, 2.3);
CHECK(darray_spectrum_data_cdata_get(&spectrum->data)[2].data, 6.7);
- CHECK(medium->absorption.type, SOLPARSER_MTL_DATA_SPECTRUM);
- spectrum = solparser_get_spectrum(parser, medium->absorption.value.spectrum);
+ CHECK(medium->extinction.type, SOLPARSER_MTL_DATA_SPECTRUM);
+ spectrum = solparser_get_spectrum(parser, medium->extinction.value.spectrum);
CHECK(darray_spectrum_data_size_get(&spectrum->data), 5);
CHECK(darray_spectrum_data_cdata_get(&spectrum->data)[0].wavelength, 1);
CHECK(darray_spectrum_data_cdata_get(&spectrum->data)[1].wavelength, 2);
diff --git a/src/parser/test_solparser8.c b/src/parser/test_solparser8.c
@@ -45,10 +45,10 @@ main(int argc, char** argv)
NCHECK(stream, NULL);
fprintf(stream, "- sun: { dni: 1, spectrum: [{wavelength: 1, data: 1 }] }\n");
- fprintf(stream, "- medium: &vacuum {refractive_index: 1, absorption: 0}\n");
+ fprintf(stream, "- medium: &vacuum {refractive_index: 1, extinction: 0}\n");
fprintf(stream, "- medium: &glass \n");
fprintf(stream, " refractive_index: 1.5\n");
- fprintf(stream, " absorption: \n");
+ fprintf(stream, " extinction: \n");
fprintf(stream, " - {wavelength: 1, data: 21}\n");
fprintf(stream, " - {wavelength: 2, data: 22}\n");
fprintf(stream, " - {wavelength: 3, data: 23}\n");
@@ -99,14 +99,14 @@ main(int argc, char** argv)
vacuum = solparser_get_medium(parser, dielec->medium_i);
CHECK(vacuum->refractive_index.type, SOLPARSER_MTL_DATA_REAL);
CHECK(vacuum->refractive_index.value.real, 1);
- CHECK(vacuum->absorption.type, SOLPARSER_MTL_DATA_REAL);
- CHECK(vacuum->absorption.value.real, 0);
+ CHECK(vacuum->extinction.type, SOLPARSER_MTL_DATA_REAL);
+ CHECK(vacuum->extinction.value.real, 0);
glass = solparser_get_medium(parser, dielec->medium_t);
CHECK(glass->refractive_index.type, SOLPARSER_MTL_DATA_REAL);
CHECK(glass->refractive_index.value.real, 1.5);
- CHECK(glass->absorption.type, SOLPARSER_MTL_DATA_SPECTRUM);
- spectrum = solparser_get_spectrum(parser, glass->absorption.value.spectrum);
+ CHECK(glass->extinction.type, SOLPARSER_MTL_DATA_SPECTRUM);
+ spectrum = solparser_get_spectrum(parser, glass->extinction.value.spectrum);
CHECK(darray_spectrum_data_size_get(&spectrum->data), 6);
CHECK(darray_spectrum_data_cdata_get(&spectrum->data)[0].wavelength, 1);
CHECK(darray_spectrum_data_cdata_get(&spectrum->data)[1].wavelength, 2);
diff --git a/src/parser/test_solparser_normal_map.c b/src/parser/test_solparser_normal_map.c
@@ -40,8 +40,8 @@ test_dielectric(struct solparser* parser)
fprintf(stream, "- material: &glass\n");
fprintf(stream, " front:\n");
fprintf(stream, " dielectric:\n");
- fprintf(stream, " medium_i: &out {refractive_index: 1, absorption: 0}\n");
- fprintf(stream, " medium_t: &in {refractive_index: 1.5, absorption: 20}\n");
+ fprintf(stream, " medium_i: &out {refractive_index: 1, extinction: 0}\n");
+ fprintf(stream, " medium_t: &in {refractive_index: 1.5, extinction: 20}\n");
fprintf(stream, " normal_map: {path: my_normal_map}\n");
fprintf(stream, " back: {dielectric: {medium_i: *in, medium_t: *out}}\n");
fprintf(stream, "\n");
@@ -267,10 +267,10 @@ test_thin_dielectric(struct solparser* parser)
fprintf(stream, " thickness: 0.1\n");
fprintf(stream, " medium_i:\n");
fprintf(stream, " refractive_index: 1\n");
- fprintf(stream, " absorption: 0\n");
+ fprintf(stream, " extinction: 0\n");
fprintf(stream, " medium_t:\n");
fprintf(stream, " refractive_index: 1.5\n");
- fprintf(stream, " absorption: 20\n");
+ fprintf(stream, " extinction: 20\n");
fprintf(stream, " normal_map: { path: Bump }\n");
rewind(stream);
diff --git a/src/parser/test_solparser_spectrum.c b/src/parser/test_solparser_spectrum.c
@@ -210,10 +210,10 @@ test_thin_dielectric(struct solparser* parser)
fprintf(stream, "- material:\n");
fprintf(stream, " thin_dielectric:\n");
fprintf(stream, " thickness: 1\n");
- fprintf(stream, " medium_i: { refractive_index: 1, absorption: 0 }\n");
+ fprintf(stream, " medium_i: { refractive_index: 1, extinction: 0 }\n");
fprintf(stream, " medium_t: \n");
fprintf(stream, " refractive_index: *refractive_index\n");
- fprintf(stream, " absorption: *absorption\n");
+ fprintf(stream, " extinction: *absorption\n");
rewind(stream);
CHECK(solparser_setup(parser, NULL, stream), RES_OK);
@@ -232,8 +232,8 @@ test_thin_dielectric(struct solparser* parser)
mdm = solparser_get_medium(parser, thin->medium_i);
CHECK(mdm->refractive_index.type, SOLPARSER_MTL_DATA_REAL);
CHECK(mdm->refractive_index.value.real, 1);
- CHECK(mdm->absorption.type, SOLPARSER_MTL_DATA_REAL);
- CHECK(mdm->absorption.value.real, 0);
+ CHECK(mdm->extinction.type, SOLPARSER_MTL_DATA_REAL);
+ CHECK(mdm->extinction.value.real, 0);
mdm = solparser_get_medium(parser, thin->medium_t);
CHECK(mdm->refractive_index.type, SOLPARSER_MTL_DATA_SPECTRUM);
@@ -245,7 +245,7 @@ test_thin_dielectric(struct solparser* parser)
CHECK(darray_spectrum_data_cdata_get(&spectrum->data)[0].data, 1.1);
CHECK(darray_spectrum_data_cdata_get(&spectrum->data)[1].data, 2.2);
CHECK(darray_spectrum_data_cdata_get(&spectrum->data)[2].data, 3.3);
- spectrum = solparser_get_spectrum(parser, mdm->absorption.value.spectrum);
+ spectrum = solparser_get_spectrum(parser, mdm->extinction.value.spectrum);
CHECK(darray_spectrum_data_size_get(&spectrum->data), 2);
CHECK(darray_spectrum_data_cdata_get(&spectrum->data)[0].wavelength, 0.123);
CHECK(darray_spectrum_data_cdata_get(&spectrum->data)[1].wavelength, 0.456);
@@ -281,10 +281,10 @@ test_dielectric(struct solparser* parser)
fprintf(stream, " - { wavelength: 0.123, data: 0.1 }\n");
fprintf(stream, "- material:\n");
fprintf(stream, " dielectric:\n");
- fprintf(stream, " medium_i: { refractive_index: 1, absorption: 0 }\n");
+ fprintf(stream, " medium_i: { refractive_index: 1, extinction: 0 }\n");
fprintf(stream, " medium_t: \n");
fprintf(stream, " refractive_index: *refractive_index\n");
- fprintf(stream, " absorption: *absorption\n");
+ fprintf(stream, " extinction: *absorption\n");
rewind(stream);
CHECK(solparser_setup(parser, NULL, stream), RES_OK);
@@ -302,8 +302,8 @@ test_dielectric(struct solparser* parser)
mdm = solparser_get_medium(parser, dielec->medium_i);
CHECK(mdm->refractive_index.type, SOLPARSER_MTL_DATA_REAL);
CHECK(mdm->refractive_index.value.real, 1);
- CHECK(mdm->absorption.type, SOLPARSER_MTL_DATA_REAL);
- CHECK(mdm->absorption.value.real, 0);
+ CHECK(mdm->extinction.type, SOLPARSER_MTL_DATA_REAL);
+ CHECK(mdm->extinction.value.real, 0);
mdm = solparser_get_medium(parser, dielec->medium_t);
CHECK(mdm->refractive_index.type, SOLPARSER_MTL_DATA_SPECTRUM);
@@ -315,7 +315,7 @@ test_dielectric(struct solparser* parser)
CHECK(darray_spectrum_data_cdata_get(&spectrum->data)[0].data, 1.1);
CHECK(darray_spectrum_data_cdata_get(&spectrum->data)[1].data, 2.2);
CHECK(darray_spectrum_data_cdata_get(&spectrum->data)[2].data, 3.3);
- spectrum = solparser_get_spectrum(parser, mdm->absorption.value.spectrum);
+ spectrum = solparser_get_spectrum(parser, mdm->extinction.value.spectrum);
CHECK(darray_spectrum_data_size_get(&spectrum->data), 2);
CHECK(darray_spectrum_data_cdata_get(&spectrum->data)[0].wavelength, 0.123);
CHECK(darray_spectrum_data_cdata_get(&spectrum->data)[1].wavelength, 0.456);
diff --git a/src/parser/yaml/test_ko_0.yaml b/src/parser/yaml/test_ko_0.yaml
@@ -252,31 +252,31 @@
# medium_t: <dielectric-medium>
#
-# invalid absorption
+# invalid extinction
- material:
thin_dielectric:
thickness: 0
- medium_i: &m { refractive_index: 1, absorption: -1 }
+ medium_i: &m { refractive_index: 1, extinction: -1 }
medium_t: *m
---
# invalid thickness
- material:
thin_dielectric:
thickness: -0.01
- medium_i: &m { refractive_index: 1, absorption: 0 }
+ medium_i: &m { refractive_index: 1, extinction: 0 }
medium_t: *m
---
# invalid refractive index
- material:
thin_dielectric:
thickness: 0
- medium_i: &m { refractive_index: 0, absorption: 0 }
+ medium_i: &m { refractive_index: 0, extinction: 0 }
medium_t: *m
---
# missing thickness
- material:
thin_dielectric:
- medium_i: &m { refractive_index: 1, absorption: 0 }
+ medium_i: &m { refractive_index: 1, extinction: 0 }
medium_t: *m
---
@@ -290,22 +290,22 @@
# invalid refractive_index
- material:
dielectric:
- medium_i: &m { refractive_index: 0, absorption: 0 }
+ medium_i: &m { refractive_index: 0, extinction: 0 }
medium_t: *m
---
-# invalid absorption
+# invalid extinction
- material:
dielectric:
- medium_i: &m { refractive_index: 1, absorption: -1 }
+ medium_i: &m { refractive_index: 1, extinction: -1 }
medium_t: *m
---
# missing refractive_index
- material:
dielectric:
- medium_i: &m { absorption: 0 }
+ medium_i: &m { extinction: 0 }
medium_t: *m
---
-# missing absorption
+# missing extinction
- material:
dielectric:
medium_i: &m { refractive_index: 1 }
@@ -314,12 +314,12 @@
# missing medium_i
- material:
dielectric:
- medium_t: { refractive_index: 1, absorption: 0 }
+ medium_t: { refractive_index: 1, extinction: 0 }
---
# missing medium_t
- material:
dielectric:
- medium_i: { refractive_index: 1, absorption: 0 }
+ medium_i: { refractive_index: 1, extinction: 0 }
---
#
@@ -1897,7 +1897,7 @@
#
# <atmosphere> ::=
# atmosphere:
-# absorption: <mtl-data> # in [0, 1]
+# extinction: <mtl-data> # in [0, 1]
#
# missing atmosphere definition
@@ -1907,30 +1907,30 @@
- atmosphere:
dummy: 1
---
-# missing absorption definition
+# missing extinction definition
- atmosphere:
- absorption:
+ extinction:
---
-# absorption should be a number
+# extinction should be a number
- atmosphere:
- absorption: "dummy"
+ extinction: "dummy"
---
# 2 invalid
- atmosphere:
- absorption: 2
+ extinction: 2
---
# 0 invalid
- atmosphere:
- absorption: [{wavelength: 0, data: 1}]
+ extinction: [{wavelength: 0, data: 1}]
---
# 2 invalid
- atmosphere:
- absorption: [{wavelength: 0, data: 2}]
+ extinction: [{wavelength: 0, data: 2}]
---
-# 2x absorption
+# 2x extinction
- atmosphere:
- absorption: 0.1
- absorption: [{wavelength: 1, data: 1}]
+ extinction: 0.1
+ extinction: [{wavelength: 1, data: 1}]
---
#
@@ -1967,6 +1967,6 @@
---
# 2x atmosphere
- atmosphere:
- absorption: 0.1
+ extinction: 0.1
- atmosphere:
- absorption: 0.1
+ extinction: 0.1
diff --git a/src/parser/yaml/test_ok_5.yaml b/src/parser/yaml/test_ok_5.yaml
@@ -3,8 +3,8 @@
- material: &thin_dielectric
thin_dielectric:
thickness: 1
- medium_i: { absorption: 0, refractive_index: 1.00027 }
- medium_t: { absorption: 0.1, refractive_index: 1.5 }
+ medium_i: { extinction: 0, refractive_index: 1.00027 }
+ medium_t: { extinction: 0.1, refractive_index: 1.5 }
- entity:
name: "entity"
@@ -18,8 +18,8 @@
- material: &thin_dielectric
thin_dielectric:
thickness: 0
- medium_i: { absorption: 0, refractive_index: 0.00027 }
- medium_t: { absorption: 0.1, refractive_index: 1.5 }
+ medium_i: { extinction: 0, refractive_index: 0.00027 }
+ medium_t: { extinction: 0.1, refractive_index: 1.5 }
- entity:
name: "entity"
@@ -38,6 +38,6 @@
material:
thin_dielectric:
thickness: 10
- medium_i: { absorption: 0, refractive_index: 1 }
- medium_t: { absorption: 20, refractive_index: 1.5 }
+ medium_i: { extinction: 0, refractive_index: 1 }
+ medium_t: { extinction: 20, refractive_index: 1.5 }
diff --git a/src/parser/yaml/test_ok_7.yaml b/src/parser/yaml/test_ok_7.yaml
@@ -2,8 +2,8 @@
- material: &dielectric
dielectric:
- medium_i: { absorption: 0, refractive_index: 1.00027 }
- medium_t: { absorption: 0.1, refractive_index: 1.5 }
+ medium_i: { extinction: 0, refractive_index: 1.00027 }
+ medium_t: { extinction: 0.1, refractive_index: 1.5 }
- entity:
name: "entity"
@@ -16,8 +16,8 @@
- material: &dielectric
dielectric:
- medium_i: { absorption: 0, refractive_index: 0.00027 }
- medium_t: { absorption: 0.1, refractive_index: 1.5 }
+ medium_i: { extinction: 0, refractive_index: 0.00027 }
+ medium_t: { extinction: 0.1, refractive_index: 1.5 }
- entity:
name: "entity"
@@ -35,13 +35,13 @@
- cylinder: { height: 1, radius: 1 }
material:
dielectric:
- medium_i: { absorption: 0, refractive_index: 1 }
- medium_t: { absorption: 20, refractive_index: 1.5 }
+ medium_i: { extinction: 0, refractive_index: 1 }
+ medium_t: { extinction: 20, refractive_index: 1.5 }
---
- sun: { dni: 1 }
-- medium: &vacuum { refractive_index: 1, absorption: 0 }
-- medium: &glass { refractive_index: 1.5, absorption: 20 }
+- medium: &vacuum { refractive_index: 1, extinction: 0 }
+- medium: &glass { refractive_index: 1.5, extinction: 20 }
- entity:
name: "entity"
primary: 0
diff --git a/src/solstice_atmosphere.c b/src/solstice_atmosphere.c
@@ -23,7 +23,7 @@ res_T
solstice_create_atmosphere(struct solstice* solstice)
{
struct ssol_atmosphere* atm = NULL;
- struct ssol_data absorption = SSOL_DATA_NULL;
+ struct ssol_data extinction = SSOL_DATA_NULL;
const struct solparser_atmosphere* solparser_atm = NULL;
res_T res = RES_OK;
ASSERT(solstice);
@@ -34,12 +34,12 @@ solstice_create_atmosphere(struct solstice* solstice)
res = ssol_atmosphere_create(solstice->ssol, &atm);
if(res != RES_OK) goto error;
- res = mtl_to_ssol_data(solstice, &solparser_atm->absorption, &absorption);
+ res = mtl_to_ssol_data(solstice, &solparser_atm->extinction, &extinction);
if(res != RES_OK) goto error;
- res = ssol_atmosphere_set_absorption(atm, &absorption);
+ res = ssol_atmosphere_set_extinction(atm, &extinction);
if(res != RES_OK) {
- fprintf(stderr, "Could not set atmosphere absorbtion.\n");
+ fprintf(stderr, "Could not set atmosphere extinction.\n");
goto error;
}
@@ -50,7 +50,7 @@ solstice_create_atmosphere(struct solstice* solstice)
}
exit:
- ssol_data_clear(&absorption);
+ ssol_data_clear(&extinction);
solstice->atmosphere = atm;
return res;
error:
diff --git a/src/solstice_material.c b/src/solstice_material.c
@@ -335,8 +335,8 @@ create_material_dielectric
} (void)0
SET_SSOL_DATA(medium_i, refractive_index);
SET_SSOL_DATA(medium_t, refractive_index);
- SET_SSOL_DATA(medium_i, absorption);
- SET_SSOL_DATA(medium_t, absorption);
+ SET_SSOL_DATA(medium_i, extinction);
+ SET_SSOL_DATA(medium_t, extinction);
#undef SET_SSOL_DATA
SSOL(dielectric_setup(mtl, &shader, &ssol_medium_i, &ssol_medium_t));
@@ -547,8 +547,8 @@ create_material_thin_dielectric
} (void)0
SET_SSOL_DATA(medium_i, refractive_index);
SET_SSOL_DATA(medium_t, refractive_index);
- SET_SSOL_DATA(medium_i, absorption);
- SET_SSOL_DATA(medium_t, absorption);
+ SET_SSOL_DATA(medium_i, extinction);
+ SET_SSOL_DATA(medium_t, extinction);
#undef SET_SSOL_DATA
SSOL(thin_dielectric_setup
(mtl, &shader, &ssol_medium_i, &ssol_medium_t, thin->thickness));
diff --git a/src/solstice_solve.c b/src/solstice_solve.c
@@ -60,7 +60,7 @@ write_mc_global(struct solstice* solstice, struct ssol_estimator* estimator)
PRINT_MC_GLOBAL(shadowed);
PRINT_MC_GLOBAL(missing);
PRINT_MC_GLOBAL(other_absorbed);
- PRINT_MC_GLOBAL(absorbed_by_atmosphere);
+ PRINT_MC_GLOBAL(extinguished_by_atmosphere);
#undef PRINT_MC_GLOBAL
/* Receivers' data */
diff --git a/yaml/test07.yaml b/yaml/test07.yaml
@@ -1,7 +1,7 @@
- sun: &sun { dni: 1 }
- atmosphere:
- absorption: [{wavelength: 1, data: 0},{wavelength: 10, data: 0}]
+ extinction: [{wavelength: 1, data: 0},{wavelength: 10, data: 0}]
- material: &specular
front:
diff --git a/yaml/test08.yaml b/yaml/test08.yaml
@@ -1,7 +1,7 @@
- sun: &sun { dni: 1 }
- atmosphere:
- absorption: 0
+ extinction: 0
- material: &lambertian
front:
