XClib - libxc related fixes

Modules/dgcxc_drivers.f90

@@ -183,7 +183,7 @@ SUBROUTINE dgcxc( length, sp, r_in, g_in, dvxc_rr, dvxc_sr, dvxc_ss )
        !
        ALLOCATE( sigma(length) )
        sigma(:) = g_in(:,1,1)**2 + g_in(:,2,1)**2 + g_in(:,3,1)**2
-       CALL dgcxc_unpol( length, r_in, sigma, vrrx, vsrx, vssx, vrrc, vsrc, vssc )
+       CALL dgcxc_unpol( length, r_in(:,1), sigma, vrrx(:,1), vsrx(:,1), vssx(:,1), vrrc(:,1), vsrc(:,1), vssc )
        DEALLOCATE( sigma )
        !
        dvxc_rr(:,1,1) = e2 * (vrrx(:,1) + vrrc(:,1))

Modules/funct.f90

@@ -823,6 +823,9 @@ CONTAINS
     dft_defined = .TRUE.
     !
 #if defined(__LIBXC)
+    iexch_qe = iexch ; icorr_qe = icorr
+    igcx_qe  = igcx  ; igcc_qe  = igcc
+    imeta_qe = imeta
     IF ( is_libxc(1) ) iexch_qe = 0
     IF ( is_libxc(2) ) icorr_qe = 0
     IF ( is_libxc(3) ) igcx_qe  = 0

PP/src/make.depend

@@ -912,10 +912,9 @@ xctest.o : ../../Modules/funct.o
 xctest.o : ../../Modules/io_global.o
 xctest.o : ../../Modules/kind.o
 xctest.o : ../../Modules/mp_global.o
-xctest_qe_libxc.o : ../../Modules/correlation_lda_lsda.o
 xctest_qe_libxc.o : ../../Modules/funct.o
-xctest_qe_libxc.o : ../../Modules/kind.o
 xctest_qe_libxc.o : ../../Modules/xc_gga_drivers.o
 xctest_qe_libxc.o : ../../Modules/xc_lda_lsda_drivers.o
 xctest_qe_libxc.o : ../../Modules/xc_mgga_drivers.o
+xctest_qe_libxc.o : ../../Modules/kind.o
 

PP/src/xctest_qe_libxc.f90

@@ -32,7 +32,6 @@ PROGRAM xctest_qe_libxc
   USE funct,          ONLY: set_dft_from_name, set_exx_fraction
   USE funct,          ONLY: get_iexch, get_icorr, get_igcx, get_igcc, &
                             get_meta, get_metac, reset_dft
-  USE corr_lda,       ONLY: lyp, lsd_lyp
   USE xc_lda_lsda,    ONLY: xc
   USE xc_gga,         ONLY: xc_gcx
   USE xc_mgga,        ONLY: xc_metagcx