Changeset dedcf34 in sasmodels

Timestamp:

Apr 10, 2017 5:40:38 AM (8 years ago)

Author:

richardh

Branches:

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

Children:

9802ab3

Parents:

3401a7a

Message:

change two variable names in core_shell_bicelle_elliptical

File:

• sasmodels/models/core_shell_bicelle_elliptical.c (modified) (3 diffs)

sasmodels/models/core_shell_bicelle_elliptical.c

@@ -24 +24 @@
     double si1,si2,be1,be2;
      // core_shell_bicelle_elliptical, RKH Dec 2016, based on elliptical_cylinder and core_shell_bicelle
-     // tested against limiting cases of cylinder, elliptical_cylinder and core_shell_bicelle
+     // tested against limiting cases of cylinder, elliptical_cylinder, stacked_discs, and core_shell_bicelle
      //    const double uplim = M_PI_4;
     const double halfheight = 0.5*length;
@@ -34 +34 @@
 
     const double r_major = r_minor * x_core;
-    const double rA = 0.5*(square(r_major) + square(r_minor));
-    const double rB = 0.5*(square(r_major) - square(r_minor));
+    const double r2A = 0.5*(square(r_major) + square(r_minor));
+    const double r2B = 0.5*(square(r_major) - square(r_minor));
     const double dr1 = (rhoc-rhoh)   *M_PI*r_minor*r_major*(2.0*halfheight);;
     const double dr2 = (rhor-rhosolv)*M_PI*(r_minor+thick_rim)*(r_major+thick_rim)*2.0*(halfheight+thick_face);
@@ -60 +60 @@
             //const double beta = ( Gauss76Z[j]*(vbj-vaj) + vaj + vbj )/2.0;
             const double beta = ( Gauss76Z[j] +1.0)*M_PI_2;
-            const double rr = sqrt(rA - rB*cos(beta));
+            const double rr = sqrt(r2A - r2B*cos(beta));
             double besarg1 = q*rr*sin_alpha;
             double besarg2 = q*(rr+thick_rim)*sin_alpha;