Changeset aa8c6e0 in sasmodels for sasmodels/models/lib

Timestamp:

Oct 30, 2018 8:43:35 AM (5 years ago)

Author:

Paul Kienzle <pkienzle@…>

Branches:

master, core_shell_microgels, magnetic_model, ticket-1257-vesicle-product, ticket_1156, ticket_1265_superball, ticket_822_more_unit_tests

Children:

765d025, 23df833

Parents:

153f8f6 (diff), c6084f1 (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 branch 'master' into beta_approx

Location:

sasmodels/models/lib

Files:

• sas_gammainc.c (added)
• core_shell.c (modified) (2 diffs)
• gauss76.c (modified) (2 diffs)
• polevl.c (modified) (2 diffs)
• sas_J1.c (modified) (5 diffs)
• sphere_form.c (modified) (1 diff)

sasmodels/models/lib/core_shell.c

@@ -7 +7 @@
 ********************************************************************/
 static
-double core_shell_kernel(double q,
+double core_shell_fq(double q,
                          double radius,
                          double thickness,
                          double core_sld,
                          double shell_sld,
-                         double solvent_sld) {
+                         double solvent_sld)
+{
     // Core first, then add in shell
     const double core_qr = q * radius;
@@ -26 +27 @@
     const double shell_volume = M_4PI_3 * cube(radius + thickness);
     f += shell_volume * shell_bes * shell_contrast;
-    return f * f * 1.0e-4;
+    return f;
 }
+
+// Deprecated function: use core_shell_fq instead.
+static
+double core_shell_kernel(double q,
+                         double radius,
+                         double thickness,
+                         double core_sld,
+                         double shell_sld,
+                         double solvent_sld)
+{
+    const double fq = core_shell_fq(q, radius, thickness, core_sld, shell_sld, solvent_sld);
+    return 1.0e-4 * fq*fq;
+}

sasmodels/models/lib/gauss76.c

@@ -11 +11 @@
 
 // Gaussians
-constant double Gauss76Wt[76]={
+constant double Gauss76Wt[76] = {
         .00126779163408536,             //0
         .00294910295364247,
@@ -90 +90 @@
 };
 
-constant double Gauss76Z[76]={
+constant double Gauss76Z[76] = {
         -.999505948362153,              //0
         -.997397786355355,

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 )
+static
+double polevl( double x, pconstant double *coef, int N )
 {
 
@@ -72 +72 @@
  */
 
-double p1evl( double x, constant double *coef, int N );
-double p1evl( double x, constant double *coef, int N )
+static
+double p1evl( double x, pconstant double *coef, int N )
 {
     int i=0;

sasmodels/models/lib/sas_J1.c

@@ -42 +42 @@
 #if FLOAT_SIZE>4
 //Cephes double pression function
-double cephes_j1(double x);
 
 constant double RPJ1[8] = {
@@ -106 +105 @@
     0.0 };
 
+static
 double cephes_j1(double x)
 {
@@ -155 +155 @@
 #else
 //Single precission version of cephes
-float cephes_j1f(float x);
-
 constant float JPJ1[8] = {
     -4.878788132172128E-009,
@@ -190 +188 @@
     };
 
+static
 float cephes_j1f(float xx)
 {
@@ -240 +239 @@
 
 //Finally J1c function that equals 2*J1(x)/x
-double sas_2J1x_x(double x);
+static
 double sas_2J1x_x(double x)
 {

sasmodels/models/lib/sphere_form.c

@@ -13 +13 @@
     return 1.0e-4*square(contrast * fq);
 }
+