ViewVC Help
View File | Revision Log | Show Annotations | View Changeset | Root Listing
root/group/trunk/OOPSE_old/src/mdtools/libmdCode/calc_LJ_FF.F90
(Generate patch)

Comparing trunk/OOPSE_old/src/mdtools/libmdCode/calc_LJ_FF.F90 (file contents):
Revision 356 by gezelter, Mon Mar 17 20:42:57 2003 UTC vs.
Revision 358 by gezelter, Mon Mar 17 21:07:50 2003 UTC

# Line 2 | Line 2
2   !! Corresponds to the force field defined in lj_FF.cpp
3   !! @author Charles F. Vardeman II
4   !! @author Matthew Meineke
5 < !! @version $Id: calc_LJ_FF.F90,v 1.10 2003-03-17 20:42:57 gezelter Exp $, $Date: 2003-03-17 20:42:57 $, $Name: not supported by cvs2svn $, $Revision: 1.10 $
5 > !! @version $Id: calc_LJ_FF.F90,v 1.11 2003-03-17 21:07:50 gezelter Exp $, $Date: 2003-03-17 21:07:50 $, $Name: not supported by cvs2svn $, $Revision: 1.11 $
6  
7   module lj
8    use simulation
# Line 15 | Line 15 | module lj
15    implicit none
16    PRIVATE
17  
18 + #define __FORTRAN90
19 + #include "fForceField.h"
20 +
21    integer, save :: LJ_Mixing_Policy
19  integer, parameter :: LB_Mixing_Rule = 1
20  integer, parameter :: Explicit_Mixing_Rule = 2
22    
23    !! Logical has lj force field module been initialized?
24    
# Line 47 | Line 48 | contains
48   contains
49  
50    subroutine init_LJ_FF(mix_Policy, status)
51 <    character(len=100), intent(in) :: mix_Policy
51 >    integer, intent(in) :: mix_Policy
52      integer, intent(out) :: status
53      integer :: myStatus
54      
55 <    if ((mix_Policy == "standard") .or.  (mix_Policy == "LB")) then
56 <       LJ_Mixing_Policy = LB_Mixing_Rule
55 >    if (mix_Policy == LB_MIXING_RULE) then
56 >       LJ_Mixing_Policy = LB_MIXING_RULE
57      else
58 <       if (mix_Policy == "EXPLICIT") then
59 <          LJ_Mixing_Policy = Explicit_Mixing_Rule
58 >       if (mix_Policy == EXPLICIT_MIXING_RULE) then
59 >          LJ_Mixing_Policy = EXPLICIT_MIXING_RULE
60         else
61            write(*,*) 'Unknown Mixing Policy!'
62            status = -1
# Line 71 | Line 72 | contains
72      end if
73      
74      LJ_FF_initialized = .true.
75 <
75 >    
76    end subroutine init_LJ_FF
77    
78    subroutine createMixingList(status)
# Line 263 | Line 264 | contains
264      
265      if (present(status)) status = 0
266      select case (LJ_Mixing_Policy)
267 <    case (LB_Mixing_Rule)
267 >    case (LB_MIXING_RULE)
268         select case (thisParam)
269         case ("sigma")
270            myMixParam = 0.5_dp * (param1 + param2)

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines