From 82948593fe757299dd0498a603503a6f9a7fa20e Mon Sep 17 00:00:00 2001 From: Michele Guerini Rocco Date: Tue, 18 Feb 2025 17:42:24 +0100 Subject: [PATCH] src/gray_core.f90: fix output polarisation for nray>1 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Store the polarisation ellipse angles χ, ψ only for the central ray. Otherwise they'll be zeroed out since `plasma_in` does not compute the polarisation of the other rays. --- src/gray_core.f90 | 2 +- tests/01-ITER/outputs/summary.7.txt | 6 +++--- tests/02-ITER-half-field/outputs/summary.7.txt | 6 +++--- tests/03-TCV/outputs/summary.7.txt | 6 +++--- tests/04-JT60SA/outputs/summary.7.txt | 4 ++-- tests/05-JT60SA-startup/outputs/summary.7.txt | 4 ++-- tests/06-ITER-startup/outputs/mixed/summary.7.txt | 8 ++++---- tests/06-ITER-startup/outputs/x-mode/summary.7.txt | 6 +++--- tests/07-DTT/outputs/summary.7.txt | 4 ++-- tests/08-STEP/outputs/summary.7.txt | 4 ++-- tests/09-DTT-rampup/outputs/summary.7.txt | 4 ++-- 11 files changed, 27 insertions(+), 27 deletions(-) diff --git a/src/gray_core.f90 b/src/gray_core.f90 index 5a2add2..140992c 100644 --- a/src/gray_core.f90 +++ b/src/gray_core.f90 @@ -335,7 +335,7 @@ contains perfect=.not. params%raytracing%ipol & .and. params%antenna%iox == iox & .and. iop(jk) == 0 .and. ip == 1) - if (iop(jk) == 1) then + if (iop(jk) == 1 .and. jk == 1) then ! Store the polarisation of the mode during this pass mode_ellipse = [psipol, chipol] end if diff --git a/tests/01-ITER/outputs/summary.7.txt b/tests/01-ITER/outputs/summary.7.txt index a781a4b..4f07144 100644 --- a/tests/01-ITER/outputs/summary.7.txt +++ b/tests/01-ITER/outputs/summary.7.txt @@ -1,5 +1,5 @@ -# Run date/time: 2024/11/02 10:33:29.006 -# GRAY Git revision: fcf2864-dirty +# Run date/time: 2025/02/21 08:24:48.574 +# GRAY Git revision: e86d293-dirty # EQL input: ITER_s134173_r106_t0599.9.eqdsk # EQL B0 R0 aminor Rax zax: 0 0 0 0 0 # EQL iequil sgnb sgni factb: 2 -1 -1 1.00 @@ -20,4 +20,4 @@ # COD iwarm ilarm imx ieccd: 2 5 -20 3 # COD ipec nrho istpr istpl: 1 501 5 5 # 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 --9.50222804E-003 9.99994829E-001 2.17820967E-002 6.02436034E-002 7.66711861E-001 7.66832700E-001 7.66711861E-001 7.66269459E-001 1.55074166E-002 1.56592664E-002 1.07509484E+000 1.01806397E+000 3.60000000E+002 0.00000000E+000 0.00000000E+000 1 2.11205380E-002 5.84233347E-002 1.62312234E-002 1.64058608E-002 1.00000000E+000 0.00000000E+000 0.00000000E+000 +-9.50222804E-003 9.99994829E-001 2.17820967E-002 6.02436034E-002 7.66711861E-001 7.66832700E-001 7.66711861E-001 7.66269459E-001 1.55074166E-002 1.56592664E-002 1.07509484E+000 1.01806397E+000 3.60000000E+002 -9.38446284E+000 -2.10480891E+001 1 2.11205380E-002 5.84233347E-002 1.62312234E-002 1.64058608E-002 1.00000000E+000 0.00000000E+000 0.00000000E+000 diff --git a/tests/02-ITER-half-field/outputs/summary.7.txt b/tests/02-ITER-half-field/outputs/summary.7.txt index a464aa9..c1b6f75 100644 --- a/tests/02-ITER-half-field/outputs/summary.7.txt +++ b/tests/02-ITER-half-field/outputs/summary.7.txt @@ -1,5 +1,5 @@ -# Run date/time: 2024/11/02 10:33:58.104 -# GRAY Git revision: fcf2864-dirty +# Run date/time: 2025/02/21 08:25:18.911 +# GRAY Git revision: e86d293-dirty # EQL input: F4E_Equil_10820_case006_25VFZX.eqdsk # EQL B0 R0 aminor Rax zax: 0 0 0 0 0 # EQL iequil sgnb sgni factb: 2 -1 -1 1.06 @@ -20,4 +20,4 @@ # COD iwarm ilarm imx ieccd: 2 5 -20 3 # COD ipec nrho istpr istpl: 1 251 5 5 # 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 - 4.78146303E-003 9.99994553E-001 4.16999641E-004 2.08308915E-003 8.85104612E-002 4.98191126E-001 4.89184384E-001 5.86701046E-001 5.92245874E-001 5.48672255E-001 1.05575829E+000 1.02688391E+000 5.60000000E+002 0.00000000E+000 0.00000000E+000 2 1.63328740E-003 2.09888680E-003 6.40696407E-002 8.43776799E-001 1.00000000E+000 0.00000000E+000 0.00000000E+000 + 4.78146303E-003 9.99994553E-001 4.16999641E-004 2.08308915E-003 8.85104612E-002 4.98191126E-001 4.89184384E-001 5.86701046E-001 5.92245874E-001 5.48672255E-001 1.05575829E+000 1.02688391E+000 5.60000000E+002 -6.35965940E+001 -3.13365692E+001 2 1.63328740E-003 2.09888680E-003 6.40696407E-002 8.43776799E-001 1.00000000E+000 0.00000000E+000 0.00000000E+000 diff --git a/tests/03-TCV/outputs/summary.7.txt b/tests/03-TCV/outputs/summary.7.txt index c0228d2..7f71639 100644 --- a/tests/03-TCV/outputs/summary.7.txt +++ b/tests/03-TCV/outputs/summary.7.txt @@ -1,5 +1,5 @@ -# Run date/time: 2024/11/02 10:34:03.505 -# GRAY Git revision: fcf2864-dirty +# Run date/time: 2025/02/21 08:25:25.156 +# GRAY Git revision: e86d293-dirty # EQL input: EQDSK_55394t0.7030_COCOS02 # EQL B0 R0 aminor Rax zax: 0 0 0 0 0 # EQL iequil sgnb sgni factb: 2 -1 -1 1.00 @@ -20,4 +20,4 @@ # COD iwarm ilarm imx ieccd: 2 5 -20 3 # COD ipec nrho istpr istpl: 1 1001 5 5 # 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.00000000E+000 0.00000000E+000 0.00000000E+000 0.00000000E+000 0.00000000E+000 0.00000000E+000 0.00000000E+000 0.00000000E+000 0.00000000E+000 0.00000000E+000 0.00000000E+000 0.00000000E+000 1.20000000E+002 0.00000000E+000 0.00000000E+000 2 0.00000000E+000 0.00000000E+000 0.00000000E+000 0.00000000E+000 1.00000000E+000 0.00000000E+000 0.00000000E+000 + 0.00000000E+000 0.00000000E+000 0.00000000E+000 0.00000000E+000 0.00000000E+000 0.00000000E+000 0.00000000E+000 0.00000000E+000 0.00000000E+000 0.00000000E+000 0.00000000E+000 0.00000000E+000 1.20000000E+002 -8.57133940E+001 -1.19957807E+000 2 0.00000000E+000 0.00000000E+000 0.00000000E+000 0.00000000E+000 1.00000000E+000 0.00000000E+000 0.00000000E+000 diff --git a/tests/04-JT60SA/outputs/summary.7.txt b/tests/04-JT60SA/outputs/summary.7.txt index 715eafd..31afed8 100644 --- a/tests/04-JT60SA/outputs/summary.7.txt +++ b/tests/04-JT60SA/outputs/summary.7.txt @@ -1,5 +1,5 @@ -# Run date/time: 2024/11/02 10:34:04.763 -# GRAY Git revision: fcf2864-dirty +# Run date/time: 2025/02/21 08:25:26.424 +# GRAY Git revision: e86d293-dirty # EQL input: JT-60SA_scenario2_lowden_eqdsk_chease_cocos13.geq_newlim.txt # EQL B0 R0 aminor Rax zax: 0 0 0 0 0 # EQL iequil sgnb sgni factb: 2 -1 -1 1.00 diff --git a/tests/05-JT60SA-startup/outputs/summary.7.txt b/tests/05-JT60SA-startup/outputs/summary.7.txt index b0da1a9..4af8be0 100644 --- a/tests/05-JT60SA-startup/outputs/summary.7.txt +++ b/tests/05-JT60SA-startup/outputs/summary.7.txt @@ -1,5 +1,5 @@ -# Run date/time: 2024/11/02 10:34:07.831 -# GRAY Git revision: fcf2864-dirty +# Run date/time: 2025/02/21 08:25:29.219 +# GRAY Git revision: e86d293-dirty # EQL input: ./equilan.txt # EQL B0 R0 aminor Rax zax: 0 0 0 0 0 # EQL iequil sgnb sgni factb: 1 1 1 1.00 diff --git a/tests/06-ITER-startup/outputs/mixed/summary.7.txt b/tests/06-ITER-startup/outputs/mixed/summary.7.txt index c070b42..8364b20 100644 --- a/tests/06-ITER-startup/outputs/mixed/summary.7.txt +++ b/tests/06-ITER-startup/outputs/mixed/summary.7.txt @@ -1,5 +1,5 @@ -# Run date/time: 2024/11/02 10:35:27.800 -# GRAY Git revision: fcf2864-dirty +# Run date/time: 2025/02/21 08:26:42.893 +# GRAY Git revision: e86d293-dirty # EQL input: ./F4E_Equil_10002_case001_24VQV5.eqdsk # EQL B0 R0 aminor Rax zax: 0 0 0 0 0 # EQL iequil sgnb sgni factb: 2 -1 -1 0.500 @@ -20,5 +20,5 @@ # COD iwarm ilarm imx ieccd: 2 4 -20 3 # COD ipec nrho istpr istpl: 1 501 5 5 # 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 --6.84761868E-007 6.70958966E-003 8.41854855E-006 5.31882140E-004 3.31457142E-001 3.48277613E-001 3.50892072E-001 3.50807962E-001 6.39977138E-002 4.07899012E-002 1.02361209E+000 1.00001579E+000 8.00000000E+002 0.00000000E+000 0.00000000E+000 1 1.07442271E-005 5.26793259E-004 3.16299561E-002 4.14324774E-002 5.71190361E-001 0.00000000E+000 0.00000000E+000 - 1.67484070E-005 1.64840181E-001 1.99720749E-004 1.28981575E-002 3.70133716E-001 3.56067546E-001 3.53038507E-001 3.53670278E-001 6.44956402E-002 4.10084319E-002 1.02377382E+000 1.00001668E+000 8.00000000E+002 0.00000000E+000 0.00000000E+000 2 2.44482189E-004 1.27979295E-002 2.96804467E-002 4.15437790E-002 4.28809639E-001 0.00000000E+000 0.00000000E+000 +-6.84761868E-007 6.70958966E-003 8.41854855E-006 5.31882140E-004 3.31457142E-001 3.48277613E-001 3.50892072E-001 3.50807962E-001 6.39977138E-002 4.07899012E-002 1.02361209E+000 1.00001579E+000 8.00000000E+002 3.36364721E+001 -3.41970443E+001 1 1.07442271E-005 5.26793259E-004 3.16299561E-002 4.14324774E-002 5.71190361E-001 0.00000000E+000 0.00000000E+000 + 1.67484070E-005 1.64840181E-001 1.99720749E-004 1.28981575E-002 3.70133716E-001 3.56067546E-001 3.53038507E-001 3.53670278E-001 6.44956402E-002 4.10084319E-002 1.02377382E+000 1.00001668E+000 8.00000000E+002 -5.63635279E+001 3.41970443E+001 2 2.44482189E-004 1.27979295E-002 2.96804467E-002 4.15437790E-002 4.28809639E-001 0.00000000E+000 0.00000000E+000 diff --git a/tests/06-ITER-startup/outputs/x-mode/summary.7.txt b/tests/06-ITER-startup/outputs/x-mode/summary.7.txt index ee95f05..8cbfc87 100644 --- a/tests/06-ITER-startup/outputs/x-mode/summary.7.txt +++ b/tests/06-ITER-startup/outputs/x-mode/summary.7.txt @@ -1,5 +1,5 @@ -# Run date/time: 2024/11/02 10:36:07.564 -# GRAY Git revision: fcf2864-dirty +# Run date/time: 2025/02/21 08:27:23.299 +# GRAY Git revision: e86d293-dirty # EQL input: ./F4E_Equil_10002_case001_24VQV5.eqdsk # EQL B0 R0 aminor Rax zax: 0 0 0 0 0 # EQL iequil sgnb sgni factb: 2 -1 -1 0.500 @@ -20,4 +20,4 @@ # COD iwarm ilarm imx ieccd: 2 4 -20 3 # COD ipec nrho istpr istpl: 1 501 5 5 # 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 - 3.90425628E-005 3.84383056E-001 4.66399221E-004 3.00793382E-002 3.70133716E-001 3.55972396E-001 3.53038507E-001 3.53578490E-001 6.45085061E-002 4.10148056E-002 1.02377231E+000 1.00001666E+000 8.00000000E+002 0.00000000E+000 0.00000000E+000 2 5.70581310E-004 2.98529841E-002 2.96939387E-002 4.15444773E-002 1.00000000E+000 0.00000000E+000 0.00000000E+000 + 3.90425628E-005 3.84383056E-001 4.66399221E-004 3.00793382E-002 3.70133716E-001 3.55972396E-001 3.53038507E-001 3.53578490E-001 6.45085061E-002 4.10148056E-002 1.02377231E+000 1.00001666E+000 8.00000000E+002 -5.63635279E+001 3.41970443E+001 2 5.70581310E-004 2.98529841E-002 2.96939387E-002 4.15444773E-002 1.00000000E+000 0.00000000E+000 0.00000000E+000 diff --git a/tests/07-DTT/outputs/summary.7.txt b/tests/07-DTT/outputs/summary.7.txt index d2b661b..c6202cd 100644 --- a/tests/07-DTT/outputs/summary.7.txt +++ b/tests/07-DTT/outputs/summary.7.txt @@ -1,5 +1,5 @@ -# Run date/time: 2024/11/02 10:36:10.858 -# GRAY Git revision: fcf2864-dirty +# Run date/time: 2025/02/21 08:27:27.891 +# GRAY Git revision: e86d293-dirty # EQL input: jetto_PPF2293.eqdsk_out # EQL B0 R0 aminor Rax zax: 0 0 0 0 0 # EQL iequil sgnb sgni factb: 3 -1 1 0.513 diff --git a/tests/08-STEP/outputs/summary.7.txt b/tests/08-STEP/outputs/summary.7.txt index 8b910f4..e973201 100644 --- a/tests/08-STEP/outputs/summary.7.txt +++ b/tests/08-STEP/outputs/summary.7.txt @@ -1,5 +1,5 @@ -# Run date/time: 2024/11/02 10:36:14.136 -# GRAY Git revision: fcf2864-dirty +# Run date/time: 2025/02/21 08:27:33.798 +# GRAY Git revision: e86d293-dirty # EQL input: jetto.eqdsk_out # EQL B0 R0 aminor Rax zax: 0 0 0 0 0 # EQL iequil sgnb sgni factb: 3 1 1 1.00 diff --git a/tests/09-DTT-rampup/outputs/summary.7.txt b/tests/09-DTT-rampup/outputs/summary.7.txt index c92bf31..d9cd79b 100644 --- a/tests/09-DTT-rampup/outputs/summary.7.txt +++ b/tests/09-DTT-rampup/outputs/summary.7.txt @@ -1,5 +1,5 @@ -# Run date/time: 2024/11/02 10:36:16.897 -# GRAY Git revision: fcf2864-dirty +# Run date/time: 2025/02/21 08:27:39.694 +# GRAY Git revision: e86d293-dirty # EQL input: Equil_DTT_v15_Ipl_5d5MA_betap_0d1_li_0d8_t_at_13d75s_piastre_rame_8cm_COCOS01_DTT2022_07140_OK.eqdsk # EQL B0 R0 aminor Rax zax: 0 0 0 0 0 # EQL iequil sgnb sgni factb: 2 -1 1 1.00