tests: use new file and column names

scripts/gray_visual.py

@@ -186,12 +186,12 @@ def read_grayout(dirname, **kwargs):
 
     HEADER_GRAY = 21
     UNITS_GRAY = {
-        'ray': 4,
+        'ray':    'central_ray.4.txt',
-        'totals': 7,
+        'totals': 'summary.7.txt',
-        'rays': 33,
+        'rays':   'outer-rays.33.txt',
-        'prof': 48,
+        'prof':   'ec-profiles.48.txt',
-        'bres': 70,
+        'bres':   'ec-resonance.70.txt',
-        'flux': 71,
+        'flux':   'flux-surfaces.71.txt',
         }
 
     if not os.path.isdir(dirname):
@@ -202,7 +202,7 @@ def read_grayout(dirname, **kwargs):
     name = os.path.basename(dirname)
     run = dict(name=name)
     for label, unit in UNITS_GRAY.items():
-        file = dirname + f"/fort.{unit}"
+        file = dirname + f"/{unit}"
         if label == 'bres' or label == 'flux':
             # Replace blank lines with as many NaNs as the number of columns.
             # In case of success, file is a string with the file's content.

tests/01-ITER/outputs/beam-shape-final.9.txt

@@ -19,7 +19,7 @@
  # COD nrayr nrayth nstep rwmax dst: 11 16 1800 1.000 0.2000                                                                         
  # COD iwarm ilarm imx ieccd:    2    5  -20   11                                                                                    
  # COD ipec nrho istpr istpl:    1  501    5    5                                                                                    
- #sst j k xt yt zt rt
+ #s j k x y z r
   0.36000000E+003    1    1  0.00000000E+000 -0.00000000E+000  0.00000000E+000  0.00000000E+000
   0.36000000E+003    2    1  0.72753847E+000  0.96305632E-001  0.26670834E-001  0.73388487E+000
   0.36000000E+003    2    2  0.69326595E+000  0.40359084E+000 -0.37731947E-002  0.80218654E+000

tests/01-ITER/outputs/central-ray.4.txt

@@ -19,7 +19,7 @@
  # COD nrayr nrayth nstep rwmax dst: 11 16 1800 1.000 0.2000                                                                         
  # COD iwarm ilarm imx ieccd:    2    5  -20   11                                                                                    
  # COD ipec nrho istpr istpl:    1  501    5    5                                                                                    
- #sst R z phi psin rhot ne Te Btot Bx By Bz Nperp Npl Nx Ny Nz ki alpha tau Pt dIds nhmin nhmax iohkw index_rt ddr Xg Yg dXgdx dXgdy dXgdz
+ # s R z φ ψ_n ρ_t n_e T_e B b_x b_y b_z N_⊥ N_∥ N_x N_y N_z k_im α τ P_t dI/ds n_harm_min n_harm_max i_okhawa index_rt Λ_r X Y ∇X_x ∇X_y ∇X_z
   0.20000000E-002  0.70670104E+001  0.42321192E+001 -0.33115433E+000  0.13780230E+001  0.10000000E+001  0.00000000E+000  0.00000000E+000  0.47151745E+001 -0.10517592E+000 -0.98553805E+000  0.13286374E+000  0.93591618E+000 -0.35222281E+000 -0.69607906E+000  0.34693580E+000 -0.62857736E+000  0.00000000E+000  0.00000000E+000  0.00000000E+000  0.56055339E-002  0.00000000E+000    0    0    0    1  0.00000000E+000  0.00000000E+000  0.77640874E+000  0.00000000E+000 -0.00000000E+000  0.00000000E+000
   0.40000000E-002  0.70656143E+001  0.42308621E+001 -0.32559300E+000  0.13771805E+001  0.10000000E+001  0.00000000E+000  0.00000000E+000  0.47160800E+001 -0.10513598E+000 -0.98555342E+000  0.13278135E+000  0.93592320E+000 -0.35220416E+000 -0.69607906E+000  0.34693580E+000 -0.62857736E+000  0.00000000E+000  0.00000000E+000  0.00000000E+000  0.56055339E-002  0.00000000E+000    0    0    0    1  0.00000000E+000  0.00000000E+000  0.77655784E+000  0.00000000E+000 -0.00000000E+000  0.00000000E+000
   0.60000000E-002  0.70642183E+001  0.42296049E+001 -0.32002947E+000  0.13763382E+001  0.10000000E+001  0.00000000E+000  0.00000000E+000  0.47169859E+001 -0.10509617E+000 -0.98556876E+000  0.13269894E+000  0.93593026E+000 -0.35218539E+000 -0.69607906E+000  0.34693580E+000 -0.62857736E+000  0.00000000E+000  0.00000000E+000  0.00000000E+000  0.56055339E-002  0.00000000E+000    0    0    0    1  0.00000000E+000  0.00000000E+000  0.77670701E+000  0.00000000E+000 -0.00000000E+000  0.00000000E+000

tests/01-ITER/outputs/summary.7.txt

@@ -19,5 +19,5 @@
  # COD nrayr nrayth nstep rwmax dst: 11 16 1800 1.000 0.2000                                                                         
  # COD iwarm ilarm imx ieccd:    2    5  -20   11                                                                                    
  # COD ipec nrho istpr istpl:    1  501    5    5                                                                                    
- #Icd Pa Jphip dPdVp rhotj rhotjava rhotp rhotpav drhotjava drhotpav ratjamx ratjbmx stmx psipol chipol index_rt Jphimx dPdVmx drhotj drhotp P0 cplO cplX
+ # I_cd P_abs J_φ_peak dPdV_peak ρ_max_J ρ_avg_J ρ_max_P ρ_avg_P Δρ_avg_J Δρ_avg_P ratio_Ja_max ratio_Jb_max s_max ψ χ index_rt J_φ_max dPdV_max Δρ_J Δρ_P P0 cpl1 cpl2
  -0.95022E-02  0.99999E+00 -0.21800E-01  0.60286E-01  0.76671E+00  0.76683E+00  0.76671E+00  0.76626E+00  0.15507E-01  0.15660E-01  0.10751E+01  0.10181E+01  0.36000E+03 -0.93845E+01 -0.21048E+02    1 -0.21105E-01  0.58396E-01  0.16232E-01  0.16399E-01  0.10000E+01  0.00000E+00  0.00000E+00

tests/02-ITER-half-field/outputs/beam-shape-final.9.txt

@@ -19,7 +19,7 @@
  # COD nrayr nrayth nstep rwmax dst:   11   16 2800  0.10000E+01  0.20000E+00                                                        
  # COD iwarm ilarm imx ieccd:    2    5  -20   11                                                                                    
  # COD ipec nrho istpr istpl:    1  251    5    5                                                                                    
- #sst j k xt yt zt rt
+ # s j k x y z r
   0.56000000E+003    1    1  0.00000000E+000  0.00000000E+000 -0.00000000E+000  0.00000000E+000
   0.56000000E+003    2    1  0.25796776E+001 -0.12693863E-001 -0.75540894E-001  0.25797088E+001
   0.56000000E+003    2    2  0.23796259E+001  0.50373901E+000 -0.73979584E-001  0.24323595E+001

tests/02-ITER-half-field/outputs/central-ray.4.txt

@@ -19,7 +19,7 @@
  # COD nrayr nrayth nstep rwmax dst:   11   16 2800  0.10000E+01  0.20000E+00                                                        
  # COD iwarm ilarm imx ieccd:    2    5  -20   11                                                                                    
  # COD ipec nrho istpr istpl:    1  251    5    5                                                                                    
- #sst R z phi psin rhot ne Te Btot Bx By Bz Nperp Npl Nx Ny Nz ki alpha tau Pt dIds nhmax iohkw index_rt ddr
+ # s R z φ ψ_n ρ_t n_e T_e B b_x b_y b_z N_⊥ N_∥ N_x N_y N_z k_im α τ P_t dI/ds n_harm_max i_okhawa index_rt Λ_r
   0.20000000E-002  0.93921847E+001  0.11915136E+001 -0.41728972E-002  0.21065597E+001  0.10000000E+001  0.00000000E+000  0.00000000E+000  0.19630456E+001 -0.42328237E-001 -0.94156343E+000  0.33416558E+000  0.96023840E+000  0.27918135E+000 -0.90767337E+000 -0.34202014E+000 -0.24321035E+000  0.00000000E+000  0.00000000E+000  0.00000000E+000  0.10000000E+001  0.00000000E+000    0    0    1  0.00000000E+000
   0.40000000E-002  0.93903694E+001  0.11910272E+001 -0.83474078E-002  0.21049278E+001  0.10000000E+001  0.00000000E+000  0.00000000E+000  0.19634286E+001 -0.42390383E-001 -0.94155867E+000  0.33417112E+000  0.96022286E+000  0.27923478E+000 -0.90767337E+000 -0.34202014E+000 -0.24321035E+000  0.00000000E+000  0.00000000E+000  0.00000000E+000  0.10000000E+001  0.00000000E+000    0    0    1  0.00000000E+000
   0.60000000E-002  0.93885542E+001  0.11905407E+001 -0.12523533E-001  0.21032960E+001  0.10000000E+001  0.00000000E+000  0.00000000E+000  0.19638117E+001 -0.42452593E-001 -0.94155390E+000  0.33417664E+000  0.96020730E+000  0.27928827E+000 -0.90767337E+000 -0.34202014E+000 -0.24321035E+000  0.00000000E+000  0.00000000E+000  0.00000000E+000  0.10000000E+001  0.00000000E+000    0    0    1  0.00000000E+000

tests/02-ITER-half-field/outputs/summary.7.txt

