commit 268da321c27f787e784f5b49473308588c2bc510
parent 59cbec3ab09527de64d846618a03cbdef2a5d5c6
Author: Vincent Forest <vincent.forest@meso-star.com>
Date: Fri, 15 Oct 2021 15:57:01 +0200
Fix compilation warnings detected by gcc 11
Diffstat:
15 files changed, 45 insertions(+), 43 deletions(-)
diff --git a/src/sdis.h b/src/sdis.h
@@ -807,8 +807,8 @@ sdis_scene_ref_put
SDIS_API res_T
sdis_scene_get_aabb
(const struct sdis_scene* scn,
- double lower[3],
- double upper[3]);
+ double lower[],
+ double upper[]);
/* Get scene's fp_to_meter */
SDIS_API res_T
@@ -857,10 +857,10 @@ sdis_scene_set_reference_temperature
SDIS_API res_T
sdis_scene_find_closest_point
(const struct sdis_scene* scn,
- const double pos[3], /* Query position */
+ const double pos[], /* Query position */
const double radius, /* Maximum search distance around pos */
size_t* iprim, /* Primitive index onto which the closest point lies */
- double uv[2]); /* Parametric cordinate onto the primitive */
+ double uv[]); /* Parametric cordinate onto the primitive */
/* Define the world space position of a point onto the primitive `iprim' whose
* parametric coordinate is uv. */
@@ -868,8 +868,8 @@ SDIS_API res_T
sdis_scene_get_boundary_position
(const struct sdis_scene* scn,
const size_t iprim, /* Primitive index */
- const double uv[2], /* Parametric coordinate onto the primitive */
- double pos[3]); /* World space position */
+ const double uv[], /* Parametric coordinate onto the primitive */
+ double pos[]); /* World space position */
/* roject a world space position onto a primitive wrt its normal and compute
* the parametric coordinates of the projected point onto the primitive. This
@@ -902,7 +902,7 @@ SDIS_API res_T
sdis_scene_boundary_project_position
(const struct sdis_scene* scn,
const size_t iprim,
- const double pos[3],
+ const double pos[],
double uv[]);
/* Get the 2D scene's enclosures. Only defined for a 2D scene. */
diff --git a/src/sdis_interface.c b/src/sdis_interface.c
@@ -274,7 +274,7 @@ build_interface_fragment_2d
(struct sdis_interface_fragment* frag,
const struct sdis_scene* scn,
const unsigned iprim,
- const double* uv,
+ const double uv[1],
const enum sdis_side side)
{
struct s2d_attrib attr_P, attr_N;
@@ -317,7 +317,7 @@ build_interface_fragment_3d
(struct sdis_interface_fragment* frag,
const struct sdis_scene* scn,
const unsigned iprim,
- const double* uv,
+ const double uv[2],
const enum sdis_side side)
{
struct s3d_attrib attr_P, attr_N;
diff --git a/src/sdis_realisation.c b/src/sdis_realisation.c
@@ -26,8 +26,8 @@ ray_realisation_3d
(struct sdis_scene* scn,
struct ssp_rng* rng,
struct sdis_medium* medium,
- const double position[],
- const double direction[],
+ const double position[3],
+ const double direction[3],
const double time,
struct sdis_heat_path* heat_path, /* May be NULL */
double* weight)
diff --git a/src/sdis_realisation_Xd.h b/src/sdis_realisation_Xd.h
@@ -116,7 +116,7 @@ XD(probe_realisation)
struct sdis_scene* scn,
struct ssp_rng* rng,
struct sdis_medium* medium,
- const double position[],
+ const double position[DIM],
const double time,
struct green_path_handle* green_path, /* May be NULL */
struct sdis_heat_path* heat_path, /* May be NULL */
@@ -204,7 +204,7 @@ XD(boundary_realisation)
(struct sdis_scene* scn,
struct ssp_rng* rng,
const size_t iprim,
- const double uv[2],
+ const double uv[DIM-1],
const double time,
const enum sdis_side side,
struct green_path_handle* green_path, /* May be NULL */
@@ -279,7 +279,7 @@ XD(boundary_flux_realisation)
(struct sdis_scene* scn,
struct ssp_rng* rng,
const size_t iprim,
- const double uv[DIM],
+ const double uv[DIM-1],
const double time,
const enum sdis_side solid_side,
const int flux_mask,
diff --git a/src/sdis_scene.c b/src/sdis_scene.c
@@ -158,7 +158,9 @@ sdis_scene_ref_put(struct sdis_scene* scn)
res_T
sdis_scene_get_aabb
- (const struct sdis_scene* scn, double lower[], double upper[])
+ (const struct sdis_scene* scn,
+ double lower[],
+ double upper[])
{
float low[3], upp[3];
res_T res = RES_OK;
@@ -241,10 +243,10 @@ sdis_scene_set_ambient_radiative_temperature
res_T
sdis_scene_find_closest_point
(const struct sdis_scene* scn,
- const double pos[3],
+ const double pos[],
const double radius,
size_t* iprim,
- double uv[2])
+ double uv[])
{
if(!scn) return RES_BAD_ARG;
if(scene_is_2d(scn)) {
diff --git a/src/sdis_scene_Xd.h b/src/sdis_scene_Xd.h
@@ -186,8 +186,8 @@ check_sdis_scene_create_args(const struct sdis_scene_create_args* args)
static INLINE int
hit_on_vertex
(const struct s2d_hit* hit,
- const float org[3],
- const float dir[3])
+ const float org[2],
+ const float dir[2])
{
struct s2d_attrib v0, v1;
float E[2];
diff --git a/src/test_sdis_conducto_radiative.c b/src/test_sdis_conducto_radiative.c
@@ -69,7 +69,7 @@ static const double vertices[16/*#vertices*/*3/*#coords per vertex*/] = {
-1.5, 1.0, 1.0,
1.5, 1.0, 1.0,
};
-static const size_t nvertices = sizeof(vertices) / sizeof(double[3]);
+static const size_t nvertices = sizeof(vertices) / (3*sizeof(double));
static const size_t indices[32/*#triangles*/*3/*#indices per triangle*/] = {
0, 2, 1, 1, 2, 3, /* Solid back face */
@@ -91,7 +91,7 @@ static const size_t indices[32/*#triangles*/*3/*#indices per triangle*/] = {
3, 7, 11, 11, 7, 15, /* Right fluid top face */
1, 9, 5, 5, 9, 13 /* Right fluid bottom face */
};
-static const size_t ntriangles = sizeof(indices) / sizeof(size_t[3]);
+static const size_t ntriangles = sizeof(indices) / (3*sizeof(size_t));
static void
get_indices(const size_t itri, size_t ids[3], void* ctx)
diff --git a/src/test_sdis_conducto_radiative_2d.c b/src/test_sdis_conducto_radiative_2d.c
@@ -58,7 +58,7 @@ static const double vertices[8/*#vertices*/*2/*#coords par vertex*/] = {
-1.5, 1.0,
1.5, 1.0
};
-static const size_t nvertices = sizeof(vertices) / sizeof(double[2]);
+static const size_t nvertices = sizeof(vertices) / (2*sizeof(double));
static const size_t indices[10/*#segments*/*2/*#indices per segment*/] = {
0, 1, /* Solid bottom segment */
@@ -74,7 +74,7 @@ static const size_t indices[10/*#segments*/*2/*#indices per segment*/] = {
3, 7, /* Right fluid top segment */
7, 4 /* Right fluid right segment */
};
-static const size_t nsegments = sizeof(indices) / sizeof(size_t[2]);
+static const size_t nsegments = sizeof(indices) / (2*sizeof(size_t));
static void
get_indices(const size_t iseg, size_t ids[2], void* ctx)
diff --git a/src/test_sdis_contact_resistance.h b/src/test_sdis_contact_resistance.h
@@ -52,7 +52,7 @@ static const double model3d_vertices[12/*#vertices*/ * 3/*#coords per vertex*/]
X0, L, L,
L, L, L
};
-static const size_t model3d_nvertices = sizeof(model3d_vertices) / sizeof(double[3]);
+static const size_t model3d_nvertices = sizeof(model3d_vertices) / (3*sizeof(double));
/* The following array lists the indices toward the 3D vertices of each
* triangle.
@@ -74,7 +74,7 @@ static const size_t model3d_indices[22/*#triangles*/ * 3/*#indices per triangle*
0, 1, 7, 7, 6, 0, 1, 2, 8, 8, 7, 1, /* -Y */
4, 10, 7, 7, 1, 4 /* Inside */
};
-static const size_t model3d_ntriangles = sizeof(model3d_indices) / sizeof(size_t[3]);
+static const size_t model3d_ntriangles = sizeof(model3d_indices) / (3*sizeof(size_t));
static INLINE void
model3d_get_indices(const size_t itri, size_t ids[3], void* context)
@@ -118,7 +118,7 @@ static const double model2d_vertices[6/*#vertices*/ * 2/*#coords per vertex*/] =
X0, L,
L, L
};
-static const size_t model2d_nvertices = sizeof(model2d_vertices) / sizeof(double[2]);
+static const size_t model2d_nvertices = sizeof(model2d_vertices) / (2*sizeof(double));
static const size_t model2d_indices[7/*#segments*/ * 2/*#indices per segment*/] = {
0, 1, 1, 2, /* Bottom */
@@ -127,7 +127,7 @@ static const size_t model2d_indices[7/*#segments*/ * 2/*#indices per segment*/]
5, 0, /* Right */
4, 1 /* Inside */
};
-static const size_t model2d_nsegments = sizeof(model2d_indices) / sizeof(size_t[2]);
+static const size_t model2d_nsegments = sizeof(model2d_indices) / (2*sizeof(size_t));
static INLINE void
diff --git a/src/test_sdis_transcient.c b/src/test_sdis_transcient.c
@@ -47,7 +47,7 @@ static const double vertices[12/*#vertices*/*3/*#coords per vertex*/] = {
1.0, 0.0, 1.0,
1.0, 1.0, 1.0
};
-static const size_t nvertices = sizeof(vertices) / sizeof(double[3]);
+static const size_t nvertices = sizeof(vertices) / (3*sizeof(double));
/* The following array lists the indices toward the 3D vertices of each
* triangle.
@@ -67,7 +67,7 @@ static const size_t indices[22/*#triangles*/*3/*#indices per triangle*/] = {
0, 2, 1, 1, 2, 3, 1, 3, 8, 8, 3, 9, /* Z min */
4, 5, 6, 6, 5, 7, 5,10, 7, 7,10,11 /* Z max */
};
-static const size_t ntriangles = sizeof(indices) / sizeof(size_t[3]);
+static const size_t ntriangles = sizeof(indices) / (3*sizeof(size_t));
/*******************************************************************************
* Box geometry functions
diff --git a/src/test_sdis_unstationary_atm.c b/src/test_sdis_unstationary_atm.c
@@ -91,7 +91,7 @@ static const double model3d_vertices[12/*#vertices*/ * 3/*#coords per vertex*/]
XH, XHpE, XHpE,
XHpE, XHpE, XHpE
};
-static const size_t model3d_nvertices = sizeof(model3d_vertices) / sizeof(double[3]);
+static const size_t model3d_nvertices = sizeof(model3d_vertices) / (3*sizeof(double));
/* The following array lists the indices toward the 3D vertices of each
* triangle.
@@ -113,7 +113,7 @@ static const size_t model3d_indices[22/*#triangles*/ * 3/*#indices per triangle*
0, 1, 7, 7, 6, 0, 1, 2, 8, 8, 7, 1, /* -Y */
4, 10, 7, 7, 1, 4 /* Inside */
};
-static const size_t model3d_ntriangles = sizeof(model3d_indices) / sizeof(size_t[3]);
+static const size_t model3d_ntriangles = sizeof(model3d_indices) / (3*sizeof(size_t));
static INLINE void
model3d_get_indices(const size_t itri, size_t ids[3], void* context)
@@ -157,7 +157,7 @@ static const double model2d_vertices[6/*#vertices*/ * 2/*#coords per vertex*/] =
XH, XHpE,
XHpE, XHpE
};
-static const size_t model2d_nvertices = sizeof(model2d_vertices) / sizeof(double[2]);
+static const size_t model2d_nvertices = sizeof(model2d_vertices) / (2*sizeof(double));
static const size_t model2d_indices[7/*#segments*/ * 2/*#indices per segment*/] = {
0, 1, 1, 2, /* Bottom */
@@ -166,7 +166,7 @@ static const size_t model2d_indices[7/*#segments*/ * 2/*#indices per segment*/]
5, 0, /* Right */
4, 1 /* Inside */
};
-static const size_t model2d_nsegments = sizeof(model2d_indices) / sizeof(size_t[2]);
+static const size_t model2d_nsegments = sizeof(model2d_indices) / (2*sizeof(size_t));
static INLINE void
diff --git a/src/test_sdis_utils.h b/src/test_sdis_utils.h
@@ -41,7 +41,7 @@ static const double box_vertices[8/*#vertices*/*3/*#coords per vertex*/] = {
0.0, 1.0, 1.0,
1.0, 1.0, 1.0
};
-static const size_t box_nvertices = sizeof(box_vertices) / sizeof(double[3]);
+static const size_t box_nvertices = sizeof(box_vertices) / (3*sizeof(double));
/* The following array lists the indices toward the 3D vertices of each
* triangle.
@@ -61,7 +61,7 @@ static const size_t box_indices[12/*#triangles*/*3/*#indices per triangle*/] = {
2, 6, 7, 7, 3, 2, /* +Y */
0, 1, 5, 5, 4, 0 /* -Y */
};
-static const size_t box_ntriangles = sizeof(box_indices) / sizeof(size_t[3]);
+static const size_t box_ntriangles = sizeof(box_indices) / (3*sizeof(size_t));
static INLINE void
box_get_indices(const size_t itri, size_t ids[3], void* context)
@@ -103,7 +103,7 @@ static const double square_vertices[4/*#vertices*/*2/*#coords per vertex*/] = {
0.0, 1.0,
1.0, 1.0
};
-static const size_t square_nvertices = sizeof(square_vertices)/sizeof(double[2]);
+static const size_t square_nvertices = sizeof(square_vertices)/(2*sizeof(double));
static const size_t square_indices[4/*#segments*/*2/*#indices per segment*/]= {
0, 1, /* Bottom */
@@ -111,7 +111,7 @@ static const size_t square_indices[4/*#segments*/*2/*#indices per segment*/]= {
2, 3, /* Top */
3, 0 /* Right */
};
-static const size_t square_nsegments = sizeof(square_indices)/sizeof(size_t[2]);
+static const size_t square_nsegments = sizeof(square_indices)/(2*sizeof(size_t));
static INLINE void
square_get_indices(const size_t iseg, size_t ids[2], void* context)
diff --git a/src/test_sdis_volumic_power2.c b/src/test_sdis_volumic_power2.c
@@ -66,7 +66,7 @@ static const double vertices[16/*#vertices*/*3/*#coords per vertex*/] = {
0.1, 0.6, 0.5,
0.1, 0.4, 0.5
};
-static const size_t nvertices = sizeof(vertices)/sizeof(double[3]);
+static const size_t nvertices = sizeof(vertices)/(3*sizeof(double));
static const size_t indices[36/*#triangles*/*3/*#indices per triangle*/]= {
0, 4, 5, 5, 1, 0, /* Cuboid left */
@@ -90,7 +90,7 @@ static const size_t indices[36/*#triangles*/*3/*#indices per triangle*/]= {
8, 9, 10, 10, 11, 8, /* Cube back */
12, 15, 14, 14, 13, 12 /* Cube front */
};
-static const size_t ntriangles = sizeof(indices)/sizeof(size_t[3]);
+static const size_t ntriangles = sizeof(indices)/(3*sizeof(size_t));
/*******************************************************************************
* Geometry
diff --git a/src/test_sdis_volumic_power2_2d.c b/src/test_sdis_volumic_power2_2d.c
@@ -99,7 +99,7 @@ static const double vertices[8/*#vertices*/*2/*#coords per vertex*/] = {
0.1, 0.6,
0.1, 0.4
};
-static const size_t nvertices = sizeof(vertices)/sizeof(double[2]);
+static const size_t nvertices = sizeof(vertices)/(2*sizeof(double));
static const size_t indices[8/*#segments*/*2/*#indices per segment*/]= {
0, 1, /* Rectangle left */
@@ -111,7 +111,7 @@ static const size_t indices[8/*#segments*/*2/*#indices per segment*/]= {
6, 7, /* Square right */
7, 4 /* Square bottom */
};
-static const size_t nsegments = sizeof(indices)/sizeof(size_t[2]);
+static const size_t nsegments = sizeof(indices)/(2*sizeof(size_t));
/*******************************************************************************
* Geometry
diff --git a/src/test_sdis_volumic_power3_2d.c b/src/test_sdis_volumic_power3_2d.c
@@ -84,7 +84,7 @@ static const double vertices[8/*#vertices*/*2/*#coords per vertex*/] = {
100000.5, 1.4, /* 6 */
100000.5, 0.0 /* 7 */
};
-static const size_t nvertices = sizeof(vertices)/sizeof(double[2]);
+static const size_t nvertices = sizeof(vertices)/(2*sizeof(double));
static const size_t indices[10/*#segments*/*2/*#indices per segment*/]= {
0, 1,
@@ -98,7 +98,7 @@ static const size_t indices[10/*#segments*/*2/*#indices per segment*/]= {
6, 1,
2, 5
};
-static const size_t nsegments = sizeof(indices)/sizeof(size_t[2]);
+static const size_t nsegments = sizeof(indices)/(2*sizeof(size_t));
/*******************************************************************************
* Geometry
