From bc17a4ed56c3ee5d4a98d2f16b6ad8fa70c06a34 Mon Sep 17 00:00:00 2001 From: mn3981 Date: Mon, 8 Dec 2025 15:02:16 +0000 Subject: [PATCH] Add MFILE support and update zeff variable in EBW/ECRH coupling graph plotting --- process/current_drive.py | 7 +++++++ process/io/plot_proc.py | 8 ++++++-- 2 files changed, 13 insertions(+), 2 deletions(-) diff --git a/process/current_drive.py b/process/current_drive.py index a2addcf001..faebea1f70 100644 --- a/process/current_drive.py +++ b/process/current_drive.py @@ -1305,6 +1305,7 @@ def __init__( electron_bernstein: ElectronBernstein, ): self.outfile = constants.NOUT + self.mfile = constants.MFILE self.plasma_profile = plasma_profile self.electron_cyclotron = electron_cyclotron self.ion_cyclotron = ion_cyclotron @@ -2078,6 +2079,12 @@ def output_current_drive(self): current_drive_variables.eta_cd_dimensionless_hcd_primary, "OP ", ) + po.ovarre( + self.mfile, + "EBW coupling efficiency", + "(xi_ebw)", + current_drive_variables.xi_ebw, + ) if current_drive_variables.i_hcd_primary == 10: po.ovarre( self.outfile, diff --git a/process/io/plot_proc.py b/process/io/plot_proc.py index cfef09d06a..dbc53e69ee 100644 --- a/process/io/plot_proc.py +++ b/process/io/plot_proc.py @@ -12484,7 +12484,9 @@ def plot_ebw_ecrh_coupling_graph(axis, mfile_data, scan): ) eta_ecrh_omode = ecrg.electron_cyclotron_freethy( te=mfile_data.data["temp_plasma_electron_vol_avg_kev"].get_scan(scan), - zeff=mfile_data.data["zeff"].get_scan(scan), + zeff=mfile_data.data["n_charge_plasma_effective_vol_avg"].get_scan( + scan + ), rmajor=mfile_data.data["rmajor"].get_scan(scan), nd_plasma_electrons_vol_avg=mfile_data.data[ "nd_plasma_electrons_vol_avg" @@ -12495,7 +12497,9 @@ def plot_ebw_ecrh_coupling_graph(axis, mfile_data, scan): ) eta_ecrh_xmode = ecrg.electron_cyclotron_freethy( te=mfile_data.data["temp_plasma_electron_vol_avg_kev"].get_scan(scan), - zeff=mfile_data.data["zeff"].get_scan(scan), + zeff=mfile_data.data["n_charge_plasma_effective_vol_avg"].get_scan( + scan + ), rmajor=mfile_data.data["rmajor"].get_scan(scan), nd_plasma_electrons_vol_avg=mfile_data.data[ "nd_plasma_electrons_vol_avg"