Changeset 4c8a5b4 in sasmodels

Timestamp:

Feb 2, 2017 3:11:00 AM (8 years ago)

Author:

wojciech

Branches:

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

Children:

faf83f2

Parents:

b91bb7c (diff), 66ca2a6 (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.

Message:

Merged with master

Files:

• sasmodels/models/unified_power_Rg.py (modified) (1 diff)
• doc/ref/gpu/gpu_computations.rst (modified) (2 diffs)

sasmodels/models/unified_power_Rg.py

@@ -38 +38 @@
 .. math::
 
-    q_i^* = \frac{q}{\operatorname{erf}^3(q R_{gi}/\sqrt{6}}
+    q_i^* = q \left[\operatorname{erf}
+            \left(\frac{q R_{gi}}{\sqrt{6}}\right)
+        \right]^{-3}
 
 

doc/ref/gpu/gpu_computations.rst

@@ -31 +31 @@
 from available OpenCL platforms.
 
+OpenCL devices can be set from OpenCL options dialog in Fitting menu or as
+enviromental variables.
+
+**If you don't want to use OpenCL, you can select "No OpenCL" option from**
+**GUI dialog or set *SAS_OPENCL=None* in your environment settings**
+**This will only use normal programs.**
+
 SasView prefers AMD or NVIDIA drivers for GPU, and prefers Intel or
 Apple drivers for CPU. Both GPU and CPU are included on the assumption that CPU 
@@ -39 +46 @@
 chose to run the model.
 
-**If you don't want to use OpenCL, you can set** *SAS_OPENCL=None*
-**in your environment settings, and it will only use normal programs.**
-
-If you want to use one of the other devices, you can run the following
-from the python console in SasView::
+If you want to use one of the other devices, you can select it from OpenCL
+options dialog (accessible from Fitting menu) or run the following from
+the python console in SasView::
 
     import pyopencl as cl