Changeset bde38b5 in sasmodels for sasmodels/kernel_iq.cl

Timestamp:

Aug 14, 2016 9:12:40 PM (8 years ago)

Author:

Paul Kienzle <pkienzle@…>

Branches:

master, core_shell_microgels, costrafo411, magnetic_model, release_v0.94, release_v0.95, ticket-1257-vesicle-product, ticket_1156, ticket_1265_superball, ticket_822_more_unit_tests

Children:

ac98886

Parents:

b1c40bee

git-author:

Paul Kienzle <pkienzle@…> (08/14/16 21:08:59)

git-committer:

Paul Kienzle <pkienzle@…> (08/14/16 21:12:40)

Message:

simplify kernel calling

File:

• sasmodels/kernel_iq.cl (modified) (4 diffs)

sasmodels/kernel_iq.cl

@@ -22 +22 @@
     int32_t pd_stride[MAX_PD];  // stride to move to the next index at this level
 #endif // MAX_PD > 0
-    int32_t pd_prod;            // total number of voxels in hypercube
-    int32_t pd_sum;             // total length of the weights vector
+    int32_t num_eval;           // total number of voxels in hypercube
+    int32_t num_weights;        // total length of the weights vector
     int32_t num_active;         // number of non-trivial pd loops
     int32_t theta_par;          // id of spherical correction variable
@@ -90 +90 @@
 
   // Storage for the current parameter values.  These will be updated as we
-  // walk the polydispersity cube.  local_values will be aliased to pvec.
+  // walk the polydispersity cube.
   ParameterBlock local_values;
-
-  // Fill in the initial variables
-  for (int i=0; i < NUM_PARS; i++) {
-    local_values.vector[i] = values[2+i];
-//if (q_index==0) printf("p%d = %g\n",i, local_values.vector[i]);
-  }
 
 #if defined(MAGNETIC) && NUM_MAGNETIC>0
@@ -117 +111 @@
 #endif // MAGNETIC
 
-  double pd_norm, this_result;
-  if (pd_start == 0) {
-    pd_norm = this_result = 0.0;
-  } else {
-    pd_norm = result[nq];
-    this_result = result[q_index];
-  }
+  // Fill in the initial variables
+  //   values[0] is scale
+  //   values[1] is background
+  for (int i=0; i < NUM_PARS; i++) {
+    local_values.vector[i] = values[2+i];
+//if (q_index==0) printf("p%d = %g\n",i, local_values.vector[i]);
+  }
+//if (q_index==0) printf("NUM_VALUES:%d  NUM_PARS:%d  MAX_PD:%d\n", NUM_VALUES, NUM_PARS, MAX_PD);
+//if (q_index==0) printf("start:%d stop:%d\n", pd_start, pd_stop);
+
+  double pd_norm = (pd_start == 0 ? 0.0 : result[nq]);
+  double this_result = (pd_start == 0 ? 0.0 : result[q_index]);
 //if (q_index==0) printf("start %d %g %g\n", pd_start, pd_norm, this_result);
 
 #if MAX_PD>0
-  global const double *pd_value = values + NUM_VALUES + 2;
-  global const double *pd_weight = pd_value + details->pd_sum;
+  global const double *pd_value = values + NUM_VALUES;
+  global const double *pd_weight = pd_value + details->num_weights;
 #endif
 
@@ -256 +255 @@
         // TODO: what is the magnetic scattering at q=0
         if (qsq > 1.e-16) {
-          double p[4];  // spin_i, spin_f
+          double p[4];  // dd, du, ud, uu
           p[0] = (qy*cos_mspin + qx*sin_mspin)/qsq;
           p[3] = -p[0];