~nickpapior/siesta/merge-OSSO-class

« back to all changes in this revision

Viewing changes to Src/dfscf.f

  • Committer: Alberto Garcia
  • Author(s): Nick Papior
  • Date: 2018-04-21 22:05:21 UTC
  • mfrom: (694.1.1 merge-OSSO-fixes)
  • Revision ID: albertog@icmab.es-20180421220521-8911fvsme0mdotf2
Fixes to manual and removal of comments

Show diffs side-by-side

added added

removed removed

Lines of Context:
71
71
      use parallel,      only: Nodes, Node
72
72
      use sys,           only: die
73
73
      use parallelsubs,  only: GlobalToLocalOrb
74
 
!      use m_spin,        only: NonCol, SpOrb
75
 
!      use m_spin,        only: h_spin_dim, spinor_dim
76
74
 
77
 
! CC RC  Added  for the offSpOrb
78
75
      use m_spin,        only: spin
79
 
! CC RC  Added  for the offSpOrb
80
76
 
81
77
      implicit none
82
78
 
354
350
        ! done with nspin=4 (grid_nspin)?
355
351
        V(1:nsp,1:nspin) = Vscf(1:nsp,ip,1:nspin)
356
352
 
357
 
!! CC RC  Added  for the offSpOrb
358
353
C     Factor two for nondiagonal elements for non-collinear spin
359
 
        if( spin%SO ) then
 
354
        if ( spin%SO ) then
360
355
         V(1:nsp,7:8) = V(1:nsp,3:4)
361
 
        elseif( spin%NCol ) then 
 
356
        else if ( spin%NCol ) then 
362
357
         V(1:nsp,3:4) = 2.0_dp * V(1:nsp,3:4)
363
 
        endif
364
 
!! CC RC  Added  for the offSpOrb
 
358
        end if
365
359
 
366
360
C     Loop on first orbital of mesh point
367
361
        do ic = 1,nc