Skip to content

Commit fd41678

Browse files
committed
adapt vasp patch files for ver6.3.2
1 parent 6b315f0 commit fd41678

File tree

3 files changed

+9
-5
lines changed

3 files changed

+9
-5
lines changed

Docker/openmpi_dockerfile

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -119,6 +119,12 @@ RUN cd /source && wget --quiet https://gitlab.com/QEF/q-e/-/archive/qe-7.0/q-e-q
119119
#ADD csc_vasp.tar.gz /vasp/
120120
#COPY openmpi_vasp.makefile /vasp/makefile.include
121121

122+
# patch for Vasp CSC
123+
#COPY vasp_diffs /vasp/vasp_diffs
124+
#RUN cd /vasp/src \
125+
#&& for name in electron.F fileio.F locproj.F mlwf.F .objects; \
126+
#do patch $name -p1 -i ../vasp_diffs/$name; done
127+
122128
#RUN cd /vasp/ \
123129
#&& make std \
124130
#&& rm -rf src/ build/ arch/

Docker/vasp_diffs/electron.F

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
656a660,661
77
> flush(17)
88
> print *, ' '
9-
697,704c702,718
9+
697,704c702,720
1010
< IF (IO%LORBIT==14) CALL SPHPRO_FAST( &
1111
< GRID,LATT_CUR, P,T_INFO,W, WDES, 71,IO%IU6,&
1212
< INFO%LOVERL,LMDIM,CQIJ, LDIMP, LDIMP,LMDIMP,INNER_STEP, IO%LORBIT,PAR, &
@@ -26,10 +26,12 @@
2626
> EFERMI, KPOINTS%EMIN, KPOINTS%EMAX)
2727
> CALL LPRJ_PROALL(W,WDES,P,CQIJ,LATT_CUR,LPRJ_functions,LPRJ_COVL,T_INFO,INFO,IO)
2828
> CALL LPRJ_WRITE(LPRJ_functions,LPRJ_COVL,IO%IU6, IO%IU0, W, EFERMI)
29+
> ! CALL LPRJ_LDApU(IO, W) ! write a LDA+U GAMMA file
2930
> CALL LPRJ_DEALLOC
3031
>
3132
> IF (WANNIER90()) THEN
3233
> CALL KPAR_SYNC_ALL(WDES,W)
3334
> CALL MLWF_MAIN(WDES,W,P,KPOINTS,CQIJ,T_INFO,LATT_CUR,INFO,IO,MLWF_GLOBAL)
35+
> CALL WRITE_EIGENVAL(WDES, W, IO%IU6)
3436
> ENDIF
3537
> ENDIF

Docker/vasp_diffs/mlwf.F

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,3 @@
2121
< ! or unitary matrix contrained optimization (umco)
2222
< ELSE
2323
< CALL MLWF_TRAFO_RUN(P_MLWF,W,P,CQIJ,LATT_CUR,T_INFO,INFO,IO)
24-
1125c1132
25-
< MLWF%LPRJ_functions(IS)%spin_qaxis = proj_s_qaxisx(3,IS)
26-
---
27-
> MLWF%LPRJ_functions(IS)%spin_qaxis = proj_s_qaxisx(:,IS)

0 commit comments

Comments
 (0)