From 570512bb1ac6d469c8140e38ab0445cf16d34f14 Mon Sep 17 00:00:00 2001 From: Matthias Redies Date: Wed, 31 Oct 2018 16:59:20 +0100 Subject: [PATCH] most link & include lines are longer than 50 characters --- init/compile_descr.F90 | 68 ++++++++++++++++++++++-------------------- inpgen/inpgen_help.f90 | 4 +-- io/writeOutHeader.F90 | 4 +-- io/xmlOutput.F90 | 4 +-- main/fleur_help.F90 | 4 +-- 5 files changed, 43 insertions(+), 41 deletions(-) diff --git a/init/compile_descr.F90 b/init/compile_descr.F90 index fa1a97a9..c62e8e52 100644 --- a/init/compile_descr.F90 +++ b/init/compile_descr.F90 @@ -6,41 +6,43 @@ MODULE m_compile_descr - IMPLICIT NONE - - CONTAINS - - SUBROUTINE get_compile_desc_string(info) - USE m_constants - IMPLICIT NONE - CHARACTER(LEN=*),INTENT(OUT):: info - - CHARACTER(len=50)::gitdesc,githash,compile_date,compile_user,compile_host,gitbranch - CHARACTER(len=50)::compile_flags,link_flags - CALL get_compile_desc(gitdesc,githash,gitbranch,compile_date,compile_user,compile_host,compile_flags,link_flags) - info=new_line("a")// & - "This is FLEUR version: "//trim(version_const)//new_line("a")// & - "FLEUR was compiled:"//new_line("a")// & - " at: "//TRIM(compile_date)//new_line("a")// & - " by: "//TRIM(compile_user)//new_line("a")// & - " on: "//TRIM(compile_host)//new_line("a")// & - "Its git version is:"//new_line("a")// & - " described by: "//TRIM(gitdesc)//new_line("a")// & - " from branch: "//trim(gitbranch)//new_line("a")// & - " with hash: "//TRIM(githash)//new_LINE("a")//& - "Compiler info:"//new_LINE("a")// & - " flags : "//TRIM(compile_flags)//new_LINE("a")//& - " link flags: "//TRIM(link_flags) - end SUBROUTINE get_compile_desc_string - - - SUBROUTINE get_compile_desc(gitdesc,githash,gitbranch,compile_date,compile_user,compile_host,compile_flags,link_flags) - IMPLICIT NONE - CHARACTER(LEN=*),INTENT(OUT)::gitdesc,githash,compile_date,compile_user,compile_host,gitbranch,compile_flags,link_flags + IMPLICIT NONE + +CONTAINS + + SUBROUTINE get_compile_desc_string(info) + USE m_constants + IMPLICIT NONE + CHARACTER(:),ALLOCATABLE,INTENT(OUT):: info + + CHARACTER(:), ALLOCATABLE::gitdesc,githash,compile_date,compile_user,compile_host,gitbranch + CHARACTER(:), ALLOCATABLE::compile_flags,link_flags + + CALL get_compile_desc(gitdesc,githash,gitbranch,compile_date,compile_user,compile_host,compile_flags,link_flags) + + info=new_line("a")// & + "This is FLEUR version: "//trim(version_const)//new_line("a")// & + "FLEUR was compiled:"//new_line("a")// & + " at: "//TRIM(compile_date)//new_line("a")// & + " by: "//TRIM(compile_user)//new_line("a")// & + " on: "//TRIM(compile_host)//new_line("a")// & + "Its git version is:"//new_line("a")// & + " described by: "//TRIM(gitdesc)//new_line("a")// & + " from branch: "//trim(gitbranch)//new_line("a")// & + " with hash: "//TRIM(githash)//new_LINE("a")//& + "Compiler info:"//new_LINE("a")// & + " flags : "//TRIM(compile_flags)//new_LINE("a")//& + " link flags: "//TRIM(link_flags) + + end SUBROUTINE get_compile_desc_string + + SUBROUTINE get_compile_desc(gitdesc,githash,gitbranch,compile_date,compile_user,compile_host,compile_flags,link_flags) + IMPLICIT NONE + CHARACTER(:),ALLOCATABLE::gitdesc,githash,compile_date,compile_user,compile_host,gitbranch,compile_flags,link_flags !This file is created by cmake at time of configuration #include "compileinfo.h" - - END subroutine get_compile_desc + + END subroutine get_compile_desc end MODULE m_compile_descr diff --git a/inpgen/inpgen_help.f90 b/inpgen/inpgen_help.f90 index 87db7d4c..8cb9edc6 100644 --- a/inpgen/inpgen_help.f90 +++ b/inpgen/inpgen_help.f90 @@ -12,7 +12,7 @@ CONTAINS USE m_juDFT USE m_fleur_arguments IMPLICIT NONE - CHARACTER(LEN=500):: infostring + CHARACTER(:), ALLOCATABLE:: infostring PRINT *," Welcome to FLEUR - inpgen (www.flapw.de) " PRINT *," MaX-Release 2.1 (www.max-centre.eu)" @@ -21,7 +21,7 @@ CONTAINS !now print version info and help on command line arguments: CALL get_compile_desc_string(infostring) - WRITE(*,'(a500)') infostring + WRITE(*,'(a)') infostring WRITE(*,'(a)') WRITE(*,'(a)')"------------------------------------------------------" WRITE(*,'(a)')"inpgen usage info:" diff --git a/io/writeOutHeader.F90 b/io/writeOutHeader.F90 index 120ce35a..e3a6206b 100644 --- a/io/writeOutHeader.F90 +++ b/io/writeOutHeader.F90 @@ -15,7 +15,7 @@ CONTAINS USE m_compile_descr IMPLICIT NONE CHARACTER(len=9) :: cppflag(11) - CHARACTER(LEN=500):: infostring + CHARACTER(:), ALLOCATABLE:: infostring INTEGER :: i,j WRITE (6,*) 'This output is generated by ',version_const @@ -30,7 +30,7 @@ CONTAINS WRITE (6,*) CALL get_compile_desc_string(infostring) - write(6,'(a500)') infostring + write(6,'(a)') infostring CALL getComputerArchitectures(cppflag,i) ! First determine the architecture IF (i.GT.1) THEN WRITE (6,*) 'You set compiler flags for more than one' diff --git a/io/xmlOutput.F90 b/io/xmlOutput.F90 index ff2aee79..99d97c1a 100644 --- a/io/xmlOutput.F90 +++ b/io/xmlOutput.F90 @@ -66,8 +66,8 @@ MODULE m_xmlOutput CHARACTER(LEN=6) :: precisionString CHARACTER(LEN=9) :: flags(11) CHARACTER(LEN=20) :: structureSpecifiers(11) - CHARACTER(LEN=50) :: gitdesc,githash,gitbranch,compile_date,compile_user,compile_host - CHARACTER(LEN=50) :: compile_flags,link_flags + CHARACTER(:), ALLOCATABLE :: gitdesc,githash,gitbranch,compile_date,compile_user,compile_host + CHARACTER(:), ALLOCATABLE :: compile_flags,link_flags CHARACTER(LEN=20) :: attributes(7) maxNumElements = 10 diff --git a/main/fleur_help.F90 b/main/fleur_help.F90 index 992dc7fb..afcfb696 100644 --- a/main/fleur_help.F90 +++ b/main/fleur_help.F90 @@ -14,7 +14,7 @@ CONTAINS USE m_fleur_arguments IMPLICIT NONE - CHARACTER(LEN=500):: infostring + CHARACTER(:), ALLOCATABLE:: infostring PRINT *," Welcome to FLEUR (www.flapw.de) " PRINT *," MaX-Release 2.1 (www.max-centre.eu)" @@ -26,7 +26,7 @@ CONTAINS !now print version info and help on command line arguments: CALL get_compile_desc_string(infostring) - WRITE(*,'(a500)') infostring + WRITE(*,'(a)') infostring WRITE(*,'(a)') WRITE(*,'(a)')"------------------------------------------------------" WRITE(*,'(a)')"Usage info:" -- 2.26.2