diff --git a/astro0.F90 b/astro0.F90 index 4769d94d2..f2420fabb 100644 --- a/astro0.F90 +++ b/astro0.F90 @@ -34,7 +34,8 @@ subroutine astro0(nyear,month,nday,uth8,nfreq,grid,cauxra,cauxdec, & read(cauxdec(1:i-1),*,err=2,end=2) id read(cauxdec(i+1:i+2),*,err=2,end=2) im read(cauxdec(i+4:i+5),*,err=2,end=2) is - auxdec=id + im/60.0 + is/3600.0 + auxdec=abs(id) + im/60.0 + is/3600.0 + if(cauxdec(1:1).eq.'-') auxdec=-auxdec endif 2 nmode=1 diff --git a/azdist.f b/azdist.f index 1927faf58..9f02ee231 100644 --- a/azdist.f +++ b/azdist.f @@ -1,10 +1,6 @@ subroutine azdist(MyGrid,HisGrid,utch,nAz,nEl,nDmiles,nDkm, + nHotAz,nHotABetter) -C Old calling sequence: -c subroutine azdist(MyGrid,HisGrid,UTChours,Az,Dmiles,Dkm,El, -c + HotA,HotB,HotABetter) - character*6 MyGrid,HisGrid,mygrid0,hisgrid0 real*8 utch,utch0 logical HotABetter,IamEast @@ -53,13 +49,17 @@ c + HotA,HotB,HotABetter) call grid2deg(HisGrid,dlong2,dlat2) call geodist(dlat1,dlong1,dlat2,dlong2,Az,Baz,Dkm) - j=nint(Dkm/100.0)-4 + ndkm=Dkm/100 + j=ndkm-4 if(j.lt.1) j=1 if(j.gt.21)j=21 - ndkm=Dkm/100 - d1=100.0*ndkm - u=(Dkm-d1)/100.0 - El=eltab(j) + u * (eltab(j+1)-eltab(j)) + if(Dkm.lt.500.0) then + El=18.0 + else + u=(Dkm-100.0*ndkm)/100.0 + El=(1.0-u)*eltab(j) + u*eltab(j+1) + endif + daz=daztab(j) + u * (daztab(j+1)-daztab(j)) Dmiles=Dkm/1.609344 diff --git a/map65.py b/map65.py index a63b5c3a7..0828707a8 100644 --- a/map65.py +++ b/map65.py @@ -1,4 +1,4 @@ -#--------------------------------------------------------------------- MAP65 +#---------------------------------------------------------------------- MAP65 # $Date$ $Revision$ # from Tkinter import *