@@ -19,5 +19,5 @@
  # COD nrayr nrayth nstep rwmax dst:   11   16 2800  0.10000E+01  0.20000E+00                                                        
  # COD iwarm ilarm imx ieccd:    2    5  -20   11                                                                                    
  # COD ipec nrho istpr istpl:    1  251    5    5                                                                                    
- #Icd Pa Jphip dPdVp rhotj rhotjava rhotp rhotpav drhotjava drhotpav ratjamx ratjbmx stmx psipol chipol index_rt Jphimx dPdVmx drhotj drhotp
+ # I_cd P_abs J_φ_peak dPdV_peak ρ_max_J ρ_avg_J ρ_max_P ρ_avg_P Δρ_avg_J Δρ_avg_P ratio_Ja_max ratio_Jb_max s_max ψ χ index_rt J_φ_max dPdV_max Δρ_J Δρ_P
   0.34039E-01  0.99960E+00  0.12289E+00  0.34180E-01  0.78995E-01  0.92717E-01  0.82166E-01  0.10298E+00  0.75453E-01  0.17953E+00  0.10167E+01  0.10010E+01  0.56000E+03  0.25572E+02  0.30953E+02    1  0.20645E+00  0.13954E+00  0.44331E-01  0.45282E-01

tests/03-TCV/outputs/beam-shape-final.9.txt

@@ -19,7 +19,7 @@
  # COD nrayr nrayth nstep rwmax dst:   16   24 2400  0.10000E+01  0.50000E-01                                                        
  # COD iwarm ilarm imx ieccd:    2    5  -20   11                                                                                    
  # COD ipec nrho istpr istpl:    1 1001    5    5                                                                                    
- #sst j k xt yt zt rt
+ #s j k x y z r
   0.12000000E+003    1    1  0.00000000E+000 -0.00000000E+000  0.00000000E+000  0.00000000E+000
   0.12000000E+003    2    1  0.67043795E+000 -0.12422024E-001 -0.73863772E-003  0.67055302E+000
   0.12000000E+003    2    2  0.65341690E+000  0.88523022E-001 -0.77690499E-003  0.65938606E+000

tests/03-TCV/outputs/central-ray.4.txt

@@ -19,7 +19,7 @@
  # COD nrayr nrayth nstep rwmax dst: 16 24 2400 1.000 0.5000E-1                                                                      
  # COD iwarm ilarm imx ieccd:    2    5  -20   11                                                                                    
  # COD ipec nrho istpr istpl:    1 1001    5    5                                                                                    
- #sst R z phi psin rhot ne Te Btot Bx By Bz Nperp Npl Nx Ny Nz ki alpha tau Pt dIds nhmin nhmax iohkw index_rt ddr Xg Yg dXgdx dXgdy dXgdz
+ # s R z φ ψ_n ρ_t n_e T_e B b_x b_y b_z N_⊥ N_∥ N_x N_y N_z k_im α τ P_t dI/ds n_harm_min n_harm_max i_okhawa index_rt Λ_r X Y ∇X_x ∇X_y ∇X_z
   0.50000000E-003  0.85980520E+000  0.98800002E+000  0.00000000E+000 -0.10000000E+001  0.10000000E+001  0.00000000E+000  0.00000000E+000  0.14625113E+001  0.00000000E+000 -0.10000000E+001  0.00000000E+000  0.10000000E+001  0.00000000E+000 -0.95991635E-002  0.00000000E+000 -0.99995393E+000  0.00000000E+000  0.00000000E+000  0.00000000E+000  0.25172396E-002  0.00000000E+000    0    0    0    2  0.00000000E+000  0.00000000E+000  0.34753255E+000  0.00000000E+000  0.00000000E+000  0.00000000E+000
   0.10000000E-002  0.85980040E+000  0.98750005E+000  0.00000000E+000 -0.10000000E+001  0.10000000E+001  0.00000000E+000  0.00000000E+000  0.14625194E+001  0.00000000E+000 -0.10000000E+001  0.00000000E+000  0.10000000E+001  0.00000000E+000 -0.95991635E-002  0.00000000E+000 -0.99995393E+000  0.00000000E+000  0.00000000E+000  0.00000000E+000  0.25172396E-002  0.00000000E+000    0    0    0    2  0.00000000E+000  0.00000000E+000  0.34753449E+000  0.00000000E+000  0.00000000E+000  0.00000000E+000
   0.15000000E-002  0.85979560E+000  0.98700007E+000  0.00000000E+000 -0.10000000E+001  0.10000000E+001  0.00000000E+000  0.00000000E+000  0.14625276E+001  0.00000000E+000 -0.10000000E+001  0.00000000E+000  0.10000000E+001  0.00000000E+000 -0.95991635E-002  0.00000000E+000 -0.99995393E+000  0.00000000E+000  0.00000000E+000  0.00000000E+000  0.25172396E-002  0.00000000E+000    0    0    0    2  0.00000000E+000  0.00000000E+000  0.34753643E+000  0.00000000E+000  0.00000000E+000  0.00000000E+000

tests/03-TCV/outputs/summary.7.txt

@@ -19,5 +19,5 @@
  # COD nrayr nrayth nstep rwmax dst: 16 24 2400 1.000 0.5000E-1                                                                      
  # COD iwarm ilarm imx ieccd:    2    5  -20   11                                                                                    
  # COD ipec nrho istpr istpl:    1 1001    5    5                                                                                    
- #Icd Pa Jphip dPdVp rhotj rhotjava rhotp rhotpav drhotjava drhotpav ratjamx ratjbmx stmx psipol chipol index_rt Jphimx dPdVmx drhotj drhotp P0 cplO cplX
+ # I_cd P_abs J_φ_peak dPdV_peak ρ_max_J ρ_avg_J ρ_max_P ρ_avg_P Δρ_avg_J Δρ_avg_P ratio_Ja_max ratio_Jb_max s_max ψ χ index_rt J_φ_max dPdV_max Δρ_J Δρ_P P0 cpl1 cpl2
   0.00000E+00  0.00000E+00  0.00000E+00  0.00000E+00  0.00000E+00  0.00000E+00  0.00000E+00  0.00000E+00  0.42147E-07  0.42147E-07  0.00000E+00  0.00000E+00  0.12000E+03 -0.85611E+02 -0.12738E+01    2  0.00000E+00  0.00000E+00  0.00000E+00  0.00000E+00  0.10000E+01  0.00000E+00  0.00000E+00

tests/04-JT60SA/outputs/beam-shape-final.9.txt

@@ -19,4 +19,4 @@
  # COD nrayr nrayth nstep rwmax dst: 1 18 15000 1.200 0.1000                                                                         
  # COD iwarm ilarm imx ieccd:    2    4  -20    3                                                                                    
  # COD ipec nrho istpr istpl:    1 2001    5    5                                                                                    
- #sst j k xt yt zt rt
+ #s j k x y z r

tests/04-JT60SA/outputs/beam-shape.8.txt

@@ -19,4 +19,4 @@
  # COD nrayr nrayth nstep rwmax dst: 1 18 15000 1.200 0.1000                                                                         
  # COD iwarm ilarm imx ieccd:    2    4  -20    3                                                                                    
  # COD ipec nrho istpr istpl:    1 2001    5    5                                                                                    
- #sst j k xt yt zt rt
+ #s j k x y z r

tests/04-JT60SA/outputs/central-ray.4.txt

@@ -19,7 +19,7 @@
  # COD nrayr nrayth nstep rwmax dst: 1 18 15000 1.200 0.1000                                                                         
  # COD iwarm ilarm imx ieccd:    2    4  -20    3                                                                                    
  # COD ipec nrho istpr istpl:    1 2001    5    5                                                                                    
- #sst R z phi psin rhot ne Te Btot Bx By Bz Nperp Npl Nx Ny Nz ki alpha tau Pt dIds nhmin nhmax iohkw index_rt ddr Xg Yg dXgdx dXgdy dXgdz
+ # s R z φ ψ_n ρ_t n_e T_e B b_x b_y b_z N_⊥ N_∥ N_x N_y N_z k_im α τ P_t dI/ds n_harm_min n_harm_max i_okhawa index_rt Λ_r X Y ∇X_x ∇X_y ∇X_z
   0.10000000E-002  0.43777716E+001  0.93791889E+000 -0.12659179E+001  0.15850311E+001  0.10000000E+001  0.00000000E+000  0.00000000E+000  0.16956298E+001 -0.19459887E+000 -0.89342254E+000  0.40487953E+000  0.98065114E+000  0.19576350E+000 -0.99838580E+000  0.22062361E-001  0.52335956E-001  0.00000000E+000  0.00000000E+000  0.00000000E+000  0.10000000E+001  0.00000000E+000    0    0    0    1  0.00000000E+000  0.00000000E+000  0.34494844E+000  0.00000000E+000 -0.00000000E+000  0.00000000E+000
   0.20000000E-002  0.43767729E+001  0.93797123E+000 -0.12659179E+001  0.15850661E+001  0.10000000E+001  0.00000000E+000  0.00000000E+000  0.16960148E+001 -0.19460441E+000 -0.89342345E+000  0.40487488E+000  0.98065009E+000  0.19576876E+000 -0.99838580E+000  0.22062361E-001  0.52335956E-001  0.00000000E+000  0.00000000E+000  0.00000000E+000  0.10000000E+001  0.00000000E+000    0    0    0    1  0.00000000E+000  0.00000000E+000  0.34502675E+000  0.00000000E+000 -0.00000000E+000  0.00000000E+000
   0.30000000E-002  0.43757743E+001  0.93802357E+000 -0.12659179E+001  0.15851010E+001  0.10000000E+001  0.00000000E+000  0.00000000E+000  0.16963999E+001 -0.19460994E+000 -0.89342435E+000  0.40487023E+000  0.98064904E+000  0.19577402E+000 -0.99838580E+000  0.22062361E-001  0.52335956E-001  0.00000000E+000  0.00000000E+000  0.00000000E+000  0.10000000E+001  0.00000000E+000    0    0    0    1  0.00000000E+000  0.00000000E+000  0.34510510E+000  0.00000000E+000 -0.00000000E+000  0.00000000E+000

