star-schiff

commit cfd01ee7e289d0f7d155c00833e079116e9103b2
parent a9bc05a88c0322e1eb9c3a095de7e55952102bb6
Author: Vincent Forest <vincent.forest@meso-star.com>
Date:   Mon,  4 Apr 2016 14:48:05 +0200

Handle the shape aspect ratio in the cylinder test

Diffstat:
M
src/test_sschiff_estimator_cylinder.c
 | 
9
+++++----

1 file changed, 5 insertions(+), 4 deletions(-)
diff --git a/src/test_sschiff_estimator_cylinder.c b/src/test_sschiff_estimator_cylinder.c
@@ -64,7 +64,8 @@ sample_cylinder
   struct sampler_context* sampler_ctx = sampler_context;
   double sphere_volume;
   double sample;
-  (void)rng, (void)sampler_context;
+
+  NCHECK(volume_scaling, NULL);
 
   sample = ssp_ran_lognormal(rng, log(sampler_ctx->mean_radius), log(sampler_ctx->sigma));
   sphere_volume = 4.0*PI*sample*sample*sample / 3.0;
@@ -412,13 +413,14 @@ main(int argc, char** argv)
   const size_t nscatt_angles = 1000;
   const size_t ngeoms = 100;
   const size_t ndirs = 100;
+  const double aspect_ratio = 0.837; /* diameter / height */
   double cylinder_volume = 0;
   size_t i;
   (void)argc, (void)argv;
 
   mem_init_proxy_allocator(&allocator, &mem_default_allocator);
 
-  CHECK(s3d_device_create(NULL, NULL, 0, &s3d), RES_OK);
+  CHECK(s3d_device_create(NULL, &allocator, 0, &s3d), RES_OK);
   CHECK(s3d_shape_create_mesh(s3d, &shape), RES_OK);
 
   CHECK(ssp_rng_create(&allocator, &ssp_rng_threefry, &rng), RES_OK);
@@ -428,7 +430,7 @@ main(int argc, char** argv)
   geometry_init_cylinder(&geometry, 64);
   cylinder.geometry = &geometry;
   cylinder.radius = 1.0;
-  cylinder.height = 1.0;
+  cylinder.height = (float)(cylinder.radius / aspect_ratio * 2.0);
   cylinder_setup_s3d_shape(&cylinder, shape);
   cylinder_volume = PI * cylinder.radius * cylinder.radius * cylinder.height;
 
@@ -439,7 +441,6 @@ main(int argc, char** argv)
     struct sschiff_state* val;
     struct sschiff_state result;
 
-    /*sampler_ctx.aspect_ratio = 0.837;*/
     sampler_ctx.mean_radius = (x[i] * 0.450) / (2*PI);
     sampler_ctx.sigma = 1.18;
     sampler_ctx.shape = shape;