Changeset 5b07138 in sasview for sansmodels


Ignore:
Timestamp:
Dec 18, 2012 11:42:49 AM (12 years ago)
Author:
Jae Cho <jhjcho@…>
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:
87f8971
Parents:
62827da
Message:

removed some compile warnings

Location:
sansmodels/src/c_models
Files:
6 edited

Legend:

Unmodified
Added
Removed

  • sansmodels/src/c_models/bcc.cpp

    r318b5bbb r5b07138  
    5454 */ 
    5555static double bc_analytical_2D_scaled(BCParameters *pars, double q, double q_x, double q_y) { 
    56   double b3_x, b3_y, b3_z, b1_x, b1_y, b2_x, b2_y; 
     56  double b3_x, b3_y, b1_x, b1_y, b2_x, b2_y; //b3_z, 
    5757  double q_z; 
    5858  double cos_val_b3, cos_val_b2, cos_val_b1; 

  • sansmodels/src/c_models/fcc.cpp

    r318b5bbb r5b07138  
    5353 */ 
    5454static double fc_analytical_2D_scaled(FCParameters *pars, double q, double q_x, double q_y) { 
    55   double b3_x, b3_y, b3_z, b1_x, b1_y, b2_x, b2_y; 
     55  double b3_x, b3_y, b1_x, b1_y, b2_x, b2_y; //, b3_z 
    5656  double q_z; 
    5757  double cos_val_b3, cos_val_b2, cos_val_b1; 

  • sansmodels/src/c_models/hollowcylinder.cpp

    r318b5bbb r5b07138  
    5252 */ 
    5353static double hollow_cylinder_analytical_2D_scaled(HollowCylinderParameters *pars, double q, double q_x, double q_y) { 
    54   double cyl_x, cyl_y, cyl_z; 
     54  double cyl_x, cyl_y; //, cyl_z 
    5555  //double q_z; 
    5656  double  alpha,vol, cos_val; 

  • sansmodels/src/c_models/libfunc.c

    r318b5bbb r5b07138  
    136136        double m_sigma_z = 0.0; 
    137137        double m_sigma_y = 0.0; 
    138         double b_m = 0.0; 
     138        //double b_m = 0.0; 
    139139        double q_angle = 0.0; 
    140140        double mx = 0.0; 

  • sansmodels/src/c_models/sc.cpp

    r318b5bbb r5b07138  
    5353 */ 
    5454static double sc_analytical_2D_scaled(SCParameters *pars, double q, double q_x, double q_y) { 
    55   double a3_x, a3_y, a3_z, a2_x, a2_y, a1_x, a1_y; 
     55  double a3_x, a3_y, a2_x, a2_y, a1_x, a1_y; //, a3_z 
    5656  double q_z; 
    5757  double cos_val_a3, cos_val_a2, cos_val_a1; 

  • sansmodels/src/c_models/sphere.cpp

    r318b5bbb r5b07138  
    142142        } 
    143143        else{ 
    144                 double contrast = sldSph - sldSolv; 
     144                //double contrast = sldSph - sldSolv; 
    145145                double qx = q_x; 
    146146                double qy = q_y; 
Note: See TracChangeset for help on using the changeset viewer.