Changeset 994d77f in sasmodels for sasmodels/models/lib/J1.c

Timestamp:

Oct 30, 2014 12:33:53 PM (10 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:

ef2861b

Parents:

d087487b

Message:

Convert double to float rather than using real

File:

• sasmodels/models/lib/J1.c (modified) (1 diff)

sasmodels/models/lib/J1.c

@@ -1 @@
-real J1(real x);
-real J1(real x)
+double J1(double x);
+double J1(double x)
 {
-  const real ax = fabs(x);
-  if (ax < REAL(8.0)) {
-    const real y = x*x;
-    const real ans1 = x*(REAL(72362614232.0)
-              + y*(REAL(-7895059235.0)
-              + y*(REAL(242396853.1)
-              + y*(REAL(-2972611.439)
-              + y*(REAL(15704.48260)
-              + y*(REAL(-30.16036606)))))));
-    const real ans2 = REAL(144725228442.0)
-              + y*(REAL(2300535178.0)
-              + y*(REAL(18583304.74)
-              + y*(REAL(99447.43394)
-              + y*(REAL(376.9991397)
+  const double ax = fabs(x);
+  if (ax < 8.0) {
+    const double y = x*x;
+    const double ans1 = x*(72362614232.0
+              + y*(-7895059235.0
+              + y*(242396853.1
+              + y*(-2972611.439
+              + y*(15704.48260
+              + y*(-30.16036606))))));
+    const double ans2 = 144725228442.0
+              + y*(2300535178.0
+              + y*(18583304.74
+              + y*(99447.43394
+              + y*(376.9991397
               + y))));
     return ans1/ans2;
   } else {
-    const real y = REAL(64.0)/(ax*ax);
-    const real xx = ax - REAL(2.356194491);
-    const real ans1 = REAL(1.0)
-              + y*(REAL(0.183105e-2)
-              + y*(REAL(-0.3516396496e-4)
-              + y*(REAL(0.2457520174e-5)
-              + y*REAL(-0.240337019e-6))));
-    const real ans2 = REAL(0.04687499995)
-              + y*(REAL(-0.2002690873e-3)
-              + y*(REAL(0.8449199096e-5)
-              + y*(REAL(-0.88228987e-6)
-              + y*REAL(0.105787412e-6))));
-    real sn,cn;
+    const double y = 64.0/(ax*ax);
+    const double xx = ax - 2.356194491;
+    const double ans1 = 1.0
+              + y*(0.183105e-2
+              + y*(-0.3516396496e-4
+              + y*(0.2457520174e-5
+              + y*-0.240337019e-6)));
+    const double ans2 = 0.04687499995
+              + y*(-0.2002690873e-3
+              + y*(0.8449199096e-5
+              + y*(-0.88228987e-6
+              + y*0.105787412e-6)));
+    double sn,cn;
     SINCOS(xx, sn, cn);
-    const real ans = sqrt(REAL(0.636619772)/ax) * (cn*ans1 - (REAL(8.0)/ax)*sn*ans2);
-    return (x < REAL(0.0)) ? -ans : ans;
+    const double ans = sqrt(0.636619772/ax) * (cn*ans1 - (8.0/ax)*sn*ans2);
+    return (x < 0.0) ? -ans : ans;
   }
 }