Changeset 0278e3f in sasmodels


Ignore:
Timestamp:
Apr 6, 2016 5:22:46 PM (8 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:
6 edited

Legend:

Unmodified
Added
Removed
  • sasmodels/kernel_template.c

    rc4e7a5f r0278e3f  
    226226#ifdef IQXY_OPEN_LOOPS 
    227227    double ret=0.0, norm=0.0; 
    228     #ifdef VOLUME_PARAMETERS 
    229     double vol=0.0, norm_vol=0.0; 
    230     #endif 
    231228    IQXY_OPEN_LOOPS 
    232229    //for (int radius_i=0; radius_i < Nradius; radius_i++) { 
     
    243240        // For cos(theta) fixed at 90, we effectively multiply top and bottom 
    244241        // by 1e-6, so the effect cancels. 
    245         const double spherical_correction = fmax(fabs(cos(M_PI_180*theta)), 1e-6); 
     242        const double spherical_correction = fmax(fabs(cos(M_PI_180*theta)), 1.e-6); 
    246243        weight *= spherical_correction; 
    247244      #endif 
  • sasmodels/models/lib/Si.c

    re7678b2 r0278e3f  
     1// integral of sin(x)/x Taylor series approximated to w/i 0.1% 
    12double Si(double x); 
    2  
    3 // integral of sin(x)/x Taylor series approximated to w/i 0.1% 
    43double Si(double x) 
    54{ 
  • sasmodels/models/lib/polevl.c

    r0b05c24 r0278e3f  
    5151*/ 
    5252 
    53 double polevl( double x, constant double *coef, int N ) { 
     53double polevl( double x, constant double *coef, int N ); 
     54double polevl( double x, constant double *coef, int N ) 
     55{ 
    5456 
    5557    int i = 0; 
     
    6163    } 
    6264 
    63     return ans ; 
     65    return ans; 
    6466} 
    6567 
     
    7072 */ 
    7173 
    72 double p1evl( double x, constant double *coef, int N ) { 
     74double p1evl( double x, constant double *coef, int N ); 
     75double p1evl( double x, constant double *coef, int N ) 
     76{ 
    7377    int i=0; 
    7478    double ans = x+coef[i]; 
     
    7983    } 
    8084 
    81     return( ans ); 
     85    return ans; 
    8286} 
  • sasmodels/models/lib/sas_J0.c

    ra776125 r0278e3f  
    177177 }; 
    178178 
    179 double sas_J0(double x) { 
     179double sas_J0(double x); 
     180double sas_J0(double x) 
     181{ 
    180182 
    181183//Cephes single precission 
  • sasmodels/models/lib/sas_J1.c

    r19b9005 r0278e3f  
    135135    }; 
    136136 
    137 double sas_J1(double x) { 
     137double sas_J1(double x); 
     138double sas_J1(double x) 
     139{ 
    138140 
    139141//Cephes double pression function 
     
    206208 
    207209//Finally J1c function that equals 2*J1(x)/x 
    208 double sas_J1c(double x) { 
     210double sas_J1c(double x); 
     211double sas_J1c(double x) 
     212{ 
    209213    return (x != 0.0 ) ? 2.0*sas_J1(x)/x : 1.0; 
    210214} 
  • sasmodels/models/lib/sas_JN.c

    ra776125 r0278e3f  
    4848*/ 
    4949 
    50 double sas_JN( int n, double x ); 
    51  
    52 double sas_JN( int n, double x ) { 
     50static double 
     51sas_JN( int n, double x ) { 
    5352 
    5453    const double MACHEP = 1.11022302462515654042E-16; 
Note: See TracChangeset for help on using the changeset viewer.