star-gf

commit ddd8500078660a9a8f8d11bb5ab9b78c6cd804a8
parent 582e690656d7822feec144774fa5eb15cd4d39d1
Author: Vincent Forest <vincent.forest@meso-star.com>
Date:   Wed,  1 Jun 2016 21:34:52 +0200

Fix GCC warnings and update the version of the dependencies

Diffstat:
M
cmake/CMakeLists.txt
 | 
8
++++----
M
src/test_sgf_cube.c
 | 
11
++++++-----
M
src/test_sgf_tetrahedron.c
 | 
13
+++++++------

3 files changed, 17 insertions(+), 15 deletions(-)
diff --git a/cmake/CMakeLists.txt b/cmake/CMakeLists.txt
@@ -23,11 +23,11 @@ option(NO_TEST "Disable the test" OFF)
 ################################################################################
 # Check dependencies
 ################################################################################
-find_package(RCMake 0.2 REQUIRED)
-find_package(RSys 0.2 REQUIRED)
-find_package(StarSP 0.1 REQUIRED)
+find_package(RCMake 0.2.3 REQUIRED)
+find_package(RSys 0.3 REQUIRED)
+find_package(StarSP 0.3 REQUIRED)
 find_package(Star3D 0.3 REQUIRED)
-find_package(OpenMP REQUIRED)
+find_package(OpenMP 1.2 REQUIRED)
 
 include_directories(
   ${RSys_INCLUDE_DIR}
diff --git a/src/test_sgf_cube.c b/src/test_sgf_cube.c
@@ -58,7 +58,7 @@ static const unsigned indices[] = {
   2, 6, 3, 3, 6, 7, /* Top */
   0, 1, 4, 4, 1, 5 /* Bottom */
 };
-static const size_t nprims = sizeof(indices) / sizeof(unsigned[3]);
+static const size_t nprims = (int)(sizeof(indices) / sizeof(unsigned[3]));
 
 static const double emissivity[] = {
   0.6, 0.6, /* Front */
@@ -249,11 +249,12 @@ main(int argc, char** argv)
   #pragma omp parallel for
   for(iprim = 0; iprim < (int)nprims; ++iprim) {
     size_t iprim2;
-    struct sgf_status* row = status + iprim * nprims;
+    struct sgf_status* row = status + (size_t)iprim * nprims;
     const int ithread = omp_get_thread_num();
     struct sgf_estimator* est;
 
-    CHECK(sgf_integrate(sgf, rngs[ithread], iprim, &scn_desc, NSTEPS, &est), RES_OK);
+    CHECK(sgf_integrate
+      (sgf, rngs[ithread], (size_t)iprim, &scn_desc, NSTEPS, &est), RES_OK);
 
 
     FOR_EACH(iprim2, 0, nprims) {
@@ -270,8 +271,8 @@ main(int argc, char** argv)
   CHECK(s3d_scene_end_session(scn), RES_OK);
 
   /* Merge the radiative flux of coplanar primitives */
-  FOR_EACH(iprim, 0, nprims/2) {
-    const struct sgf_status* row_src0 = status + iprim * 2 * nprims;
+  for(iprim=0; iprim < (int)(nprims/2); ++iprim) {
+    const struct sgf_status* row_src0 = status + (size_t)iprim * 2 * nprims;
     const struct sgf_status* row_src1 = row_src0 + nprims;
     size_t icol;
     double sum = 0;
diff --git a/src/test_sgf_tetrahedron.c b/src/test_sgf_tetrahedron.c
@@ -107,12 +107,13 @@ main(int argc, char** argv)
   /* Gebhart Factor integration */
   #pragma omp parallel for
   for(iprim = 0; iprim < (int)nprims; ++iprim) {
-    struct sgf_status* row = status + iprim*nprims;
+    struct sgf_status* row = status + (size_t)iprim*nprims;
     struct sgf_estimator* estimator = NULL;
     size_t iprim2;
     const int ithread = omp_get_thread_num();
 
-    CHECK(sgf_integrate(sgf, rngs[ithread], iprim, &desc, NSTEPS, &estimator), RES_OK);
+    CHECK(sgf_integrate
+      (sgf, rngs[ithread], (size_t)iprim, &desc, NSTEPS, &estimator), RES_OK);
 
     FOR_EACH(iprim2, 0, nprims) {
       struct sgf_status inf;
@@ -126,8 +127,8 @@ main(int argc, char** argv)
   CHECK(s3d_scene_end_session(scn), RES_OK);
 
   /* Expected value */
-  FOR_EACH(iprim, 0, nprims) {
-    const struct sgf_status* row = status + iprim * nprims;
+  for(iprim=0; iprim < (int)nprims; ++iprim) {
+    const struct sgf_status* row = status + (size_t)iprim * nprims;
     unsigned icol;
     double sum = 0.0;
     FOR_EACH(icol, 0, nprims) {
@@ -141,8 +142,8 @@ main(int argc, char** argv)
   printf("\n");
 
   /* Standard error */
-  FOR_EACH(iprim, 0, nprims) {
-    const struct sgf_status* row = status + iprim * nprims;
+  for(iprim=0; iprim < (int)nprims; ++iprim) {
+    const struct sgf_status* row = status + (size_t)iprim * nprims;
     unsigned icol;
     FOR_EACH(icol, 0, nprims) {
       printf("%.6f  ", row[icol].SE);