[#1132] Debug unit tests

Author: dvezinet

tofu/physics_tools/electrons/distribution/_distribution.py

@@ -153,7 +153,7 @@ def main(
             dplasma=din,
             # coords
             dcoords=dc,
-            version=version,
+            version=dfunc[kdist]['version'],
             dominant=dominant,
         )
 
@@ -320,6 +320,8 @@ def _get_velocity_par(ddist, kdist):
         # get cos
         sli = (None,)*(len(shape)-2) + (None, slice(None))
         cos = np.cos(ddist['coords']['x1']['data'][sli])
+        v_par_ms = velocity['data'] * cos
+        units = velocity['units']
 
     elif kcoords == ('p_par_norm', 'p_perp_norm'):
 
@@ -343,6 +345,17 @@ def _get_velocity_par(ddist, kdist):
             np.broadcast_to(ddist['coords']['x0']['data'][sli], shape)[iok]
             / pnorm[iok]
         )
+        v_par_ms = velocity['data'] * cos
+        units = velocity['units']
+
+    elif kcoords == ('E_eV',):
+
+        # abs(velocity)
+        v_par_ms = _convert.convert_momentum_velocity_energy(
+            energy_kinetic_eV=ddist['coords']['x0']['data'],
+        )['velocity_ms']
+        units = v_par_ms['units']
+        v_par_ms = v_par_ms['data']
 
     else:
         raise NotImplementedError(kcoords)
@@ -352,8 +365,8 @@ def _get_velocity_par(ddist, kdist):
     # ---------------
 
     velocity_par = {
-        'data': velocity['data'] * cos,
-        'units': asunits.Unit(velocity['units']),
+        'data': v_par_ms,
+        'units': asunits.Unit(units),
     }
 
     return velocity_par

tofu/physics_tools/electrons/distribution/_distribution_check.py

@@ -424,7 +424,7 @@ def _dfunc(
             "Please provide 1 or 2 coordinates max!\n"
             "Possible pairs and matching func:\n"
             + "\n".join(lstr0)
-            + "Provided:\n"
+            + "\nProvided:\n"
             + "\n".join(lstr1)
         )
         raise Exception(msg)

tofu/tests/tests10_physics/test_01_runaways.py

@@ -53,23 +53,18 @@ def test01_maxwellian(self):
         kTe = np.r_[0.1, 1, 10, 100] * 1e3
 
         # single
-        dout = tfpt.get_maxwellian(
-            kTe_eV=kTe[0],
-            energy_eV=E,
+        dout = tfpt.electrons.distribution.get_distribution(
+            Te_eV=kTe[0],
+            E_eV=E,
+            dist='maxwell',
         )
         assert isinstance(dout, dict)
 
         # arrays
-        dout = tfpt.get_maxwellian(
-            kTe_eV=kTe[None, :],
-            energy_eV=E[:, None],
-        )
-        assert isinstance(dout, dict)
-
-        # wavelength
-        dout = tfpt.get_maxwellian(
-            kTe_eV=kTe[None, :],
-            velocity_ms=np.linspace(1, 5, 10)[:, None]*1e6,
+        dout = tfpt.electrons.distribution.get_distribution(
+            Te_eV=kTe[None, :],
+            E_eV=E,
+            dist='maxwell',
         )
         assert isinstance(dout, dict)
 
@@ -153,7 +148,8 @@ def test04_normalized_momentum_distribution(self):
 
         # compute
         dout = tfpt.electrons.distribution.get_distribution(
-            p_par_norm=pp[:, None],
+            p_par_norm=pp,
+            p_perp_norm=pp,
             ne_m3=ne_m3[None, :],
             Zeff=2.,
             Efield_par_Vm=Epar,