From 4b578fb56ae224529d1866a9465630fcc7262848 Mon Sep 17 00:00:00 2001 From: Daniela Farina Date: Tue, 10 Jul 2012 10:42:14 +0000 Subject: [PATCH] small bugs fixed, initialized a few variables --- src/gray.f | 21 ++++++++++++++------- 1 file changed, 14 insertions(+), 7 deletions(-) diff --git a/src/gray.f b/src/gray.f index 7aaaf12..663f2e4 100644 --- a/src/gray.f +++ b/src/gray.f @@ -60,11 +60,11 @@ c second pass into plasma pabstott=pabstott+pabstot currtott=currtott+currtot end if + print*,' ' + write(6,*) 'Pabs (MW), Icd (kA) = ', pabstott,currtott*1.0d+3 999 continue - print*,' ' print*,' IERR = ', ierr - write(6,*) 'Pabs (MW), Icd (kA) = ', pabstott,currtott*1.0d+3 stop end @@ -2316,9 +2316,11 @@ c lam=alam(l) srl=0.0d0 rl2=1.0d0-lam*bv(1)/bmmx + rl0=0.d0 if(rl2.gt.0) rl0=sqrt(rl2) do inc=1,ncntt-1 rl2=1.0d0-lam*bv(inc+1)/bmmx + rl=0.0d0 if(rl2.gt.0) rl=sqrt(rl2) srl=srl+0.5d0*dlpv(inc)*(rl/bpv(inc+1)+rl0/bpv(inc)) rl0=rl @@ -3905,7 +3907,7 @@ c end if c return - 99 format(12(1x,e16.8e3)) + 99 format(24(1x,e16.8e3)) 111 format(3i5,20(1x,e16.8e3)) end c @@ -3914,7 +3916,7 @@ c subroutine ic_rt implicit real*8 (a-h,o-z) 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) dimension ywrk0(ndim,jmx,kmx),ypwrk0(ndim,jmx,kmx) dimension xc0(ndimm,jmx,kmx),du10(ndimm,jmx,kmx) @@ -4060,7 +4062,7 @@ c end if c return - 99 format(12(1x,e16.8e3)) + 99 format(24(1x,e16.8e3)) 111 format(3i5,20(1x,e16.8e3)) end @@ -4069,7 +4071,7 @@ c subroutine ic_rt2 implicit real*8 (a-h,o-z) 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) dimension ywrk0(ndim,jmx,kmx),ypwrk0(ndim,jmx,kmx) dimension yyrfl(jmx,kmx,ndim) @@ -4159,7 +4161,7 @@ c end if c return - 99 format(12(1x,e16.8e3)) + 99 format(24(1x,e16.8e3)) 111 format(3i5,20(1x,e16.8e3)) end c @@ -4720,6 +4722,7 @@ c if(n.eq.0.and.m.eq.0) then rr(0,2,0) = rr(0,2,0) - exdx*fe0m*upl2 else + ffe=0.0d0 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 . +s*s*(1.0d0+zm-zm2*fe0m))/amu4 @@ -6058,6 +6061,10 @@ c c drhop=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(ipec.eq.0) then rhopmx=sqrt(xpkp)