Changeset a24f530 in sasview for sansmodels


Ignore:
Timestamp:
Dec 7, 2011 4:23:04 PM (13 years ago)
Author:
Mathieu Doucet <doucetm@…>
Branches:
master, ESS_GUI, ESS_GUI_Docs, ESS_GUI_batch_fitting, ESS_GUI_bumps_abstraction, ESS_GUI_iss1116, ESS_GUI_iss879, ESS_GUI_iss959, ESS_GUI_opencl, ESS_GUI_ordering, ESS_GUI_sync_sascalc, costrafo411, magnetic_scatt, release-4.1.1, release-4.1.2, release-4.2.2, release_4.0.1, ticket-1009, ticket-1094-headless, ticket-1242-2d-resolution, ticket-1243, ticket-1249, ticket885, unittest-saveload
Children:
839f7e28
Parents:
71d2194
Message:

Re #4 A few more warnings

Location:
sansmodels/src/sans/models
Files:
11 edited

Legend:

Unmodified
Added
Removed

  • sansmodels/src/sans/models/c_extensions/barbell.c

    r6e24633 ra24f530  
    3535 
    3636double bar2d_kernel(double dp[], double q, double alpha) { 
    37         int i,j; 
     37        int j; 
    3838        double Pi; 
    3939        double scale,contr,bkg,sldc,slds; 
    … …  
    130130        double cyl_x, cyl_y, cyl_z; 
    131131        double q_z; 
    132         double alpha, vol, cos_val; 
     132        double alpha, cos_val; 
    133133        double answer; 
    134134        double dp[7]; 

  • sansmodels/src/sans/models/c_extensions/bcc.c

    re161fac ra24f530  
    5959 */ 
    6060double bc_analytical_2D_scaled(BCParameters *pars, double q, double q_x, double q_y) { 
    61         double a3_x, a3_y, a3_z, a2_x, a2_y, a1_x, a1_y; 
    62         double b3_x, b3_y, b3_z, b2_x, b2_y, b1_x, b1_y; 
     61        double b3_x, b3_y, b3_z, b1_x, b1_y; 
    6362        double q_z; 
    64         double alpha, vol, cos_val_b3, cos_val_b2, cos_val_b1; 
     63        double alpha, cos_val_b3, cos_val_b2, cos_val_b1; 
    6564        double a1_dot_q, a2_dot_q,a3_dot_q; 
    6665        double answer; 

  • sansmodels/src/sans/models/c_extensions/capcyl.c

    r890ac7f1 ra24f530  
    3636 
    3737double capcyl2d_kernel(double dp[], double q, double alpha) { 
    38         int i,j; 
     38        int j; 
    3939        double Pi; 
    4040        double scale,contr,bkg,sldc,slds; 
    … …  
    131131        double cyl_x, cyl_y, cyl_z; 
    132132        double q_z; 
    133         double alpha, vol, cos_val; 
     133        double alpha, cos_val; 
    134134        double answer; 
    135135        double dp[7]; 

  • sansmodels/src/sans/models/c_extensions/disperser.c

    r59b9b675 ra24f530  
    321321        PyObject *temp; 
    322322         
    323          
    324     n_pts = PyInt_AsLong( PyDict_GetItemString(self->params, "n_pts") ); 
     323        step = 0.0; 
     324  n_pts = PyInt_AsLong( PyDict_GetItemString(self->params, "n_pts") ); 
    325325     
    326326        // If we exhausted the parameter array, simply evaluate 
    … …  
    447447 
    448448 
    449 static PyMethodDef module_methods[] = { 
    450     {NULL}  
    451 }; 
     449//static PyMethodDef module_methods[] = { 
     450//    {NULL} 
     451//}; 
    452452 
    453453/** 

  • sansmodels/src/sans/models/c_extensions/lamellarPS.c

    rf10063e ra24f530  
    1111 
    1212/*LamellarPS_kernel() was moved from libigor to get rid of polydipersity in del(thickness) that we provide from control panel. 
    13 /*      LamellarPSX  :  calculates the form factor of a lamellar structure - with S(q) effects included 
     13        LamellarPSX  :  calculates the form factor of a lamellar structure - with S(q) effects included 
    1414------- 
    1515------- resolution effects ARE NOT included, but only a CONSTANT default value, not the real q-dependent resolution!! 

  • sansmodels/src/sans/models/c_extensions/libmultifunc/librefl.h

    r0164899a ra24f530  
    1 #if !defined(o_h) 
     1#if !defined(librefl_h) 
    22#define librefl_h 
    33 

  • sansmodels/src/sans/models/c_extensions/refl_adv.c

    r3be94e8 ra24f530  
    2525        double npts = dp[69]; //number of sub_layers in each interface 
    2626 
    27         double total_thick; 
     27        double total_thick=0.0; 
    2828 
    2929  int n_s; 
    3030  double sld_i,sldim_i,dz,phi,R,ko2; 
    31   double sign,erfunc; 
    3231  double pi; 
    3332 
    … …  
    3837  double* thick; 
    3938  double* fun_coef; 
    40   complex  inv_n,phi1,alpha,alpha2,kn,fnm,fnp,rn,Xn,nn,nn2,an,nnp1,one,zero,two,n_sub,n_sup,knp1,Xnp1; 
     39  complex  phi1,alpha,alpha2,kn,fnm,fnp,rn,Xn,nn,nn2,an,nnp1,one,two,n_sub,n_sup,knp1,Xnp1; 
    4140 
    4241  fun_type = (int*)malloc((n+2)*sizeof(int)); 
    … …  
    7473        pi = 4.0*atan(1.0); 
    7574    one = cassign(1.0,0.0); 
    76         //zero = cassign(0.0,0.0); 
    77         two= cassign(0.0,-2.0); 
     75        Xn = cassign(0.0,0.0); 
     76        two = cassign(0.0,-2.0); 
    7877 
    7978        //Checking if floor is available. 

  • sansmodels/src/sans/models/c_extensions/triaxial_ellipsoid.c

    r4628e31 ra24f530  
    3636        double t,a,b,c; 
    3737        double kernel; 
    38         double pi = 4.0*atan(1.0); 
    3938 
    4039        a = pars->semi_axisA ; 

  • sansmodels/src/sans/models/c_models/DiamEllip.cpp

    r6110bb8 ra24f530  
    6565 
    6666        // Loop over radius weight points 
    67         for(int i=0; i<weights_rad_a.size(); i++) { 
     67        for(size_t i=0; i<weights_rad_a.size(); i++) { 
    6868                dp[0] = weights_rad_a[i].value; 
    6969                // Loop over length weight points 
    70                 for(int j=0; j<weights_rad_b.size(); j++) { 
     70                for(size_t j=0; j<weights_rad_b.size(); j++) { 
    7171                        dp[1] = weights_rad_b[j].value; 
    7272 

  • sansmodels/src/sans/models/c_models/Hardsphere.cpp

    r6110bb8 ra24f530  
    6262 
    6363        // Loop over radius weight points 
    64         for(int i=0; i<weights_rad.size(); i++) { 
     64        for(size_t i=0; i<weights_rad.size(); i++) { 
    6565                dp[0] = weights_rad[i].value; 
    6666 

  • sansmodels/src/sans/models/libigor/libCylinder.c

    r5f0dcab ra24f530  
    6969 
    7070// ?? funciton is not used - but should the log actually be log10??? 
     71/* 
    7172static double 
    7273miu(double x) 
    … …  
    7778    return (yy); 
    7879} 
     80*/ 
    7981 
    8082//WR named this w (too generic) 
Note: See TracChangeset for help on using the changeset viewer.