changes in the topological charge function to avoid DeprecationWarning

ubermag · May 29, 2024 · e4472c0 · e4472c0
1 parent 00415cf
commit e4472c0
Showing 1 changed file with 10 additions and 2 deletions.
diff --git a/discretisedfield/tools/tools.py b/discretisedfield/tools/tools.py
@@ -273,9 +273,17 @@ def topological_charge(field, /, method="continuous", absolute=False):
 
     q = topological_charge_density(field, method=method)
     if absolute:
-        return float(abs(q).integrate())
+        result = abs(q).integrate()
+        if isinstance(result, np.ndarray) and result.size == 1:
+            result = result.item()
+        assert np.isscalar(result), "Expected a scalar result from integration"
+        return float(result)
     else:
-        return float(q.integrate())
+        result = q.integrate()
+        if isinstance(result, np.ndarray) and result.size == 1:
+            result = result.item()
+        assert np.isscalar(result), "Expected a scalar result from integration"
+        return float(result)
 
 
 def emergent_magnetic_field(field):