comp-chem/cp2k
1
0
Fork 0
mirror of https://github.com/cp2k/cp2k.git synced 2026-07-28 14:15:19 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

Resolve name clash for Intel compiler

Browse source
This commit is contained in:
Matthias Krack 2025-05-27 10:21:57 +02:00
parent 82de6c2773
commit 43d811ebd1
1 changed files with 18 additions and 18 deletions
Download patch file Download diff file Expand all files Collapse all files

36
src/ec_orth_solver.F
View file

@ -106,8 +106,8 @@ CONTAINS
!> \date 01.2020
!> \author Fabian Belleflamme
! **************************************************************************************************
SUBROUTINE preconditioner(qs_env, matrix_ks, matrix_p, matrix_rhs, &
matrix_cg_z, eps_filter, iounit)
SUBROUTINE ec_preconditioner(qs_env, matrix_ks, matrix_p, matrix_rhs, &
matrix_cg_z, eps_filter, iounit)
TYPE(qs_environment_type), POINTER :: qs_env
TYPE(dbcsr_p_type), DIMENSION(:), INTENT(IN), &
@ -117,7 +117,7 @@ CONTAINS
REAL(KIND=dp), INTENT(IN) :: eps_filter
INTEGER, INTENT(IN) :: iounit
CHARACTER(len=*), PARAMETER :: routineN = 'preconditioner'
CHARACTER(len=*), PARAMETER :: routineN = 'ec_preconditioner'
INTEGER :: handle, i, ispin, max_iter, nao, nspins
LOGICAL :: converged
@ -336,7 +336,7 @@ CONTAINS
CALL timestop(handle)
END SUBROUTINE preconditioner
END SUBROUTINE ec_preconditioner
! **************************************************************************************************
!> \brief AO-based conjugate gradient linear response solver.
@ -558,13 +558,13 @@ CONTAINS
IF (linres_control%preconditioner_type == precond_mlp) THEN
! M * z_0 = r_0
! Conjugate gradient returns z_0
CALL preconditioner(qs_env=qs_env, &
matrix_ks=matrix_ks, &
matrix_p=matrix_p, &
matrix_rhs=matrix_res, &
matrix_cg_z=matrix_z0, &
eps_filter=eps_filter, &
iounit=iounit)
CALL ec_preconditioner(qs_env=qs_env, &
matrix_ks=matrix_ks, &
matrix_p=matrix_p, &
matrix_rhs=matrix_res, &
matrix_cg_z=matrix_z0, &
eps_filter=eps_filter, &
iounit=iounit)
linres_control%flag = "PCG-AO"
ELSE
! z_0 = r_0
@ -757,13 +757,13 @@ CONTAINS
IF (linres_control%preconditioner_type == precond_mlp) THEN
! M * z_j+1 = r_j+1
! Conjugate gradient returns z_j+1
CALL preconditioner(qs_env=qs_env, &
matrix_ks=matrix_ks, &
matrix_p=matrix_p, &
matrix_rhs=matrix_res, &
matrix_cg_z=matrix_z0, &
eps_filter=eps_filter, &
iounit=iounit)
CALL ec_preconditioner(qs_env=qs_env, &
matrix_ks=matrix_ks, &
matrix_p=matrix_p, &
matrix_rhs=matrix_res, &
matrix_cg_z=matrix_z0, &
eps_filter=eps_filter, &
iounit=iounit)
linres_control%flag = "PCG-AO"
ELSE
DO ispin = 1, nspins