Changeset e6f2009 in sasview

Timestamp:

Jun 13, 2018 8:40:37 AM (6 years ago)

Author:

trnielsen

Branches:

ESS_GUI, 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

Children:

f00d3fd

Parents:

3597f07

Message:

C99 compliant

Changes to be committed:

modified: sld2i.c

File:

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

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

@@ -72 +72 @@
 
         // Loop over q-values and multiply apply matrix
-
-        for(int i=0; i<npoints; i++){
+        int i;
+        for(i=0; i<npoints; i++){
                 //I_out[i] = 0.0;
                 sumj_uu = cassign(0.0, 0.0);
@@ -81 +81 @@
                 //printf ("%d ", i);
                 //q = sqrt(qx[i]*qx[i] + qy[i]*qy[i]); // + qz[i]*qz[i]);
-
-                for(int j=0; j<this->n_pix; j++){
+                int j;
+                for(j=0; j<this->n_pix; j++){
                         if (this->sldn_val[j]!=0.0
                                 ||this->mx_val[j]!=0.0
@@ -158 +158 @@
         //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++){
+        int i;   
+        for(i=0; i<npoints; i++){
                 sumj =0.0;
-                for(int j=0; j<n_pix; j++){
+                int j;
+                for(j=0; j<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<n_pix; k++){
+                                int k;
+                                for(k=0; k<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])+