From 9f2030d0535c9c897f0202f92e4eb0f774e7777b Mon Sep 17 00:00:00 2001 From: cvs Date: Fri, 20 Oct 2000 14:22:35 +0000 Subject: [PATCH] Now GNU G77 compliant --- difrac/blind.f | 6 +----- difrac/centre.f | 9 ++++++--- difrac/creduc.f | 2 +- difrac/ibmfil.f | 7 ++++++- difrac/lister.f | 2 +- difrac/ormat3.f | 2 +- 6 files changed, 16 insertions(+), 12 deletions(-) diff --git a/difrac/blind.f b/difrac/blind.f index c1a2eacc..3f0430e7 100644 --- a/difrac/blind.f +++ b/difrac/blind.f @@ -714,7 +714,7 @@ C-------------------------------------------------------------------- $ ' (E) Exit.') 12000 FORMAT ( ' Command (L,D,R,A,F,E) ',$) 13000 FORMAT (' N Theta Omega Chi Phi Int'/) -14000 FORMAT (' 'I2,1X,4(F8.2),2X,I8,5X,A) +14000 FORMAT (' ',I2,1X,4(F8.2),2X,I8,5X,A) 15000 FORMAT (' There are no reflections in the list') 16000 FORMAT (' Input reflection number: ') 17000 FORMAT (' Reflection ',I2,' marked unused') @@ -725,7 +725,3 @@ C-------------------------------------------------------------------- 21000 FORMAT (A) 22000 FORMAT (I4,' reflections have been read from ',A) END - - - - diff --git a/difrac/centre.f b/difrac/centre.f index 7b43362c..893bcea8 100644 --- a/difrac/centre.f +++ b/difrac/centre.f @@ -16,6 +16,9 @@ C----------------------------------------------------------------------- CHARACTER ANGLE(4)*6 DATA ANGLE/'2theta','Omega','Chi','PH'/ INTEGER IRUPT +C + external range ! Prevent use of intrinsic function under GNU G77 +C NATT = 0 C------- a debug flag! Set to 0 for no debug output IDEBUG = 1 @@ -79,7 +82,7 @@ C----------------------------------------------------------------------- CALL CCTIME (PRESET,COUNT) IF(IDEBUG .EQ. 1)THEN WRITE(COUT,20000),AN(1),AN(2),AN(3),AN(4),COUNT -20000 FORMAT('TH = ',F8.2,' OM = ',F8.2,' CH = ',F8.2,' PH = ' F8.2, +20000 FORMAT('TH = ',F8.2,' OM = ',F8.2,' CH = ',F8.2,' PH = ', F8.2, & ' CTS = ', F8.2) ENDIF CALL KORQ(IRUPT) @@ -292,6 +295,7 @@ C----------------------------------------------------------------------- 11000 FORMAT (' Alignment Failure on ',A,'. NBOT, NTOP',2I4,' MAX',I6) 12000 FORMAT (3I6,/,(10F10.4)) END +C C----------------------------------------------------------------------- C Subroutine to do a fine (1) or coarse (0) centreing on a specified C circle for the CAD4 using the routine GENSCN. @@ -435,6 +439,7 @@ C write (LPT,99998) ki,theta,omega,chi,phi C99998 format (' After ',a,2x,4f8.3) RETURN END +C C----------------------------------------------------------------------- C Subroutine to find the centroid of the ACOUNT distribution C----------------------------------------------------------------------- @@ -500,5 +505,3 @@ C ENDIF C99999 format (' imax,max,nbot,ntop',A,4i6/(10f7.0)) RETURN END - - diff --git a/difrac/creduc.f b/difrac/creduc.f index 87cba32c..dff8b3f4 100644 --- a/difrac/creduc.f +++ b/difrac/creduc.f @@ -195,7 +195,7 @@ C----------------------------------------------------------------------- C Order the threefold axes on the angle with the plane C----------------------------------------------------------------------- IF (N3 - N2 .GE. 2) THEN - DO 240 I = N3,N3 - 1 + DO 240 I = N3,N3 - 1,-1 ANMAX = AANG(I) MAX = I DO 230 J = I + 1,N3 diff --git a/difrac/ibmfil.f b/difrac/ibmfil.f index b068330a..b770d693 100644 --- a/difrac/ibmfil.f +++ b/difrac/ibmfil.f @@ -96,7 +96,12 @@ C----------------------------------------------------------------------- WORK = ACTUAL IF (MNCODE .NE. 'VAXVMS') then IF (MNCODE .EQ. 'PCMSDS') THEN - IF (ACTUAL .EQ. 'GROUPS') WORK = '\NRCVAX\GROUPS.DAT' +c +c Avoid a compiler problem with '\'. char(92) is '\'! +c +CCC IF (ACTUAL .EQ. 'GROUPS') WORK = '\NRCVAX\GROUPS.DAT' + IF (ACTUAL .EQ. 'GROUPS') + + WORK = char(92) // 'NRCVAX' // char(92) // 'GROUPS.DAT' C ELSE C IF (ACTUAL .EQ. 'GROUPS') C $ CALL GETENV (ACTUAL(1:LENAME),WORK) diff --git a/difrac/lister.f b/difrac/lister.f index 978bfaa2..e293ecb7 100644 --- a/difrac/lister.f +++ b/difrac/lister.f @@ -214,7 +214,7 @@ C----------------------------------------------------------------------- ELSE IF (IFREE(1) .EQ. 2) THEN IF (STRING(6:9) .EQ. ' or ') THEN WRITE (COUT,16100) STRING -16100 FORMAT (' The space-group symbol CANNOT be both 'A/ +16100 FORMAT (' The space-group symbol CANNOT be both ',A/ $ ' Please type the correct symbol ',$) CALL ALFNUM (STRING) ENDIF diff --git a/difrac/ormat3.f b/difrac/ormat3.f index e2d173cc..f03e201d 100644 --- a/difrac/ormat3.f +++ b/difrac/ormat3.f @@ -203,7 +203,7 @@ C----------------------------------------------------------------------- $ ' Alf* ',F7.3,' Bet* ',F7.3,' Gam* ',F7.3) 19000 FORMAT (' a ',F8.5,' b ',F8.5,' c ',F8.5, $ ' Alf ',F7.3,' Bet ',F7.3,' Gam ',F7.3/) -20000 FORMAT (' Type h,k,l,Psi (End) '$) +20000 FORMAT (' Type h,k,l,Psi (End) ',$) 22000 FORMAT (3I4,' Psi ',F7.3,' Rotation not possible') 22100 FORMAT (3F8.3,' Psi ',F7.3,' Rotation not possible') 23000 FORMAT (3I4,5F8.3)