From 96e92069da0969b0557bc850782bfd33f7625aed Mon Sep 17 00:00:00 2001 From: RachelSlaybaugh Date: Tue, 3 Nov 2015 13:59:01 -0800 Subject: [PATCH 1/2] got rid of some errors for getting gabs to compile with gfortran. --- src/ensdf_processing/GABS/gabs_11.f90 | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/src/ensdf_processing/GABS/gabs_11.f90 b/src/ensdf_processing/GABS/gabs_11.f90 index 0b4a4fbb14..6da502dd24 100644 --- a/src/ensdf_processing/GABS/gabs_11.f90 +++ b/src/ensdf_processing/GABS/gabs_11.f90 @@ -149,7 +149,7 @@ PROGRAM GABS DATA S,SD,SS,SB,SBD,SDR,DGARR/3*0.0,3*0.0,3*0.0,9*0.0,9*0.0,9*0.0,3*' '/ DATA DBRR,SBTOT,SBDTOT,SDRTOT/3*0.0,3*0.0,3*0.0,3*0.0/ ! - Open (UNIT=DefOut,FORM='FORMATTED',CARRIAGECONTROL='FORTRAN') + Open (UNIT=DefOut,FORM='FORMATTED')!,CARRIAGECONTROL='FORTRAN') Write (DefOut,'(a)') ' =========== '//Trim(Version)//' ===========' !.....Get command line arguments @@ -563,8 +563,8 @@ Subroutine GAMMAS() iDBX=' ' CALL CNVU2S(SNOR1,U,iBX,8,iDBX,2) If (iBX(1:8) == ' ') Then - Write (RptLun,'(a,f)') ' Could not convert BR=',SNOR1 - Write (DefOut,'(a,f)') ' Could not convert BR=',SNOR1 + Write (RptLun,'(a26,f5.5)') ' Could not convert BR=',SNOR1 + Write (DefOut,'(a26,f5.5)') ' Could not convert BR=',SNOR1 Stop End If L=IM @@ -662,15 +662,15 @@ Subroutine GAMMAS() yyabs= ryabs * YABSG CALL CNVU2S(YABSG,yyabs,iiBX,8,iiDBX,2) If (iiBX(1:8) == ' ') Then - Write (RptLun,'(a,f)') ' Could not convert RI=',YABSG - Write (DefOut,'(a,f)') ' Could not convert RI=',YABSG + Write (RptLun,'(a26,f5.5)') ' Could not convert RI=',YABSG + Write (DefOut,'(a,f5.5)') ' Could not convert RI=',YABSG Stop End If Call LBSUP(iiBX) CALL CNVU2S(YABSG,DABSG,iBX,8,iDBX,2) If (iBX(1:8) == ' ') Then - Write (RptLun,'(a,f)') ' Could not convert RI=',YABSG - Write (DefOut,'(a,f)') ' Could not convert RI=',YABSG + Write (RptLun,'(a26,f5.5)') ' Could not convert RI=',YABSG + Write (DefOut,'(a26,f5.5)') ' Could not convert RI=',YABSG Stop End If Call LBSUP(iBX) @@ -680,7 +680,7 @@ Subroutine GAMMAS() Write (RptLun,'(a)') ' E='//Str2(1:13)//' %IG='//Trim(iBX)//' '//iDBX//' per 100 dis. Compare with '//Trim(iiBX)//' '//iiDBX If (ANSW /= 'Y') Exit LoopG Write (NewLun,'(a)') NUCID//STA//Trim(iBX)//' '//iDBX//STB - Else + Else Write (RptLun,'(a)') ' E='//Str2(1:13)//' %IG='//Trim(iiBX)//' '//iiDBX//' per 100 dis.' If (ANSW /= 'Y') Exit LoopG Write (NewLun,'(a)') NUCID//STA//Trim(iiBX)//' '//iDBX//STB From 5f03fe0c3af4d8ffed422117fc866191b811faed Mon Sep 17 00:00:00 2001 From: RachelSlaybaugh Date: Wed, 2 Dec 2015 15:40:22 -0800 Subject: [PATCH 2/2] started fixing this. --- src/ensdf_processing/RADLST/radlst.for | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/ensdf_processing/RADLST/radlst.for b/src/ensdf_processing/RADLST/radlst.for index 5b17403f19..fef8ea428c 100644 --- a/src/ensdf_processing/RADLST/radlst.for +++ b/src/ensdf_processing/RADLST/radlst.for @@ -12565,7 +12565,7 @@ c 2 'LISTED X, g AND g+- RADIATIONS'//BLANKS,LISPHO 06 06070 WRITE(UNIT=MIRDRP,FMT=1) 06 06080 2 'LISTED X, $2 AND $2$+ RADIATIONS'//BLANKS,LISPHO 06 06090 c1 FORMAT(A44,P1E8.2) 06 06100 -1 FORMAT(A,1PE8.2) 06 06110 +1 FORMAT(A47,1PE8.2) 06 06110 ENDIF 06 06120 IF(OMIPHO .GT. 0)THEN 06 06130 CALL CHKCON(.FALSE.) 06 06140