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

corrected merge errors in trunk. branch new-refl integrated in trunk and removed

Browse Source
This commit is contained in:
Lorenzo Figini 2015-05-21 14:29:16 +00:00
parent c38f57b640
commit a0275d8691
1 changed files with 2 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
src/gray.f
View File

@ -122,11 +122,6 @@ c
common/taumnx/taumn,taumx,pabstot,currtot
common/pardens/dens0,aln1,aln2
common/parqte/te0,dte0,alt1,alt2
common/pardens/dens0,aln1,aln2
common/parqte/te0,dte0,alt1,alt2
c
c print all ray positions in local reference system
c
@ -166,7 +161,6 @@ c
call pec(pabs,currt)
c
return
99 format(20(1x,e16.8e3))
end
c
c
@ -1020,7 +1014,6 @@ c set simple limiter as two cylindrical walls at rwallm and r00
915 format('# dst nstep : ',1x,es12.5,i5)
916 format('# Date : ',a4,2('/',a2),1x,a2,2(':',a2))
99 format(20(1x,e16.8e3))
end
c
c
@ -1411,7 +1404,7 @@ c write(79,2021) rv(i),zv(j),psin(i,j)
c write(79,*) ' '
enddo
end if
2021 format(5(1x,e16.9))
c2021 format(5(1x,e16.9))
c
nur=1
nuz=0
@ -2380,7 +2373,6 @@ c
end if
return
111 format(i6,12(1x,e12.5))
99 format(12(1x,e12.5))
end
c
c
@ -3166,7 +3158,7 @@ c spline interpolation of H(lambda,rhop) and dH/dlambda
parameter(nnr=101,nrest=nnr+4)
parameter(lwrk=nnr*4+nrest*16)
dimension rhop(nnr),rhot(nnr),rhopi(nnr),rhoti(nnr)
dimension psin(nnr),fqi(nnr)
dimension psin(nnr)
dimension trp(nrest),crp(nrest)
dimension trot(nrest),crot(nrest)
dimension wrk(lwrk),iwrk(nrest),wp(nrest)
@ -5099,7 +5091,6 @@ c
dimension ytmp(ndim),yptmp(ndim)
dimension yyrfl(jmx,kmx,ndim)
dimension xc0(ndimm,jmx,kmx),du10(ndimm,jmx,kmx)
dimension dffiu(jmx),ddffiu(jmx)
dimension grad2(jmx,kmx),dgrad2v(ndimm,jmx,kmx)
dimension gri(3,jmx,kmx),ggri(3,3,jmx,kmx)
complex*16 ext(jmx,kmx,0:4),eyt(jmx,kmx,0:4)
@ -5466,7 +5457,6 @@ c
if(ieccd.gt.0) call eccd(effjcd)
return
999 format(12(1x,e12.5))
end
c
c
@ -5613,7 +5603,6 @@ c
end if
c
return
99 format(20(1x,e12.5))
end
c
c Fully relativistic case
@ -7242,7 +7231,6 @@ c dPdV [MW/m^3], Jcd [MA/m^2]
end do
return
49 format(i5,20(1x,e12.5))
99 format(30(1x,e12.5))
end
c
@ -7463,7 +7451,6 @@ c
gam=atan(sngam/csgam)*180.d0/pi
return
111 format(20(1x,e12.5))
end
subroutine stokes(ext,eyt,qq,uu,vv)
@ -7532,9 +7519,6 @@ c ell=bb/aa
integer nbb,nlim
parameter(nbb=5000)
real*8 rlim(nbb),zlim(nbb)
integer nbb,nlim
parameter(nbb=5000)
real*8 rlim(nbb),zlim(nbb)
common/limiter/rlim,zlim,nlim
@ -7600,7 +7584,6 @@ c wave vector and electric field after reflection in lab frame
eztr=dot_product(vv3,evrfl)
return
111 format(20(1x,e12.5))
end
subroutine vacuum_rt(xvstart,anv,xvend,ivac)
@ -7675,6 +7658,5 @@ c ivac=-1 vessel (and thus plasma) never crossed
anv=anv0
return
111 format(20(1x,e12.5))
end