Changeset 765d025 in sasmodels for sasmodels/autoc.py

Timestamp:

Oct 30, 2018 10:05:27 AM (5 years ago)

Author:

Paul Kienzle <pkienzle@…>

Children:

646eeaa

Parents:

1662ebe (diff), aa8c6e0 (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:

Merge remote-tracking branch 'upstream/beta_approx'

File:

• sasmodels/autoc.py (modified) (5 diffs)

sasmodels/autoc.py

@@ -30 +30 @@
     'sas_erfc': ['lib/polevl.c', 'lib/sas_erf.c'],
     'sas_gamma': ['lib/sas_gamma.c'],
+    'sas_gammaln': ['lib/sas_gammainc.c'],
+    'sas_gammainc': ['lib/sas_gammainc.c'],
+    'sas_gammaincc': ['lib/sas_gammainc.c'],
     'sas_J0': ['lib/polevl.c', 'lib/sas_J0.c'],
     'sas_J1': ['lib/polevl.c', 'lib/sas_J1.c'],
@@ -41 +44 @@
     # type: ("ModelInfo", ModuleType) -> bool
     """
-    convert Iq, Iqxy and form_volume to c
+    Convert Iq, Iqxy, form_volume, etc. to c
+
+    Returns list of warnings
     """
     # Check if there is already C code
@@ -47 +52 @@
         return
 
-    public_methods = "Iq", "Iqac", "Iqabc", "Iqxy", "form_volume"
+    public_methods = ("Iq", "Iqac", "Iqabc", "Iqxy", 
+            "form_volume", "shell_volume", "effective_radius")
 
     tagged = [] # type: List[str]
@@ -120 +126 @@
     # translate source
     ordered_code = [code[name] for name in py2c.ordered_dag(depends) if name in code]
-    functions = py2c.translate(ordered_code, constants)
+    functions, warnings = py2c.translate(ordered_code, constants)
     snippets.extend(functions)
 
@@ -127 +133 @@
     info.c_code = "".join(snippets)
     info.Iq = info.Iqac = info.Iqabc = info.Iqxy = info.form_volume = None
+
+    return warnings
+