Changeset 7e82256 in sasview for src/sas/sascalc/calculator/c_extensions/sld2i.c

Timestamp:

Nov 13, 2017 11:51:56 AM (7 years ago)

Author:

Paul Kienzle <pkienzle@…>

Branches:

master, magnetic_scatt, release-4.2.2, ticket-1009, ticket-1094-headless, ticket-1242-2d-resolution, ticket-1243, ticket-1249, ticket885, unittest-saveload

Children:

95d7c4f

Parents:

f926abb

Message:

declare all variables at the start of the block so C89 compilers don't complain

File:

• src/sas/sascalc/calculator/c_extensions/sld2i.c (modified) (5 diffs)

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

@@ -65 +65 @@
 
         double count = 0.0;
-        //check if this computation is for averaging
+        int i, j;
 
         //Assume that pixel volumes are given in vol_pix in A^3 unit
@@ -75 +75 @@
 
         //printf("npoints: %d, npix: %d\n", npoints, this->n_pix);
-        for(int i=0; i<npoints; i++){
+        for(i=0; i<npoints; i++){
                 //I_out[i] = 0.0;
                 sumj_uu = cassign(0.0, 0.0);
@@ -84 +84 @@
                 //q = sqrt(qx[i]*qx[i] + qy[i]*qy[i]); // + qz[i]*qz[i]);
 
-                for(int j=0; j<this->n_pix; j++){
+                for(j=0; j<this->n_pix; j++){
                         if (this->sldn_val[j]!=0.0
                                 ||this->mx_val[j]!=0.0
@@ -156 +156 @@
         double sld_j = 0.0;
         double count = 0.0;
+        int i, j, k;
+
         //Assume that pixel volumes are given in vol_pix in A^3 unit
         // Loop over q-values and multiply apply matrix
-        for(int i=0; i<npoints; i++){
+        for(i=0; i<npoints; i++){
                 sumj =0.0;
-                for(int j=0; j<this->n_pix; j++){
+                for(j=0; j<this->n_pix; j++){
                         //Isotropic: Assumes all slds are real (no magnetic)
                         //Also assumes there is no polarization: No dependency on spin
@@ -177 +179 @@
                                 //full calculation
                                 //pragma omp parallel for
-                                for(int k=0; k<this->n_pix; k++){
+                                for(k=0; k<this->n_pix; k++){
                                         sld_j =  this->sldn_val[j] * this->sldn_val[k] * this->vol_pix[j] * this->vol_pix[k];
                                         qr = (this->x_val[j]-this->x_val[k])*(this->x_val[j]-this->x_val[k])+