diff options
| author | Thomas White <taw@physics.org> | 2011-03-04 15:29:37 +0100 |
|---|---|---|
| committer | Thomas White <taw@physics.org> | 2012-02-22 15:27:17 +0100 |
| commit | f3dd9b8886f2de7ba107605a3ffcaee8e91bf1db (patch) | |
| tree | 952be5a8a17c22137066613c35c6ae60088cf384 /data | |
| parent | 669df685619faed4a3661a185acb0b2c94885906 (diff) | |
Make the GPU simulation work
Diffstat (limited to 'data')
| -rw-r--r-- | data/diffraction.cl | 17 |
1 files changed, 7 insertions, 10 deletions
diff --git a/data/diffraction.cl b/data/diffraction.cl index feeae740..c806f62f 100644 --- a/data/diffraction.cl +++ b/data/diffraction.cl @@ -213,10 +213,8 @@ kernel void diffraction(global float *diff, global float *tt, float klow, float intensity; /* Calculate fractional coordinates in fs/ss */ - fs = convert_float(get_global_id(0) + (min_fs*sampling)) - / convert_float(sampling); - ss = convert_float(get_global_id(1) + (min_ss*sampling)) - / convert_float(sampling); + fs = convert_float(get_global_id(0)) / convert_float(sampling); + ss = convert_float(get_global_id(1)) / convert_float(sampling); /* Get the scattering vector */ q = get_q(fs, ss, res, clen, k, &ttv, @@ -242,18 +240,17 @@ kernel void diffraction(global float *diff, global float *tt, float klow, float val; int idx; - idx = (min_fs + convert_int_rtz(fs)) - + w*(min_ss + convert_int_rtz(ss)); + idx = convert_int_rtz(fs) + w*convert_int_rtz(ss); for ( i=0; i<sampling*sampling*get_local_size(2); i++ ) sum += tmp[i]; - val = sum / convert_float(sampling*sampling*get_local_size(2)); + val = sum / convert_float(get_local_size(0)*get_local_size(1) + *get_local_size(2)); diff[idx] = val; - /* Leader thread also records the 2theta value. - * This should really be averaged across all pixels, but - * I strongly suspect this would be a waste of time. */ + /* Leader thread also records the 2theta value */ tt[idx] = ttv; + } } |