Changeset aadec17 in sasmodels

Timestamp:

Feb 7, 2018 3:49:25 PM (6 years ago)

Author:

Paul Kienzle <pkienzle@…>

Branches:

master, core_shell_microgels, magnetic_model, ticket-1257-vesicle-product, ticket_1156, ticket_1265_superball, ticket_822_more_unit_tests

Children:

a09d55d

Parents:

e526a9d

Message:

opencl: remove compiler warning for Radeon

File:

• sasmodels/kernel_iq.c (modified) (3 diffs)

sasmodels/kernel_iq.c

@@ -93 +93 @@
 // Compute the magnetic sld
 static double mag_sld(
-  const int xs, // 0=dd, 1=du real, 2=ud real, 3=uu, 4=du imag, 5=up imag
+  const unsigned int xs, // 0=dd, 1=du real, 2=ud real, 3=uu, 4=du imag, 5=up imag
   const double qx, const double qy,
   const double px, const double py,
@@ -103 +103 @@
     const double perp = qy*mx - qx*my;
     switch (xs) {
+      default: // keep compiler happy; condition ensures xs in [0,1,2,3]
       case 0: // uu => sld - D M_perpx
           return sld - px*perp;
@@ -659 +660 @@
 
             // loop over uu, ud real, du real, dd, ud imag, du imag
-            for (int xs=0; xs<6; xs++) {
+            for (unsigned int xs=0; xs<6; xs++) {
               const double xs_weight = spins[xs];
               if (xs_weight > 1.e-8) {