solstice

commit b8bf49046787e791bf2f94b7b01f0fd83b2573d5
parent 78c1c9ae4a38b977eddc8d582a27ad3a184e0973
Author: Christophe Coustet <christophe.coustet@meso-star.com>
Date:   Wed, 18 Apr 2018 16:19:18 +0200

Fix Linux warnings

Also some complements to previous commit.

Diffstat:
M
doc/solstice-output.5.txt
 | 
19
++++++++++++-------
M
src/receivers/srcvl.c
 | 
2
+-
M
src/solstice_solve.c
 | 
3
++-

3 files changed, 15 insertions(+), 9 deletions(-)
diff --git a/doc/solstice-output.5.txt b/doc/solstice-output.5.txt
@@ -349,11 +349,13 @@ given triangle, the total number of experiments required through the *-n*
 option of *solstice*(1) should be increased significantly, as 1 or 2 order of
 magnitude.
 
-If only the front or the back side of the receiver is active, then only one set
-of per triangle incoming-flux estimate is written. If the *side* attribute of
-the receiver is set to *FRONT_AND_BACK*, the incoming-flux estimates for the
-front facing triangles are written before the estimates of the back facing
-ones. The following grammar gives a brief description of the formatting of a
+The number of written per-triangle flux estimates depends on the receiver's
+parameters: both front and back sides of the receiver can be active and each
+side can produce an estimate both for the incoming flux and for the absorbed
+flux. As a consequence, the output can include up to 4 different estimates that
+are written in the order: incoming front, absorbed front, incoming back,
+absorbed back.
+The following grammar gives a brief description of the formatting of a
 *VTK-RECEIVER-MAP*. Please refer to the VTK format specification [2] for more
 informations on the VTK file format.
 
@@ -383,12 +385,15 @@ VTK-RECEIVER-MAP      ::= # vtk DataFile Version 2.0
 <map-front-data>      ::= <map-side-data>
 <map-back-data>       ::= <map-side-data>
 
-<map-side-data>       ::= SCALARS <side-name> float 2
+<map-side-data>       ::= SCALARS <side-and-flux-names> float 2
                           LOOKUP_TABLE default
                           <incoming-flux>
                         [ <incoming-flux> ... ]
 
-<map-side-name>       ::= Front_faces | Back_faces
+<side-and-flux-names> ::= Front_faces_Incoming_flux
+                        | Front_faces_Absorbed_flux
+                        | Back_faces_Incoming_flux
+                        | Back_faces_Absorbed_flux
 
 <#triangles>          ::= INTEGER
 <#vertices>           ::= INTEGER
diff --git a/src/receivers/srcvl.c b/src/receivers/srcvl.c
@@ -171,7 +171,7 @@ static res_T
 parse_pp_output
   (struct srcvl* srcvl,
    yaml_node_t* side,
-   enum srcvl_side* out_side)
+   enum srcvl_pp_output* out_side)
 {
   res_T res = RES_OK;
   ASSERT(side && out_side);
diff --git a/src/solstice_solve.c b/src/solstice_solve.c
@@ -323,7 +323,7 @@ dump_per_primitive_mc_estimations
     default: FATAL("Unreachable code.\n"); break;
   }
 
-  fprintf(solstice->output, "SCALARS %s__%s float 2\n", name, flux);
+  fprintf(solstice->output, "SCALARS %s_%s float 2\n", name, flux);
   fprintf(solstice->output, "LOOKUP_TABLE default\n");
 
   SSOL(instance_get_shaded_shapes_count(inst, &nshapes));
@@ -339,6 +339,7 @@ dump_per_primitive_mc_estimations
       case SRCVL_PP_ABSORBED:
         dump_mc_shape_abs(solstice, inst_sshape.shape, &mc_shape);
         break;
+      default: FATAL("Unreachable code.\n"); break;
     }
   }
 }