Changeset 3a48772 in sasmodels for sasmodels/models/hayter_msa.c

Timestamp:

Oct 14, 2016 3:23:40 PM (8 years ago)

Author:

Paul Kienzle <pkienzle@…>

Branches:

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

Children:

a5b6997

Parents:

b716cc6

Message:

use predefined constants for fractions of pi

File:

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

sasmodels/models/hayter_msa.c

@@ -23 +23 @@
         double SIdiam, diam, Kappa, cs, IonSt;
         double  Perm, Beta;
-        double pi, charge;
+        double charge;
         int ierr;
         
-        pi = M_PI;
-
         diam=2*radius_effective;                //in A
 
@@ -38 +36 @@
         charge=zz*Elcharge;             //in Coulomb (C)
         SIdiam = diam*1.0E-10;          //in m
-        Vp=4.0*pi/3.0*(SIdiam/2.0)*(SIdiam/2.0)*(SIdiam/2.0);   //in m^3
+        Vp=M_4PI_3*cube(SIdiam/2.0);    //in m^3
         cs=csalt*6.022E23*1.0E3;        //# salt molecules/m^3
         
@@ -50 +48 @@
         Kappa=sqrt(2*Beta*IonSt/Perm);     //Kappa calc from Ionic strength
                                                                            //   Kappa=2/SIdiam                                  // Use to compare with HP paper
-        gMSAWave[5]=Beta*charge*charge/(pi*Perm*SIdiam*pow((2.0+Kappa*SIdiam),2));
+        gMSAWave[5]=Beta*charge*charge/(M_PI*Perm*SIdiam*pow((2.0+Kappa*SIdiam),2));
         
         //         Finally set up dimensionless parameters