Changeset 1105286 in sasmodels

Timestamp:

Feb 7, 2017 2:41:16 PM (7 years ago)

Author:

GitHub <noreply@…>

Branches:

master, core_shell_microgels, costrafo411, magnetic_model, ticket-1257-vesicle-product, ticket_1156, ticket_1265_superball, ticket_822_more_unit_tests

Children:

3a45c2c, a769b54, 7b7fcf0, 130d4c7

Parents:

fe8ff99 (diff), d2b939c (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

git-author:

Paul Kienzle <pkienzle@…> (02/07/17 14:41:16)

git-committer:

GitHub <noreply@…> (02/07/17 14:41:16)

Message:

Merge pull request #26 from SasView?/ticket-794

Allow for (rare) cases where the size of q_input is smaller than result. Fixes #794.

File:

• sasmodels/kernelcl.py (modified) (2 diffs)

sasmodels/kernelcl.py

@@ -465 +465 @@
         # architectures tested so far.
         if self.is_2d:
-            # Note: 17 rather than 15 because results is 2 elements
-            # longer than input.
-            width = ((self.nq+17)//16)*16
+            # Note: 16 rather than 15 because result is 1 longer than input.
+            width = ((self.nq+16)//16)*16
             self.q = np.empty((width, 2), dtype=dtype)
             self.q[:self.nq, 0] = q_vectors[0]
             self.q[:self.nq, 1] = q_vectors[1]
         else:
-            # Note: 33 rather than 31 because results is 2 elements
-            # longer than input.
-            width = ((self.nq+33)//32)*32
+            # Note: 32 rather than 31 because result is 1 longer than input.
+            width = ((self.nq+32)//32)*32
             self.q = np.empty(width, dtype=dtype)
             self.q[:self.nq] = q_vectors[0]
@@ -524 +522 @@
         self.dim = '2d' if q_input.is_2d else '1d'
         # plus three for the normalization values
-        self.result = np.empty(q_input.nq+3, dtype)
+        self.result = np.empty(q_input.nq+1, dtype)
 
         # Inputs and outputs for each kernel call