Changeset d53d3cd in sasmodels

Timestamp:

Dec 23, 2015 10:19:57 AM (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:

ce166d3

Parents:

07e72e6

Message:

floating point constants need to include '.' to be recognized and converted

Location:

sasmodels/models

Files:

• ellipsoid.c (modified) (1 diff)
• sphere.py (modified) (1 diff)
• triaxial_ellipsoid.c (modified) (1 diff)

sasmodels/models/ellipsoid.c

@@ -14 +14 @@
     //const double f = ( u==0.0 ? 1.0 : 3.0*(sn-u*cn)/(u*u*u) );
     const double usq = u*u;
-    const double f = (u < 1e-1)
+    const double f = (u < 1.e-1)
         ? 1.0 + usq*(-3./30. + usq*(3./840. + usq*(-3./45360.)))// + qrsq*(3./3991680.))))
         : 3.0*(sn/u - cn)/usq;

sasmodels/models/sphere.py

@@ -98 +98 @@
     // requires the first 3 terms.  Double precision requires the 4th term.
     // The fifth term is not needed, and is commented out below.
-    const double bes = (qr < 1e-1)
+    const double bes = (qr < 1.e-1)
         ? 1.0 + qrsq*(-3./30. + qrsq*(3./840. + qrsq*(-3./45360.)))// + qrsq*(3./3991680.))))
         : 3.0*(sn/qr - cn)/qrsq;

sasmodels/models/triaxial_ellipsoid.c

@@ -39 +39 @@
             //const double fq = ( t==0.0 ? 1.0 : 3.0*(st-t*ct)/(t*t*t) );
             const double tsq = t*t;
-            const double fq = (t < 1e-1)
+            const double fq = (t < 1.e-1)
                 ? 1.0 + tsq*(-3./30. + tsq*(3./840. + tsq*(-3./45360.)))// + tsq*(3./3991680.))))
                 : 3.0*(st/t - ct)/tsq;