tests/04-JT60SA/outputs/summary.7.txt

@@ -19,7 +19,7 @@
  # COD nrayr nrayth nstep rwmax dst: 1 18 15000 1.200 0.1000                                                                         
  # COD iwarm ilarm imx ieccd:    2    4  -20    3                                                                                    
  # COD ipec nrho istpr istpl:    1 2001    5    5                                                                                    
- #Icd Pa Jphip dPdVp rhotj rhotjava rhotp rhotpav drhotjava drhotpav ratjamx ratjbmx stmx psipol chipol index_rt Jphimx dPdVmx drhotj drhotp P0 cplO cplX
+ # I_cd P_abs J_φ_peak dPdV_peak ρ_max_J ρ_avg_J ρ_max_P ρ_avg_P Δρ_avg_J Δρ_avg_P ratio_Ja_max ratio_Jb_max s_max ψ χ index_rt J_φ_max dPdV_max Δρ_J Δρ_P P0 cpl1 cpl2
   0.15169E-08  0.45444E-02  0.64319E-07  0.17151E-01  0.60265E+00  0.60158E+00  0.60168E+00  0.60172E+00  0.28890E-02  0.17636E-02  0.11006E+01  0.10392E+01  0.32950E+03  0.95525E+01  0.61358E+00    1  0.10617E-05  0.16957E-01 -0.97408E-03  0.17931E-02  0.10000E+01  0.97118E+00  0.28819E-01
  -0.47742E-09  0.13059E-02 -0.28889E-07  0.55187E-02  0.89509E+00  0.89556E+00  0.89605E+00  0.89575E+00  0.15307E-02  0.13159E-02  0.11734E+01  0.10226E+01  0.72580E+03  0.75487E+01 -0.62824E+01    3 -0.26035E-06  0.44854E-02 -0.94195E-03  0.18062E-02  0.96677E+00  0.00000E+00  0.00000E+00
   0.00000E+00  0.00000E+00  0.00000E+00  0.00000E+00  0.00000E+00  0.00000E+00  0.00000E+00  0.00000E+00  0.42147E-07  0.42147E-07  0.00000E+00  0.00000E+00  0.61930E+03  0.75487E+01 -0.62824E+01    4  0.00000E+00  0.00000E+00  0.00000E+00  0.00000E+00  0.28688E-01  0.00000E+00  0.00000E+00

tests/05-JT60SA-startup/outputs/central-ray.4.txt

@@ -19,7 +19,7 @@
  # COD nrayr nrayth nstep rwmax dst: 1 1 10000 1.000 0.1000                                                                          
  # COD iwarm ilarm imx ieccd:    2    4  -20    3                                                                                    
  # COD ipec nrho istpr istpl:    1 2001    5    5                                                                                    
- #sst R z phi psin rhot ne Te Btot Bx By Bz Nperp Npl Nx Ny Nz ki alpha tau Pt dIds nhmin nhmax iohkw index_rt ddr Xg Yg dXgdx dXgdy dXgdz
+ # s R z φ ψ_n ρ_t n_e T_e B b_x b_y b_z N_⊥ N_∥ N_x N_y N_z k_im α τ P_t dI/ds n_harm_min n_harm_max i_okhawa index_rt Λ_r X Y ∇X_x ∇X_y ∇X_z
   0.10000000E-002  0.52131859E+001  0.17714193E+001  0.00000000E+000 -0.10000000E+001  0.10000000E+001  0.00000000E+000  0.00000000E+000  0.11348147E+001 -0.00000000E+000  0.10000000E+001  0.00000000E+000  0.10000000E+001  0.00000000E+000 -0.81411552E+000  0.00000000E+000 -0.58070296E+000  0.00000000E+000  0.00000000E+000  0.00000000E+000  0.10000000E+001  0.00000000E+000    0    0    0    2  0.00000000E+000  0.00000000E+000  0.28878447E+000  0.00000000E+000  0.00000000E+000  0.00000000E+000
   0.20000000E-002  0.52123718E+001  0.17708386E+001  0.00000000E+000 -0.10000000E+001  0.10000000E+001  0.00000000E+000  0.00000000E+000  0.11349920E+001 -0.00000000E+000  0.10000000E+001  0.00000000E+000  0.10000000E+001  0.00000000E+000 -0.81411552E+000  0.00000000E+000 -0.58070296E+000  0.00000000E+000  0.00000000E+000  0.00000000E+000  0.10000000E+001  0.00000000E+000    0    0    0    2  0.00000000E+000  0.00000000E+000  0.28882957E+000  0.00000000E+000  0.00000000E+000  0.00000000E+000
   0.30000000E-002  0.52115577E+001  0.17702579E+001  0.00000000E+000 -0.10000000E+001  0.10000000E+001  0.00000000E+000  0.00000000E+000  0.11351693E+001 -0.00000000E+000  0.10000000E+001  0.00000000E+000  0.10000000E+001  0.00000000E+000 -0.81411552E+000  0.00000000E+000 -0.58070296E+000  0.00000000E+000  0.00000000E+000  0.00000000E+000  0.10000000E+001  0.00000000E+000    0    0    0    2  0.00000000E+000  0.00000000E+000  0.28887469E+000  0.00000000E+000  0.00000000E+000  0.00000000E+000

tests/05-JT60SA-startup/outputs/fort.8

@@ -1,22 +0,0 @@
- # Run date/time: 2024/04/11 22:16:25.239                                                                                            
- # GRAY Git revision: 3e613ec-dirty                                                                                                  
- # EQL input: ./equilan.txt                                                                                                          
- # EQL iequil sgnb sgni factb: 1 1 1 1.00                                                                                            
- # EQL icocos ipsinorm idesc ifreefmt: N/A (analytical)                                                                              
- # EQL ssplps ssplf ixp: N/A (analytical)                                                                                            
- # EQL B0 R0 aminor Rax zax: 0.0000 0.0000 0.0000 0.0000 0.0000                                                                      
- # PRF input: ./profilesan.txt                                                                                                       
- # PRF iprof iscal factne factte: 0 1 1.000 1.000                                                                                    
- # PRF irho psnbnd sspld: N/A (analytical)                                                                                           
- # PRF Te0 ne0 Zeff0: 0.000 0.000 0.000                                                                                              
- # ANT input: ./no-steer-110.txt                                                                                                     
- # ANT ibeam iox psi chi: 0 2 0.000 0.000                                                                                            
- # ANT alpha beta power fghz: 35.5 0.00 1.00 110.                                                                                    
- # ANT x0 y0 z0: 521. 0.00 177.                                                                                                      
- # ANT wx wy Rcix Rciy psiw psir:       1.9400          1.9400         -0.0000         -0.0000          0.0000          0.0000       
- # RFL rwall:  0.16981E+01                                                                                                           
- # COD igrad idst ipass ipol:    0    0    3    F                                                                                    
- # COD nrayr nrayth nstep rwmax dst: 1 1 10000 1.000 0.1000                                                                          
- # COD iwarm ilarm imx ieccd:    2    4  -20    3                                                                                    
- # COD ipec nrho istpr istpl:    1 2001    5    5                                                                                    
- #sst j k xt yt zt rt

tests/05-JT60SA-startup/outputs/fort.9

@@ -1,22 +0,0 @@
- # Run date/time: 2024/04/11 22:16:25.239                                                                                            
- # GRAY Git revision: 3e613ec-dirty                                                                                                  
- # EQL input: ./equilan.txt                                                                                                          
- # EQL iequil sgnb sgni factb: 1 1 1 1.00                                                                                            
- # EQL icocos ipsinorm idesc ifreefmt: N/A (analytical)                                                                              
- # EQL ssplps ssplf ixp: N/A (analytical)                                                                                            
- # EQL B0 R0 aminor Rax zax: 0.0000 0.0000 0.0000 0.0000 0.0000                                                                      
- # PRF input: ./profilesan.txt                                                                                                       
- # PRF iprof iscal factne factte: 0 1 1.000 1.000                                                                                    
- # PRF irho psnbnd sspld: N/A (analytical)                                                                                           
- # PRF Te0 ne0 Zeff0: 0.000 0.000 0.000                                                                                              
- # ANT input: ./no-steer-110.txt                                                                                                     
- # ANT ibeam iox psi chi: 0 2 0.000 0.000                                                                                            
- # ANT alpha beta power fghz: 35.5 0.00 1.00 110.                                                                                    
- # ANT x0 y0 z0: 521. 0.00 177.                                                                                                      
- # ANT wx wy Rcix Rciy psiw psir:       1.9400          1.9400         -0.0000         -0.0000          0.0000          0.0000       
- # RFL rwall:  0.16981E+01                                                                                                           
- # COD igrad idst ipass ipol:    0    0    3    F                                                                                    
- # COD nrayr nrayth nstep rwmax dst: 1 1 10000 1.000 0.1000                                                                          
- # COD iwarm ilarm imx ieccd:    2    4  -20    3                                                                                    
- # COD ipec nrho istpr istpl:    1 2001    5    5                                                                                    
- #sst j k xt yt zt rt

tests/05-JT60SA-startup/outputs/summary.7.txt

