commit 016bf2bf1ab2249ee813749fbe6dfd081636a4c2
parent fa2c3578efc13d6fb35bbd860b81fd7bf7c94c9a
Author: Vincent Forest <vincent.forest@meso-star.com>
Date: Wed, 18 Apr 2018 15:23:09 +0200
Rename the sdis_side_flag enum in sdis_side
Diffstat:
5 files changed, 15 insertions(+), 15 deletions(-)
diff --git a/src/sdis.h b/src/sdis.h
@@ -63,10 +63,10 @@ struct sdis_interface;
struct sdis_medium;
struct sdis_scene;
-enum sdis_side_flag {
- SDIS_FRONT = BIT(0),
- SDIS_BACK = BIT(1),
- SDIS_SIDE_NULL__ = BIT(2)
+enum sdis_side {
+ SDIS_FRONT,
+ SDIS_BACK,
+ SDIS_SIDE_NULL__
};
enum sdis_medium_type {
@@ -94,7 +94,7 @@ struct sdis_interface_fragment {
double Ng[3]; /* Normalized world space geometry normal at the interface */
double uv[2]; /* Parametric coordinates of the interface */
double time; /* Current time */
- enum sdis_side_flag side;
+ enum sdis_side side;
};
#define SDIS_INTERFACE_FRAGMENT_NULL__ {{0}, {0}, {0}, -1, SDIS_SIDE_NULL__}
static const struct sdis_interface_fragment SDIS_INTERFACE_FRAGMENT_NULL =
@@ -554,7 +554,7 @@ sdis_solve_probe_boundary
const size_t iprim, /* Identifier of the primitive on which the probe lies */
const double uv[2], /* Parametric coordinates of the probe onto the primitve */
const double time, /* Observation time */
- const enum sdis_side_flag side, /* Side of iprim on which the probe lies */
+ const enum sdis_side side, /* Side of iprim on which the probe lies */
const double fp_to_meter, /* Scale from floating point units to meters */
const double ambient_radiative_temperature, /* In Kelvin */
const double reference_temperature, /* In Kelvin */
diff --git a/src/sdis_interface.c b/src/sdis_interface.c
@@ -180,7 +180,7 @@ sdis_interface_ref_put(struct sdis_interface* interf)
******************************************************************************/
const struct sdis_medium*
interface_get_medium
- (const struct sdis_interface* interf, const enum sdis_side_flag side)
+ (const struct sdis_interface* interf, const enum sdis_side side)
{
struct sdis_medium* mdm = NULL;
ASSERT(interf);
@@ -204,7 +204,7 @@ setup_interface_fragment_2d
(struct sdis_interface_fragment* frag,
const struct sdis_rwalk_vertex* vertex,
const struct s2d_hit* hit,
- const enum sdis_side_flag side)
+ const enum sdis_side side)
{
ASSERT(frag && vertex && hit && !S2D_HIT_NONE(hit));
ASSERT(side == SDIS_FRONT || side == SDIS_BACK);
@@ -222,7 +222,7 @@ setup_interface_fragment_3d
(struct sdis_interface_fragment* frag,
const struct sdis_rwalk_vertex* vertex,
const struct s3d_hit* hit,
- const enum sdis_side_flag side)
+ const enum sdis_side side)
{
ASSERT(frag && vertex && hit && !S3D_HIT_NONE(hit));
ASSERT(side == SDIS_FRONT || side == SDIS_BACK);
diff --git a/src/sdis_interface_c.h b/src/sdis_interface_c.h
@@ -39,7 +39,7 @@ struct sdis_interface {
extern LOCAL_SYM const struct sdis_medium*
interface_get_medium
(const struct sdis_interface* interf,
- const enum sdis_side_flag side);
+ const enum sdis_side side);
extern LOCAL_SYM unsigned
interface_get_id
@@ -50,14 +50,14 @@ setup_interface_fragment_2d
(struct sdis_interface_fragment* frag,
const struct sdis_rwalk_vertex* vertex,
const struct s2d_hit* hit,
- const enum sdis_side_flag side);
+ const enum sdis_side side);
extern LOCAL_SYM void
setup_interface_fragment_3d
(struct sdis_interface_fragment* frag,
const struct sdis_rwalk_vertex* vertex,
const struct s3d_hit* hit,
- const enum sdis_side_flag side);
+ const enum sdis_side side);
static INLINE double
interface_get_convection_coef
diff --git a/src/sdis_solve.c b/src/sdis_solve.c
@@ -273,7 +273,7 @@ sdis_solve_probe_boundary
const size_t iprim, /* Identifier of the primitive on which the probe lies */
const double uv[2], /* Parametric coordinates of the probe onto the primitve */
const double time, /* Observation time */
- const enum sdis_side_flag side, /* Side of iprim on which the probe lies */
+ const enum sdis_side side, /* Side of iprim on which the probe lies */
const double fp_to_meter, /* Scale from floating point units to meters */
const double Tarad, /* In Kelvin */
const double Tref, /* In Kelvin */
diff --git a/src/sdis_solve_Xd.h b/src/sdis_solve_Xd.h
@@ -94,7 +94,7 @@ struct XD(rwalk) {
struct sdis_rwalk_vertex vtx; /* Position and time of the Random walk */
const struct sdis_medium* mdm; /* Medium in which the random walk lies */
struct sXd(hit) hit; /* Hit of the random walk */
- enum sdis_side_flag hit_side;
+ enum sdis_side hit_side;
};
static const struct XD(rwalk) XD(RWALK_NULL) = {
SDIS_RWALK_VERTEX_NULL__, NULL, SXD_HIT_NULL__, SDIS_SIDE_NULL__
@@ -851,7 +851,7 @@ XD(boundary_realisation)
const size_t iprim,
const double uv[DIM],
const double time,
- const enum sdis_side_flag side,
+ const enum sdis_side side,
const double fp_to_meter,
const double Tarad,
const double Tref,