Changeset 0278e3f in sasmodels

Timestamp:

Apr 6, 2016 7:22:46 PM (9 years ago)

Author:

Paul Kienzle <pkienzle@…>

Branches:

master, core_shell_microgels, costrafo411, magnetic_model, release_v0.94, release_v0.95, ticket-1257-vesicle-product, ticket_1156, ticket_1265_superball, ticket_822_more_unit_tests

Children:

3a45c2c, e6408d0

Parents:

c4e7a5f

Message:

remove opencl compiler warnings; maybe fix build server breakage

Location:

sasmodels

Files:

• kernel_template.c (modified) (2 diffs)
• models/lib/Si.c (modified) (1 diff)
• models/lib/polevl.c (modified) (4 diffs)
• models/lib/sas_J0.c (modified) (1 diff)
• models/lib/sas_J1.c (modified) (2 diffs)
• models/lib/sas_JN.c (modified) (1 diff)

sasmodels/kernel_template.c

@@ -226 +226 @@
 #ifdef IQXY_OPEN_LOOPS
     double ret=0.0, norm=0.0;
-    #ifdef VOLUME_PARAMETERS
-    double vol=0.0, norm_vol=0.0;
-    #endif
     IQXY_OPEN_LOOPS
     //for (int radius_i=0; radius_i < Nradius; radius_i++) {
@@ -243 +240 @@
         // For cos(theta) fixed at 90, we effectively multiply top and bottom
         // by 1e-6, so the effect cancels.
-        const double spherical_correction = fmax(fabs(cos(M_PI_180*theta)), 1e-6);
+        const double spherical_correction = fmax(fabs(cos(M_PI_180*theta)), 1.e-6);
         weight *= spherical_correction;
       #endif

sasmodels/models/lib/Si.c

@@ +1 @@
+// integral of sin(x)/x Taylor series approximated to w/i 0.1%
 double Si(double x);
-
-// integral of sin(x)/x Taylor series approximated to w/i 0.1%
 double Si(double x)
 {

sasmodels/models/lib/polevl.c

@@ -51 +51 @@
 */
 
-double polevl( double x, constant double *coef, int N ) {
+double polevl( double x, constant double *coef, int N );
+double polevl( double x, constant double *coef, int N )
+{
 
     int i = 0;
@@ -61 +63 @@
     }
 
-    return ans ;
+    return ans;
 }
 
@@ -70 +72 @@
  */
 
-double p1evl( double x, constant double *coef, int N ) {
+double p1evl( double x, constant double *coef, int N );
+double p1evl( double x, constant double *coef, int N )
+{
     int i=0;
     double ans = x+coef[i];
@@ -79 +83 @@
     }
 
-    return( ans );
+    return ans;
 }

sasmodels/models/lib/sas_J0.c

@@ -177 +177 @@
  };
 
-double sas_J0(double x) {
+double sas_J0(double x);
+double sas_J0(double x)
+{
 
 //Cephes single precission

sasmodels/models/lib/sas_J1.c

@@ -135 +135 @@
     };
 
-double sas_J1(double x) {
+double sas_J1(double x);
+double sas_J1(double x)
+{
 
 //Cephes double pression function
@@ -206 +208 @@
 
 //Finally J1c function that equals 2*J1(x)/x
-double sas_J1c(double x) {
+double sas_J1c(double x);
+double sas_J1c(double x)
+{
     return (x != 0.0 ) ? 2.0*sas_J1(x)/x : 1.0;
 }

sasmodels/models/lib/sas_JN.c

@@ -48 +48 @@
 */
 
-double sas_JN( int n, double x );
-
-double sas_JN( int n, double x ) {
+static double
+sas_JN( int n, double x ) {
 
     const double MACHEP = 1.11022302462515654042E-16;