istp/gray
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 1 Wiki Activity

fixed wrong psi assignment if input profiles are given vs rhot. Added comment for ieccd flag in gray_params.data

Browse Source
This commit is contained in:
Lorenzo Figini 2017-02-10 14:14:53 +00:00
parent 526870458f
commit 4f0cc7fb47
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
input/gray_params.data
View File

@ -2,7 +2,7 @@
1 1 0 : igrad (0 rtr - 1 gauss beam) ipass [=1,2 passes in the plasma] ipol 1 1 0 : igrad (0 rtr - 1 gauss beam) ipass [=1,2 passes in the plasma] ipol
.2 5000 0 : dst (cm), nsteps < = 8000, , ist (0,1,2 integration in s,ct,Sr) .2 5000 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 2 4 -20 : iwarm= 0-3 ECRH&CD computation, ilarm order of larmor expans, imx
11 : ieccd 0/1 NO/YES ECCD calculation 11 : ieccd 0/1/2/oth ECCD=none/Cohen/notrap/mom.cons.
5 20 x alfac, betac poloidal and toroidal launching angles 5 20 x alfac, betac poloidal and toroidal launching angles
1 x P0 (MW) injected power 1 x P0 (MW) injected power

2
src/main.f90
View File

@ -62,7 +62,7 @@ program main_std
call setqphi_num(psinr,qpsi,psia,rhot) call setqphi_num(psinr,qpsi,psia,rhot)
call set_rhospl(sqrt(psinr),rhot) call set_rhospl(sqrt(psinr),rhot)
deallocate(rhot) deallocate(rhot)
psrad=frhopolv(xrad) psrad=frhopolv(xrad)**2
else if(prfp%irho == 1) then ! xrad==rhop else if(prfp%irho == 1) then ! xrad==rhop
psrad=xrad**2 psrad=xrad**2
else else