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

small bugs fixed, initialized a few variables

Browse Source
This commit is contained in:
Daniela Farina 2012-07-10 10:42:14 +00:00
parent c8bb0e8cbf
commit 4b578fb56a
1 changed files with 14 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
src/gray.f
View File

@ -60,11 +60,11 @@ c second pass into plasma
pabstott=pabstott+pabstot pabstott=pabstott+pabstot
currtott=currtott+currtot currtott=currtott+currtot
end if end if
print*,' '
write(6,*) 'Pabs (MW), Icd (kA) = ', pabstott,currtott*1.0d+3
999 continue 999 continue
print*,' '
print*,' IERR = ', ierr print*,' IERR = ', ierr
write(6,*) 'Pabs (MW), Icd (kA) = ', pabstott,currtott*1.0d+3
stop stop
end end
@ -2316,9 +2316,11 @@ c
lam=alam(l) lam=alam(l)
srl=0.0d0 srl=0.0d0
rl2=1.0d0-lam*bv(1)/bmmx rl2=1.0d0-lam*bv(1)/bmmx
rl0=0.d0
if(rl2.gt.0) rl0=sqrt(rl2) if(rl2.gt.0) rl0=sqrt(rl2)
do inc=1,ncntt-1 do inc=1,ncntt-1
rl2=1.0d0-lam*bv(inc+1)/bmmx rl2=1.0d0-lam*bv(inc+1)/bmmx
rl=0.0d0
if(rl2.gt.0) rl=sqrt(rl2) if(rl2.gt.0) rl=sqrt(rl2)
srl=srl+0.5d0*dlpv(inc)*(rl/bpv(inc+1)+rl0/bpv(inc)) srl=srl+0.5d0*dlpv(inc)*(rl/bpv(inc+1)+rl0/bpv(inc))
rl0=rl rl0=rl
@ -3905,7 +3907,7 @@ c
end if end if
c c
return return
99 format(12(1x,e16.8e3)) 99 format(24(1x,e16.8e3))
111 format(3i5,20(1x,e16.8e3)) 111 format(3i5,20(1x,e16.8e3))
end end
c c
@ -3914,7 +3916,7 @@ c
subroutine ic_rt subroutine ic_rt
implicit real*8 (a-h,o-z) implicit real*8 (a-h,o-z)
parameter(ndim=6,ndimm=3) parameter(ndim=6,ndimm=3)
parameter(jmx=31,kmx=36,zero=0.0d0,izero=0) parameter(jmx=31,kmx=36,zero=0.0d0,izero=0,one=1.0d0)
parameter(pi=3.14159265358979d0,cvdr=pi/180.0d0) parameter(pi=3.14159265358979d0,cvdr=pi/180.0d0)
dimension ywrk0(ndim,jmx,kmx),ypwrk0(ndim,jmx,kmx) dimension ywrk0(ndim,jmx,kmx),ypwrk0(ndim,jmx,kmx)
dimension xc0(ndimm,jmx,kmx),du10(ndimm,jmx,kmx) dimension xc0(ndimm,jmx,kmx),du10(ndimm,jmx,kmx)
@ -4060,7 +4062,7 @@ c
end if end if
c c
return return
99 format(12(1x,e16.8e3)) 99 format(24(1x,e16.8e3))
111 format(3i5,20(1x,e16.8e3)) 111 format(3i5,20(1x,e16.8e3))
end end
@ -4069,7 +4071,7 @@ c
subroutine ic_rt2 subroutine ic_rt2
implicit real*8 (a-h,o-z) implicit real*8 (a-h,o-z)
parameter(ndim=6,ndimm=3) parameter(ndim=6,ndimm=3)
parameter(jmx=31,kmx=36,zero=0.0d0,izero=0) parameter(jmx=31,kmx=36,zero=0.0d0,izero=0,one=1.0d0)
parameter(pi=3.14159265358979d0,cvdr=pi/180.0d0) parameter(pi=3.14159265358979d0,cvdr=pi/180.0d0)
dimension ywrk0(ndim,jmx,kmx),ypwrk0(ndim,jmx,kmx) dimension ywrk0(ndim,jmx,kmx),ypwrk0(ndim,jmx,kmx)
dimension yyrfl(jmx,kmx,ndim) dimension yyrfl(jmx,kmx,ndim)
@ -4159,7 +4161,7 @@ c
end if end if
c c
return return
99 format(12(1x,e16.8e3)) 99 format(24(1x,e16.8e3))
111 format(3i5,20(1x,e16.8e3)) 111 format(3i5,20(1x,e16.8e3))
end end
c c
@ -4720,6 +4722,7 @@ c
if(n.eq.0.and.m.eq.0) then if(n.eq.0.and.m.eq.0) then
rr(0,2,0) = rr(0,2,0) - exdx*fe0m*upl2 rr(0,2,0) = rr(0,2,0) - exdx*fe0m*upl2
else else
ffe=0.0d0
if(m.eq.1) ffe=(1.0d0+s*(1.0d0-zm*fe0m))/amu2 if(m.eq.1) ffe=(1.0d0+s*(1.0d0-zm*fe0m))/amu2
if(m.eq.2) ffe=(6.0d0-2.0d0*zm+4.0d0*s if(m.eq.2) ffe=(6.0d0-2.0d0*zm+4.0d0*s
. +s*s*(1.0d0+zm-zm2*fe0m))/amu4 . +s*s*(1.0d0+zm-zm2*fe0m))/amu4
@ -6058,6 +6061,10 @@ c
c c
drhop=0.0d0 drhop=0.0d0
drhot=0.0d0 drhot=0.0d0
psie1=0.0d0
psie2=1.0d0
rhopmx=1.0d0
rhopmn=0.0d0
if (ie1.gt.0.or.ie2.gt.0) then if (ie1.gt.0.or.ie2.gt.0) then
if(ipec.eq.0) then if(ipec.eq.0) then
rhopmx=sqrt(xpkp) rhopmx=sqrt(xpkp)