ViewVC Help
View File | Revision Log | Show Annotations | View Changeset | Root Listing
root/group/trunk/OOPSE-4/src/UseTheForce/DarkSide/eam.F90
(Generate patch)

Comparing trunk/OOPSE-4/src/UseTheForce/DarkSide/eam.F90 (file contents):
Revision 2277 by chrisfen, Fri Aug 26 21:30:41 2005 UTC vs.
Revision 2278 by chrisfen, Fri Aug 26 22:39:25 2005 UTC

# Line 141 | Line 141 | contains
141  
142    subroutine newEAMtype(lattice_constant,eam_nrho,eam_drho,eam_nr,&
143         eam_dr,rcut,eam_Z_r,eam_rho_r,eam_F_rho,&
144 <       eam_ident,status)
144 >       c_ident,status)
145      real (kind = dp )                      :: lattice_constant
146      integer                                :: eam_nrho
147      real (kind = dp )                      :: eam_drho
# Line 151 | Line 151 | contains
151      real (kind = dp ), dimension(eam_nr)   :: eam_Z_r
152      real (kind = dp ), dimension(eam_nr)   :: eam_rho_r
153      real (kind = dp ), dimension(eam_nrho) :: eam_F_rho
154 <    integer                                :: eam_ident
154 >    integer                                :: c_ident
155      integer                                :: status
156  
157      integer                                :: nAtypes,nEAMTypes,myATID
# Line 179 | Line 179 | contains
179      EAMList%currentAddition = EAMList%currentAddition + 1
180      current = EAMList%currentAddition
181  
182 <    myATID =  getFirstMatchingElement(atypes, "c_ident", eam_ident)
182 >    myATID =  getFirstMatchingElement(atypes, "c_ident", c_ident)
183      EAMList%atidToEAMType(myATID) = current
184  
185      call allocate_EAMType(eam_nrho,eam_nr,EAMList%EAMParams(current),stat=alloc_stat)
# Line 189 | Line 189 | contains
189      end if
190  
191    
192 <    EAMList%EAMParams(current)%eam_atype    = eam_ident
192 >    EAMList%EAMParams(current)%eam_atype    = c_ident
193      EAMList%EAMParams(current)%eam_lattice  = lattice_constant
194      EAMList%EAMParams(current)%eam_nrho     = eam_nrho
195      EAMList%EAMParams(current)%eam_drho     = eam_drho
# Line 222 | Line 222 | contains
222  
223    function getEAMCut(atomID) result(cutValue)
224      integer, intent(in) :: atomID
225 +    integer :: eamID
226      real(kind=dp) :: cutValue
227      
228 <    cutValue = eamList%EAMParams(atomID)%eam_rcut
228 >    eamID = EAMList%atidToEAMType(atomID)
229 >    cutValue = EAMList%EAMParams(eamID)%eam_rcut
230  
231    end function getEAMCut
232  

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines