Ignore:
Timestamp:
Jul 19, 2011 7:24:27 PM (11 years ago)
Author:
ajj
Message:
  • Turned off file-check for me as well as Steve. DoCheck?(0) is getting boring!
File:
1 edited

Legend:

Unmodified
Added
Removed
  • sans/XOP_Dev/SANSAnalysis/lib/libSphere.c

    r678 r821  
    17211721} 
    17221722 
     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 
    17231725double 
    17241726PolyThreeShell(double dp[], double x) 
     
    17271729        double va,vb,summ,yyy,zi; 
    17281730        double answer,zp1,zp2,zp3,vpoly,range,temp_3sf[11],pi; 
    1729         int nord=76,ii; 
     1731        int nord=150,ii; 
    17301732        double thick1,thick2,thick3; 
    17311733        double rhoshel1,rhoshel2,rhoshel3; 
     
    17741776        for(ii=0;ii<nord;ii+=1) { 
    17751777                // calculate Gauss points on integration interval (r-value for evaluation) 
    1776                 zi = ( Gauss76Z[ii]*(vb-va) + vb + va )/2.0; 
     1778                zi = ( Gauss150Z[ii]*(vb-va) + vb + va )/2.0; 
    17771779                temp_3sf[1] = zi; 
    1778                 yyy = Gauss76Wt[ii] * SchulzPoint(zi,rcore,zz) * ThreeShell(temp_3sf,x); 
     1780                yyy = Gauss150Wt[ii] * SchulzPoint(zi,rcore,zz) * ThreeShell(temp_3sf,x); 
    17791781                //un-normalize by volume 
    17801782                yyy *= 4.0*pi/3.0*pow((zi+thick1+thick2+thick3),3); 
     
    17981800} 
    17991801 
     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 
    18001805double 
    18011806PolyFourShell(double dp[], double x) 
     
    18041809        double va,vb,summ,yyy,zi; 
    18051810        double answer,zp1,zp2,zp3,vpoly,range,temp_4sf[13],pi; 
    1806         int nord=76,ii; 
     1811        int nord=150,ii; 
    18071812        double thick1,thick2,thick3,thick4; 
    18081813        double rhoshel1,rhoshel2,rhoshel3,rhoshel4; 
     
    18551860        for(ii=0;ii<nord;ii+=1) { 
    18561861                // calculate Gauss points on integration interval (r-value for evaluation) 
    1857                 zi = ( Gauss76Z[ii]*(vb-va) + vb + va )/2.0; 
     1862                zi = ( Gauss150Z[ii]*(vb-va) + vb + va )/2.0; 
    18581863                temp_4sf[1] = zi; 
    1859                 yyy = Gauss76Wt[ii] * SchulzPoint(zi,rcore,zz) * FourShell(temp_4sf,x); 
     1864                yyy = Gauss150Wt[ii] * SchulzPoint(zi,rcore,zz) * FourShell(temp_4sf,x); 
    18601865                //un-normalize by volume 
    18611866                yyy *= 4.0*pi/3.0*pow((zi+thick1+thick2+thick3+thick4),3); 
Note: See TracChangeset for help on using the changeset viewer.