Commit 15a23533 authored by Uliana Alekseeva's avatar Uliana Alekseeva

Merge branch 'develop' of ifflinux.iff.kfa-juelich.de:fleur into develop

Conflicts:
	juDFT/time.F90
parents 48113773 4601aaea
...@@ -25,7 +25,7 @@ SUBROUTINE w_inpXML(& ...@@ -25,7 +25,7 @@ SUBROUTINE w_inpXML(&
& numSpecies,enpara) & numSpecies,enpara)
USE m_types USE m_types
USE m_juDFT_init USE m_juDFT
USE m_constants USE m_constants
USE m_xmlOutput USE m_xmlOutput
......
...@@ -16,4 +16,5 @@ juDFT/init.F90 ...@@ -16,4 +16,5 @@ juDFT/init.F90
juDFT/juDFT.F90 juDFT/juDFT.F90
juDFT/stop.F90 juDFT/stop.F90
juDFT/time.F90 juDFT/time.F90
juDFT/args.F90
) )
...@@ -8,28 +8,9 @@ ...@@ -8,28 +8,9 @@
USE m_judft_time USE m_judft_time
IMPLICIT NONE IMPLICIT NONE
PRIVATE PRIVATE
PUBLIC juDFT_init,juDFT_was_argument PUBLIC juDFT_init
CONTAINS CONTAINS
FUNCTION juDFT_was_argument(arg) RESULT(OK)
IMPLICIT NONE
CHARACTER(len=*),INTENT(IN)::arg
LOGICAL ok
INTEGER:: i
CHARACTER(LEN=30)::str
ok=.false.
DO i=1,command_argument_count()
CALL get_command_argument(i,str)
IF(adjustl(str)==adjustl(arg)) ok=.true.
ENDDO
IF (ok) return
!Test for environment variable as well
CALL get_environment_variable("juDFT",str,status=i)
IF (i==0) ok=index(str,adjustl(arg))>0
END FUNCTION
SUBROUTINE juDFT_init() SUBROUTINE juDFT_init()
CALL signal_handler() CALL signal_handler()
END SUBROUTINE juDFT_init END SUBROUTINE juDFT_init
......
...@@ -8,5 +8,6 @@ ...@@ -8,5 +8,6 @@
USE m_juDFT_stop USE m_juDFT_stop
USE m_juDFT_time USE m_juDFT_time
USE m_juDFT_init USE m_juDFT_init
USE m_judft_args
END MODULE m_juDFT END MODULE m_juDFT
This diff is collapsed.
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