Changeset b966a96 in sasmodels for sasmodels/kernel_iq.c

Timestamp:

Jul 21, 2016 3:12:18 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:

6a0d6aa

Parents:

32e3c9b

Message:

better line numbers for compiler errors; tinycc support (mostly)

File:

• sasmodels/kernel_iq.c (modified) (3 diffs)

sasmodels/kernel_iq.c

@@ -29 +29 @@
 
 typedef struct {
-    PARAMETER_TABLE;
+    PARAMETER_TABLE
 } ParameterBlock;
 #endif
@@ -41 +41 @@
 static double clip(double value, double low, double high)
 {
-    return (value < low ? low : (value > high ? high : value));
+  return (value < low ? low : (value > high ? high : value));
 }
 
@@ -53 +53 @@
     double *uu, double *dd, double *ud, double *du)
 {
-    in_spin = clip(in_spin, 0.0, 1.0);
-    out_spin = clip(out_spin, 0.0, 1.0);
-        *uu = sqrt(sqrt(in_spin * out_spin));
-        *dd = sqrt(sqrt((1.0-in_spin) * (1.0-out_spin)));
-        *ud = sqrt(sqrt(in_spin * (1.0-out_spin)));
-        *du = sqrt(sqrt((1.0-in_spin) * out_spin));
+  in_spin = clip(in_spin, 0.0, 1.0);
+  out_spin = clip(out_spin, 0.0, 1.0);
+  *uu = sqrt(sqrt(in_spin * out_spin));
+  *dd = sqrt(sqrt((1.0-in_spin) * (1.0-out_spin)));
+  *ud = sqrt(sqrt(in_spin * (1.0-out_spin)));
+  *du = sqrt(sqrt((1.0-in_spin) * out_spin));
 }
 
 // Convert polar to rectangular coordinates.
 static void polrec(double r, double theta, double phi,
-    double *x, double *y, double *z)
+  double *x, double *y, double *z)
 {
-    double cos_theta, sin_theta, cos_phi, sin_phi;
-    SINCOS(theta*M_PI_180, sin_theta, cos_theta);
-    SINCOS(phi*M_PI_180, sin_phi, cos_phi);
-    *x = r * cos_theta * cos_phi;
-    *y = r * sin_theta;
-    *z = -r * cos_theta * sin_phi;
+  double cos_theta, sin_theta, cos_phi, sin_phi;
+  SINCOS(theta*M_PI_180, sin_theta, cos_theta);
+  SINCOS(phi*M_PI_180, sin_phi, cos_phi);
+  *x = r * cos_theta * cos_phi;
+  *y = r * sin_theta;
+  *z = -r * cos_theta * sin_phi;
 }
 #endif