Merge pull request #28 from jwscook/jwscook/numpy-update

changed machine's self.Ns to an int, and followed numpy's deprecation…
freegs-plasma · Mar 25, 2020 · 24bde48 · 24bde48
2 parents b3b4c06 + 8b88307
commit 24bde48
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/freegs/machine.py b/freegs/machine.py
@@ -261,7 +261,7 @@ def __init__(self, Rs, Zsmin, Zsmax, Ns, current=0.0, control=True):
         self.Rs = Rs
         self.Zsmin = Zsmin
         self.Zsmax = Zsmax
-        self.Ns = Ns
+        self.Ns = int(Ns)
 
         self.current = current
         self.control = control
@@ -513,7 +513,7 @@ def controlAdjust(self, current_change):
 
         for coil, dI in zip(controlcoils, current_change):
             # Ensure that dI is a scalar
-            coil.current += np.asscalar(dI)
+            coil.current += dI.item()
 
     def controlCurrents(self):
         """