Changes in / [e1454ab:fa227d3] in sasmodels

Location:

sasmodels/models

Files:

• core_multi_shell.c (modified) (1 diff)
• core_shell_parallelepiped.c (modified) (1 diff)
• elliptical_cylinder.c (modified) (1 diff)
• onion.c (modified) (1 diff)
• rpa.c (modified) (2 diffs)

sasmodels/models/core_multi_shell.c

@@ -182 +182 @@
     if (r == r0) {
       // no thickness, so nothing to add
-    } else if (fabs(A[i]) < 1e-16 || sld_out[i] == sld_in[i]) {
+    } else if (fabs(A[i]) < 1.0e-16 || sld_out[i] == sld_in[i]) {
       f -= f_constant(q, r0, sld_in[i]);
       f += f_constant(q, r, sld_in[i]);
-    } else if (fabs(A[i]) < 1e-4) {
+    } else if (fabs(A[i]) < 1.0e-4) {
       const double slope = (sld_out[i] - sld_in[i])/thickness[i];
       f -= f_linear(q, r0, sld_in[i], slope);

sasmodels/models/core_shell_parallelepiped.c

@@ -48 +48 @@
     double a_scaled = a_side / b_side;
     double c_scaled = c_side / b_side;
-    double arim_scaled = arim_thickness / b_side;
-    double brim_scaled = brim_thickness / b_side;
-       
+
     // DelRho values (note that drC is not used later)       
         double dr0 = core_sld-solvent_sld;

sasmodels/models/elliptical_cylinder.c

@@ -87 +87 @@
 
     const double vol = form_volume(r_minor, r_ratio, length);
-    return answer*vol*vol*1e-4;
+    return answer*vol*vol*1.0e-4;
 }
 

sasmodels/models/onion.c

@@ -80 +80 @@
     if (r == r0) {
       // no thickness, so nothing to add
-    } else if (fabs(A[i]) < 1e-16 || sld_out[i] == sld_in[i]) {
+    } else if (fabs(A[i]) < 1.0e-16 || sld_out[i] == sld_in[i]) {
       f -= f_constant(q, r0, sld_in[i]);
       f += f_constant(q, r, sld_in[i]);
-    } else if (fabs(A[i]) < 1e-4) {
+    } else if (fabs(A[i]) < 1.0e-4) {
       const double slope = (sld_out[i] - sld_in[i])/thickness[i];
       f -= f_linear(q, r0, sld_in[i], slope);

sasmodels/models/rpa.c

@@ -39 +39 @@
     Phia=Phib=0.0000001;
     Kab=Kac=Kad=Kbc=Kbd=-0.0004;
-    La=Lb=1e-12;
+    La=Lb=1.0e-12;
     va=vb=100.0;
     ba=bb=5.0;
@@ -45 +45 @@
     Phia=0.0000001;
     Kab=Kac=Kad=-0.0004;
-    La=1e-12;
+    La=1.0e-12;
     va=100.0;
     ba=5.0;