Skip to content

GitLab

fleur
fleur
Commit 570512bb authored by Matthias Redies's avatar Matthias Redies
3 Browse files
Options

most link & include lines are longer than 50 characters

parent d4cd3fdb
Hide whitespace changes
Inline Side-by-side
Showing with 43 additions and 41 deletions
init/compile_descr.F90
View file @ 570512bb
...@@ -6,41 +6,43 @@ ...@@ -6,41 +6,43 @@
MODULE m_compile_descr MODULE m_compile_descr
IMPLICIT NONE IMPLICIT NONE
CONTAINS CONTAINS
SUBROUTINE get_compile_desc_string(info) SUBROUTINE get_compile_desc_string(info)
USE m_constants USE m_constants
IMPLICIT NONE IMPLICIT NONE
CHARACTER(LEN=*),INTENT(OUT):: info CHARACTER(:),ALLOCATABLE,INTENT(OUT):: info
CHARACTER(len=50)::gitdesc,githash,compile_date,compile_user,compile_host,gitbranch CHARACTER(:), ALLOCATABLE::gitdesc,githash,compile_date,compile_user,compile_host,gitbranch
CHARACTER(len=50)::compile_flags,link_flags 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")// & CALL get_compile_desc(gitdesc,githash,gitbranch,compile_date,compile_user,compile_host,compile_flags,link_flags)
"This is FLEUR version: "//trim(version_const)//new_line("a")// &
"FLEUR was compiled:"//new_line("a")// & info=new_line("a")// &
" at: "//TRIM(compile_date)//new_line("a")// & "This is FLEUR version: "//trim(version_const)//new_line("a")// &
" by: "//TRIM(compile_user)//new_line("a")// & "FLEUR was compiled:"//new_line("a")// &
" on: "//TRIM(compile_host)//new_line("a")// & " at: "//TRIM(compile_date)//new_line("a")// &
"Its git version is:"//new_line("a")// & " by: "//TRIM(compile_user)//new_line("a")// &
" described by: "//TRIM(gitdesc)//new_line("a")// & " on: "//TRIM(compile_host)//new_line("a")// &
" from branch: "//trim(gitbranch)//new_line("a")// & "Its git version is:"//new_line("a")// &
" with hash: "//TRIM(githash)//new_LINE("a")//& " described by: "//TRIM(gitdesc)//new_line("a")// &
"Compiler info:"//new_LINE("a")// & " from branch: "//trim(gitbranch)//new_line("a")// &
" flags : "//TRIM(compile_flags)//new_LINE("a")//& " with hash: "//TRIM(githash)//new_LINE("a")//&
" link flags: "//TRIM(link_flags) "Compiler info:"//new_LINE("a")// &
end SUBROUTINE get_compile_desc_string " flags : "//TRIM(compile_flags)//new_LINE("a")//&
" link flags: "//TRIM(link_flags)
SUBROUTINE get_compile_desc(gitdesc,githash,gitbranch,compile_date,compile_user,compile_host,compile_flags,link_flags) end SUBROUTINE get_compile_desc_string
IMPLICIT NONE
CHARACTER(LEN=*),INTENT(OUT)::gitdesc,githash,compile_date,compile_user,compile_host,gitbranch,compile_flags,link_flags 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 !This file is created by cmake at time of configuration
#include "compileinfo.h" #include "compileinfo.h"
END subroutine get_compile_desc END subroutine get_compile_desc
end MODULE m_compile_descr end MODULE m_compile_descr
inpgen/inpgen_help.f90
View file @ 570512bb
...@@ -12,7 +12,7 @@ CONTAINS ...@@ -12,7 +12,7 @@ CONTAINS
USE m_juDFT USE m_juDFT
USE m_fleur_arguments USE m_fleur_arguments
IMPLICIT NONE IMPLICIT NONE
CHARACTER(LEN=500):: infostring CHARACTER(:), ALLOCATABLE:: infostring
PRINT *," Welcome to FLEUR - inpgen (www.flapw.de) " PRINT *," Welcome to FLEUR - inpgen (www.flapw.de) "
PRINT *," MaX-Release 2.1 (www.max-centre.eu)" PRINT *," MaX-Release 2.1 (www.max-centre.eu)"
...@@ -21,7 +21,7 @@ CONTAINS ...@@ -21,7 +21,7 @@ CONTAINS
!now print version info and help on command line arguments: !now print version info and help on command line arguments:
CALL get_compile_desc_string(infostring) CALL get_compile_desc_string(infostring)
WRITE(*,'(a500)') infostring WRITE(*,'(a)') infostring
WRITE(*,'(a)') WRITE(*,'(a)')
WRITE(*,'(a)')"------------------------------------------------------" WRITE(*,'(a)')"------------------------------------------------------"
WRITE(*,'(a)')"inpgen usage info:" WRITE(*,'(a)')"inpgen usage info:"
......
io/writeOutHeader.F90
View file @ 570512bb
...@@ -15,7 +15,7 @@ CONTAINS ...@@ -15,7 +15,7 @@ CONTAINS
USE m_compile_descr USE m_compile_descr
IMPLICIT NONE IMPLICIT NONE
CHARACTER(len=9) :: cppflag(11) CHARACTER(len=9) :: cppflag(11)
CHARACTER(LEN=500):: infostring CHARACTER(:), ALLOCATABLE:: infostring
INTEGER :: i,j INTEGER :: i,j
WRITE (6,*) 'This output is generated by ',version_const WRITE (6,*) 'This output is generated by ',version_const
...@@ -30,7 +30,7 @@ CONTAINS ...@@ -30,7 +30,7 @@ CONTAINS
WRITE (6,*) WRITE (6,*)
CALL get_compile_desc_string(infostring) CALL get_compile_desc_string(infostring)
write(6,'(a500)') infostring write(6,'(a)') infostring
CALL getComputerArchitectures(cppflag,i) ! First determine the architecture CALL getComputerArchitectures(cppflag,i) ! First determine the architecture
IF (i.GT.1) THEN IF (i.GT.1) THEN
WRITE (6,*) 'You set compiler flags for more than one' WRITE (6,*) 'You set compiler flags for more than one'
......
io/xmlOutput.F90
View file @ 570512bb
...@@ -66,8 +66,8 @@ MODULE m_xmlOutput ...@@ -66,8 +66,8 @@ MODULE m_xmlOutput
CHARACTER(LEN=6) :: precisionString CHARACTER(LEN=6) :: precisionString
CHARACTER(LEN=9) :: flags(11) CHARACTER(LEN=9) :: flags(11)
CHARACTER(LEN=20) :: structureSpecifiers(11) CHARACTER(LEN=20) :: structureSpecifiers(11)
CHARACTER(LEN=50) :: gitdesc,githash,gitbranch,compile_date,compile_user,compile_host CHARACTER(:), ALLOCATABLE :: gitdesc,githash,gitbranch,compile_date,compile_user,compile_host
CHARACTER(LEN=50) :: compile_flags,link_flags CHARACTER(:), ALLOCATABLE :: compile_flags,link_flags
CHARACTER(LEN=20) :: attributes(7) CHARACTER(LEN=20) :: attributes(7)
maxNumElements = 10 maxNumElements = 10
......
main/fleur_help.F90
View file @ 570512bb
...@@ -14,7 +14,7 @@ CONTAINS ...@@ -14,7 +14,7 @@ CONTAINS
USE m_fleur_arguments USE m_fleur_arguments
IMPLICIT NONE IMPLICIT NONE
CHARACTER(LEN=500):: infostring CHARACTER(:), ALLOCATABLE:: infostring
PRINT *," Welcome to FLEUR (www.flapw.de) " PRINT *," Welcome to FLEUR (www.flapw.de) "
PRINT *," MaX-Release 2.1 (www.max-centre.eu)" PRINT *," MaX-Release 2.1 (www.max-centre.eu)"
...@@ -26,7 +26,7 @@ CONTAINS ...@@ -26,7 +26,7 @@ CONTAINS
!now print version info and help on command line arguments: !now print version info and help on command line arguments:
CALL get_compile_desc_string(infostring) CALL get_compile_desc_string(infostring)
WRITE(*,'(a500)') infostring WRITE(*,'(a)') infostring
WRITE(*,'(a)') WRITE(*,'(a)')
WRITE(*,'(a)')"------------------------------------------------------" WRITE(*,'(a)')"------------------------------------------------------"
WRITE(*,'(a)')"Usage info:" WRITE(*,'(a)')"Usage info:"
......
  • Gregor Michalicek @micha ·
    Maintainer

    @redies: in the file io/xmlOutput.F90 I will revert your changes. It is actually important for the XML IO to have exactly 50 characters. With your changes I obtain The error "Fortran runtime error: Different CHARACTER lengths (19/6) in array constructor". We decided a long time ago to cut the output after 50 characters, because otherwise it would not be readable anyway.

    So: There is an array of these strings and therefore they cannot have different lengths.

    The error appears in line 90 of xmlOutput.F90. With gfortran and debugging options.

    Edited by Gregor Michalicek
  • Gregor Michalicek @micha ·
    Maintainer

    Change of plan: We will discuss this tomorrow and then probably revert the whole commit. The changes seem to depend on each other.

  • Gregor Michalicek @micha ·
    Maintainer

    I committed a quick fix for this issue in commit 08859e6c.

Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment