htrdr

commit f8f35d5bf11c7697e87401c5d7a4723bca952c0b
parent af4a211c7373cfa2409447011f664bb91f2d8079
Author: Vincent Forest <vincent.forest@meso-star.com>
Date:   Fri, 14 Sep 2018 10:12:01 +0200

Handle the API upd of the SVX trace_ray function

Diffstat:
M
src/htrdr_compute_radiance_sw.c
 | 
4
++--
M
src/htrdr_sky.c
 | 
5
+++--
M
src/htrdr_sky.h
 | 
4
++--

3 files changed, 7 insertions(+), 6 deletions(-)
diff --git a/src/htrdr_compute_radiance_sw.c b/src/htrdr_compute_radiance_sw.c
@@ -246,7 +246,7 @@ transmissivity
 
   /* Compute the transmissivity */
   svx_tree = htrdr_sky_get_svx_tree(htrdr->sky, iband, iquad);
-  SVX(octree_trace_ray(svx_tree, pos, dir, range, NULL,
+  SVX(tree_trace_ray(svx_tree, pos, dir, range, NULL,
     transmissivity_hit_filter, &transmissivity_ctx, &svx_hit));
 
   if(SVX_HIT_NONE(&svx_hit)) {
@@ -374,7 +374,7 @@ htrdr_compute_radiance_sw
 
     /* Define if a scattering event occurs */
     d2(range, 0, s3d_hit.distance);
-    SVX(octree_trace_ray(svx_tree, pos, dir, range, NULL,
+    SVX(tree_trace_ray(svx_tree, pos, dir, range, NULL,
       scattering_hit_filter, &scattering_ctx, &svx_hit));
 
     /* No scattering and no surface reflection. Stop the radiative random walk */
diff --git a/src/htrdr_sky.c b/src/htrdr_sky.c
@@ -1228,8 +1228,8 @@ htrdr_sky_fetch_raw_property
    const size_t iband, /* Index of the spectral band */
    const size_t iquad, /* Index of the quadrature point in the spectral band */
    const double pos[3],
-   double k_min,
-   double k_max)
+   const double k_min,
+   const double k_max)
 {
   size_t ivox[3];
   size_t i;
@@ -1323,6 +1323,7 @@ htrdr_sky_fetch_raw_property
 
   k = k_particle + k_gas;
   ASSERT(k >= k_min && k <= k_max);
+  (void)k_min, (void)k_max;
   return k;
 }
 
diff --git a/src/htrdr_sky.h b/src/htrdr_sky.h
@@ -84,8 +84,8 @@ htrdr_sky_fetch_raw_property
    const size_t ispectral_band,
    const size_t iquadrature_pt,
    const double pos[3],
-   double k_min,
-   double k_max);
+   const double k_min, /* For debug only */
+   const double k_max); /* For debug only */
 
 extern LOCAL_SYM struct svx_tree*
 htrdr_sky_get_svx_tree