Commit 53cdc8da authored by Daniel Wortmann's avatar Daniel Wortmann

Removed dependence on judft_env.h in hdf_tools, fixed cmake files

parent b5daec2b
......@@ -72,7 +72,7 @@ set_source_files_properties(${fleur_F77} PROPERTIES Fortran_FORMAT FIXED)
set_source_files_properties(${inpgen_F90} PROPERTIES Fortran_FORMAT FREE)
set_source_files_properties(${inpgen_F77} PROPERTIES Fortran_FORMAT FIXED)
set(CMAKE_Fortran_FLAGS "${CMAKE_Fortran_FLAGS};${FLEUR_PRECISION_OPTION}")
set(CMAKE_Fortran_FLAGS "${CMAKE_Fortran_FLAGS} ${FLEUR_PRECISION_OPTION}")
if (${FLEUR_USE_SERIAL})
#Serial executables
......
......@@ -6,7 +6,6 @@
module m_hdf_accessprp
USE hdf5
#include "juDFT_env.h"
implicit none
private
!the hdf-access-properties
......@@ -42,13 +41,11 @@ module m_hdf_accessprp
#endif
IF (.not.present(setupfile)) THEN
CPP_juDFT_timestart_debug("generating access prp")
n_access_prp=1
call priv_generate_access_prp("default")
call getenv("HOME",path)
call priv_generate_access_prp(trim(path)//"/.gf_hdf")
call priv_generate_access_prp("gf_hdf")
CPP_juDFT_timestop_debug("generating access prp")
return
ENDIF
......@@ -143,7 +140,6 @@ module m_hdf_accessprp
character(len=*),intent(in) :: filename
INTEGER(hid_t) :: hdf_access_prp
INTEGER :: n
CPP_juDFT_timestart_debug("getting access prp")
!if this is the first attempt to get an access_prp, generate them
if (n_access_prp==0) CALL priv_generate_access_prp()
hdf_access_prp=access_prp(1)
......@@ -153,7 +149,6 @@ module m_hdf_accessprp
write(6,*) "Assigned:",n," to ", filename
ENDIF
ENDDO
CPP_juDFT_timestop_debug("getting access prp")
END function
end module m_hdf_accessprp
......@@ -6,7 +6,6 @@
MODULE m_hdf_tools4
USE hdf5
#include "juDFT_env.h"
!-----------------------------------------------
! major rewrite of hdf_tools
! this module contains various subroutines
......@@ -455,6 +454,7 @@
! Version for LINUX compiled with IFC
! (last modified: 05-02-25) D. Wortmann
!-----------------------------------------------
use m_juDFT_stop
IMPLICIT NONE
!<-- Arguments
CHARACTER*(*) ::message
......@@ -462,7 +462,7 @@
!>
WRITE(*,*) "Error in HDF-io"
WRITE(*,*) message
CPP_error(message)
call judft_error(message)
END SUBROUTINE
!>
......
......@@ -5,7 +5,6 @@
!--------------------------------------------------------------------------------
MODULE m_hdf_tools2
#include "juDFT_env.h"
!-----------------------------------------------
! major rewrite of hdf_tools
! this module contains only the
......@@ -14,6 +13,7 @@
! only the generic interface is public
!-----------------------------------------------
USE m_hdf_tools4
USE m_judft_stop
!PRIVATE
!<--definitions of interfaces
......@@ -1543,7 +1543,7 @@
foffset=1
fncount=2
ENDWHERE
if (count(start<0).ne.1) CPP_error("Wrong no of negatives")
if (count(start<0).ne.1) call judft_error("Wrong no of negatives")
if (start(1)<0) then
ALLOCATE(A(2,SIZE(DATA,1),size(data,2)))
CALL io_read_real3(did,foffset,fncount,a,trans)
......@@ -1581,7 +1581,7 @@
foffset=1
fncount=2
ENDWHERE
if (count(start<0).ne.1) CPP_error("Wrong no of negatives")
if (count(start<0).ne.1) call judft_error("Wrong no of negatives")
if (start(1)<0) then
ALLOCATE(A(2,SIZE(DATA,1),size(data,2),size(data,3)))
CALL io_read_real4(did,foffset,fncount,a,trans)
......@@ -1591,7 +1591,7 @@
CALL io_read_real4(did,foffset,fncount,a,trans)
DATA=CMPLX(a(:,:,:,1),a(:,:,:,2))
else
CPP_error("Wrong position of negative")
call judft_error("Wrong position of negative")
endif
DEALLOCATE(a)
END SUBROUTINE
......@@ -1617,7 +1617,7 @@
foffset=1
fncount=2
ENDWHERE
if (count(start<0)/=1) CPP_error("Wrong no of negatives")
if (count(start<0)/=1) call judft_error("Wrong no of negatives")
if (start(1)<0) then
ALLOCATE(A(2,SIZE(DATA,1),size(data,2),size(data,3),size(data,4)))
CALL io_read_real5(did,foffset,fncount,a,trans)
......@@ -1627,7 +1627,7 @@
CALL io_read_real5(did,foffset,fncount,a,trans)
DATA=CMPLX(a(:,:,:,:,1),a(:,:,:,:,2))
else
CPP_error("Wrong position of negative")
call judft_error("Wrong position of negative")
endif
DEALLOCATE(a)
END SUBROUTINE
......@@ -1653,7 +1653,7 @@
foffset=1
fncount=2
ENDWHERE
if (count(start<0)/=1) CPP_error("Wrong no of negatives")
if (count(start<0)/=1) call judft_error("Wrong no of negatives")
if (start(1)<0) then
ALLOCATE(A(2,SIZE(DATA,1),size(data,2),size(data,3),size(data,4),size(data,5)))
CALL io_read_real6(did,foffset,fncount,a,trans)
......@@ -1663,7 +1663,7 @@
CALL io_read_real6(did,foffset,fncount,a,trans)
DATA=CMPLX(a(:,:,:,:,:,1),a(:,:,:,:,:,2))
else
CPP_error("Wrong position of negative")
call judft_error("Wrong position of negative")
endif
DEALLOCATE(a)
END SUBROUTINE
......
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