Changeset 98f60fc in sasmodels

Timestamp:

Mar 30, 2016 4:30:35 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:

b7172bb

Parents:

364d8f7

Message:

cruft to support meshgrid on one vector; should fix sphere test

Location:

sasmodels

Files:

• core.py (modified) (2 diffs)
• models/raspberry.py (modified) (1 diff)

sasmodels/core.py

@@ -2 +2 @@
 Core model handling routines.
 """
+__all__ = [
+    "list_models", "load_model_info", "precompile_dll",
+    "build_model", "make_kernel", "call_kernel", "call_ER_VR",
+    ]
+
 
 from os.path import basename, dirname, join as joinpath, splitext
@@ -24 +29 @@
     HAVE_OPENCL = False
 
-__all__ = [
-    "list_models", "load_model_info", "precompile_dll",
-    "build_model", "make_kernel", "call_kernel", "call_ER_VR",
-]
+try:
+    np.meshgrid([])
+    meshgrid = np.meshgrid
+except ValueError:
+    # CRUFT: np.meshgrid requires multiple vectors
+    def meshgrid(*args):
+        if len(args) > 1:
+            return np.meshgrid(*args)
+        else:
+            return [np.asarray(v) for v in args]
+
 
 def list_models():

sasmodels/models/raspberry.py

@@ -129 +129 @@
             Ref: J. coll. inter. sci. (2010) vol. 343 (1) pp. 36-41."""
 category = "shape:sphere"
+#single = False
 
 #             [ "name", "units", default, [lower, upper], "type", "description"],