Changes in / [541e7c9:ee8f734] in sasmodels

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) (2 diffs)
• models/lib/sas_J1.c (modified) (3 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++) {
@@ -240 +243 @@
         // 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)), 1.e-6);
+        const double spherical_correction = fmax(fabs(cos(M_PI_180*theta)), 1e-6);
         weight *= spherical_correction;
       #endif

sasmodels/models/lib/Si.c

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

sasmodels/models/lib/polevl.c

@@ -52 +52 @@
 
 double polevl( double x, constant double *coef, int N );
+double p1evl( double x, constant double *coef, int N );
+
+
 double polevl( double x, constant double *coef, int N )
 {
@@ -63 +66 @@
     }
 
-    return ans;
+    return ans ;
 }
 
@@ -72 +75 @@
  */
 
-double p1evl( double x, constant double *coef, int N );
 double p1evl( double x, constant double *coef, int N )
 {
@@ -83 +85 @@
     }
 
-    return ans;
+    return( ans );
 }

sasmodels/models/lib/sas_J0.c

@@ -49 +49 @@
 Copyright 1984, 1987, 1989, 2000 by Stephen L. Moshier
 */
+
+double sas_J0(double x);
 
 /* Note: all coefficients satisfy the relative error criterion
@@ -177 +179 @@
  };
 
-double sas_J0(double x);
 double sas_J0(double x)
 {

sasmodels/models/lib/sas_J1.c

@@ -39 +39 @@
 Copyright 1984, 1987, 1989, 2000 by Stephen L. Moshier
 */
+double sas_J1(double x);
+double sas_J1c(double x);
 
 constant double RPJ1[8] = {
@@ -135 +137 @@
     };
 
-double sas_J1(double x);
 double sas_J1(double x)
 {
@@ -208 +209 @@
 
 //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

@@ -47 +47 @@
 Copyright 1984, 1987, 2000 by Stephen L. Moshier
 */
-
 double sas_JN( int n, double x );
 
-double sas_JN( int n, double x ) {
+double sas_JN( int n, double x )
+{
 
     const double MACHEP = 1.11022302462515654042E-16;