From 79d67c8128d780b99ee3f56488e6f0bd30136dd2 Mon Sep 17 00:00:00 2001 From: Michele Guerini Rocco Date: Wed, 7 Feb 2024 11:44:33 +0100 Subject: [PATCH] tests: replace all gray_params.data with gray.ini --- tests/01-ITER/inputs/gray.ini | 35 ++++++++++++++++ tests/01-ITER/inputs/gray_params.data | 27 ------------ tests/02-ITER-half-field/inputs/gray.ini | 38 +++++++++++++++++ .../inputs/gray_params.data | 27 ------------ tests/03-TCV/inputs/gray.ini | 36 ++++++++++++++++ tests/03-TCV/inputs/gray_params.data | 22 ---------- tests/04-JT60SA/inputs/gray.ini | 39 ++++++++++++++++++ tests/04-JT60SA/inputs/gray_params.data | 28 ------------- tests/05-JT60SA-startup/inputs/gray.ini | 40 ++++++++++++++++++ .../05-JT60SA-startup/inputs/gray_params.data | 28 ------------- tests/06-ITER-startup/inputs/gray.ini | 36 ++++++++++++++++ tests/06-ITER-startup/inputs/gray_params.data | 28 ------------- tests/07-DTT/inputs/gray.ini | 37 +++++++++++++++++ tests/07-DTT/inputs/gray_params.data | 22 ---------- tests/08-STEP/inputs/gray.ini | 34 +++++++++++++++ tests/08-STEP/inputs/gray_params.data | 28 ------------- tests/09-DTT-rampup/inputs/gray.ini | 38 +++++++++++++++++ tests/09-DTT-rampup/inputs/gray_params.data | 28 ------------- .../inputs/gray_params.data | 28 ------------- tests/11-vacuum/inputs/gray.ini | 41 +++++++++++++++++++ tests/11-vacuum/inputs/gray_params.data | 27 ------------ tests/__init__.py | 2 +- 22 files changed, 375 insertions(+), 294 deletions(-) create mode 100644 tests/01-ITER/inputs/gray.ini delete mode 100644 tests/01-ITER/inputs/gray_params.data create mode 100644 tests/02-ITER-half-field/inputs/gray.ini delete mode 100644 tests/02-ITER-half-field/inputs/gray_params.data create mode 100644 tests/03-TCV/inputs/gray.ini delete mode 100644 tests/03-TCV/inputs/gray_params.data create mode 100644 tests/04-JT60SA/inputs/gray.ini delete mode 100644 tests/04-JT60SA/inputs/gray_params.data create mode 100644 tests/05-JT60SA-startup/inputs/gray.ini delete mode 100644 tests/05-JT60SA-startup/inputs/gray_params.data create mode 100644 tests/06-ITER-startup/inputs/gray.ini delete mode 100644 tests/06-ITER-startup/inputs/gray_params.data create mode 100644 tests/07-DTT/inputs/gray.ini delete mode 100644 tests/07-DTT/inputs/gray_params.data create mode 100644 tests/08-STEP/inputs/gray.ini delete mode 100644 tests/08-STEP/inputs/gray_params.data create mode 100644 tests/09-DTT-rampup/inputs/gray.ini delete mode 100644 tests/09-DTT-rampup/inputs/gray_params.data delete mode 100644 tests/10-JETTO-interface/inputs/gray_params.data create mode 100644 tests/11-vacuum/inputs/gray.ini delete mode 100644 tests/11-vacuum/inputs/gray_params.data diff --git a/tests/01-ITER/inputs/gray.ini b/tests/01-ITER/inputs/gray.ini new file mode 100644 index 0000000..9241480 --- /dev/null +++ b/tests/01-ITER/inputs/gray.ini @@ -0,0 +1,35 @@ +[raytracing] +nrayr = 11 +nrayth = 16 +igrad = 1 +dst = 0.2 +nstep = 1800 +idst = STEP_ARCLEN + +[ecrh_cd] + +[antenna] +alpha = 42.0 +beta = 20.0 +iox = MODE_O +ibeam = BEAM_1D +filenm = "beamdata_L6_B3.txt" + +[equilibrium] +filenm = "ITER_s134173_r106_t0599.9.eqdsk" +icocos = 11 +sgnb = -1 +sgni = -1 + +[profiles] +iprof = PROF_NUMERIC +irho = RHO_PSI +filenm = "ITER_s134173_r106_t0599.9_prf.txt" +sspld = 0.01 +psnbnd = 1.015 + +[output] +ipec = RHO_POL + +[misc] +rwall = 4.0 diff --git a/tests/01-ITER/inputs/gray_params.data b/tests/01-ITER/inputs/gray_params.data deleted file mode 100644 index 94c8826..0000000 --- a/tests/01-ITER/inputs/gray_params.data +++ /dev/null @@ -1,27 +0,0 @@ -11 16 1 : nray ktx,rhomx -1 1 0 : igrad (0 rtr - 1 gauss beam) ipass [=1,2 passes in the plasma] ipol -.2 1800 0 : dst (cm), nsteps < = 8000, , ist (0,1,2 integration in s,ct,Sr) -2 5 -20 : iwarm= 0-3 ECRH&CD computation, ilarm order of larmor expans, imx -11 : ieccd=0/1/2/oth ECCD=none/Cohen/notrap/mom.cons. -42.0 20.0 : alfac, betac poloidal and toroidal launching angles -1 : P0 (MW) injected power -1 0. 0. : IOX = 1 : O-MODE IOX = 2 : X-MODE, psipol, chipol - -1 : ibeam=0/1/2 beam file with single beam shape (0) or with 1D/2D (1/2) table -"beamdata_L6_B3.txt" : filename for beam data - -2 : iequil= 0 vacuum, 1 analytical equilibrium, 2 EQDSK -"ITER_s134173_r106_t0599.9.eqdsk" : filename for equilibrium -11 0 1 0 : icocos [=0..8,10..18], ipsinorm =0/1 [psi normalized (1) or not (0) in EQDSK], idesc =0/1, ifreefmt= 0/1 -0 0.005 0.01 : indXpoint, sspl spline coeff psi, ssplf spline coeff fpol --1 -1 1 : signum B_phi I_phi +1=counterclockwise , -1=clockwise from above, factb - -4. : rwall [inner wall radius, m] - -1 2 : iprof= 0/1 analytical/numerical profiles, irho=0/1/2 radial coordinate rhot/rhop/psi -"ITER_s134173_r106_t0599.9_prf.txt" : filename for profiles -1.015 0.01 : psi plasma boundary, sspld spline coeff density -1 1 2 : factT, factn, iscal=0/1/2 nustar=const/ngreenw=const/no_scal. - -1 501 : ipec=±1/2 profiles rhop/rhot; nnd=no. radial points (no. of radial intervals +1) -5 5 : istprj,istpl diff --git a/tests/02-ITER-half-field/inputs/gray.ini b/tests/02-ITER-half-field/inputs/gray.ini new file mode 100644 index 0000000..796fe18 --- /dev/null +++ b/tests/02-ITER-half-field/inputs/gray.ini @@ -0,0 +1,38 @@ +[raytracing] +nrayr = 11 +nrayth = 16 +igrad = 1 +dst = 0.2 +nstep = 2800 +idst = STEP_ARCLEN + +[ecrh_cd] + +[antenna] +alpha = 15.0 +beta = -20.0 +iox = MODE_X +ibeam = BEAM_2D +filenm = "beam_OM_TOP.data" + +[equilibrium] +filenm = "F4E_Equil_10820_case006_25VFZX.eqdsk" +icocos = 11 +sgnb = -1 +sgni = -1 +factb = 1.0566 + +[profiles] +iprof = PROF_NUMERIC +irho = RHO_PSI +filenm = "F4E_Equil_10820_case006_25S3S3.prf" +sspld = 0.01 +iscal = SCALE_GREENWALD +psnbnd = 1.015 + +[output] +ipec = RHO_POL +nrho = 251 + +[misc] +rwall = 4.0 diff --git a/tests/02-ITER-half-field/inputs/gray_params.data b/tests/02-ITER-half-field/inputs/gray_params.data deleted file mode 100644 index 553fbf0..0000000 --- a/tests/02-ITER-half-field/inputs/gray_params.data +++ /dev/null @@ -1,27 +0,0 @@ -11 16 1 : nray ktx,rhomx -1 1 0 : igrad (0 rtr - 1 gauss beam) ipass [=1,2 passes in the plasma] ipol -.2 2800 0 : dst (cm), nsteps < = 8000, , ist (0,1,2 integration in s,ct,Sr) -2 5 -20 : iwarm= 0-3 ECRH&CD computation, ilarm order of larmor expans, imx -11 : ieccd=0/1/2/oth ECCD=none/Cohen/notrap/mom.cons. -15 -20 : alfac, betac poloidal and toroidal launching angles -1 : P0 (MW) injected power -2 0. 0. : IOX = 1 : O-MODE IOX = 2 : X-MODE, psipol, chipol - -2 : ibeam=0/1/2 beam file with single beam shape (0) or with 1D/2D (1/2) table -beam_OM_TOP.data : filename for beam data - -2 : iequil= 0 vacuum, 1 analytical equilibrium, 2 EQDSK -F4E_Equil_10820_case006_25VFZX.eqdsk : filename for equilibrium -11 0 1 0 : icocos [=0..8,10..18], ipsinorm =0/1 [psi normalized (1) or not (0) in EQDSK], idesc =0/1, ifreefmt= 0/1 -0 0.005 0.01 : indXpoint, sspl spline coeff psi, ssplf spline coeff fpol --1 -1 1.0566 : signum B_phi I_phi +1=counterclockwise , -1=clockwise from above, factb - -4. : rwall [inner wall radius, m] - -1 2 : iprof= 0/1 analytical/numerical profiles, irho=0/1/2 radial coordinate rhot/rhop/psi -F4E_Equil_10820_case006_25S3S3.prf : filename for profiles -1.015 0.01 : psi plasma boundary, sspld spline coeff density -1 1 1 : factT, factn, iscal=0/1/2 nustar=const/ngreenw=const/no_scal. - -1 251 : ipec=±1/2 profiles rhop/rhot; nnd=no. radial points (no. of radial intervals +1) -5 5 : istprj,istpl diff --git a/tests/03-TCV/inputs/gray.ini b/tests/03-TCV/inputs/gray.ini new file mode 100644 index 0000000..84a37a1 --- /dev/null +++ b/tests/03-TCV/inputs/gray.ini @@ -0,0 +1,36 @@ +[raytracing] +nrayr = 16 +nrayth = 24 +igrad = 1 +dst = 0.05 +nstep = 2400 +idst = STEP_PHASE + +[ecrh_cd] + +[antenna] +alpha = 89.45 +beta = 0.0 +iox = MODE_X +ibeam = BEAM_1D +filenm = "L8_TCV.txt" + +[equilibrium] +filenm = "EQDSK_55394t0.7030_COCOS02" +icocos = 2 +sgnb = -1 +sgni = -1 + +[profiles] +iprof = PROF_ANALYTIC +irho = RHO_TOR +filenm = "55394t0.7030_anprof.txt" +sspld = 0.01 +iscal = SCALE_GREENWALD + +[output] +ipec = RHO_POL +nrho = 1001 + +[misc] +rwall = 0.6 diff --git a/tests/03-TCV/inputs/gray_params.data b/tests/03-TCV/inputs/gray_params.data deleted file mode 100644 index 32b0a69..0000000 --- a/tests/03-TCV/inputs/gray_params.data +++ /dev/null @@ -1,22 +0,0 @@ -16 24 1 : nray ktx,rhomx -1 1 0 : igrad (0 rtr - 1 gauss beam) ipass [=1,2 passes in the plasma] ipol -.05 2400 2 : dst (cm), nsteps < = 8000, , ist (0,1,2 integration in s,ct,Sr) -2 5 -20 : iwarm= 0-3 ECRH&CD computation, ilarm order of larmor expans, imx -11 : ieccd=0/1/2/oth ECCD=none/Cohen/notrap/mom.cons. -89.45 0.0 x alfac, betac poloidal and toroidal launching angles -1 x P0 (MW) injected power -2 0. 0. x IOX = 1 : O-MODE IOX = 2 : X-MODE, psipol, chipol -1 x ibeam=0/1/2 beam file with single beam shape (0) or with 1D/2D (1/2) table -"L8_TCV.txt" x filename for beam data -2 x iequil= 0 vacuum, 1 analytical equilibrium, 2 EQDSK -"EQDSK_55394t0.7030_COCOS02" x filename for equilibrium -2 0 1 0 x icocos [=0..8,10..18], ipsinorm =0/1 [psi normalized (1) or not (0) in EQDSK], idesc =0/1, ifreefmt= 0/1 -0 0.005 0.01 : indXpoint, sspl spline coeff psi, ssplf spline coeff fpol --1 -1 1 x signum B_phi I_phi +1=counterclockwise , -1=clockwise from above, factb -0.6 x rwall [inner wall radius, m] -0 0 x iprof= 0/1 analytical/numerical profiles, irho=0/1/2 radial coordinate rhot/rhop/psi -"55394t0.7030_anprof.txt" x filename for profiles -1.01 0.01 : psi plasma boundary, sspld spline coeff density -1 1 1 x factT, factn, iscal=0/1/2 nustar=const/ngreenw=const/no_scal. -1 1001 x ipec=±1/2 profiles rhop/rhot; nnd=no. radial points (no. of radial intervals +1) -5 5 : istprj,istpl diff --git a/tests/04-JT60SA/inputs/gray.ini b/tests/04-JT60SA/inputs/gray.ini new file mode 100644 index 0000000..34e6ed9 --- /dev/null +++ b/tests/04-JT60SA/inputs/gray.ini @@ -0,0 +1,39 @@ +[raytracing] +nrayr = 1 +nrayth = 18 +rwmax = 1.2 +igrad = 1 +ipass = 2 +dst = 0.1 +nstep = 15000 + +[ecrh_cd] +ilarm = 4 + +[antenna] +alpha = -3.0 +beta = 0.0 +iox = MODE_O +ibeam = BEAM_2D +filenm = "WG2_new_138_OM.txt" + +[equilibrium] +filenm = "JT-60SA_scenario2_lowden_eqdsk_chease_cocos13.geq_newlim.txt" +icocos = 13 +sgnb = -1 +sgni = -1 + +[profiles] +iprof = PROF_NUMERIC +irho = RHO_TOR +filenm = "profscenario2_lowden_cut.txt" +sspld = 5.0E-3 +factte = 2.51189E-3 +psnbnd = 1.03 + +[output] +ipec = RHO_POL +nrho = 2001 + +[misc] +rwall = 1.6 diff --git a/tests/04-JT60SA/inputs/gray_params.data b/tests/04-JT60SA/inputs/gray_params.data deleted file mode 100644 index ed624ce..0000000 --- a/tests/04-JT60SA/inputs/gray_params.data +++ /dev/null @@ -1,28 +0,0 @@ -1 18 1.2 : nray ktx,rhomx -1 2 0 : igrad (0 rtr - 1 gauss beam) ipass [=1,2 passes in the plasma] ipol -0.1 15000 1 : dst (cm), nsteps < = 8000, , ist (0,1,2 integration in s,ct,Sr) -2 4 -20 : iwarm= 0-3 ECRH&CD computation, ilarm order of larmor expans, imx -11 : ieccd 0/1 NO/YES ECCD calculation - --3.0 0 : alfac, betac poloidal and toroidal launching angles -1 : P0 (MW) injected power -1 0. 0. : IOX = 1 : O-MODE IOX = 2 : X-MODE, psipol, chipol - -2 : ibeam=0/1/2 beam file with single beam shape (0) or with 1D/2D (1/2) table -WG2_new_138_OM.txt : filename for beam data - -2 : iequil= 0 vacuum, 1 analytical equilibrium, 2 EQDSK -JT-60SA_scenario2_lowden_eqdsk_chease_cocos13.geq_newlim.txt x filename for equilibrium -13 0 1 0 : icocos [=0..8,10..18], ipsinorm =0/1 [psi normalized (1) or not (0) in EQDSK], idesc =0/1, ifreefmt= 0/1 -0 0.005 0.01 : indXpoint, sspl spline coeff psi, ssplf spline coeff fpol --1 -1 1 : signum B_phi I_phi +1=counterclockwise , -1=clockwise from above, factb - -1.6 : rwall [inner wall radius, m] - -1 0 : iprof= 0/1 analytical/numerical profiles, irho=0/1/2 radial coordinate rhot/rhop/psi -profscenario2_lowden_cut.txt : filename for profiles -1.03 0.005 : psi plasma boundary, sspld spline coeff density -.00251188643150958011 1 2 : factT, factn, iscal=0/1/2 nustar=const/ngreenw=const/no_scal. - -1 2001 : ipec=±1/2 profiles rhop/rhot; nnd=no. radial points (no. of radial intervals +1) -5 5 : istprj,istpl diff --git a/tests/05-JT60SA-startup/inputs/gray.ini b/tests/05-JT60SA-startup/inputs/gray.ini new file mode 100644 index 0000000..64627de --- /dev/null +++ b/tests/05-JT60SA-startup/inputs/gray.ini @@ -0,0 +1,40 @@ +[raytracing] +nrayr = 1 +nrayth = 1 +igrad = 1 +ipass = 3 +dst = 0.1 +nstep = 10000 +idst = STEP_ARCLEN + +[ecrh_cd] +ilarm = 4 + +[antenna] +alpha = 35.5 +beta = 0.0 +iox = MODE_X +ibeam = BEAM_0D +filenm = "./no-steer-110.txt" + +[equilibrium] +iequil = EQ_ANALYTICAL +filenm = "./equilan.txt" +icocos = 11 +sgnb = 1 +sgni = 1 + +[profiles] +iprof = PROF_ANALYTIC +irho = RHO_PSI +filenm = "./profilesan.txt" +sspld = 0.005 +iscal = SCALE_GREENWALD +psnbnd = 1.0 + +[output] +ipec = RHO_POL +nrho = 2001 + +[misc] +rwall = 1.6981 diff --git a/tests/05-JT60SA-startup/inputs/gray_params.data b/tests/05-JT60SA-startup/inputs/gray_params.data deleted file mode 100644 index 0f57698..0000000 --- a/tests/05-JT60SA-startup/inputs/gray_params.data +++ /dev/null @@ -1,28 +0,0 @@ -1 1 1 : nray ktx,rhomx -1 3 0 : igrad (0 rtr - 1 gauss beam) ipass [=1,2 passes in the plasma] ipol -.1 10000 0 : dst (cm), nsteps < = 8000, , ist (0,1,2 integration in s,ct,Sr) -2 4 -20 : iwarm= 0-3 ECRH&CD computation, ilarm order of larmor expans, imx -11 : ieccd 0/1/2/oth ECCD=none/Cohen/notrap/mom.cons. - -35.5 0 : alfac, betac poloidal and toroidal launching angles -1 : P0 (MW) injected power -2 0. 0. : IOX = 1 : O-MODE IOX = 2 : X-MODE, psipol, chipol - -0 : ibeam=0/1/2 beam file with single beam shape (0) or with 1D/2D (1/2) table -"./no-steer-110.txt" : filename for beam data - -1 : iequil= 0 vacuum, 1 analytical equilibrium, 2 EQDSK -"./equilan.txt" : filename for equilibrium -11 0 1 0 : icocos [=0..8,10..18], ipsinorm =0/1 [psi normalized (1) or not (0) in EQDSK], idesc =0/1, ifreefmt= 0/1 -0 0.005 0.01 : indXpoint, sspl spline coeff psi, ssplf spline coeff fpol -+1 +1 1 : signum B_phi I_phi +1=counterclockwise , -1=clockwise from above, factb - -1.6981 : rwall [inner wall radius, m] - -0 2 : iprof= 0/1 analytical/numerical profiles, irho=0/1/2 radial coordinate rhot/rhop/psi -"./profilesan.txt" : filename for profiles -1.0 0.005 : psi plasma boundary, sspld spline coeff density -1 1 1 : factT, factn, iscal=0/1/2 nustar=const/ngreenw=const/no_scal. - -1 2001 : ipec=±1/2 profiles rhop/rhot; nnd=no. radial points (no. of radial intervals +1) -5 5 : istprj,istpl diff --git a/tests/06-ITER-startup/inputs/gray.ini b/tests/06-ITER-startup/inputs/gray.ini new file mode 100644 index 0000000..fa988a1 --- /dev/null +++ b/tests/06-ITER-startup/inputs/gray.ini @@ -0,0 +1,36 @@ +[raytracing] +nrayr = 11 +nrayth = 16 +igrad = 1 +dst = 0.1 +nstep = 8000 + +[ecrh_cd] +ilarm = 4 + +[antenna] +alpha = 39.0 +beta = 20.0 +iox = MODE_X +ibeam = BEAM_0D +filenm = "./beamUSM.data" + +[equilibrium] +filenm = "./F4E_Equil_10002_case001_24VQV5.eqdsk" +icocos = 11 +sgnb = -1 +sgni = -1 +factb = 0.5 + +[profiles] +iprof = PROF_ANALYTIC +irho = RHO_PSI +filenm = "./profiles.txt" +sspld = 0.005 +psnbnd = 1.0 + +[output] +ipec = RHO_POL + +[misc] +rwall = 4.0 diff --git a/tests/06-ITER-startup/inputs/gray_params.data b/tests/06-ITER-startup/inputs/gray_params.data deleted file mode 100644 index 8024410..0000000 --- a/tests/06-ITER-startup/inputs/gray_params.data +++ /dev/null @@ -1,28 +0,0 @@ -11 16 1 : nray ktx,rhomx -1 1 0 : igrad (0 rtr - 1 gauss beam) ipass [=1,2 passes in the plasma] ipol -.1 8000 1 : dst (cm), nsteps < = 8000, , ist (0,1,2 integration in s,ct,Sr) -2 4 -20 : iwarm= 0-3 ECRH&CD computation, ilarm order of larmor expans, imx -11 : ieccd 0/1/2/oth ECCD=none/Cohen/notrap/mom.cons. - -39 20 x alfac, betac poloidal and toroidal launching angles -1 x P0 (MW) injected power -2 0. 0. x IOX = 1 : O-MODE IOX = 2 : X-MODE, psipol, chipol - -0 x ibeam=0/1/2 beam file with single beam shape (0) or with 1D/2D (1/2) table -"./beamUSM.data" x filename for beam data - -2 x iequil= 0 vacuum, 1 analytical equilibrium, 2 EQDSK -"./F4E_Equil_10002_case001_24VQV5.eqdsk" x filename for equilibrium -11 0 1 0 x icocos [=0..8,10..18], ipsinorm =0/1 [psi normalized (1) or not (0) in EQDSK], idesc =0/1, ifreefmt= 0/1 -0 0.005 0.01 : indXpoint, sspl spline coeff psi, ssplf spline coeff fpol --1 -1 0.5 x signum B_phi I_phi +1=counterclockwise , -1=clockwise from above, factb - -4. x rwall [inner wall radius, m] - -0 2 x iprof= 0/1 analytical/numerical profiles, irho=0/1/2 radial coordinate rhot/rhop/psi -"./profiles.txt" x filename for profiles -1.0 0.005 : psi plasma boundary, sspld spline coeff density -1 1 2 x factT, factn, iscal=0/1/2 nustar=const/ngreenw=const/no_scal. - -1 501 x ipec=±1/2 profiles rhop/rhot; nnd=no. radial points (no. of radial intervals +1) -5 5 : istprj,istpl diff --git a/tests/07-DTT/inputs/gray.ini b/tests/07-DTT/inputs/gray.ini new file mode 100644 index 0000000..3614a92 --- /dev/null +++ b/tests/07-DTT/inputs/gray.ini @@ -0,0 +1,37 @@ +[raytracing] +nrayr = 1 +nrayth = 16 +dst = 0.02 +idst = STEP_ARCLEN + +[ecrh_cd] + +[antenna] +alpha = 0.0 +beta = 0.0 +iox = MODE_X +ibeam = BEAM_0D +filenm = "beam_DTT_VR13_EQB.txt" + +[equilibrium] +iequil = EQ_EQDSK_PARTIAL +filenm = "jetto_PPF2293.eqdsk_out" +icocos = 0 +sgnb = -1 +sgni = +1 +factb = 0.51282 + +[profiles] +iprof = PROF_NUMERIC +irho = RHO_TOR +filenm = "DTT_prof_PPF2295.txt" +factne = 0.630957 +factte = 0.630957 +psnbnd = 1.007 + +[output] +ipec = RHO_POL +nrho = 901 + +[misc] +rwall = 1.36 diff --git a/tests/07-DTT/inputs/gray_params.data b/tests/07-DTT/inputs/gray_params.data deleted file mode 100644 index 45d4904..0000000 --- a/tests/07-DTT/inputs/gray_params.data +++ /dev/null @@ -1,22 +0,0 @@ -1 16 1 : nray,ktx,rhomx -0 1 0 : igrad (0 rtr - 1 gauss beam) ipass [=1,2 passes in the plasma] ipol -.02 12000 0 : dst (cm), nsteps < = 8000, , ist (0,1,2 integration in s,ct,Sr) -2 5 -20 : iwarm= 0-3 ECRH&CD computation, ilarm order of larmor expans, imx -11 : ieccd 0/1/2/oth ECCD=none/Cohen/notrap/mom.cons. -0 0 : alfac, betac poloidal [>0 down] and toroidal [>0 right] launching angles (deg) -1 : P0 (MW) injected power -2 0. 0. : iox [O/X-mode selection: 1=OM, 2=XM], psipol, chipol -0 : ibeam=0/1/2 beam file with single beam shape (0) or with 1D/2D (1/2) table -"beam_DTT_VR13_EQB.txt" x filename for beam data -3 : iequil= 0 vacuum, 1 analytical equilibrium, 2 EQDSK -"jetto_PPF2293.eqdsk_out" :eqdska.gsef fldemoeqdsk22018_official_EQDSK.eqdsk Equil_AR3d1_2015_04_v2_EOF_CSred_fine_final.eqdsk -0 0 1 0 : icocos [=0..8,10..18], ipsinorm =0/1 [psi normalized (1) or not (0) in EQDSK], idesc =0/1, ifreefmt= 0/1 -0 0.005 0.01 : indXpoint, sspl spline coeff psi, ssplf spline coeff fpol --1 1 0.51282 : signum B_phi I_phi [+1=ccw , -1=cw from above, only for icocos=0,10], factb [B field scaling factor] -1.36 : rwall [inner wall radius, m] -1 0 : iprof= 0/1 analytical/numerical profiles, irho=0/1/2 radial coordinate rhot/rhop/psi -"DTT_prof_PPF2295.txt" x filename for profiles -1.007 0.1 : psi plasma boundary, sspld spline coeff density -.63095734448019324943 .63095734448019324943 2 x factT [temperature scaling factor], factn [density scaling factor], iscal=0/1/2 nustar=const/ngreenw=const/no_scal. -1 901 : ipec=±1/2 profiles rhop/rhot; nnd=no. radial points (no. of radial intervals +1) -5 5 : istprj,istpl diff --git a/tests/08-STEP/inputs/gray.ini b/tests/08-STEP/inputs/gray.ini new file mode 100644 index 0000000..b69d754 --- /dev/null +++ b/tests/08-STEP/inputs/gray.ini @@ -0,0 +1,34 @@ +[raytracing] +nrayr = 1 +nrayth = 16 +igrad = 1 +dst = 0.2 + +[ecrh_cd] + +[antenna] +alpha = -55.0 +beta = -30.0 +iox = MODE_O +ibeam = BEAM_0D +filenm = "SPR45_J.txt" + +[equilibrium] +iequil = EQ_EQDSK_PARTIAL +filenm = "jetto.eqdsk_out" +icocos = 0 +sgnb = 1 +sgni = 1 + +[profiles] +iprof = PROF_NUMERIC +irho = RHO_PSI +filenm = "SPR45_profiles.txt" +sspld = 0.005 +psnbnd = 1.015 + +[output] +ipec = RHO_POL + +[misc] +rwall = 1.0 diff --git a/tests/08-STEP/inputs/gray_params.data b/tests/08-STEP/inputs/gray_params.data deleted file mode 100644 index 5e9481f..0000000 --- a/tests/08-STEP/inputs/gray_params.data +++ /dev/null @@ -1,28 +0,0 @@ -1 16 1 : nray,ktx,rhomx -1 1 0 : igrad (0 rtr - 1 gauss beam) ipass [=1,2 passes in the plasma] ipol -.2 12000 1 : dst (cm), nsteps < = 8000, , ist (0,1,2 integration in s,ct,Sr) -2 5 -20 : iwarm= 0-3 ECRH&CD computation, ilarm order of larmor expans, imx -11 : ieccd 0/1 NO/YES ECCD calculation - --55 -30 x alfac, betac poloidal [>0 down] and toroidal [>0 right] launching angles (deg) -1 x P0 (MW) injected power -1 0. 0. x iox [O/X-mode selection: 1=OM, 2=XM], psipol, chipol - -0 x ibeam=0/1/2 beam file with single beam shape (0) or with 1D/2D (1/2) table -"SPR45_J.txt" x filename for beam data - -3 x iequil= 0 vacuum, 1 analytical equilibrium, 2 EQDSK, 3 EQDSK invalid outside LCFS -"jetto.eqdsk_out" x filename for equilibrium -0 0 1 0 x icocos [=0..8,10..18], ipsinorm =0/1 [psi normalized (1) or not (0) in EQDSK], idesc =0/1, ifreefmt= 0/1 -0 0.005 0.01 : indXpoint, sspl spline coeff psi, ssplf spline coeff fpol -1 1 1 x signum B_phi I_phi [+1=ccw , -1=cw from above, only for icocos=0,10], factb [B field scaling factor] - -1. x rwall [inner wall radius, m] - -1 2 x iprof= 0/1 analytical/numerical profiles, irho=0/1/2 radial coordinate rhot/rhop/psi -"SPR45_profiles.txt" x filename for profiles -1.015 0.005 : psi plasma boundary, sspld spline coeff density -1 1 2 x factT [temperature scaling factor], factn [density scaling factor], iscal=0/1/2 nustar=const/ngreenw=const/no_scal. - -1 501 x ipec=±1/2 profiles rhop/rhot; nnd=no. radial points (no. of radial intervals +1) -5 5 : istprj,istpl diff --git a/tests/09-DTT-rampup/inputs/gray.ini b/tests/09-DTT-rampup/inputs/gray.ini new file mode 100644 index 0000000..3f4c662 --- /dev/null +++ b/tests/09-DTT-rampup/inputs/gray.ini @@ -0,0 +1,38 @@ +[raytracing] +nrayr = 1 +nrayth = 16 +igrad = 1 +dst = 0.1 +nstep = 4000 + +[ecrh_cd] +ilarm = 4 +imx = 20 + +[antenna] +alpha = 0.0 +beta = 0.0 +iox = MODE_O +ibeam = BEAM_0D +filenm = "beam.data" + +[equilibrium] +filenm = "Equil_DTT_v15_Ipl_5d5MA_betap_0d1_li_0d8_t_at_13d75s_piastre_rame_8cm_COCOS01_DTT2022_07140_OK.eqdsk" +icocos = 1 +ssplps = 0.05 +sgnb = -1 +sgni = 1 + +[profiles] +iprof = PROF_NUMERIC +irho = RHO_TOR +filenm = "DTT_prof_rampupAstra_t13d5.txt" +sspld = 0.01 +psnbnd = 1.025 + +[output] +ipec = RHO_POL +nrho = 251 + +[misc] +rwall = 1.36 diff --git a/tests/09-DTT-rampup/inputs/gray_params.data b/tests/09-DTT-rampup/inputs/gray_params.data deleted file mode 100644 index 8e72469..0000000 --- a/tests/09-DTT-rampup/inputs/gray_params.data +++ /dev/null @@ -1,28 +0,0 @@ -1 16 1 : nray,ktx,rhomx -1 1 0 : igrad (0 rtr - 1 gauss beam) ipass [=1,2 passes in the plasma] ipol -0.1 4000 1 : dst (cm), nsteps < = 8000, , ist (0,1,2 integration in s,ct,Sr) -2 4 20 : iwarm= 0-3 ECRH&CD computation, ilarm order of larmor expans, imx -11 : ieccd 0/1/2/oth ECCD=none/Cohen/notrap/mom.cons. - -0 0 : alfac, betac poloidal [>0 down] and toroidal [>0 right] launching angles (deg) -1 : P0 (MW) injected power -1 0. 0. : iox [O/X-mode selection: 1=OM, 2=XM], psipol, chipol - -0 : ibeam=0/1/2 beam file with single beam shape (0) or with 1D/2D (1/2) table -beam.data : filename for beam data - -2 : iequil= 0 vacuum, 1 analytical equilibrium, 2 EQDSK -Equil_DTT_v15_Ipl_5d5MA_betap_0d1_li_0d8_t_at_13d75s_piastre_rame_8cm_COCOS01_DTT2022_07140_OK.eqdsk : filename for equilibrium -1 0 1 0 : icocos [=0..8,10..18], ipsinorm =0/1 [psi normalized (1) or not (0) in EQDSK], idesc =0/1, ifreefmt= 0/1 -0 0.05 0.01 : indXpoint, sspl spline coeff psi, ssplf spline coeff fpol --1 1 1 : signum B_phi I_phi [+1=ccw , -1=cw from above, only for icocos=0,10], factb [B field scaling factor] - -1.36 : rwall [inner wall radius, m] - -1 0 : iprof= 0/1 analytical/numerical profiles, irho=0/1/2 radial coordinate rhot/rhop/psi -DTT_prof_rampupAstra_t13d5.txt : filename for profiles -1.025 0.01 : psi plasma boundary, sspld spline coeff density -1 1 2 : factT [temperature scaling factor], factn [density scaling factor], iscal=0/1/2 nustar=const/ngreenw=const/no_scal. - -1 251 : ipec=±1/2 profiles rhop/rhot; nnd=no. radial points (no. of radial intervals +1) -5 5 : istprj,istpl diff --git a/tests/10-JETTO-interface/inputs/gray_params.data b/tests/10-JETTO-interface/inputs/gray_params.data deleted file mode 100644 index 2fdb9be..0000000 --- a/tests/10-JETTO-interface/inputs/gray_params.data +++ /dev/null @@ -1,28 +0,0 @@ -11 16 1 : nray,ktx,rhomx -1 1 0 : igrad (0 rtr - 1 gauss beam) ipass [=1,2 passes in the plasma] ipol -.15 12000 0 : dst (cm), nsteps < = 8000, , ist (0,1,2 integration in s,ct,Sr) -2 5 -20 : iwarm= 0-3 ECRH&CD computation, ilarm order of larmor expans, imx -11 : ieccd 0/1/2/oth ECCD=none/Cohen/notrap/mom.cons. - -20 -20 x alfac, betac poloidal [>0 down] and toroidal [>0 right] launching angles (deg) -1 x P0 (MW) injected power -1 0. 0. x iox [O/X-mode selection: 1=OM, 2=XM], psipol, chipol - -2 x ibeam=0/1/2 beam file with single beam shape (0) or with 1D/2D (1/2) table -"./graybeam_R19_v2.data" x filename for beam data - -3 x iequil= 0 vacuum, 1 analytical equilibrium, 2 EQDSK -"./DTT2020_00129_596_COCOS1_output_eqdsk_from_jetto.eqdsk" : filename for equilibrium -0 0 1 0 x icocos [=0..8,10..18], ipsinorm =0/1 [psi normalized (1) or not (0) in EQDSK], idesc =0/1, ifreefmt= 0/1 -0 0.005 0.01 : indXpoint, sspl spline coeff psi, ssplf spline coeff fpol --1 1 1 x signum B_phi I_phi [+1=ccw , -1=cw from above, only for icocos=0,10], factb [B field scaling factor] - -1.36 x rwall [inner wall radius, m] - -1 0 x iprof= 0/1 analytical/numerical profiles, irho=0/1/2 radial coordinate rhot/rhop/psi -"./Prof_DTT2020_00138_R0_2d19.txt" x filename for profiles -1.015 0.1 : psi plasma boundary, sspld spline coeff density -1 1 2 x factT [temperature scaling factor], factn [density scaling factor], iscal=0/1/2 nustar=const/ngreenw=const/no_scal. - -1 251 x ipec=±1/2 profiles rhop/rhot; nnd=no. radial points (no. of radial intervals +1) -5 5 : istprj,istpl diff --git a/tests/11-vacuum/inputs/gray.ini b/tests/11-vacuum/inputs/gray.ini new file mode 100644 index 0000000..2b0191c --- /dev/null +++ b/tests/11-vacuum/inputs/gray.ini @@ -0,0 +1,41 @@ +[raytracing] +nrayr = 6 +nrayth = 56 +igrad = 1 +dst = 0.1 +nstep = 400 +idst = STEP_PHASE + +[ecrh_cd] +iwarm = ABSORP_OFF +ieccd = CD_OFF + +[antenna] +alpha = 0.0 +beta = 90.0 +iox = MODE_O +ibeam = BEAM_1D +filenm = "beam.txt" + +[equilibrium] +iequil = EQ_VACUUM +filenm = "equilibrium.txt" +icocos = 0 +sgnb = -1 +sgni = -1 +factb = 1.0566 + +[profiles] +iprof = PROF_ANALYTIC +irho = RHO_TOR +filenm = "profiles.txt" +sspld = 0.01 +iscal = SCALE_GREENWALD +psnbnd = 1.0150 + +[output] +ipec = RHO_POL +nrho = 251 + +[misc] +rwall = 100.0 diff --git a/tests/11-vacuum/inputs/gray_params.data b/tests/11-vacuum/inputs/gray_params.data deleted file mode 100644 index e1fc078..0000000 --- a/tests/11-vacuum/inputs/gray_params.data +++ /dev/null @@ -1,27 +0,0 @@ -6 56 1 : nray ktx,rhomx -1 1 0 : igrad (0 rtr - 1 gauss beam) ipass [=1,2 passes in the plasma] ipol -0.1 400 2 : dst (cm), nsteps < = 8000, , ist (0,1,2 integration in s,ct,Sr) -0 5 -20 : iwarm= 0-3 ECRH&CD computation, ilarm order of larmor expans, imx -0 : ieccd=0/1/2/oth ECCD=none/Cohen/notrap/mom.cons. -0 90 : alfac, betac poloidal and toroidal launching angles -1 : P0 (MW) injected power -1 0. 0. : IOX = 1 : O-MODE IOX = 2 : X-MODE, psipol, chipol - -1 : ibeam=0/1/2 beam file with single beam shape (0) or with 1D/2D (1/2) table -beam.txt : filename for beam data - -0 : iequil= 0 vacuum, 1 analytical equilibrium, 2 EQDSK -equilibrium.txt : filename for equilibrium -0 0 1 0 : icocos [=0..8,10..18], ipsinorm =0/1 [psi normalized (1) or not (0) in EQDSK], idesc =0/1, ifreefmt= 0/1 -0 0.005 0.01 : indXpoint, sspl spline coeff psi, ssplf spline coeff fpol --1 -1 1.0566 : signum B_phi I_phi +1=counterclockwise , -1=clockwise from above, factb - -100. : rwall [inner wall radius, m] - -0 0 : iprof= 0/1 analytical/numerical profiles, irho=0/1/2 radial coordinate rhot/rhop/psi -profiles.txt : filename for profiles -1.015 0.01 : psi plasma boundary, sspld spline coeff density -1 1 1 : factT, factn, iscal=0/1/2 nustar=const/ngreenw=const/no_scal. - -1 251 : ipec=±1/2 profiles rhop/rhot; nnd=no. radial points (no. of radial intervals +1) -5 5 : istprj,istpl diff --git a/tests/__init__.py b/tests/__init__.py index cfa1353..cec0c54 100644 --- a/tests/__init__.py +++ b/tests/__init__.py @@ -247,7 +247,7 @@ def run_gray(inputs: Path, outputs: Path, params = [['-g', f'{k}={v}'] for k, v in params.items()] args = [ binary, - '-p', str(inputs / 'gray_params.data'), + '-c', str(inputs / 'gray.ini'), '-u', ','.join(map(str, units)), '-o', str(outputs), '-v'