Changeset 2de9a5e in sasmodels for Kernel-CapCyl.cpp

Timestamp:

Jul 11, 2014 2:47:47 PM (10 years ago)

Author:

HMP1 <helen.park@…>

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:

be5d7df

Parents:

8faffcd

Message:

Update for Aaron

File:

• Kernel-CapCyl.cpp (modified) (4 diffs)

Kernel-CapCyl.cpp

@@ -1 @@
-__kernel void CapCylinderKernel(__global const float *qx, __global const float *qy, __global float *__ptvalue, __global float *vol_i
+__kernel void CapCylinderKernel(__global const float *qx, __global const float *qy, __global float *_ptvalue, __global float *vol_i,
 const float rad_cyl, const float rad_cap, const float length, const float thet, const float ph, const float sub,
 const float scale, const float phi_weight, const float theta_float, const float rad_cap_weight, const float rad_cyl_weight,
-const float length_weight, const int total, const int size)
+const float length_weight, const int total, const int size, __const float Gauss76Wt, __const float Gauss76Z)
 //ph is phi, sub is sldc-slds, thet is theta
 {
@@ -8 +8 @@
     if(i < total)
     {
-        float q = sqrt(qx[i]*qx[i] + qy[i]*qy[i])
+        float q = sqrt(qx[i]*qx[i] + qy[i]*qy[i]);
         float pi = 4.0*atan(1.0);
         float theta = thet*pi/180.0;
@@ -16 +16 @@
         float cos_val = cyl_x*qx[i]/q + cyl_y*qy[i]/q;
         float alpha = acos(cos_val);
-        float yyy=0; float ans1=0; float ans2=0; float y=0; float xx=0; float ans=0; float zij=0; float be=0
+        float yyy=0; float ans1=0; float ans2=0; float y=0; float xx=0; float ans=0; float zij=0; float be=0; float summj=0;
 
         float hDist = -1.0*sqrt(fabs(rad_cap*rad_cap-rad_cyl*rad_cyl));
-        vol_i[i] = pi*rad_cyl*rad_cyl*len_cyl+2.0*pi/3.0*((rad_cap-hDist)*(rad_cap-hDist)*(2*rad_cap+hDist));
+        vol_i[i] = pi*rad_cyl*rad_cyl*length+2.0*pi/3.0*((rad_cap-hDist)*(rad_cap-hDist)*(2*rad_cap+hDist));
         float vaj = -1.0*hDist/rad_cap;
 
-        for(j=0;j<76;j++) //the 76 corresponds to the Gauss constants
+        for(int j=0;j<76;j++) //the 76 corresponds to the Gauss constants
         {
             zij = (Gauss76Z[j]*(1.0-vaj)+vaj+1.0)/2.0;
@@ -45 +45 @@
         }
         float answer=yyy*yyy*1.0e8*sub*sub*scale/pi*rad_cyl*rad_cyl*length+2.0*pi*(2.0*rad_cap*rad_cap*rad_cap/3.0+rad_cap*rad_cap*hDist-hDist*hDist*hDist/3.0);
-        answer/=sin(alpha)
+        answer/=sin(alpha);
 
         _ptvalue[i] = rad_cyl_weight*length_weight*rad_cap_weight*theta_weight*phi_weight*vol_i[i]*answer