📄 rayinvr_g77.diff
字号:
diff -u -r misc/xshot.f ../rayinvr_g77/misc/xshot.f--- misc/xshot.f 2000-05-20 14:40:58.000000000 -0600+++ ../rayinvr_g77/misc/xshot.f 2003-11-18 16:34:49.000000000 -0700@@ -1,3 +1,6 @@+c File patched for g77 compilation+c Scott Pearse (scott.pearse@durham.ac.uk)+c c c version 1.3 Aug 1992 c@@ -18,11 +21,10 @@ c character*72 ifname,ofname c- write(*,*, fmt="(/'Enter input file name')")+ write(*,*)'Enter input file name' read(5,15) ifname 15 format(a72)- write(*,*, fmt=- + "(/'Enter output file name (default is input file)')")+ write(*,*)'Enter output file name (default is input file)' read(5,15) ofname if(ofname.eq.'') ofname=ifname open(unit=10, file=ifname, status='old')diff -u -r pltlib/pltlib.f ../rayinvr_g77/pltlib/pltlib.f--- pltlib/pltlib.f 2000-05-20 14:40:57.000000000 -0600+++ ../rayinvr_g77/pltlib/pltlib.f 2003-11-18 16:33:32.000000000 -0700@@ -1,3 +1,6 @@+c File patched for g77 compilation+c Scott Pearse (scott.pearse@durham.ac.uk)+c c c version 1.3 Aug 1992 c@@ -192,7 +195,7 @@ c if(iplot.le.0) write(19,5) + 3,nchar,x,y,ht,ang,(label(i),i=1,nchar)-5 format(i2/i10/4e15.5,<nchar>a1)+5 format(i2/i10/4e15.5,10000a1) c return enddiff -u -r pltsyn/Makefile ../rayinvr_g77/pltsyn/Makefile--- pltsyn/Makefile 2000-05-20 14:40:57.000000000 -0600+++ ../rayinvr_g77/pltsyn/Makefile 2003-11-18 16:34:21.000000000 -0700@@ -1,13 +1,16 @@+# File patched for g77 compilation+# Scott Pearse (scott.pearse@durham.ac.uk)+# # # makefile for PLTSYN #-EXEDIR=/elmore/sunbin/-PLTLIB=/elmore/src/pltlib+EXEDIR=../bin/+PLTLIB=../pltlib # # compile flags # FFLAGS = -O-CFLAGS = -O -I/usr/openwin/include+CFLAGS = -O # #rules for compiling .f files: #@@ -29,12 +32,13 @@ # pltsyn: $(PLTSYN_EXEC) $(PLTSYN_EXEC): ${PLTSYN_OBJS}- unilink ${PLTSYN_OBJS}+# unilink ${PLTSYN_OBJS}+ f77 -o main ${PLTSYN_OBJS} mv main ${PLTSYN_EXEC} # xpltsyn: $(XPLTSYN_EXEC) $(XPLTSYN_EXEC): ${XPLTSYN_OBJS}- f77 -o main ${XPLTSYN_OBJS} -L/usr/openwin/lib -lX11+ f77 -o main ${XPLTSYN_OBJS} -L/usr/X11R6/lib -lX11 mv main ${XPLTSYN_EXEC} # # dependenciesdiff -u -r pltsyn/pltsec.f ../rayinvr_g77/pltsyn/pltsec.f--- pltsyn/pltsec.f 2000-05-20 14:40:57.000000000 -0600+++ ../rayinvr_g77/pltsyn/pltsec.f 2003-11-18 16:34:05.000000000 -0700@@ -1,3 +1,6 @@+c File patched for g77 compilation+c Scott Pearse (scott.pearse@durham.ac.uk)+c c c version 1.2 Mar 1992 c @@ -250,8 +253,7 @@ end if end if go to 107-108 if(namp.eq.0) write(*,*, fmt="(/- + '*** error in file tx.out ***'/)")+108 if(namp.eq.0) write(*,*)'*** error in file tx.out ***' if(namp.gt.0) write(18,45) xshot,0.,0.,0 end if idir=1 diff -u -r rayinvr/main.f ../rayinvr_g77/main.f--- rayinvr/main.f 2000-05-20 14:40:56.000000000 -0600+++ ../rayinvr_g77/main.f 2003-11-18 16:33:40.000000000 -0700@@ -1,3 +1,6 @@+c File patched for g77 compilation+c Scott Pearse (scott.pearse@durham.ac.uk)+c c c version 1.4 Apr 1993 c@@ -72,7 +75,7 @@ + poisl(papois),poisb(papois),ibreak(prayf),frbnd(prayf), + ifo2pt(pnobsf),ipos(pr2pt),modi(player),nsmin(prayf), + insmth(pncntr)- character flag*1,title*80+ character flag*1 c include 'rayinvr.com' c @@ -399,8 +402,8 @@ read(30,555) (xfrefl(nfrefl,i),i=1,npfref(nfrefl)) read(30,555) (zfrefl(nfrefl,i),i=1,npfref(nfrefl)) read(30,575) (ivarf(nfrefl,i),i=1,npfref(nfrefl))-555 format(3x,<npfref(nfrefl)>f7.2)-575 format(3x,<npfref(nfrefl)>i7)+555 format(3x,1000000f7.2)+575 format(3x,1000000i7) go to 590 595 close(30) do 550 i=1,ngroup diff -u -r rayinvr/Makefile ../rayinvr_g77/Makefile--- rayinvr/Makefile 2000-05-20 14:40:56.000000000 -0600+++ ../rayinvr_g77/Makefile 2003-11-18 16:35:03.000000000 -0700@@ -1,14 +1,17 @@+# File patched for g77 compilation+# Scott Pearse (scott.pearse@durham.ac.uk)+# # # makefile for RAYINVR #-EXEDIR=/net/ray/sunbin/-PLTLIB=/net/ray/src/pltlib+EXEDIR=../bin/+PLTLIB=../pltlib/ # # compile flags # FFLAGS = -O #CFLAGS = -O -I/usr/openwin/include-CFLAGS = -O -I/usr/openwin/share/include+CFLAGS = -O # #rules for compiling .f files: #@@ -36,7 +39,7 @@ # xrayinvr: $(XRAYINVR_EXEC) $(XRAYINVR_EXEC): ${XRAYINVR_OBJS}- f77 -o main ${XRAYINVR_OBJS} -L/usr/openwin/lib -lX11+ f77 -o main ${XRAYINVR_OBJS} -L/usr/X11R6/lib -lX11 mv main ${XRAYINVR_EXEC} # # dependencies@@ -67,6 +70,6 @@ $(PLTLIB)/xbuplot.o: FORCE- cd $(@D);cc -O -I/usr/openwin/share/include -c xbuplot.c+ cd $(@D);cc -O -I/usr/X11R6/include/X11 -c xbuplot.c FORCE: diff -u -r rayinvr/plt.f ../rayinvr_g77/plt.f--- rayinvr/plt.f 2000-05-20 14:40:56.000000000 -0600+++ ../rayinvr_g77/plt.f 2003-11-18 16:33:51.000000000 -0700@@ -1,3 +1,6 @@+c File patched for g77 compilation+c Scott Pearse (scott.pearse@durham.ac.uk)+c c c version 1.3 Aug 1992 c @@ -771,7 +774,7 @@ end if c if(istep.eq.1) write(6,5) anglew-5 format('take-off angle: ',f10.5$)+5 format('take-off angle: ',f10.5) c if(ircol.ne.0) call pcolor(irrcol) cdiff -u -r rayinvr/rngkta.f ../rayinvr_g77/rngkta.f--- rayinvr/rngkta.f 2000-05-20 14:40:56.000000000 -0600+++ ../rayinvr_g77/rngkta.f 2003-11-18 16:34:12.000000000 -0700@@ -1,3 +1,6 @@+c File patched for g77 compilation+c Scott Pearse (scott.pearse@durham.ac.uk)+c c c version 1.3 Aug 1992 c@@ -13,7 +16,7 @@ real y(2),f(2),t(2),s(2),g(2) logical*1 be,bh,br,bx logical bxx- common /rkc$/ bxx+ common /rkcS/ bxx c bh=.true. br=.true. diff -u -r rayinvr/trc.f ../rayinvr_g77/trc.f--- rayinvr/trc.f 2000-05-20 14:40:56.000000000 -0600+++ ../rayinvr_g77/trc.f 2003-11-18 16:33:44.000000000 -0700@@ -1,3 +1,6 @@+c File patched for g77 compilation+c Scott Pearse (scott.pearse@durham.ac.uk)+c c c version 1.3 Aug 1992 c @@ -495,7 +498,7 @@ real y(2),f(2) logical ok include 'rayinvr.com'- common /rkc$/ ok+ common /rkcS/ ok c f(1)=1./tan(y(2)) term1=c(layer,iblk,3)+c(layer,iblk,4)*x@@ -530,7 +533,7 @@ real y(2),f(2) logical ok include 'rayinvr.com'- common /rkc$/ ok+ common /rkcS/ ok c f(1)=tan(y(2)) term1=c(layer,iblk,3)+c(layer,iblk,4)*y(1)diff -u -r rayplot/Makefile ../rayinvr_g77/rayplot/Makefile--- rayplot/Makefile 2000-05-20 14:40:57.000000000 -0600+++ ../rayinvr_g77/rayplot/Makefile 2003-11-18 16:35:19.000000000 -0700@@ -1,13 +1,16 @@+# File patched for g77 compilation+# Scott Pearse (scott.pearse@durham.ac.uk)+# # # makefile for RAYPLOT #-EXEDIR=/net/ray/sunbin/-PLTLIB=/net/ray/src/pltlib+EXEDIR=../bin/+PLTLIB=../pltlib/ # # compile flags # FFLAGS = -O -CFLAGS = -O -I/usr/openwin/include+CFLAGS = -O # #rules for compiling .f files: #@@ -34,7 +37,7 @@ # xrayplot: $(XRAYPLOT_EXEC) $(XRAYPLOT_EXEC): ${XRAYPLOT_OBJS}- f77 -o rayplot ${XRAYPLOT_OBJS} -L/usr/openwin/lib -lX11+ f77 -o rayplot ${XRAYPLOT_OBJS} -L/usr/X11R6/lib -lX11 mv rayplot ${XRAYPLOT_EXEC} $(PLTLIB)/pltsub.o: FORCEdiff -u -r rayplot/rayplot.f ../rayinvr_g77/rayplot/rayplot.f--- rayplot/rayplot.f 2000-05-20 14:40:57.000000000 -0600+++ ../rayinvr_g77/rayplot/rayplot.f 2003-11-18 16:33:48.000000000 -0700@@ -1,3 +1,6 @@+c File patched for g77 compilation+c Scott Pearse (scott.pearse@durham.ac.uk)+c c c version 1.2 Mar 1992 c @@ -126,7 +129,7 @@ 3000 read(20,35) nchar 35 format(2i10) read(20,45) x,y,albht,angle,(label(i),i=1,nchar)-45 format(4e15.5,<nchar>a1)+45 format(4e15.5,10000a1) x=x*xsf+x0 y=y*ysf+y0 albht=albht*asfOnly in rayplot: rayplot.odiff -u -r tramp/amp.f ../rayinvr_g77/tramp/amp.f--- tramp/amp.f 2000-05-20 14:40:56.000000000 -0600+++ ../rayinvr_g77/tramp/amp.f 2003-11-18 16:35:22.000000000 -0700@@ -1,3 +1,6 @@+c File patched for g77 compilation+c Scott Pearse (scott.pearse@durham.ac.uk)+c c c version 1.3 Aug 1992 c@@ -553,7 +556,7 @@ c implicit double precision (a-h,o-z) real*4 x,y,dy,s,yy,yy1,yy2- common /spln$/ ncount+ common /splnS/ ncount dimension x(n),y(n),dy(n),w(1) dimension yy(1),yy1(1),yy2(1) integer a,b,c,d,r,r1,r2,t,t1,u,vdiff -u -r tramp/Makefile ../rayinvr_g77/tramp/Makefile--- tramp/Makefile 2000-05-20 14:40:56.000000000 -0600+++ ../rayinvr_g77/tramp/Makefile 2003-11-18 16:34:44.000000000 -0700@@ -1,13 +1,16 @@+# File patched for g77 compilation+# Scott Pearse (scott.pearse@durham.ac.uk)+# # # makefile for TRAMP #-EXEDIR=/elmore/sunbin/-PLTLIB=/elmore/src/pltlib+EXEDIR=../bin/+PLTLIB=../pltlib/ # # compile flags # FFLAGS = -O-CFLAGS = -O -I/usr/openwin/include+CFLAGS = -O # #rules for compiling .f files: #@@ -29,12 +32,13 @@ # tramp: $(TRAMP_EXEC) $(TRAMP_EXEC): ${TRAMP_OBJS}- unilink ${TRAMP_OBJS}+#unilink ${TRAMP_OBJS}+ f77 -o main ${TRAMP_OBJS} mv main ${TRAMP_EXEC} # xtramp: $(XTRAMP_EXEC) $(XTRAMP_EXEC): ${XTRAMP_OBJS}- f77 -o main ${XTRAMP_OBJS} -L/usr/openwin/lib -lX11+ f77 -o main ${XTRAMP_OBJS} -L/usr/X11R6/lib -lX11 mv main ${XTRAMP_EXEC} # # dependenciesdiff -u -r tramp/plt.f ../rayinvr_g77/tramp/plt.f--- tramp/plt.f 2000-05-20 14:40:56.000000000 -0600+++ ../rayinvr_g77/tramp/plt.f 2003-11-18 16:34:09.000000000 -0700@@ -1,3 +1,6 @@+c File patched for g77 compilation+c Scott Pearse (scott.pearse@durham.ac.uk)+c c c version 1.3 Aug 1992 c @@ -504,7 +507,7 @@ 10 continue c if(istep.eq.1) write(6,5) anglew-5 format('take-off angle: ',f10.5$)+5 format('take-off angle: ',f10.5) c if(irayps.ne.1) then call line(x,z,npts)diff -u -r tramp/rngkta.f ../rayinvr_g77/tramp/rngkta.f--- tramp/rngkta.f 2000-05-20 14:40:56.000000000 -0600+++ ../rayinvr_g77/tramp/rngkta.f 2003-11-18 16:35:05.000000000 -0700@@ -1,3 +1,6 @@+c File patched for g77 compilation+c Scott Pearse (scott.pearse@durham.ac.uk)+c c c version 1.3 Aug 1992 c@@ -13,7 +16,7 @@ real y(2),f(2),t(2),s(2),g(2) logical*1 be,bh,br,bx logical bxx- common /rkc$/ bxx+ common /rkcS/ bxx c bh=.true. br=.true. diff -u -r tramp/trc.f ../rayinvr_g77/tramp/trc.f--- tramp/trc.f 2000-05-20 14:40:56.000000000 -0600+++ ../rayinvr_g77/tramp/trc.f 2003-11-18 16:34:24.000000000 -0700@@ -1,3 +1,6 @@+c File patched for g77 compilation+c Scott Pearse (scott.pearse@durham.ac.uk)+c c c version 1.3 Aug 1992 c @@ -405,7 +408,7 @@ real y(2),f(2) logical ok include 'tramp.com'- common /rkc$/ ok+ common /rkcS/ ok c f(1)=1./tan(y(2)) term1=c(layer,iblk,3)+c(layer,iblk,4)*x@@ -440,7 +443,7 @@ real y(2),f(2) logical ok include 'tramp.com'- common /rkc$/ ok+ common /rkcS/ ok c f(1)=tan(y(2)) term1=c(layer,iblk,3)+c(layer,iblk,4)*y(1)diff -u -r vmodel/Makefile ../rayinvr_g77/vmodel/Makefile--- vmodel/Makefile 2000-05-20 14:40:57.000000000 -0600+++ ../rayinvr_g77/vmodel/Makefile 2003-11-18 16:34:37.000000000 -0700@@ -1,13 +1,16 @@+# File patched for g77 compilation+# Scott Pearse (scott.pearse@durham.ac.uk)+# # # makefile for VMODEL #-EXEDIR=/net/ray/sunbin/-PLTLIB=/net/ray/src/pltlib+EXEDIR=../bin/+PLTLIB=../pltlib/ # # compile flags # FFLAGS = -O-CFLAGS = -O -I/usr/openwin/include+CFLAGS = -O # #rules for compiling .f files: #@@ -29,12 +32,13 @@ # vmodel: $(VMODEL_EXEC) $(VMODEL_EXEC): ${VMODEL_OBJS}- unilink ${VMODEL_OBJS} +# unilink ${VMODEL_OBJS}+ f77 -o main ${VMODEL_OBJS} mv main ${VMODEL_EXEC} # xvmodel: $(XVMODEL_EXEC) $(XVMODEL_EXEC): ${XVMODEL_OBJS}- f77 -o main ${XVMODEL_OBJS} -L/usr/openwin/lib -lX11+ f77 -o main ${XVMODEL_OBJS} -L/usr/X11R6/lib -lX11 mv main ${XVMODEL_EXEC} # # dependenciesdiff -u -r vmodel/plt.f ../rayinvr_g77/vmodel/plt.f--- vmodel/plt.f 2000-05-20 14:40:57.000000000 -0600+++ ../rayinvr_g77/vmodel/plt.f 2003-11-18 16:33:36.000000000 -0700@@ -1,3 +1,6 @@+c File patched for g77 compilation+c Scott Pearse (scott.pearse@durham.ac.uk)+c c c version 1.2 Mar 1992 c @@ -207,7 +210,7 @@ read(30,755) (xfrefl(i),i=1,nfrefr) read(30,755) (zfrefl(i),i=1,nfrefr) read(30,765) -755 format(3x,<nfrefr>f7.2)+755 format(3x,1000000f7.2) 765 format(' ') c ipen=3@@ -472,7 +475,7 @@ read(30,555) (xfrefl(i),i=1,nfrefr) read(30,555) (zfrefl(i),i=1,nfrefr) read(30,765)-555 format(3x,<nfrefr>f7.2)+555 format(3x,1000000f7.2) c ipen=3 do 1010 ii=1,nfrefr
⌨️ 快捷键说明
复制代码
Ctrl + C
搜索代码
Ctrl + F
全屏模式
F11
切换主题
Ctrl + Shift + D
显示快捷键
?
增大字号
Ctrl + =
减小字号
Ctrl + -