diff options
| author | Thomas White <taw@bitwiz.org.uk> | 2010-02-19 22:43:11 +0100 |
|---|---|---|
| committer | Thomas White <taw@bitwiz.org.uk> | 2010-02-19 22:43:38 +0100 |
| commit | dca8cc2962e2768a7cb69b5d9717b6e5c78be288 (patch) | |
| tree | d89d9bf32b37a3d9c781321bcc4f523f7586b48c /data | |
| parent | c7e0450702ab668cdcda34541e6bf815d50be8a8 (diff) | |
Move critical array size definitions to share between CPU and GPU versions
Diffstat (limited to 'data')
| -rw-r--r-- | data/Makefile.am | 2 | ||||
| -rw-r--r-- | data/defs.h | 23 | ||||
| -rw-r--r-- | data/diffraction.cl | 3 |
3 files changed, 25 insertions, 3 deletions
diff --git a/data/Makefile.am b/data/Makefile.am index b55597f0..afecb737 100644 --- a/data/Makefile.am +++ b/data/Makefile.am @@ -2,4 +2,4 @@ hdfseedir = $(datadir)/hdfsee hdfsee_DATA = displaywindow.ui crystfeldir = $(datadir)/crystfel -crystfel_DATA = sfac/* diffraction.cl +crystfel_DATA = sfac/* diffraction.cl defs.h diff --git a/data/defs.h b/data/defs.h new file mode 100644 index 00000000..934d138e --- /dev/null +++ b/data/defs.h @@ -0,0 +1,23 @@ +/* + * defs.h + * + * Constant definitions which must be consistent throughout + * + * (c) 2006-2010 Thomas White <taw@physics.org> + * + * Part of CrystFEL - crystallography with a FEL + * + */ + +#ifndef DEFS_H +#define DEFS_H + + +/* Maxmimum index to hold values up to (can be increased if necessary) */ +#define INDMAX 70 + +/* Array size */ +#define IDIM (INDMAX*2 +1) + + +#endif /* DEFS_H */ diff --git a/data/diffraction.cl b/data/diffraction.cl index 41d331b3..7cb98034 100644 --- a/data/diffraction.cl +++ b/data/diffraction.cl @@ -10,8 +10,7 @@ */ -#define INDMAX 70 -#define IDIM (INDMAX*2 +1) +#include <defs.h> float4 quat_rot(float4 q, float4 z) |