Changeset 541e7c9 in sasmodels for sasmodels/models/lib


Ignore:
Timestamp:
Apr 6, 2016 7:27: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:
4937980
Parents:
ee8f734 (diff), 0278e3f (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.
Message:

Merge remote-tracking branch 'origin/master' into polydisp

Conflicts:

sasmodels/models/lib/Si.c
sasmodels/models/lib/polevl.c
sasmodels/models/lib/sas_J0.c
sasmodels/models/lib/sas_J1.c
sasmodels/models/lib/sas_JN.c

Location:
sasmodels/models/lib
Files:
8 edited

Legend:

Unmodified
Added
Removed

  • sasmodels/models/lib/Si.c

    rba32cdd r0278e3f  
    11// integral of sin(x)/x Taylor series approximated to w/i 0.1% 
    22double Si(double x); 
    3  
    43double Si(double x) 
    54{ 

  • sasmodels/models/lib/polevl.c

    rba32cdd r0278e3f  
    5252 
    5353double polevl( double x, constant double *coef, int N ); 
    54 double p1evl( double x, constant double *coef, int N ); 
    55  
    56  
    5754double polevl( double x, constant double *coef, int N ) 
    5855{ 
    … …  
    6663    } 
    6764 
    68     return ans ; 
     65    return ans; 
    6966} 
    7067 
    … …  
    7572 */ 
    7673 
     74double p1evl( double x, constant double *coef, int N ); 
    7775double p1evl( double x, constant double *coef, int N ) 
    7876{ 
    … …  
    8583    } 
    8684 
    87     return( ans ); 
     85    return ans; 
    8886} 

  • sasmodels/models/lib/sas_J0.c

    rba32cdd r0278e3f  
    4949Copyright 1984, 1987, 1989, 2000 by Stephen L. Moshier 
    5050*/ 
    51  
    52 double sas_J0(double x); 
    5351 
    5452/* Note: all coefficients satisfy the relative error criterion 
    … …  
    179177 }; 
    180178 
     179double sas_J0(double x); 
    181180double sas_J0(double x) 
    182181{ 

  • sasmodels/models/lib/sas_J1.c

    rba32cdd r0278e3f  
    3939Copyright 1984, 1987, 1989, 2000 by Stephen L. Moshier 
    4040*/ 
    41 double sas_J1(double x); 
    42 double sas_J1c(double x); 
    4341 
    4442constant double RPJ1[8] = { 
    … …  
    137135    }; 
    138136 
     137double sas_J1(double x); 
    139138double sas_J1(double x) 
    140139{ 
    … …  
    209208 
    210209//Finally J1c function that equals 2*J1(x)/x 
    211 double sas_J1c(double x) { 
     210double sas_J1c(double x); 
     211double sas_J1c(double x) 
     212{ 
    212213    return (x != 0.0 ) ? 2.0*sas_J1(x)/x : 1.0; 
    213214} 

  • sasmodels/models/lib/sas_JN.c

    rba32cdd r541e7c9  
    4747Copyright 1984, 1987, 2000 by Stephen L. Moshier 
    4848*/ 
     49 
    4950double sas_JN( int n, double x ); 
    5051 
    51 double sas_JN( int n, double x ) 
    52 { 
     52double sas_JN( int n, double x ) { 
    5353 
    5454    const double MACHEP = 1.11022302462515654042E-16; 

  • sasmodels/models/lib/sph_j1c.c

    re6f1410 rba32cdd  
    77* using double precision that are the source. 
    88*/ 
     9double sph_j1c(double q); 
    910 
    1011// The choice of the number of terms in the series and the cutoff value for 
    … …  
    4344#endif 
    4445 
    45 double sph_j1c(double q); 
    4646double sph_j1c(double q) 
    4747{ 

  • sasmodels/models/lib/sphere_form.c

    rad90df9 rba32cdd  
    1 inline double 
    2 sphere_volume(double radius) 
     1double sphere_volume(double radius); 
     2double sphere_form(double q, double radius, double sld, double solvent_sld); 
     3 
     4double sphere_volume(double radius) 
    35{ 
    46    return M_4PI_3*cube(radius); 
    57} 
    68 
    7 inline double 
    8 sphere_form(double q, double radius, double sld, double solvent_sld) 
     9double sphere_form(double q, double radius, double sld, double solvent_sld) 
    910{ 
    1011    const double fq = sphere_volume(radius) * sph_j1c(q*radius); 

  • sasmodels/models/lib/wrc_cyl.c

    re7678b2 rba32cdd  
    22    Functions for WRC implementation of flexible cylinders 
    33*/ 
     4double Sk_WR(double q, double L, double b); 
     5 
     6 
    47static double 
    58AlphaSquare(double x) 
    … …  
    363366} 
    364367 
    365 double Sk_WR(double q, double L, double b); 
    366368double Sk_WR(double q, double L, double b) 
    367369{ 
Note: See TracChangeset for help on using the changeset viewer.