Changeset 793

Timestamp:

Feb 23, 2011 10:26:15 AM (11 years ago)

Author:

srkline

Message:

added point ranges to maxDistance functions to allow threading by breaking up the outer for loop.

Location:

sans/XOP_Dev/MonteCarlo

Files:

• DebyeSpheres.c (modified) (2 diffs)
• DebyeSpheres.h (modified) (1 diff)
• MonteCarlo.r (modified) (1 diff)

sans/XOP_Dev/MonteCarlo/DebyeSpheres.c

@@ -172 +172 @@
         int i,j;
     int npt;
-        
-        
+        int p1,p2;
         
         // check for all of the required waves
@@ -209 +208 @@
         zv = WaveData(p->zwavH);
         
+        p1 = (int) p->p1;
+        p2 = (int) p->p2;
+        
         dmax = 0;
         //do the i!=j double loop, keeping the maximum distance
 
-        for(i=0;i<npt;i+=1) {
+        for(i=p1;i<p2;i+=1) {
                 for(j=(i+1);j<npt;j+=1) {
 //                      dij=XYZDistance(xv[i],xv[j],yv[i],yv[j],zv[i],zv[j]);

sans/XOP_Dev/MonteCarlo/DebyeSpheres.h

@@ -30 +30 @@
 // result is the last parameter, always.
 typedef struct DistParam {
+        double p2;
+        double p1;              // start and stop of the outer index
         waveHndl zwavH; // z coordinate. ALL are expected to be DP waves
         waveHndl ywavH; // y coordinate.

sans/XOP_Dev/MonteCarlo/MonteCarlo.r

@@ -112 +112 @@
                         NT_FP64 + WAVE_TYPE,
                         NT_FP64 + WAVE_TYPE,
+                        NT_FP64,                                                // start index
+                        NT_FP64,                                                // stop index
                 },