diff options
author | Joseph Hunkeler <jhunkeler@gmail.com> | 2021-08-04 15:18:08 -0400 |
---|---|---|
committer | Joseph Hunkeler <jhunkeler@gmail.com> | 2021-08-04 15:18:08 -0400 |
commit | 70fd14e98bc476a84aef352eaf063cfcba44ab83 (patch) | |
tree | 2737f5c1c21c76824f49c6a1b9c7061952b646f5 /Specplot.f | |
parent | c396a4bc7a3282de9d2191de0e1076fec9df0783 (diff) | |
download | moog-70fd14e98bc476a84aef352eaf063cfcba44ab83.tar.gz |
Use modern equality operators
Diffstat (limited to 'Specplot.f')
-rwxr-xr-x | Specplot.f | 82 |
1 files changed, 41 insertions, 41 deletions
@@ -18,7 +18,7 @@ c****************************************************************************** real*8 inx1,inx2,iny1,iny2 c*****for grid syntheses, dump out relevant information to a file - if (choice .eq. 'g') then + if (choice == 'g') then write (nf6out,3001) syncount write (nf6out,3002) obsitle, moditle, linitle, smitle endif @@ -44,24 +44,24 @@ c*****write smoothing information at the top of the plot call sm_label (smitle) - if (isoitle(1:10) .eq. ' ') then + if (isoitle(1:10) == ' ') then isoitle(1:16) = 'no isotopic data' endif call sm_relocate (-0.120,1.075) call sm_label (isoitle(1:120)) - if (numiso .gt. 3) then + if (numiso > 3) then call sm_relocate (-0.120,1.045) call sm_label (isoitle(121:240)) endif - if (control .eq. 'gridplo' .or. - . control .eq. 'gridsyn' .or. - . control .eq. 'gridend') then + if (control == 'gridplo' .or. + . control == 'gridsyn' .or. + . control == 'gridend') then write (nf6out,3002) isoitle(1:120) write (nf6out,3002) isoitle(121:240) endif c*****define the real plot limits - if (xlo .lt. xhi) then + if (xlo < xhi) then call sm_limits (xlo,xhi,ylo,yhi) iflip = 0 else @@ -75,7 +75,7 @@ c*****define the real plot limits c*****draw and label the box for the spectra call defcolor (1) - if (whichwin .eq. '1of1') then + if (whichwin == '1of1') then idev = 1 call sm_window (1,1,1,1,1,1) else @@ -89,7 +89,7 @@ c*****draw and label the box for the spectra call sm_lweight (2.0) call sm_expand (0.8) call sm_box (1,2,4,4) - if (iflip .eq. 1) then + if (iflip == 1) then array = 'Wavenumber' else array = 'Wavelength' @@ -103,15 +103,15 @@ c*****plot the synthetic spectra call sm_lweight (2.2) call sm_expand (0.7) do i=1,100 - if (pec(i) .ne. 0) go to 111 + if (pec(i) /= 0) go to 111 enddo 111 do j=1,nsyn - if (choice.eq.'h' .or. choice.eq.'f' .or. - . choice.eq.'g') then + if (choice=='h' .or. choice=='f' .or. + . choice=='g') then call defcolor (8) call sm_ltype (j-1) else - if (smterm(1:3) .eq. 'x11') then + if (smterm(1:3) == 'x11') then call defcolor (j+1) call sm_ltype (0) else @@ -120,7 +120,7 @@ c*****plot the synthetic spectra endif endif call sm_connect (xsyn,chunk(1,j),kount) - if (iflip .eq. 1) then + if (iflip == 1) then call sm_relocate (xhi+0.045*(xlo-xhi), . ylo+(0.12+0.06*j)*(yhi-ylo)) call sm_draw (xhi+0.005*(xlo-xhi), @@ -138,10 +138,10 @@ c*****plot the synthetic spectra noff = 80*(j-1) call sm_lweight (2.2) call sm_label (abitle(noff+1:noff+80)) - if ((control .eq. 'gridplo' .or. - . control .eq. 'gridsyn' .or. - . control .eq. 'gridend') .and. - . whichwin.eq.'1of1') then + if ((control == 'gridplo' .or. + . control == 'gridsyn' .or. + . control == 'gridend') .and. + . whichwin=='1of1') then write (nf6out,3002) abitle(noff+1:noff+80) endif enddo @@ -150,10 +150,10 @@ c*****plot the synthetic spectra c*****plot the observed spectrum - if (plotopt .eq. 2) then + if (plotopt == 2) then call defcolor (1) - if (choice.eq.'h' .or. choice.eq.'f' .or. - . choice.eq.'g') then + if (choice=='h' .or. choice=='f' .or. + . choice=='g') then call sm_lweight (4.0) else call sm_lweight (2.2) @@ -163,10 +163,10 @@ c*****plot the observed spectrum style(1) = 43.5 call sm_ptype (style,1) mount = lim2obs - lim1obs + 1 - if (mount .lt. 500) then + if (mount < 500) then call sm_points (xobs(lim1obs),yobs(lim1obs),mount) else - if (histoyes .eq. 1) then + if (histoyes == 1) then call sm_histogram (xobs(lim1obs),yobs(lim1obs),mount) else call sm_connect (xobs(lim1obs),yobs(lim1obs),mount) @@ -174,54 +174,54 @@ c*****plot the observed spectrum endif call sm_lweight (2.2) call sm_expand (0.7) - if (iflip .eq. 1) then + if (iflip == 1) then call sm_relocate (xhi+0.05*(xlo-xhi),ylo+0.12*(yhi-ylo)) else call sm_relocate (xlo+0.05*(xhi-xlo),ylo+0.12*(yhi-ylo)) endif call sm_label (obsitle) endif - if (iflip .eq. 1) then + if (iflip == 1) then call sm_relocate (xhi+0.05*(xlo-xhi),ylo+0.06*(yhi-ylo)) else call sm_relocate (xlo+0.05*(xhi-xlo),ylo+0.06*(yhi-ylo)) endif call sm_label (moditle) - if (whichwin.eq.'1of1' .or. plotopt.ne.2) then + if (whichwin=='1of1' .or. plotopt/=2) then return endif c*****this section of code is executed only if a deviations plot is desired; c find the starting and stopping points in the arrays for the deviations - if (xsyn(kount) .le. xobs(lim1obs)) go to 1000 - if (xsyn(1) .gt. xobs(lim2obs)) go to 1000 - if (xsyn(1) .gt. xobs(lim1obs)) go to 150 + if (xsyn(kount) <= xobs(lim1obs)) go to 1000 + if (xsyn(1) > xobs(lim2obs)) go to 1000 + if (xsyn(1) > xobs(lim1obs)) go to 150 lim3obs = lim1obs do k=2,kount - if (xsyn(k) .gt. xobs(lim3obs)) then + if (xsyn(k) > xobs(lim3obs)) then lim1syn = k - 1 go to 155 endif enddo 150 lim1syn = 1 do l=lim1obs,lim2obs - if (xsyn(lim1syn) .le. xobs(l)) then + if (xsyn(lim1syn) <= xobs(l)) then lim3obs = l go to 155 endif enddo -155 if (xsyn(kount) .lt. xobs(lim2obs)) go to 160 +155 if (xsyn(kount) < xobs(lim2obs)) go to 160 lim4obs = lim2obs do k=lim1syn,kount - if (xsyn(k) .gt. xobs(lim4obs)) then + if (xsyn(k) > xobs(lim4obs)) then lim2syn = k go to 165 endif enddo 160 lim2syn = kount do l=lim3obs,lim2obs - if (xsyn(lim2syn) .lt. xobs(l)) then + if (xsyn(lim2syn) < xobs(l)) then lim4obs = l - 1 go to 165 endif @@ -235,7 +235,7 @@ c of the synthetic spectra is considered sufficient lpoint = lim1syn devsigma = 0. do i=lim3obs,lim4obs -170 if (xsyn(lpoint+1) .lt. xobs(i)) then +170 if (xsyn(lpoint+1) < xobs(i)) then lpoint = lpoint + 1 go to 170 endif @@ -253,7 +253,7 @@ c of the synthetic spectra is considered sufficient c from first set of deviations, define the plot limits, draw and label box - if (j .eq. 1) then + if (j == 1) then yup = -1000. ydown = +1000. do i=lim3obs,lim4obs @@ -283,12 +283,12 @@ c from first set of deviations, define the plot limits, draw and label box c plot the array of deviations - if (choice.eq.'h' .or. choice.eq.'f' .or. - . choice.eq.'g') then + if (choice=='h' .or. choice=='f' .or. + . choice=='g') then call defcolor (8) call sm_ltype (j-1) else - if (smterm(1:3) .eq. 'x11') then + if (smterm(1:3) == 'x11') then call defcolor (j+1) call sm_ltype (0) else @@ -307,7 +307,7 @@ c plot the array of deviations call sm_draw(xhi-0.215*(xhi-xlo), . ydown+(0.10+0.06*j)*(yup-ydown)) call sm_label (array) - if (choice .eq. 'g') then + if (choice == 'g') then noff = 80*(j-1) write (nf6out,3002) abitle(noff+1:noff+80) write (nf6out,3003) devsigma, velsh @@ -317,7 +317,7 @@ c plot the array of deviations c reset the spectrum plot boundaries before exiting - if(xlo .lt. xhi) then + if(xlo < xhi) then call sm_limits (xlo,xhi,ylo,yhi) iflip = 0 else |