modified character length of input filenames from 24 to 255

This commit is contained in:
Daniela Farina 2014-02-24 13:32:40 +00:00
parent 0d971665aa
commit 31317c257e

View File

@ -107,7 +107,7 @@ c ray integration: end
subroutine after_gray_integration subroutine after_gray_integration
implicit real*8 (a-h,o-z) implicit real*8 (a-h,o-z)
parameter(zero=0.0d0) parameter(zero=0.0d0)
character*24 filenmeqq,filenmprf,filenmbm character*255 filenmeqq,filenmprf,filenmbm
c c
common/ss/st common/ss/st
common/ibeam/ibeam common/ibeam/ibeam
@ -540,7 +540,7 @@ c
real*8 me real*8 me
character*8 wdat character*8 wdat
character*10 wtim character*10 wtim
character*24 filenmeqq,filenmprf,filenmbm character*255 filenmeqq,filenmprf,filenmbm
parameter(qe=4.8032d-10,me=9.1095d-28,vc=2.9979d+10) parameter(qe=4.8032d-10,me=9.1095d-28,vc=2.9979d+10)
parameter(pi=3.14159265358979d0,cvdr=pi/180.0d0) parameter(pi=3.14159265358979d0,cvdr=pi/180.0d0)
parameter(nmx=8000,nbb=1000) parameter(nmx=8000,nbb=1000)
@ -860,20 +860,20 @@ c set simple limiter as two cylindrical walls at rwallm and r00
. wtim(1:2),wtim(3:4),wtim(5:6) . wtim(1:2),wtim(3:4),wtim(5:6)
write(nfil,904) REVISION write(nfil,904) REVISION
if (iequil.eq.2) then if (iequil.eq.2) then
write(nfil,905) filenmeqq write(nfil,905) trim(filenmeqq)
else else
if (iequil.eq.1) write(nfil,912) rr0,zr0,rpa,B0,q0,qa,alq if (iequil.eq.1) write(nfil,912) rr0,zr0,rpa,B0,q0,qa,alq
if (iequil.eq.0) write(nfil,'("# VACUUM CASE")') if (iequil.eq.0) write(nfil,'("# VACUUM CASE")')
end if end if
if (iprof.eq.1) then if (iprof.eq.1) then
write(nfil,907) filenmprf write(nfil,907) trim(filenmprf)
else else
write(nfil,913) dens0,aln1,aln2,te0,dte0,alt1,alt2,zeff write(nfil,913) dens0,aln1,aln2,te0,dte0,alt1,alt2,zeff
end if end if
write(nfil,911) fghz,p0mw,iox write(nfil,911) fghz,p0mw,iox
write(nfil,902) x00,y00,z00 write(nfil,902) x00,y00,z00
write(nfil,908) alpha0,beta0 write(nfil,908) alpha0,beta0
if(ibeam.ge.1) write(nfil,909) filenmbm if(ibeam.ge.1) write(nfil,909) trim(filenmbm)
if(ibeam.eq.0) write(nfil,903) w0csi,w0eta,d0csi,d0eta,phiw if(ibeam.eq.0) write(nfil,903) w0csi,w0eta,d0csi,d0eta,phiw
write(nfil,900) nrayr, nrayth, rwmax write(nfil,900) nrayr, nrayth, rwmax
write(nfil,901) igrad,iwarm,ilarm,ieccd,idst write(nfil,901) igrad,iwarm,ilarm,ieccd,idst
@ -891,9 +891,9 @@ c set simple limiter as two cylindrical walls at rwallm and r00
902 format('# X0 Y0 Z0 launching point (cm) : ',3(1x,es12.5)) 902 format('# X0 Y0 Z0 launching point (cm) : ',3(1x,es12.5))
903 format('# w0xi w0eta d0xi d0eta (cm) phiw (deg) : ',5(1x,es12.5)) 903 format('# w0xi w0eta d0xi d0eta (cm) phiw (deg) : ',5(1x,es12.5))
904 format('# GRAY revision : ',a) 904 format('# GRAY revision : ',a)
905 format('# EQUILIBRIUM file : ',a24) 905 format('# EQUILIBRIUM file : ',a)
906 format('# fact_B fact_T fact_n iscal : ',(3(1x,es12.5),i5)) 906 format('# fact_B fact_T fact_n iscal : ',(3(1x,es12.5),i5))
907 format('# PROFILES file : ',a24) 907 format('# PROFILES file : ',a)
908 format('# alpha0 beta0 launch angles (deg) CYL : ',2(1x,es12.5)) 908 format('# alpha0 beta0 launch angles (deg) CYL : ',2(1x,es12.5))
909 format('# LAUNCHER file : ',a24) 909 format('# LAUNCHER file : ',a24)
910 format('# sspl psdbnd nd ipec ipsinorm : ',2(1x,es12.5),3i5) 910 format('# sspl psdbnd nd ipec ipsinorm : ',2(1x,es12.5),3i5)
@ -952,7 +952,7 @@ c
c c
subroutine read_beams subroutine read_beams
implicit real*8(a-h,o-z) implicit real*8(a-h,o-z)
character*24 filenmeqq,filenmprf,filenmbm character*255 filenmeqq,filenmprf,filenmbm
parameter(nstrmx=50) parameter(nstrmx=50)
c c
dimension alphastv(nstrmx),betastv(nstrmx),cbeta(nstrmx,4) dimension alphastv(nstrmx),betastv(nstrmx),cbeta(nstrmx,4)