Commit 0aa079fa authored by Daniel Wortmann's avatar Daniel Wortmann

Merge branch 'develop' of fleur-git:fleur into develop

parents da06019c 07452ffc
ml purge
ml use /usr/local/software/jureca/OtherStages
ml Stages/2016a
ml CMake intel-para HDF5 ELPA/2015.11.001-hybrid Python
ml intel-para HDF5 ELPA/2016.05.004-hybrid Python
ml CMake
......@@ -39,7 +39,7 @@
#ifdef __INTEL_COMPILER
FUNCTION intel_signal_handler(signal)
USE m_judft_time
USE m_judft_stop
USE m_judft_sysinfo
IMPLICIT NONE
INTEGER :: signal
INTEGER :: intel_signal_handler
......
......@@ -34,7 +34,8 @@
FUNCTION memory_usage_string()
IMPLICIT NONE
CHARACTER(len=10):: memory_usage_string
INTEGER:: fid=543,idum
INTEGER:: fid=543
INTEGER*8:: idum
LOGICAL:: firstcall=.TRUE.
LOGICAL:: available=.FALSE.
......@@ -46,7 +47,7 @@
IF (available) THEN
REWIND(fid)
READ(fid,*) idum
WRITE(memory_usage_string,"(f8.3,a)") idum*CPP_PAGESIZE/(1024.*1024.*1024.),"GB"
WRITE(memory_usage_string,"(f8.3,a)") (CPP_PAGESIZE/(1024.*1024.*1024.))*idum,"GB"
ELSE
memory_usage_string=""
ENDIF
......
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