corrected current sign assignment, more output in units 6,7

This commit is contained in:
Lorenzo Figini 2014-02-04 12:38:10 +00:00
parent 1a60867b5b
commit 0d971665aa

View File

@ -514,7 +514,7 @@ c
write(12,*) ' #i sst psi w1 w2'
write(7,*)'#Icd Pa Jphip dPdVp '//
.'rhotj rhotjava rhotp rhotpav drhotjava drhotpav '//
.'ratjbmx stmx psipol chipol index_rt Jphimx dPdVmx'
.'ratjbmx stmx psipol chipol index_rt Jphimx dPdVmx drhotj drhotp'
write(48,*) '#psi rhot Jphi Jcdb dPdV Icdins Pins P% index_rt'
else
@ -1190,7 +1190,7 @@ c icocos mod 10 = 2,3,6,7: psi decreasing with CCW Ip
c
c add check for Ip/psi and B0/Fpol sign consistency?
c
current=sign(current,psiax-psiedge)
current=sign(current,psiaxis-psiedge)
btrcen=sign(btrcen,fpol(nr))
c
@ -6371,16 +6371,16 @@ c dPdV [MW/m^3], Jcd [MA/m^2]
write(6,*)' '
write(6,*)'#beta0 alpha0 Icd Pa Jphip dPdVp '//
.'rhotj rhotjava rhotp rhotpav drhotjava drhotpav '//
.'ratjbmx stmx psipol chipol index_rt Jphimx dPdVmx'
.'ratjbmx stmx psipol chipol index_rt Jphimx dPdVmx drhotj drhotp'
write(6,99) beta0,alpha0,currtka,pabstot,ajphip,dpdvp,
. rhotjfi,rhotjava,rhotp,rhotpav,
. drhotjava,drhotpav,
. stmx,psipol,chipol,real(index_rt),ajmxfi,dpdvmx
. drhotjava,drhotpav,stmx,psipol,chipol,real(index_rt),
. ajmxfi,dpdvmx,drhotjfi,drhotp
write(7,99) currtka,pabstot,ajphip,dpdvp,
. rhotjfi,rhotjava,rhotp,rhotpav,
. drhotjava,drhotpav,ratjbmx,
. stmx,psipol,chipol,real(index_rt),ajmxfi,dpdvmx
. drhotjava,drhotpav,ratjbmx,stmx,psipol,chipol,real(index_rt),
. ajmxfi,dpdvmx,drhotjfi,drhotp
do i=1,nd
if (ipec.eq.0) then