@@ -19,7 +19,7 @@
  # COD nrayr nrayth nstep rwmax dst: 1 1 10000 1.000 0.1000                                                                          
  # COD iwarm ilarm imx ieccd:    2    4  -20    3                                                                                    
  # COD ipec nrho istpr istpl:    1 2001    5    5                                                                                    
- #Icd Pa Jphip dPdVp rhotj rhotjava rhotp rhotpav drhotjava drhotpav ratjamx ratjbmx stmx psipol chipol index_rt Jphimx dPdVmx drhotj drhotp P0 cplO cplX
+ # I_cd P_abs J_φ_peak dPdV_peak ρ_max_J ρ_avg_J ρ_max_P ρ_avg_P Δρ_avg_J Δρ_avg_P ratio_Ja_max ratio_Jb_max s_max ψ χ index_rt J_φ_max dPdV_max Δρ_J Δρ_P P0 cpl1 cpl2
   0.10908E-05  0.11876E+00  0.12842E-04  0.14423E+00  0.76701E+00  0.76222E+00  0.76298E+00  0.76255E+00  0.13937E-01  0.74120E-02  0.10209E+01  0.10104E+01  0.43320E+03 -0.83083E+02 -0.50380E+01    2 -0.16762E-02  0.19462E+00 -0.23535E-02  0.72563E-02  0.10000E+01  0.97780E+00  0.22201E-01
   0.99486E-07  0.73191E-03  0.13483E-05  0.93672E-03  0.77580E+00  0.77803E+00  0.77784E+00  0.77884E+00  0.11955E-01  0.69433E-02  0.10209E+01  0.10104E+01  0.72460E+03 -0.83251E+02  0.53297E+01    5  0.95719E-05  0.12753E-02 -0.40714E-02  0.69218E-02  0.86168E+00  0.26613E-02  0.99734E+00
   0.44956E-07  0.94854E-03  0.62429E-06  0.13668E-02  0.81173E+00  0.80733E+00  0.80822E+00  0.80797E+00  0.11414E-01  0.60339E-02  0.10209E+01  0.10104E+01  0.92640E+03 -0.83251E+02  0.53297E+01    6 -0.12265E-04  0.19052E-02 -0.23045E-02  0.59688E-02  0.19564E-01  0.43430E-01  0.95657E+00

tests/06-ITER-startup/outputs/mixed/beam-shape-final.9.txt

@@ -19,7 +19,7 @@
  # COD nrayr nrayth nstep rwmax dst: 11 16 8000 1.000 0.1000                                                                         
  # COD iwarm ilarm imx ieccd:    2    4  -20    3                                                                                    
  # COD ipec nrho istpr istpl:    1  501    5    5                                                                                    
- #sst j k xt yt zt rt
+ #s j k x y z r
   0.80000000E+003    1    1  0.00000000E+000 -0.00000000E+000  0.00000000E+000  0.00000000E+000
   0.80000000E+003    2    1 -0.22132933E+001 -0.91328737E-001  0.44604528E-001  0.22151768E+001
   0.80000000E+003    2    2 -0.20826043E+001  0.34003773E+000  0.52617479E-001  0.21101816E+001

tests/06-ITER-startup/outputs/mixed/beam-shape.8.txt

@@ -19,7 +19,7 @@
  # COD nrayr nrayth nstep rwmax dst: 11 16 8000 1.000 0.1000                                                                         
  # COD iwarm ilarm imx ieccd:    2    4  -20    3                                                                                    
  # COD ipec nrho istpr istpl:    1  501    5    5                                                                                    
- #sst j k xt yt zt rt
+ #s j k x y z r
   0.00000000E+000   11    1  0.50470054E+001  0.89290809E-014 -0.12175891E-013  0.50470054E+001
   0.00000000E+000   11    2  0.46628250E+001  0.19314054E+001  0.37414516E-013  0.50470054E+001
   0.00000000E+000   11    3  0.35687718E+001  0.35687718E+001  0.41078252E-013  0.50470054E+001

tests/06-ITER-startup/outputs/mixed/central-ray.4.txt

@@ -19,7 +19,7 @@
  # COD nrayr nrayth nstep rwmax dst: 11 16 8000 1.000 0.1000                                                                         
  # COD iwarm ilarm imx ieccd:    2    4  -20    3                                                                                    
  # COD ipec nrho istpr istpl:    1  501    5    5                                                                                    
- #sst R z phi psin rhot ne Te Btot Bx By Bz Nperp Npl Nx Ny Nz ki alpha tau Pt dIds nhmin nhmax iohkw index_rt ddr Xg Yg dXgdx dXgdy dXgdz
+ # s R z φ ψ_n ρ_t n_e T_e B b_x b_y b_z N_⊥ N_∥ N_x N_y N_z k_im α τ P_t dI/ds n_harm_min n_harm_max i_okhawa index_rt Λ_r X Y ∇X_x ∇X_y ∇X_z
   0.10000000E-002  0.69979797E+001  0.44138186E+001  0.28002812E-002 -0.10000000E+001  0.10000000E+001  0.00000000E+000  0.00000000E+000  0.23478223E+001  0.48874126E-004 -0.10000000E+001  0.00000000E+000  0.93967963E+000 -0.34205583E+000 -0.73027833E+000  0.34202014E+000 -0.59136773E+000  0.00000000E+000  0.00000000E+000  0.00000000E+000  0.56055339E-002  0.00000000E+000    0    0    0    1  0.00000000E+000  0.00000000E+000  0.38659646E+000  0.00000000E+000  0.00000000E+000  0.00000000E+000
   0.20000000E-002  0.69972495E+001  0.44132273E+001  0.56011468E-002 -0.10000000E+001  0.10000000E+001  0.00000000E+000  0.00000000E+000  0.23480674E+001  0.97758453E-004 -0.10000000E+001  0.00000000E+000  0.93966663E+000 -0.34209153E+000 -0.73027833E+000  0.34202014E+000 -0.59136773E+000  0.00000000E+000  0.00000000E+000  0.00000000E+000  0.56055339E-002  0.00000000E+000    0    0    0    1  0.00000000E+000  0.00000000E+000  0.38663681E+000  0.00000000E+000  0.00000000E+000  0.00000000E+000
   0.30000000E-002  0.69965192E+001  0.44126359E+001  0.84025971E-002 -0.10000000E+001  0.10000000E+001  0.00000000E+000  0.00000000E+000  0.23483124E+001  0.14665298E-003 -0.99999999E+000  0.00000000E+000  0.93965363E+000 -0.34212724E+000 -0.73027833E+000  0.34202014E+000 -0.59136773E+000  0.00000000E+000  0.00000000E+000  0.00000000E+000  0.56055339E-002  0.00000000E+000    0    0    0    1  0.00000000E+000  0.00000000E+000  0.38667716E+000  0.00000000E+000  0.00000000E+000  0.00000000E+000

tests/06-ITER-startup/outputs/mixed/summary.7.txt

@@ -19,6 +19,6 @@
  # COD nrayr nrayth nstep rwmax dst: 11 16 8000 1.000 0.1000                                                                         
  # COD iwarm ilarm imx ieccd:    2    4  -20    3                                                                                    
  # COD ipec nrho istpr istpl:    1  501    5    5                                                                                    
- #Icd Pa Jphip dPdVp rhotj rhotjava rhotp rhotpav drhotjava drhotpav ratjamx ratjbmx stmx psipol chipol index_rt Jphimx dPdVmx drhotj drhotp P0 cplO cplX
+ # I_cd P_abs J_φ_peak dPdV_peak ρ_max_J ρ_avg_J ρ_max_P ρ_avg_P Δρ_avg_J Δρ_avg_P ratio_Ja_max ratio_Jb_max s_max ψ χ index_rt J_φ_max dPdV_max Δρ_J Δρ_P P0 cpl1 cpl2
  -0.68490E-06  0.67096E-02 -0.13262E-05  0.53181E-03  0.33146E+00  0.34828E+00  0.35089E+00  0.35081E+00  0.64000E-01  0.40790E-01  0.10236E+01  0.10000E+01  0.80000E+03  0.33636E+02 -0.34197E+02    1 -0.10735E-04  0.52652E-03 -0.31634E-01  0.41431E-01  0.57119E+00  0.00000E+00  0.00000E+00
   0.16737E-04  0.16484E+00  0.31486E-04  0.12896E-01  0.37013E+00  0.35607E+00  0.35304E+00  0.35367E+00  0.64500E-01  0.41008E-01  0.10238E+01  0.10000E+01  0.80000E+03 -0.56364E+02  0.34197E+02    2  0.24421E-03  0.12791E-01 -0.29686E-01  0.41543E-01  0.42881E+00  0.00000E+00  0.00000E+00

tests/06-ITER-startup/outputs/x-mode/beam-shape-final.9.txt

@@ -19,7 +19,7 @@
  # COD nrayr nrayth nstep rwmax dst:   11   16 8000  0.10000E+01  0.10000E+00                                                        
  # COD iwarm ilarm imx ieccd:    2    4  -20   11                                                                                    
  # COD ipec nrho istpr istpl:    1  501    5    5                                                                                    
- #sst j k xt yt zt rt
+ #s j k x y z r
   0.80000000E+003    1    1  0.00000000E+000 -0.00000000E+000  0.00000000E+000  0.00000000E+000
   0.80000000E+003    2    1 -0.22051832E+001 -0.85773220E-001  0.33398606E-001  0.22068507E+001
   0.80000000E+003    2    2 -0.20788587E+001  0.34652333E+000  0.40589140E-001  0.21075417E+001

tests/06-ITER-startup/outputs/x-mode/central-ray.4.txt

