Changeset 4937980 in sasmodels for sasmodels/models/lib

Timestamp:

Apr 6, 2016 7:46:11 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:

cb3a824, 8bd7b77

Parents:

541e7c9 (diff), e6408d0 (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/flexible_cylinder.c

Location:

sasmodels/models/lib

Files:

• sas_JN.c (modified) (2 diffs)
• sph_j1c.c (modified) (2 diffs)
• sphere_form.c (modified) (1 diff)
• wrc_cyl.c (modified) (2 diffs)

sasmodels/models/lib/sas_JN.c

@@ -53 +53 @@
 
     const double MACHEP = 1.11022302462515654042E-16;
-    double pkm2, pkm1, pk, xk, r, ans, xinv;
+    double pkm2, pkm1, pk, xk, r, ans;
     int k, sign;
 
@@ -123 +123 @@
 
     #else
-        xinv = 1.0/x;
+        const double xinv = 1.0/x;
         pkm1 = ans * xinv;
         k = n-1;

sasmodels/models/lib/sph_j1c.c

@@ -7 +7 @@
 * using double precision that are the source.
 */
+double sph_j1c(double q);
 
 // The choice of the number of terms in the series and the cutoff value for
@@ -43 +44 @@
 #endif
 
-double sph_j1c(double q);
 double sph_j1c(double q)
 {

sasmodels/models/lib/sphere_form.c

@@ -1 @@
-inline double
-sphere_volume(double radius)
+double sphere_volume(double radius);
+double sphere_form(double q, double radius, double sld, double solvent_sld);
+
+double sphere_volume(double radius)
 {
     return M_4PI_3*cube(radius);
 }
 
-inline double
-sphere_form(double q, double radius, double sld, double solvent_sld)
+double sphere_form(double q, double radius, double sld, double solvent_sld)
 {
     const double fq = sphere_volume(radius) * sph_j1c(q*radius);

sasmodels/models/lib/wrc_cyl.c

@@ -2 +2 @@
     Functions for WRC implementation of flexible cylinders
 */
+double Sk_WR(double q, double L, double b);
+
+
 static double
 AlphaSquare(double x)
@@ -363 +366 @@
 }
 
-double Sk_WR(double q, double L, double b);
 double Sk_WR(double q, double L, double b)
 {