From 4f0cc7fb47fb9662a9de11085e57ba66ac53f37c Mon Sep 17 00:00:00 2001 From: Lorenzo Figini Date: Fri, 10 Feb 2017 14:14:53 +0000 Subject: [PATCH] fixed wrong psi assignment if input profiles are given vs rhot. Added comment for ieccd flag in gray_params.data --- input/gray_params.data | 2 +- src/main.f90 | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/input/gray_params.data b/input/gray_params.data index a696a9e..8671f06 100644 --- a/input/gray_params.data +++ b/input/gray_params.data @@ -2,7 +2,7 @@ 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 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 1 x P0 (MW) injected power diff --git a/src/main.f90 b/src/main.f90 index c889d76..7dca69c 100644 --- a/src/main.f90 +++ b/src/main.f90 @@ -62,7 +62,7 @@ program main_std call setqphi_num(psinr,qpsi,psia,rhot) call set_rhospl(sqrt(psinr),rhot) deallocate(rhot) - psrad=frhopolv(xrad) + psrad=frhopolv(xrad)**2 else if(prfp%irho == 1) then ! xrad==rhop psrad=xrad**2 else