Commit 72eee7c7 authored by Matthias Redies's avatar Matthias Redies

now it compiles

parent 4cf783ad
...@@ -2185,17 +2185,17 @@ input%preconditioning_param = evaluateFirstOnly(xmlGetAttributeValue('/fleurInpu ...@@ -2185,17 +2185,17 @@ input%preconditioning_param = evaluateFirstOnly(xmlGetAttributeValue('/fleurInpu
! 2 -> GGA ! 2 -> GGA
! 3 -> MetaGGA ! 3 -> MetaGGA
! 4 -> Hybrid functional ! 4 -> Hybrid functional
if(xcpot%is_lda()) then if(xcpot%vxc_is_lda()) then
call add_usage_data("XC-treatment", 1) call add_usage_data("XC-treatment", 1)
return return
endif endif
if(xcpot%is_MetaGGA()) then if(xcpot%exc_is_MetaGGA()) then
call add_usage_data("XC-treatment", 3) call add_usage_data("XC-treatment", 3)
return return
endif endif
if(xcpot%is_GGA()) then if(xcpot%vxc_is_GGA()) then
call add_usage_data("XC-treatment", 2) call add_usage_data("XC-treatment", 2)
return return
endif endif
...@@ -2208,7 +2208,7 @@ input%preconditioning_param = evaluateFirstOnly(xmlGetAttributeValue('/fleurInpu ...@@ -2208,7 +2208,7 @@ input%preconditioning_param = evaluateFirstOnly(xmlGetAttributeValue('/fleurInpu
END SUBROUTINE set_xcpot_usage END SUBROUTINE set_xcpot_usage
SUBROUTINE getIntegerSequenceFromString(string, sequence, count) SUBROUTINE getIntegerSequenceFromString(string, sequence, count)
use m_juDFT_stop
IMPLICIT NONE IMPLICIT NONE
CHARACTER(*), INTENT(IN) :: string CHARACTER(*), INTENT(IN) :: string
......
...@@ -114,7 +114,6 @@ CONTAINS ...@@ -114,7 +114,6 @@ CONTAINS
xcpot%DATA%exchange_weight=xcpot%get_exchange_weight() xcpot%DATA%exchange_weight=xcpot%get_exchange_weight()
END SUBROUTINE xcpot_init END SUBROUTINE xcpot_init
<<<<<<< HEAD
!! LDA !! LDA
......
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