Changeset 4453136 in sasmodels


Ignore:
Timestamp:
Mar 6, 2019 2:37:48 PM (7 months ago)
Author:
Paul Kienzle <pkienzle@…>
Branches:
master, core_shell_microgels, magnetic_model, ticket-1257-vesicle-product, ticket_1156, ticket_1265_superball, ticket_822_more_unit_tests
Children:
9bc96c4
Parents:
3199b17
Message:

remove unused variables from model kernel code

Location:
sasmodels/models
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • sasmodels/models/pearl_necklace.c

    r99658f6 r4453136  
    8181radius_from_volume(double radius, double edge_sep, double thick_string, double fp_num_pearls) 
    8282{ 
    83     const int num_pearls = (int) fp_num_pearls +0.5; 
    8483    const double vol_tot = form_volume(radius, edge_sep, thick_string, fp_num_pearls); 
    8584    return cbrt(vol_tot/M_4PI_3); 
  • sasmodels/models/rpa.c

    r71b751d r4453136  
    2525  double S0ba,Pbb,S0bb,Pbc,S0bc,Pbd,S0bd; 
    2626  double S0ca,S0cb,Pcc,S0cc,Pcd,S0cd; 
    27   double S0da,S0db,S0dc; 
     27  //double S0da,S0db,S0dc; 
    2828  double Pdd,S0dd; 
    2929  double Kaa,Kbb,Kcc; 
    3030  double Kba,Kca,Kcb; 
    31   double Kda,Kdb,Kdc,Kdd; 
     31  //double Kda,Kdb,Kdc,Kdd; 
    3232  double Zaa,Zab,Zac,Zba,Zbb,Zbc,Zca,Zcb,Zcc; 
    3333  double DenT,T11,T12,T13,T21,T22,T23,T31,T32,T33; 
     
    3737  double M11,M12,M13,M21,M22,M23,M31,M32,M33; 
    3838  double S11,S12,S13,S14,S21,S22,S23,S24; 
    39   double S31,S32,S33,S34,S41,S42,S43,S44; 
     39  double S31,S32,S33,S34; //,S41,S42,S43,S44; 
    4040  double Lad,Lbd,Lcd,Nav,Intg; 
    4141 
     
    115115  S0cd=(Phicd*vcd*Ncd)*Pcd; 
    116116 
    117   S0da=S0ad; 
    118   S0db=S0bd; 
    119   S0dc=S0cd; 
     117  //S0da=S0ad; 
     118  //S0db=S0bd; 
     119  //S0dc=S0cd; 
    120120  Pdd=2.0*(exp(-Xd)-1.0+Xd)/(Xd*Xd); // free D chain 
    121121  S0dd=N[3]*Phi[3]*v[3]*Pdd; 
     
    198198  S0ca=S0ac; 
    199199  S0cb=S0bc; 
    200   S0da=S0ad; 
    201   S0db=S0bd; 
    202   S0dc=S0cd; 
     200  //S0da=S0ad; 
     201  //S0db=S0bd; 
     202  //S0dc=S0cd; 
    203203 
    204204  // self chi parameter is 0 ... of course 
     
    206206  Kbb=0.0; 
    207207  Kcc=0.0; 
    208   Kdd=0.0; 
     208  //Kdd=0.0; 
    209209 
    210210  Kba=Kab; 
    211211  Kca=Kac; 
    212212  Kcb=Kbc; 
    213   Kda=Kad; 
    214   Kdb=Kbd; 
    215   Kdc=Kcd; 
     213  //Kda=Kad; 
     214  //Kdb=Kbd; 
     215  //Kdc=Kcd; 
    216216 
    217217  Zaa=Kaa-Kad-Kad; 
     
    303303  S33= Q13*S0ca + Q23*S0cb + Q33*S0cc; 
    304304  S34=-S31-S32-S33; 
    305   S41=S14; 
    306   S42=S24; 
    307   S43=S34; 
    308   S44=S11+S22+S33+2.0*S12+2.0*S13+2.0*S23; 
     305  //S41=S14; 
     306  //S42=S24; 
     307  //S43=S34; 
     308  //S44=S11+S22+S33+2.0*S12+2.0*S13+2.0*S23; 
    309309 
    310310  //calculate contrast where L[i] is the scattering length of i and D is the matrix 
Note: See TracChangeset for help on using the changeset viewer.