@@ -19,7 +19,7 @@
  # COD nrayr nrayth nstep rwmax dst:   11   16 8000  0.10000E+01  0.10000E+00                                                        
  # COD iwarm ilarm imx ieccd:    2    4  -20   11                                                                                    
  # COD ipec nrho istpr istpl:    1  501    5    5                                                                                    
- #sst R z phi psin rhot ne Te Btot Bx By Bz Nperp Npl Nx Ny Nz ki alpha tau Pt dIds nhmin nhmax iohkw index_rt ddr Xg Yg dXgdx dXgdy dXgdz
+ # s R z φ ψ_n ρ_t n_e T_e B b_x b_y b_z N_⊥ N_∥ N_x N_y N_z k_im α τ P_t dI/ds n_harm_min n_harm_max i_okhawa index_rt Λ_r X Y ∇X_x ∇X_y ∇X_z
   0.10000000E-002  0.69979797E+001  0.44138186E+001  0.28002812E-002  0.23933309E+001  0.10000000E+001  0.00000000E+000  0.00000000E+000  0.23480287E+001 -0.10409184E-001 -0.99991264E+000  0.81461955E-002  0.94071210E+000 -0.33920606E+000 -0.73027833E+000  0.34202014E+000 -0.59136773E+000  0.00000000E+000  0.00000000E+000  0.00000000E+000  0.56055339E-002  0.00000000E+000    0    0    0    2  0.00000000E+000  0.00000000E+000  0.38663043E+000  0.00000000E+000  0.00000000E+000  0.00000000E+000
   0.20000000E-002  0.69972495E+001  0.44132273E+001  0.56011468E-002  0.23927081E+001  0.10000000E+001  0.00000000E+000  0.00000000E+000  0.23482738E+001 -0.10363749E-001 -0.99991312E+000  0.81452083E-002  0.94070028E+000 -0.33923882E+000 -0.73027833E+000  0.34202014E+000 -0.59136773E+000  0.00000000E+000  0.00000000E+000  0.00000000E+000  0.56055339E-002  0.00000000E+000    0    0    0    2  0.00000000E+000  0.00000000E+000  0.38667079E+000  0.00000000E+000  0.00000000E+000  0.00000000E+000
   0.30000000E-002  0.69965192E+001  0.44126359E+001  0.84025971E-002  0.23920852E+001  0.10000000E+001  0.00000000E+000  0.00000000E+000  0.23485189E+001 -0.10318482E-001 -0.99991360E+000  0.81442120E-002  0.94068851E+000 -0.33927145E+000 -0.73027833E+000  0.34202014E+000 -0.59136773E+000  0.00000000E+000  0.00000000E+000  0.00000000E+000  0.56055339E-002  0.00000000E+000    0    0    0    2  0.00000000E+000  0.00000000E+000  0.38671116E+000  0.00000000E+000  0.00000000E+000  0.00000000E+000

tests/06-ITER-startup/outputs/x-mode/summary.7.txt

@@ -19,5 +19,5 @@
  # COD nrayr nrayth nstep rwmax dst:   11   16 8000  0.10000E+01  0.10000E+00                                                        
  # COD iwarm ilarm imx ieccd:    2    4  -20   11                                                                                    
  # COD ipec nrho istpr istpl:    1  501    5    5                                                                                    
- #Icd Pa Jphip dPdVp rhotj rhotjava rhotp rhotpav drhotjava drhotpav ratjamx ratjbmx stmx psipol chipol index_rt Jphimx dPdVmx drhotj drhotp P0 cplO cplX
+ # I_cd P_abs J_φ_peak dPdV_peak ρ_max_J ρ_avg_J ρ_max_P ρ_avg_P Δρ_avg_J Δρ_avg_P ratio_Ja_max ratio_Jb_max s_max ψ χ index_rt J_φ_max dPdV_max Δρ_J Δρ_P P0 cpl1 cpl2
   0.39087E-04  0.38432E+00  0.73537E-04  0.30072E-01  0.37014E+00  0.35598E+00  0.35304E+00  0.35358E+00  0.64509E-01  0.41012E-01  0.10238E+01  0.10000E+01  0.80000E+03 -0.56364E+02  0.34197E+02    2  0.56996E-03  0.29835E-01 -0.29701E-01  0.41539E-01  0.10000E+01  0.00000E+00  0.00000E+00

tests/07-DTT/outputs/beam-shape-final.9.txt

@@ -19,4 +19,4 @@
  # COD nrayr nrayth nstep rwmax dst: 1 16 12000 1.000 0.2000E-1                                                                      
  # COD iwarm ilarm imx ieccd:    2    5  -20   11                                                                                    
  # COD ipec nrho istpr istpl:    1  901    5    5                                                                                    
- #sst j k xt yt zt rt
+ #s j k x y z r

tests/07-DTT/outputs/beam-shape.8.txt

@@ -19,4 +19,4 @@
  # COD nrayr nrayth nstep rwmax dst: 1 16 12000 1.000 0.2000E-1                                                                      
  # COD iwarm ilarm imx ieccd:    2    5  -20   11                                                                                    
  # COD ipec nrho istpr istpl:    1  901    5    5                                                                                    
- #sst j k xt yt zt rt
+ #s j k x y z r

tests/07-DTT/outputs/central-ray.4.txt

@@ -19,7 +19,7 @@
  # COD nrayr nrayth nstep rwmax dst: 1 16 12000 1.000 0.2000E-1                                                                      
  # COD iwarm ilarm imx ieccd:    2    5  -20   11                                                                                    
  # COD ipec nrho istpr istpl:    1  901    5    5                                                                                    
- #sst R z phi psin rhot ne Te Btot Bx By Bz Nperp Npl Nx Ny Nz ki alpha tau Pt dIds nhmin nhmax iohkw index_rt ddr Xg Yg dXgdx dXgdy dXgdz
+ # s R z φ ψ_n ρ_t n_e T_e B b_x b_y b_z N_⊥ N_∥ N_x N_y N_z k_im α τ P_t dI/ds n_harm_min n_harm_max i_okhawa index_rt Λ_r X Y ∇X_x ∇X_y ∇X_z
   0.20000000E-003  0.31258000E+001 -0.79200000E-001  0.00000000E+000 -0.10000000E+001  0.10000000E+001  0.00000000E+000  0.00000000E+000  0.21065120E+001  0.00000000E+000 -0.10000000E+001  0.00000000E+000  0.10000000E+001  0.00000000E+000 -0.10000000E+001  0.00000000E+000  0.00000000E+000  0.00000000E+000  0.00000000E+000  0.00000000E+000  0.10000000E+001  0.00000000E+000    0    0    0    2  0.00000000E+000  0.00000000E+000  0.34686189E+000  0.00000000E+000  0.00000000E+000  0.00000000E+000
   0.40000000E-003  0.31256000E+001 -0.79200000E-001  0.00000000E+000 -0.10000000E+001  0.10000000E+001  0.00000000E+000  0.00000000E+000  0.21066468E+001  0.00000000E+000 -0.10000000E+001  0.00000000E+000  0.10000000E+001  0.00000000E+000 -0.10000000E+001  0.00000000E+000  0.00000000E+000  0.00000000E+000  0.00000000E+000  0.00000000E+000  0.10000000E+001  0.00000000E+000    0    0    0    2  0.00000000E+000  0.00000000E+000  0.34688409E+000  0.00000000E+000  0.00000000E+000  0.00000000E+000
   0.60000000E-003  0.31254000E+001 -0.79200000E-001  0.00000000E+000 -0.10000000E+001  0.10000000E+001  0.00000000E+000  0.00000000E+000  0.21067816E+001  0.00000000E+000 -0.10000000E+001  0.00000000E+000  0.10000000E+001  0.00000000E+000 -0.10000000E+001  0.00000000E+000  0.00000000E+000  0.00000000E+000  0.00000000E+000  0.00000000E+000  0.10000000E+001  0.00000000E+000    0    0    0    2  0.00000000E+000  0.00000000E+000  0.34690629E+000  0.00000000E+000  0.00000000E+000  0.00000000E+000

tests/07-DTT/outputs/summary.7.txt

@@ -19,5 +19,5 @@
  # COD nrayr nrayth nstep rwmax dst: 1 16 12000 1.000 0.2000E-1                                                                      
  # COD iwarm ilarm imx ieccd:    2    5  -20   11                                                                                    
  # COD ipec nrho istpr istpl:    1  901    5    5                                                                                    
- #Icd Pa Jphip dPdVp rhotj rhotjava rhotp rhotpav drhotjava drhotpav ratjamx ratjbmx stmx psipol chipol index_rt Jphimx dPdVmx drhotj drhotp P0 cplO cplX
+ # I_cd P_abs J_φ_peak dPdV_peak ρ_max_J ρ_avg_J ρ_max_P ρ_avg_P Δρ_avg_J Δρ_avg_P ratio_Ja_max ratio_Jb_max s_max ψ χ index_rt J_φ_max dPdV_max Δρ_J Δρ_P P0 cpl1 cpl2
   0.24586E-02  0.99999E+00  0.31915E+01  0.83331E+02  0.13878E+00  0.13895E+00  0.13878E+00  0.13897E+00  0.12551E-02  0.13790E-02  0.10331E+01  0.10051E+01  0.23014E+03  0.80717E+02 -0.47051E+01    2  0.38370E+01  0.10820E+03  0.10673E-02  0.10723E-02  0.10000E+01  0.00000E+00  0.00000E+00

tests/08-STEP/outputs/beam-shape-final.9.txt

@@ -19,4 +19,4 @@
  # COD nrayr nrayth nstep rwmax dst: 1 16 12000 1.000 0.2000                                                                         
  # COD iwarm ilarm imx ieccd:    2    5  -20   11                                                                                    
  # COD ipec nrho istpr istpl:    1  501    5    5                                                                                    
