Changeset b523c0e in sasview for src/sas/sascalc/calculator

Timestamp:

May 6, 2016 4:19:24 PM (8 years ago)

Author:

Paul Kienzle <pkienzle@…>

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:

f567f92f

Parents:

4c29e4d

Message:

remove compiler warnings

Location:

src/sas/sascalc/calculator/c_extensions

Files:

• sld2i.cpp (modified) (2 diffs)
• sld2i_module.cpp (modified) (1 diff)

src/sas/sascalc/calculator/c_extensions/sld2i.cpp

@@ -164 +164 @@
         //Assume that pixel volumes are given in vol_pix in A^3 unit
         // Loop over q-values and multiply apply matrix
-        for(size_t i=0; i<npoints; i++){
+        for(int i=0; i<npoints; i++){
                 sumj =0.0;              
-                for(size_t j=0; j<n_pix; j++){
+                for(int j=0; j<n_pix; j++){
                         //Isotropic: Assumes all slds are real (no magnetic)
                         //Also assumes there is no polarization: No dependency on spin
@@ -183 +183 @@
                                 //full calculation
                                 //pragma omp parallel for
-                                for(size_t k=0; k<n_pix; k++){
+                                for(int k=0; k<n_pix; k++){
                                         sld_j =  sldn_val[j] * sldn_val[k] * vol_pix[j] * vol_pix[k];
                                         qr = (x_val[j]-x_val[k])*(x_val[j]-x_val[k])+

src/sas/sascalc/calculator/c_extensions/sld2i_module.cpp

@@ -153 +153 @@
 initsld2i(void)
 {
-    PyObject* m;
-
-    m = Py_InitModule3("sld2i", module_methods,
-                       "Sld2i module");
+    Py_InitModule3("sld2i", module_methods, "Sld2i module");
 }