Changeset e481a39 in sasmodels for sasmodels/models/binary_hard_sphere.c

Timestamp:

Mar 20, 2016 5:06:10 AM (8 years ago)

Author:

butler

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:

3f12f59

Parents:

dff1088

Message:

cleanup of binary hard sphere model - now passes tests and docs works.
also removed some compilser warnings.

File:

• sasmodels/models/binary_hard_sphere.c (modified) (6 diffs)

sasmodels/models/binary_hard_sphere.c

@@ -13 +13 @@
     );
 
-int calculate_psfs(double qval,
+void calculate_psfs(double qval,
     double r2, double nf2,
     double aa, double phi,
@@ -34 +34 @@
     double phi1,phi2,phr,a3;
     double v1,v2,n1,n2,qr1,qr2,b1,b2,sc1,sc2;
-    int err;
     
     r2 = lg_radius;
@@ -52 +51 @@
     nf2 = phr*a3/(1.0-phr+phr*a3);
     // calculate the PSF's here
-    err = calculate_psfs(q,r2,nf2,aa,phi,&psf11,&psf22,&psf12);
+    calculate_psfs(q,r2,nf2,aa,phi,&psf11,&psf22,&psf12);
     
     // /* do form factor calculations  */
@@ -103 +102 @@
 }
 
-int calculate_psfs(double qval,
+void calculate_psfs(double qval,
     double r2, double nf2,
     double aa, double phi,
@@ -112 +111 @@
     
     //   calculate constant terms
-    double s1,s2,v,a3,v1,v2,g11,g12,g22,wmv,wmv3,wmv4;
+    double s2,v,a3,v1,v2,g11,g12,g22,wmv,wmv3,wmv4;
     double a1,a2i,a2,b1,b2,b12,gm1,gm12;
-    double err=0.0,yy,ay,ay2,ay3,t1,t2,t3,f11,y2,y3,tt1,tt2,tt3;
+    double yy,ay,ay2,ay3,t1,t2,t3,f11,y2,y3,tt1,tt2,tt3;
     double c11,c22,c12,f12,f22,ttt1,ttt2,ttt3,ttt4,yl,y13;
     double t21,t22,t23,t31,t32,t33,t41,t42,yl3,wma3,y1;
     
     s2 = 2.0*r2;
-    s1 = aa*s2;
+//    s1 = aa*s2;  why is this never used?  check original paper?
     v = phi;
     a3 = aa*aa*aa;
@@ -189 +188 @@
     *s12=-c12/((1.+c11)*(1.+c22)-(c12)*(c12));   
     
-    return(err);
+    return;
 }