- #sst j k xt yt zt rt
+ #s j k x y z r

tests/08-STEP/outputs/beam-shape.8.txt

@@ -19,4 +19,4 @@
  # COD nrayr nrayth nstep rwmax dst: 1 16 12000 1.000 0.2000                                                                         
  # COD iwarm ilarm imx ieccd:    2    5  -20   11                                                                                    
  # COD ipec nrho istpr istpl:    1  501    5    5                                                                                    
- #sst j k xt yt zt rt
+ #s j k x y z r

tests/08-STEP/outputs/central-ray.4.txt

@@ -19,7 +19,7 @@
  # COD nrayr nrayth nstep rwmax dst: 1 16 12000 1.000 0.2000                                                                         
  # COD iwarm ilarm imx ieccd:    2    5  -20   11                                                                                    
  # COD ipec nrho istpr istpl:    1  501    5    5                                                                                    
- #sst R z phi psin rhot ne Te Btot Bx By Bz Nperp Npl Nx Ny Nz ki alpha tau Pt dIds nhmin nhmax iohkw index_rt ddr Xg Yg dXgdx dXgdy dXgdz
+ # s R z φ ψ_n ρ_t n_e T_e B b_x b_y b_z N_⊥ N_∥ N_x N_y N_z k_im α τ P_t dI/ds n_harm_min n_harm_max i_okhawa index_rt Λ_r X Y ∇X_x ∇X_y ∇X_z
   0.20000000E-002  0.54990066E+001 -0.74035812E+001 -0.10419296E-001 -0.10000000E+001  0.10000000E+001  0.00000000E+000  0.00000000E+000  0.20949250E+001  0.18185103E-003  0.99999998E+000  0.00000000E+000  0.86597325E+000 -0.50009032E+000 -0.49673176E+000 -0.50000000E+000  0.70940648E+000  0.00000000E+000  0.00000000E+000  0.00000000E+000  0.10000000E+001  0.00000000E+000    0    0    0    1  0.00000000E+000  0.00000000E+000  0.58642170E+000  0.00000000E+000  0.00000000E+000  0.00000000E+000
   0.40000000E-002  0.54980134E+001 -0.74021624E+001 -0.20842357E-001 -0.10000000E+001  0.10000000E+001  0.00000000E+000  0.00000000E+000  0.20953034E+001  0.36376775E-003  0.99999993E+000  0.00000000E+000  0.86592107E+000 -0.50018066E+000 -0.49673176E+000 -0.50000000E+000  0.70940648E+000  0.00000000E+000  0.00000000E+000  0.00000000E+000  0.10000000E+001  0.00000000E+000    0    0    0    1  0.00000000E+000  0.00000000E+000  0.58652764E+000  0.00000000E+000  0.00000000E+000  0.00000000E+000
   0.60000000E-002  0.54970204E+001 -0.74007436E+001 -0.31269185E-001 -0.10000000E+001  0.10000000E+001  0.00000000E+000  0.00000000E+000  0.20956819E+001  0.54575020E-003  0.99999985E+000  0.00000000E+000  0.86586888E+000 -0.50027102E+000 -0.49673176E+000 -0.50000000E+000  0.70940648E+000  0.00000000E+000  0.00000000E+000  0.00000000E+000  0.10000000E+001  0.00000000E+000    0    0    0    1  0.00000000E+000  0.00000000E+000  0.58663359E+000  0.00000000E+000  0.00000000E+000  0.00000000E+000

tests/08-STEP/outputs/summary.7.txt

@@ -19,5 +19,5 @@
  # COD nrayr nrayth nstep rwmax dst: 1 16 12000 1.000 0.2000                                                                         
  # COD iwarm ilarm imx ieccd:    2    5  -20   11                                                                                    
  # COD ipec nrho istpr istpl:    1  501    5    5                                                                                    
- #Icd Pa Jphip dPdVp rhotj rhotjava rhotp rhotpav drhotjava drhotpav ratjamx ratjbmx stmx psipol chipol index_rt Jphimx dPdVmx drhotj drhotp P0 cplO cplX
+ # I_cd P_abs J_φ_peak dPdV_peak ρ_max_J ρ_avg_J ρ_max_P ρ_avg_P Δρ_avg_J Δρ_avg_P ratio_Ja_max ratio_Jb_max s_max ψ χ index_rt J_φ_max dPdV_max Δρ_J Δρ_P P0 cpl1 cpl2
   0.25082E-02  0.32011E-01  0.42770E-03  0.25419E-03  0.63835E+00  0.65846E+00  0.65946E+00  0.67341E+00  0.14621E+00  0.14963E+00  0.10910E+01  0.10036E+01  0.24000E+04 -0.61489E+02 -0.37220E+02    1  0.43877E-03  0.25030E-03  0.14207E+00  0.15288E+00  0.10000E+01  0.00000E+00  0.00000E+00

tests/09-DTT-rampup/outputs/beam-shape-final.9.txt

@@ -19,4 +19,4 @@
  # COD nrayr nrayth nstep rwmax dst: 1 16 4000 1.000 0.1000                                                                          
  # COD iwarm ilarm imx ieccd:    2    4   20   11                                                                                    
  # COD ipec nrho istpr istpl:    1  251    5    5                                                                                    
- #sst j k xt yt zt rt
+ #s j k x y z r

tests/09-DTT-rampup/outputs/beam-shape.8.txt

@@ -19,4 +19,4 @@
  # COD nrayr nrayth nstep rwmax dst: 1 16 4000 1.000 0.1000                                                                          
  # COD iwarm ilarm imx ieccd:    2    4   20   11                                                                                    
  # COD ipec nrho istpr istpl:    1  251    5    5                                                                                    
- #sst j k xt yt zt rt
+ #s j k x y z r

tests/09-DTT-rampup/outputs/central-ray.4.txt

@@ -19,7 +19,7 @@
  # COD nrayr nrayth nstep rwmax dst: 1 16 4000 1.000 0.1000                                                                          
  # COD iwarm ilarm imx ieccd:    2    4   20   11                                                                                    
  # COD ipec nrho istpr istpl:    1  251    5    5                                                                                    
- #sst R z phi psin rhot ne Te Btot Bx By Bz Nperp Npl Nx Ny Nz ki alpha tau Pt dIds nhmin nhmax iohkw index_rt ddr Xg Yg dXgdx dXgdy dXgdz
+ # s R z φ ψ_n ρ_t n_e T_e B b_x b_y b_z N_⊥ N_∥ N_x N_y N_z k_im α τ P_t dI/ds n_harm_min n_harm_max i_okhawa index_rt Λ_r X Y ∇X_x ∇X_y ∇X_z
   0.10000000E-002  0.31250000E+001  0.17920000E+000  0.00000000E+000  0.15166465E+001  0.10000000E+001  0.00000000E+000  0.00000000E+000  0.42505029E+001 -0.14328597E-001 -0.96666192E+000 -0.25565489E+000  0.99989734E+000  0.14328597E-001 -0.10000000E+001  0.00000000E+000  0.00000000E+000  0.00000000E+000  0.00000000E+000  0.00000000E+000  0.10000000E+001  0.00000000E+000    0    0    0    1  0.00000000E+000  0.00000000E+000  0.69989512E+000  0.00000000E+000  0.00000000E+000 -0.00000000E+000
   0.20000000E-002  0.31240000E+001  0.17920000E+000  0.00000000E+000  0.15145571E+001  0.10000000E+001  0.00000000E+000  0.00000000E+000  0.42519545E+001 -0.14302807E-001 -0.96664124E+000 -0.25573450E+000  0.99989771E+000  0.14302807E-001 -0.10000000E+001  0.00000000E+000  0.00000000E+000  0.00000000E+000  0.00000000E+000  0.00000000E+000  0.10000000E+001  0.00000000E+000    0    0    0    1  0.00000000E+000  0.00000000E+000  0.70013413E+000  0.00000000E+000  0.00000000E+000 -0.00000000E+000
   0.30000000E-002  0.31230000E+001  0.17920000E+000  0.00000000E+000  0.15124669E+001  0.10000000E+001  0.00000000E+000  0.00000000E+000  0.42534072E+001 -0.14277045E-001 -0.96662051E+000 -0.25581429E+000  0.99989808E+000  0.14277045E-001 -0.10000000E+001  0.00000000E+000  0.00000000E+000  0.00000000E+000  0.00000000E+000  0.00000000E+000  0.10000000E+001  0.00000000E+000    0    0    0    1  0.00000000E+000  0.00000000E+000  0.70037334E+000  0.00000000E+000  0.00000000E+000 -0.00000000E+000

tests/09-DTT-rampup/outputs/summary.7.txt

@@ -19,5 +19,5 @@
  # COD nrayr nrayth nstep rwmax dst: 1 16 4000 1.000 0.1000                                                                          
  # COD iwarm ilarm imx ieccd:    2    4   20   11                                                                                    
  # COD ipec nrho istpr istpl:    1  251    5    5                                                                                    
- #Icd Pa Jphip dPdVp rhotj rhotjava rhotp rhotpav drhotjava drhotpav ratjamx ratjbmx stmx psipol chipol index_rt Jphimx dPdVmx drhotj drhotp P0 cplO cplX
+ # I_cd P_abs J_φ_peak dPdV_peak ρ_max_J ρ_avg_J ρ_max_P ρ_avg_P Δρ_avg_J Δρ_avg_P ratio_Ja_max ratio_Jb_max s_max ψ χ index_rt J_φ_max dPdV_max Δρ_J Δρ_P P0 cpl1 cpl2
   0.29313E-03  0.10000E+01  0.41320E+00  0.77837E+02  0.12466E-01  0.15018E-01  0.12466E-01  0.15987E-01  0.99598E-02  0.12116E-01  0.10428E+01  0.10000E+01  0.21600E+03 -0.13140E+02  0.25935E-01    1  0.71141E+00  0.14179E+03  0.59652E-02  0.68814E-02  0.10000E+01  0.00000E+00  0.00000E+00

