stardis-solver

commit a757319073de1b5db8e5c3f7e1b868ff7fcb8ea7
parent 7db538678420d047796cd092b306de31f860ac4c
Author: Christophe Coustet <christophe.coustet@meso-star.com>
Date:   Tue, 12 Mar 2019 15:12:22 +0100

Fix msvc warnings

Diffstat:
M
src/test_sdis_solve_boundary.c
 | 
2
+-
M
src/test_sdis_solve_medium.c
 | 
6
+++---
M
src/test_sdis_solve_medium_2d.c
 | 
6
+++---

3 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/src/test_sdis_solve_boundary.c b/src/test_sdis_solve_boundary.c
@@ -204,7 +204,7 @@ main(int argc, char** argv)
   OK(sdis_device_create(NULL, &allocator, SDIS_NTHREADS_DEFAULT, 0, &dev));
 
   /* Temporary file used to dump heat paths */
-  CHK(fp = tmpfile());
+  CHK((fp = tmpfile()) != NULL);
 
   /* Create the fluid medium */
   OK(sdis_data_create
diff --git a/src/test_sdis_solve_medium.c b/src/test_sdis_solve_medium.c
@@ -363,7 +363,7 @@ main(int argc, char** argv)
   OK(sdis_estimator_get_failure_count(estimator, &nfails));
   OK(sdis_estimator_get_temperature(estimator, &T));
   printf("Shape0 temperature = "STR(Tf0)" ~ %g +/- %g\n", T.E, T.SE);
-  printf("#failures = %lu/%lu\n", nfails, N);
+  printf("#failures = %lu/%lu\n", (unsigned long)nfails, N);
   CHK(eq_eps(T.E, Tf0, T.SE));
   CHK(nreals + nfails == N);
   OK(sdis_estimator_ref_put(estimator));
@@ -373,7 +373,7 @@ main(int argc, char** argv)
   OK(sdis_estimator_get_failure_count(estimator, &nfails));
   OK(sdis_estimator_get_temperature(estimator, &T));
   printf("Shape1 temperature = "STR(Tf1)" ~ %g +/- %g\n", T.E, T.SE);
-  printf("#failures = %lu/%lu\n", nfails, N);
+  printf("#failures = %lu/%lu\n", (unsigned long)nfails, N);
   CHK(eq_eps(T.E, Tf1, T.SE));
   CHK(nreals + nfails == N);
   OK(sdis_estimator_ref_put(estimator));
@@ -402,7 +402,7 @@ main(int argc, char** argv)
   OK(sdis_estimator_get_failure_count(estimator, &nfails));
   ref = Tf0 * v0/v + Tf1 * v1/v;
   printf("Shape0 + Shape1 temperature = %g ~ %g +/- %g\n", ref, T.E, T.SE);
-  printf("#failures = %lu/%lu\n", nfails, Np);
+  printf("#failures = %lu/%lu\n", (unsigned long)nfails, Np);
   CHK(eq_eps(T.E, ref, T.SE*3));
 
   /* Solve green */
diff --git a/src/test_sdis_solve_medium_2d.c b/src/test_sdis_solve_medium_2d.c
@@ -339,7 +339,7 @@ main(int argc, char** argv)
   OK(sdis_estimator_get_realisation_count(estimator, &nreals));
   OK(sdis_estimator_get_failure_count(estimator, &nfails));
   printf("Square temperature = "STR(Tf0)" ~ %g +/- %g\n", T.E, T.SE);
-  printf("#failures = %lu / %lu\n", nfails, N);
+  printf("#failures = %lu / %lu\n", (unsigned long)nfails, N);
   CHK(eq_eps(T.E, Tf0, T.SE));
   CHK(nreals + nfails == N);
   OK(sdis_estimator_ref_put(estimator));
@@ -350,7 +350,7 @@ main(int argc, char** argv)
   OK(sdis_estimator_get_realisation_count(estimator, &nreals));
   OK(sdis_estimator_get_failure_count(estimator, &nfails));
   printf("Disk temperature = "STR(Tf1)" ~ %g +/- %g\n", T.E, T.SE);
-  printf("#failures = %lu / %lu\n", nfails, N);
+  printf("#failures = %lu / %lu\n", (unsigned long)nfails, N);
   CHK(eq_eps(T.E, Tf1, T.SE));
   CHK(nreals + nfails == N);
   OK(sdis_estimator_ref_put(estimator));
@@ -373,7 +373,7 @@ main(int argc, char** argv)
   OK(sdis_estimator_get_failure_count(estimator, &nfails));
   ref = Tf0 * a0/a + Tf1 * a1/a;
   printf("Square + Disk temperature = %g ~ %g +/- %g\n", ref, T.E, T.SE);
-  printf("#failures = %lu / %lu\n", nfails, Np);
+  printf("#failures = %lu / %lu\n", (unsigned long)nfails, Np);
   CHK(eq_eps(T.E, ref, 3*T.SE));
   CHK(nreals + nfails == Np);