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

corrected reading of beam description file (bad handling of blank lines and of case nalpha=2)

Browse Source
This commit is contained in:
Lorenzo Figini 2015-02-18 16:15:38 +00:00
parent 8eee0b3ecd
commit f997ec1eb3
1 changed files with 9 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/gray-externals.f
View File

@ -898,7 +898,7 @@ c@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@
implicit real*8(a-h,o-z)
c
character*255 filenmeqq,filenmprf,filenmbm
character*20 beamname
character*20 beamname,beamnameskip
c
integer beamid, nisteer, fdeg, jumprow, nbeam, nalpha, nbeta,
. iopt, incheck, nxcoord, nycoord, nxest, nyest, lwrk, kwrk,
@ -989,7 +989,7 @@ c unused beams' data
jumprow=0
c c====================================================================================
do i=1,beamid-1
read(nfbeam,*) beamname, iox, fghz, nalpha, nbeta
read(nfbeam,*) beamnameskip, iox, fghz, nalpha, nbeta
jumprow = jumprow+nalpha*nbeta
end do
c c====================================================================================
@ -1000,8 +1000,12 @@ c beam of interest
c
c c====================================================================================
c unused beams' data grids
do i=1,(jumprow + (nbeam - beamid))
read(nfbeam,*)
do i=1,(nbeam - beamid)
read(nfbeam,*) beamnameskip
end do
do i=1,jumprow
read(nfbeam,*) alphast,betast,x00,y00,z00,
. waist1,waist2,rci1,rci2,phi1,phi2
end do
c c====================================================================================
c
@ -1037,7 +1041,7 @@ c fdeg = 0 alpha, beta free variables
c 1 alpha free variable
c 2 beta free variable
c 3 no free variables
fdeg = 2*1/nalpha + 1/nbeta
fdeg = 2*(1/nalpha) + 1/nbeta
end if
c#######################################################################################
c