Changeset 821 for sans/XOP_Dev/SANSAnalysis
 Timestamp:
 Jul 19, 2011 7:24:27 PM (12 years ago)
 File:

 1 edited
Legend:
 Unmodified
 Added
 Removed

sans/XOP_Dev/SANSAnalysis/lib/libSphere.c
r678 r821 1721 1721 } 1722 1722 1723 // Use 150 point integral. This is probably excessive, but we need at least 100 points 1724 // and this avoids yet another set of abcissae and weights 1723 1725 double 1724 1726 PolyThreeShell(double dp[], double x) … … 1727 1729 double va,vb,summ,yyy,zi; 1728 1730 double answer,zp1,zp2,zp3,vpoly,range,temp_3sf[11],pi; 1729 int nord= 76,ii;1731 int nord=150,ii; 1730 1732 double thick1,thick2,thick3; 1731 1733 double rhoshel1,rhoshel2,rhoshel3; … … 1774 1776 for(ii=0;ii<nord;ii+=1) { 1775 1777 // calculate Gauss points on integration interval (rvalue for evaluation) 1776 zi = ( Gauss 76Z[ii]*(vbva) + vb + va )/2.0;1778 zi = ( Gauss150Z[ii]*(vbva) + vb + va )/2.0; 1777 1779 temp_3sf[1] = zi; 1778 yyy = Gauss 76Wt[ii] * SchulzPoint(zi,rcore,zz) * ThreeShell(temp_3sf,x);1780 yyy = Gauss150Wt[ii] * SchulzPoint(zi,rcore,zz) * ThreeShell(temp_3sf,x); 1779 1781 //unnormalize by volume 1780 1782 yyy *= 4.0*pi/3.0*pow((zi+thick1+thick2+thick3),3); … … 1798 1800 } 1799 1801 1802 1803 // Use 150 point integral. This is probably excessive, but we need at least 100 points 1804 // and this avoids yet another set of abcissae and weights 1800 1805 double 1801 1806 PolyFourShell(double dp[], double x) … … 1804 1809 double va,vb,summ,yyy,zi; 1805 1810 double answer,zp1,zp2,zp3,vpoly,range,temp_4sf[13],pi; 1806 int nord= 76,ii;1811 int nord=150,ii; 1807 1812 double thick1,thick2,thick3,thick4; 1808 1813 double rhoshel1,rhoshel2,rhoshel3,rhoshel4; … … 1855 1860 for(ii=0;ii<nord;ii+=1) { 1856 1861 // calculate Gauss points on integration interval (rvalue for evaluation) 1857 zi = ( Gauss 76Z[ii]*(vbva) + vb + va )/2.0;1862 zi = ( Gauss150Z[ii]*(vbva) + vb + va )/2.0; 1858 1863 temp_4sf[1] = zi; 1859 yyy = Gauss 76Wt[ii] * SchulzPoint(zi,rcore,zz) * FourShell(temp_4sf,x);1864 yyy = Gauss150Wt[ii] * SchulzPoint(zi,rcore,zz) * FourShell(temp_4sf,x); 1860 1865 //unnormalize by volume 1861 1866 yyy *= 4.0*pi/3.0*pow((zi+thick1+thick2+thick3+thick4),3);
Note: See TracChangeset
for help on using the changeset viewer.