tests/11-vacuum/__init__.py

@@ -6,7 +6,7 @@ general astigmatic beam
 '''
 
 from .. import TestCase, GrayTest
-from .. import options, load_unit
+from .. import options, load_table
 
 import numpy as np
 
@@ -41,10 +41,10 @@ def eikonal_true(k0: float, W: np.array, K: np.array,
     Computes the complex eikonal from the initial
     beam parameters and the final ray position.
     '''
-    r = np.array([ray['xt'], ray['yt']]) * cm
+    r = np.array([ray['x'], ray['y']]) * cm
     # Note: z = s₀ + z̅ where s₀ is the arclength of the
     # central ray and z̅ the local beam coordinate.
-    z = (s + ray['zt']) * cm
+    z = (s + ray['z']) * cm
 
     # compute the complex curvature tensor
     K = rotate(φ_k) @ K @ rotate(φ_k).T
@@ -89,7 +89,7 @@ def eikonal_gray(k0: float, W: np.array, K: np.array,
     δr = r_max / (n_r - 1)
     r = (ray['j'] - 1) * δr
 
-    S_R = k0*ray['sst'] * cm
+    S_R = k0*ray['s'] * cm
     S_I = -r**2
 
     return S_R + 1j * S_I
@@ -121,10 +121,10 @@ class Test(GrayTest, TestCase):
         K = np.diag([k_ξ, k_η])
 
         # Load the final rays data
-        data = load_unit(self.candidate / 'fort.9')
+        data = load_table(self.candidate / 'beam-shape-final.9.txt')
 
         # Complex eikonal: analytical and gray values
-        s0 = data['sst'][0]
+        s0 = data['s'][0]
         S_true = eikonal_true(k0, W, K, φ_w, φ_k, s0, data)
         S_gray = eikonal_gray(k0, W, K, φ_w, φ_k, data)
 
@@ -134,25 +134,25 @@ class Test(GrayTest, TestCase):
             plt.suptitle(self.__module__ + '.test_eikonal')
             plt.subplot(121, aspect='equal')
             plt.title('$|S_R - S_{R,gray}|$', loc='left')
-            plt.tricontour(data['xt'], data['yt'],
+            plt.tricontour(data['x'], data['y'],
                            abs(S_true.real - S_gray.real),
                            levels=8, linewidths=0.5, colors='k')
-            plt.tricontourf(data['xt'], data['yt'],
+            plt.tricontourf(data['x'], data['y'],
                             abs(S_true.real - S_gray.real),
                             levels=8, cmap='summer')
             plt.colorbar()
-            plt.scatter(data['xt'], data['yt'], c='k', s=5)
+            plt.scatter(data['x'], data['y'], c='k', s=5)
 
             plt.subplot(122, aspect='equal')
             plt.title('$|S_I - S_{I,gray}|$', loc='left')
-            plt.tricontour(data['xt'], data['yt'],
+            plt.tricontour(data['x'], data['y'],
                            abs(S_true.imag - S_gray.imag),
                            levels=8, linewidths=0.5, colors='k')
-            plt.tricontourf(data['xt'], data['yt'],
+            plt.tricontourf(data['x'], data['y'],
                             abs(S_true.imag - S_gray.imag),
                             levels=8, cmap='summer')
             plt.colorbar()
-            plt.scatter(data['xt'], data['yt'], c='k', s=5)
+            plt.scatter(data['x'], data['y'], c='k', s=5)
             plt.show()
 
         # Compare the eikonal of each ray

tests/11-vacuum/outputs/beam-shape-final.9.txt

@@ -19,7 +19,7 @@
  # COD nrayr nrayth nstep rwmax dst: 6 56 400 1.000 0.1000                                                                           
  # COD iwarm ilarm imx ieccd:    0    5  -20    0                                                                                    
  # COD ipec nrho istpr istpl:    1  251    5    5                                                                                    
- #sst j k xt yt zt rt
+ # s j k x y z r
   0.40000000E+002    1    1  0.00000000E+000  0.00000000E+000  0.00000000E+000  0.00000000E+000
   0.39997978E+002    2    1  0.25780098E+000  0.92828988E-001 -0.15769221E-002  0.27400469E+000
   0.39998017E+002    2    2  0.24248507E+000  0.14354867E+000 -0.15923373E-002  0.28178934E+000

tests/11-vacuum/outputs/beam-shape.8.txt

@@ -19,7 +19,7 @@
  # COD nrayr nrayth nstep rwmax dst: 6 56 400 1.000 0.1000                                                                           
  # COD iwarm ilarm imx ieccd:    0    5  -20    0                                                                                    
  # COD ipec nrho istpr istpl:    1  251    5    5                                                                                    
- #sst j k xt yt zt rt
+ #s j k x y z r
  -0.50554786E-001    6    1  0.25174949E+001  0.68870866E+000 -0.19721523E-030  0.26100000E+001
  -0.49581559E-001    6    2  0.24718255E+001  0.79345433E+000 -0.49303807E-031  0.25960530E+001
  -0.47451736E-001    6    3  0.23950716E+001  0.88822186E+000  0.17256332E-030  0.25544678E+001

tests/11-vacuum/outputs/central-ray.4.txt

@@ -19,7 +19,7 @@
  # COD nrayr nrayth nstep rwmax dst: 6 56 400 1.000 0.1000                                                                           
  # COD iwarm ilarm imx ieccd:    0    5  -20    0                                                                                    
  # COD ipec nrho istpr istpl:    1  251    5    5                                                                                    
- #sst R z phi psin rhot ne Te Btot Bx By Bz Nperp Npl Nx Ny Nz ki alpha tau Pt dIds nhmin nhmax iohkw index_rt ddr Xg Yg dXgdx dXgdy dXgdz
+ # s R z φ ψ_n ρ_t n_e T_e B b_x b_y b_z N_⊥ N_∥ N_x N_y N_z k_im α τ P_t dI/ds n_harm_min n_harm_max i_okhawa index_rt Λ_r X Y ∇X_x ∇X_y ∇X_z
   0.10000000E-002  0.50000100E+000  0.00000000E+000  0.11459141E+000 -0.10000000E+001  0.10000000E+001  0.00000000E+000  0.00000000E+000  0.00000000E+000  0.00000000E+000  0.00000000E+000  0.00000000E+000  0.10000000E+001  0.00000000E+000 -0.61232340E-016  0.10000000E+001  0.00000000E+000  0.00000000E+000  0.00000000E+000  0.00000000E+000  0.21733944E-001  0.00000000E+000    0    0    0    1  0.00000000E+000  0.00000000E+000  0.99000000E+002  0.00000000E+000  0.00000000E+000  0.00000000E+000
   0.20000000E-002  0.50000400E+000  0.00000000E+000  0.22918190E+000 -0.10000000E+001  0.10000000E+001  0.00000000E+000  0.00000000E+000  0.00000000E+000  0.00000000E+000  0.00000000E+000  0.00000000E+000  0.10000000E+001  0.00000000E+000 -0.61232340E-016  0.10000000E+001  0.00000000E+000  0.00000000E+000  0.00000000E+000  0.00000000E+000  0.21733944E-001  0.00000000E+000    0    0    0    1  0.00000000E+000  0.00000000E+000  0.99000000E+002  0.00000000E+000  0.00000000E+000  0.00000000E+000
   0.30000000E-002  0.50000900E+000  0.00000000E+000  0.34377055E+000 -0.10000000E+001  0.10000000E+001  0.00000000E+000  0.00000000E+000  0.00000000E+000  0.00000000E+000  0.00000000E+000  0.00000000E+000  0.10000000E+001  0.00000000E+000 -0.61232340E-016  0.10000000E+001  0.00000000E+000  0.00000000E+000  0.00000000E+000  0.00000000E+000  0.21733944E-001  0.00000000E+000    0    0    0    1  0.00000000E+000  0.00000000E+000  0.99000000E+002  0.00000000E+000  0.00000000E+000  0.00000000E+000

tests/11-vacuum/outputs/fort.7

@@ -1,23 +0,0 @@
- # Run date/time: 2023/12/18 01:06:43.682                                                                                            
- # GRAY Git revision: 315b192-dirty                                                                                                  
- # EQL input: N/A (vacuum)                                                                                                           
- # EQL iequil sgnb sgni factb: 0 -1 -1 1.06                                                                                          
- # EQL icocos ipsinorm idesc ifreefmt: N/A (analytical)                                                                              
- # EQL ssplps ssplf ixp: N/A (analytical)                                                                                            
- # EQL B0 R0 aminor Rax zax: N/A (vacuum)                                                                                            
- # PRF input: N/A (vacuum)                                                                                                           
- # PRF iprof iscal factne factte: N/A (vacuum)                                                                                       
- # PRF irho psnbnd sspld: N/A (vacuum)                                                                                               
- # PRF Te0 ne0 Zeff0: N/A (vacuum)                                                                                                   
- # ANT input: beam.txt                                                                                                               
- # ANT ibeam iox psi chi: 1 1 0.000 0.000                                                                                            
- # ANT alpha beta power fghz: 0.00 90.0 1.00 170.                                                                                    
- # ANT x0 y0 z0: 50.0 0.00 0.00                                                                                                      
- # ANT wx wy Rcix Rciy psiw psir:       2.6100          1.0100        -0.15000E-1     -0.47000E-2       15.300          8.2000       
- # RFL rwall:  0.10000E+03                                                                                                           
- # COD igrad idst ipass ipol:    1    2    1    0                                                                                    
- # COD nrayr nrayth nstep rwmax dst: 6 56 400 1.000 0.1000                                                                           
- # COD iwarm ilarm imx ieccd:    0    5  -20    0                                                                                    
- # COD ipec nrho istpr istpl:    1  251    5    5                                                                                    
- #Icd Pa Jphip dPdVp rhotj rhotjava rhotp rhotpav drhotjava drhotpav ratjamx ratjbmx stmx psipol chipol index_rt Jphimx dPdVmx drhotj drhotp P0 cplO cplX
-  0.00000E+00  0.00000E+00  0.00000E+00  0.00000E+00  0.00000E+00  0.00000E+00  0.00000E+00  0.00000E+00  0.42147E-07  0.42147E-07  0.00000E+00  0.00000E+00  0.40000E+02  0.00000E+00  0.00000E+00    1  0.00000E+00  0.00000E+00  0.00000E+00  0.00000E+00  0.10000E+01  0.00000E+00  0.00000E+00

tests/__init__.py

@@ -80,18 +80,17 @@ class GrayTest:
         '''
         from collections import defaultdict
 
-        ref = load_unit(self.reference / 'fort.7')
+        try:
-        cand = load_unit(self.candidate / 'fort.7')
+            ref = load_table(self.reference / 'summary.7.txt')
-
+            cand = load_table(self.candidate / 'summary.7.txt')
-        if ref.size == 0 or cand.size == 0:
+        except FileNotFoundError:
             raise unittest.SkipTest("ECCD results not available")
 
         # precision as number of decimal places
         prec = defaultdict(lambda: 3, [
-            ('dPdVp', -2), ('dPdVmx', -2),
+            ('dPdV_peak', -2), ('dPdV_max', -2),
-            ('Jphip', -2), ('Jphimx', -2),
+            ('J_φ_peak', -2), ('J_φ_max', -2),
-            ('stmx', -1),
+            ('s_max', -1), ('χ', -1), ('ψ', -1),
-            ('chipol', -1), ('psipol', -1),
         ])
 
         for val in ref.dtype.names:
@@ -105,34 +104,35 @@ class GrayTest:
         '''
         Comparing the final position of the central ray
         '''
-        ref = load_unit(self.reference / 'fort.4')
+        ref = load_table(self.reference / 'central-ray.4.txt')
-        cand = load_unit(self.candidate / 'fort.4')
+        cand = load_table(self.candidate / 'central-ray.4.txt')
 
         # coordinates
         self.assertAlmostEqual(ref['R'][-1], cand['R'][-1], 1)
         self.assertAlmostEqual(ref['z'][-1], cand['z'][-1], 1)
-        self.assertAlmostEqual(ref['phi'][-1], cand['phi'][-1], 2)
+        self.assertAlmostEqual(ref['φ'][-1], cand['φ'][-1], 2)
 
         # optical path length
-        self.assertAlmostEqual(ref['sst'][-1], cand['sst'][-1], 1)
+        self.assertAlmostEqual(ref['s'][-1], cand['s'][-1], 1)
 
     def test_final_direction(self):
         '''
         Comparing the final direction of the central ray
         '''
-        ref = load_unit(self.reference / 'fort.4')
+        ref = load_table(self.reference / 'central-ray.4.txt')
-        cand = load_unit(self.candidate / 'fort.4')
+        cand = load_table(self.candidate / 'central-ray.4.txt')
 
-        self.assertAlmostEqual(ref['Npl'][-1], cand['Npl'][-1], 1)
+        self.assertAlmostEqual(ref['N_⊥'][-1], cand['N_⊥'][-1], 1)
-        self.assertAlmostEqual(ref['Nperp'][-1], cand['Nperp'][-1], 1)
+        self.assertAlmostEqual(ref['N_∥'][-1], cand['N_∥'][-1], 1)
 
     def test_beam_shape(self):
         '''
         Comparing the final beam shape
         '''
-        ref = load_unit(self.reference / 'fort.9')
+        try:
-        cand = load_unit(self.candidate / 'fort.9')
+            ref = load_table(self.reference / 'beam-shape-final.9.txt')
-        if ref.size == 0 or cand.size == 0:
+            cand = load_table(self.candidate / 'beam-shape-final.9.txt')
+        except FileNotFoundError:
             raise unittest.SkipTest("Beam shape info not available")
 
         if options.visual:
@@ -142,27 +142,27 @@ class GrayTest:
             plt.title(self.__module__ + '.test_beam_shape')
             plt.xlabel('$x$ / cm')
             plt.ylabel('$y$ / cm')
-            plt.scatter(ref['xt'], ref['yt'], c='red',
+            plt.scatter(ref['x'], ref['y'], c='red',
                         marker='_', label='reference')
-            plt.scatter(cand['xt'], cand['yt'], c='green',
+            plt.scatter(cand['x'], cand['y'], c='green',
                         alpha=0.6, marker='+', label='candidate')
             plt.legend()
             plt.show()
 
         for ref, cand in zip(ref, cand):
             with self.subTest(ray=(int(ref['j']), int(ref['k']))):
-                self.assertAlmostEqual(ref['xt'], cand['xt'], 1)
+                self.assertAlmostEqual(ref['x'], cand['x'], 1)
-                self.assertAlmostEqual(ref['yt'], cand['yt'], 1)
+                self.assertAlmostEqual(ref['y'], cand['y'], 1)
 
     def test_error_biased(self):
         '''
         Test for a proportionality between Λ and any of X, Y, N∥
         '''
 
-        data = load_unit(self.candidate / 'fort.4')
+        data = load_table(self.candidate / 'central-ray.4.txt')
 
         # restrict to within the plasma, half of the first pass
-        in_plasma = data['Xg'] > 0
+        in_plasma = data['X'] > 0
         first_pass = data['index_rt'] == data['index_rt'].min()
         data = data[in_plasma & first_pass]
         data = data[:int(data.size // 2)]
@@ -178,41 +178,41 @@ class GrayTest:
             left.set_xlabel('$s$ / cm')
             left.set_ylabel('$Λ$', color='xkcd:ocean blue')
             left.tick_params(axis='y', labelcolor='xkcd:ocean blue')
-            left.plot(data['sst'], data['ddr'], color='xkcd:ocean blue')
+            left.plot(data['s'], data['Λ_r'], color='xkcd:ocean blue')
 
             right1 = left.twinx()
             right1.set_ylabel('$X$', color='xkcd:orange')
             right1.tick_params(axis='y', labelcolor='xkcd:orange')
-            right1.plot(data['sst'], data['Xg'], color='xkcd:orange')
+            right1.plot(data['s'], data['X'], color='xkcd:orange')
 
             right2 = left.twinx()
             right2.set_ylabel('$Y$', color='xkcd:vermillion')
             right2.tick_params(axis='y', labelcolor='xkcd:vermillion')
-            right2.plot(data['sst'], data['Yg'], color='xkcd:vermillion')
+            right2.plot(data['s'], data['Y'], color='xkcd:vermillion')
             right2.spines["right"].set_position(("axes", 1.1))
 
             right3 = left.twinx()
             right3.set_ylabel('$N_∥$', color='xkcd:green')
             right3.tick_params(axis='y', labelcolor='xkcd:green')
             right3.spines["right"].set_position(("axes", 1.2))
-            right3.plot(data['sst'], data['Npl'], color='xkcd:green')
+            right3.plot(data['s'], data['N_∥'], color='xkcd:green')
 
             plt.subplots_adjust(right=0.78)
             plt.show()
 
-        err = data['ddr'].var() / 10
+        err = data['Λ_r'].var() / 10
         self.assertGreater(err, 0, msg="Λ is exactly constant")
 
         def χ2(k, var):
             '''
             Reduced χ² for the curve fit: Λ(s) = k⋅var(s)
             '''
-            res = (data['ddr'] - k*data[var]) / err
+            res = (data['Λ_r'] - k*data[var]) / err
             return np.sum(res**2) / (data.size - 1)
 
         import scipy.optimize
 
-        for var in ['Xg', 'Yg', 'Npl']:
+        for var in ['X', 'Y', 'N_⊥']:
             k_best = scipy.optimize.minimize(χ2, x0=1, args=var).x[0]
             with self.subTest(var=var):
                 self.assertGreater(χ2(k_best, var), 1)
@@ -233,8 +233,8 @@ def get_basedir(module: str) -> Path:
 def run_gray(inputs: Path, outputs: Path,
              # extra gray parameters
              params: dict[str, Any] = {},
-             # which units to generate
+             # which tables to generate
-             units: list[int] = [4, 7, 8, 9, 48, 33, 70, 71],
+             tables: list[int] = [4, 7, 8, 9, 48, 33, 70, 71],
              # which gray binary to use
              binary: str = 'gray'
              ) -> subprocess.CompletedProcess:
@@ -248,7 +248,7 @@ def run_gray(inputs: Path, outputs: Path,
     args = [
         binary,
         '-c', str(inputs / 'gray.ini'),
-        '-u', ','.join(map(str, units)),
+        '-t', ','.join(map(str, tables)),
         '-o', str(outputs),
         '-v'
     ] + list(itertools.chain(*params))
@@ -261,9 +261,9 @@ def run_gray(inputs: Path, outputs: Path,
     return proc
 
 
-def load_unit(fname: Path) -> np.array:
+def load_table(fname: Path) -> np.array:
     '''
-    Loads a GRAY output unit file as a structured numpy array
+    Loads a GRAY output file as a structured numpy array
     (columns are named as in the file header)
     '''
     # ignore warnings about empty files