stardis-solver

commit deb7f15938eab03e67872367c48c5d626c81c834
parent b82254f30264989868c8956574a0b5ad971fc0a6
Author: christophe coustet <christophe.coustet@meso-star.com>
Date:   Fri, 19 Oct 2018 16:06:14 +0200

Linux build

Diffstat:
M
src/sdis_solve.c
 | 
6
+++---
M
src/sdis_solve_Xd.h
 | 
9
++++-----

2 files changed, 7 insertions(+), 8 deletions(-)
diff --git a/src/sdis_solve.c b/src/sdis_solve.c
@@ -638,7 +638,7 @@ sdis_solve_probe_boundary_flux
     }
   }
   /* Check medium is fluid on one side and solid on the other */
-  interf = scene_get_interface(scn, (unsigned long)iprim);
+  interf = scene_get_interface(scn, (unsigned)iprim);
   fmd = interface_get_medium(interf, SDIS_FRONT);
   bmd = interface_get_medium(interf, SDIS_BACK);
   if(!fmd || !bmd
@@ -670,10 +670,10 @@ sdis_solve_probe_boundary_flux
 
   /* Compute hr and hc */
   if(scene_is_2d(scn)) {
-    res = interface_get_hc_epsilon_2d(&hc, &epsilon, scn, (unsigned long)iprim,
+    res = interface_get_hc_epsilon_2d(&hc, &epsilon, scn, (unsigned)iprim,
       uv, time, fluid_side);
   } else {
-    res = interface_get_hc_epsilon_3d(&hc, &epsilon, scn, (unsigned long)iprim,
+    res = interface_get_hc_epsilon_3d(&hc, &epsilon, scn, (unsigned)iprim,
       uv, time, fluid_side);
   }
   hr = 4.0 * BOLTZMANN_CONSTANT * Tref * Tref * Tref * epsilon;
diff --git a/src/sdis_solve_Xd.h b/src/sdis_solve_Xd.h
@@ -1627,7 +1627,7 @@ XD(probe_flux_realisation)
   /* Compute fluid temperature */
   if(compute_convective) {
     const struct sdis_interface* interf =
-      scene_get_interface(scn, (unsigned long)iprim);
+      scene_get_interface(scn, (unsigned)iprim);
     const struct sdis_medium* mdm = interface_get_medium(interf, fluid_side);
 
     RESET_WALK(fluid_side, mdm);
@@ -1685,7 +1685,6 @@ XD(interface_get_hc_epsilon)
   fX(set)(hit.normal, attr.value);
 
   hit.distance = 0;
-  hit.normal;
   hit.prim = prim;
   SET_PARAM(hit, st);
   frag.time = time;
@@ -1927,7 +1926,7 @@ static res_T
 XD(solve_boundary_flux)
   (struct sdis_scene* scn,
    const size_t nrealisations, /* #realisations */
-   const size_t primitives [], /* List of boundary primitives to handle */
+   const size_t primitives[], /* List of boundary primitives to handle */
    const size_t nprimitives, /* #primitives */
    const double time, /* Observation time */
    const double fp_to_meter, /* Scale from floating point units to meters */
@@ -2066,7 +2065,7 @@ XD(solve_boundary_flux)
     ASSERT(prim.prim_id < nprimitives);
     iprim = primitives[prim.prim_id];
 
-    interf = scene_get_interface(scn, (unsigned long)iprim);
+    interf = scene_get_interface(scn, (unsigned)iprim);
     fmd = interface_get_medium(interf, SDIS_FRONT);
     bmd = interface_get_medium(interf, SDIS_BACK);
     if(!fmd || !bmd
@@ -2080,7 +2079,7 @@ XD(solve_boundary_flux)
     fluid_side = (fmd->type == SDIS_FLUID) ? SDIS_FRONT : SDIS_BACK;
 
     res_local = XD(interface_get_hc_epsilon)(&hc, &epsilon, scn,
-      (unsigned long)iprim, uv, time, fluid_side);
+      (unsigned)iprim, uv, time, fluid_side);
     if(res_local != RES_OK) {
       ATOMIC_SET(&res, res_local);
       continue;