Merge pull request #338 from TomWagg/scf-io

IO for SCF potentials

CHANGES.rst

@@ -16,6 +16,8 @@ Bug fixes
 - ``scf.compute_coeffs_discrete`` now raises an error if GSL is not enabled rather than silently returning
   zeros
 
+- ``SCFPotential`` will now work with IO functions (``save`` & ``load``)
+
 API changes
 -----------
 

gala/potential/potential/__init__.py

@@ -16,5 +16,9 @@ def __getattr__(name):
     elif name.startswith('MultipolePotentialLmax'):
         return getattr(builtin.core, name)
 
+    elif name.startswith('SCF'):
+        from .. import scf
+        return getattr(scf, name)
+
     else:
         raise AttributeError("huh")

gala/potential/potential/tests/test_io.py

@@ -4,14 +4,17 @@
 import astropy.units as u
 from astropy.utils.data import get_pkg_data_filename
 import numpy as np
+import pytest
 
 # Project
 from ..io import load, save
 from ..core import CompositePotential
 from ..ccompositepotential import CCompositePotential
 from ..builtin import IsochronePotential, KeplerPotential
 from ..builtin.special import LM10Potential
+from ...scf import SCFPotential
 from ....units import DimensionlessUnitSystem, galactic
+from gala._cconfig import GSL_ENABLED
 
 
 def test_read_plummer():
@@ -120,3 +123,14 @@ def test_units(tmpdir):
     potential = KeplerPotential(m=1E11, units=[u.kpc, u.Gyr, u.Msun, u.radian])
     save(potential, tmp_filename)
     p = load(tmp_filename)
+
+
+@pytest.mark.skipif(not GSL_ENABLED,
+                    reason="requires GSL to run this test")
+def test_read_write_SCF(tmpdir):
+    tmp_filename = str(tmpdir.join("potential.yml"))
+
+    # try a basic SCF potential
+    potential = SCFPotential(100, 1, np.zeros((4, 3, 2)), np.zeros((4, 3, 2)))
+    save(potential, tmp_filename)
+    p = load(tmp_filename)