schiff

commit d9fcd27a759d806fe899a78c201ebd0d3fcfcd1d
parent 0e4b832de7141b9996ad638295b7a79a8c635575
Author: Vincent Forest <vincent.forest@meso-star.com>
Date:   Fri, 23 Oct 2015 20:55:08 +0200

Update the output of the "schiff sphere" command

Diffstat:
M
src/sbox_schiff_sphere.c
 | 
13
+++++++------

1 file changed, 7 insertions(+), 6 deletions(-)
diff --git a/src/sbox_schiff_sphere.c b/src/sbox_schiff_sphere.c
@@ -352,8 +352,8 @@ schiff_sphere_run
     logger_print(&sbox->logger, LOG_ERROR,
   "Couldn't create the Schiff sphere mesh discretised in %u steps along 2PI\n",
       args->nthetas);
+    goto error;
   }
-
   /* FIXME use the rng type defined in sbox */
   res = ssp_rng_create(&schiff->allocator, &ssp_rng_threefry, &rng);
   if(res != RES_OK) {
@@ -402,24 +402,25 @@ schiff_sphere_run
     const struct sschiff_estimator_value* val;
 
     logger_print(&sbox->logger, LOG_OUTPUT,
-      "Wavelength %7.2g:\n", states[iwlen].wavelength);
+      "Wavelength %g:\n", states[iwlen].wavelength);
 
     val = states[iwlen].values + SSCHIFF_EXTINCTION_CROSS_SECTION;
     logger_print(&sbox->logger, LOG_OUTPUT,
-      "  Extinction cross section ~ %12.7g +/- %12.7g\n", val->E, val->SE);
+      "  Extinction cross section ~ %g +/- %g\n", val->E, val->SE);
 
     val = states[iwlen].values + SSCHIFF_ABSORPTION_CROSS_SECTION;
     logger_print(&sbox->logger, LOG_OUTPUT,
-      "  Absorption cross section ~ %12.7g +/- %12.7g\n", val->E, val->SE);
+      "  Absorption cross section ~ %g +/- %g\n", val->E, val->SE);
 
     val = states[iwlen].values + SSCHIFF_SCATTERING_CROSS_SECTION;
     logger_print(&sbox->logger, LOG_OUTPUT,
-      "  Scattering cross section ~ %12.7g +/- %12.7g\n", val->E, val->SE);
+      "  Scattering cross section ~ %g +/- %g\n", val->E, val->SE);
 
     val = states[iwlen].values + SSCHIFF_AVERAGE_PROJECTED_AREA;
     logger_print(&sbox->logger, LOG_OUTPUT,
-      "  Average projected area ~  %12.7g +/- %12.7g\n", val->E, val->SE);
+      "  Average projected area ~ %g +/- %g\n", val->E, val->SE);
   }
+  logger_print(&sbox->logger, LOG_OUTPUT, "Elapsed time: %s\n", buf);
 
 exit:
   if(estimator) SSCHIFF(estimator_ref_put(estimator));