ViewVC Help
View File | Revision Log | Show Annotations | View Changeset | Root Listing
root/group/trunk/OOPSE/libmdtools/simulation_module.F90
(Generate patch)

Comparing trunk/OOPSE/libmdtools/simulation_module.F90 (file contents):
Revision 483 by gezelter, Wed Apr 9 04:06:43 2003 UTC vs.
Revision 1144 by tim, Sat May 1 18:52:38 2004 UTC

# Line 16 | Line 16 | module simulation
16   #define __FORTRAN90
17   #include "fSimulation.h"
18  
19 <  type (simtype), public :: thisSim
19 >  type (simtype), public, save :: thisSim
20  
21    logical, save :: simulation_setup_complete = .false.
22  
23 <  integer, public, save :: natoms
23 >  integer, public, save :: nLocal, nGlobal
24    integer, public, save :: nExcludes_Global = 0
25    integer, public, save :: nExcludes_Local = 0
26    integer, allocatable, dimension(:,:), public :: excludesLocal
27    integer, allocatable, dimension(:), public :: excludesGlobal
28    integer, allocatable, dimension(:), public :: molMembershipList
29  
30 <  real(kind=dp), save :: rcut2 = 0.0_DP
31 <  real(kind=dp), save :: rcut6 = 0.0_DP
32 <  real(kind=dp), save :: rlist2 = 0.0_DP
33 <  real(kind=dp), public, dimension(3), save :: box
34 <
30 >  real(kind=dp), public, dimension(3,3), save :: Hmat, HmatInv
31 >  logical, public, save :: boxIsOrthorhombic
32    
33    public :: SimulationSetup
34    public :: getNlocal
35    public :: setBox
39  public :: setBox_3d
40  public :: getBox
41  public :: setRcut
42  public :: getRcut
43  public :: getRlist
44  public :: getRrf
45  public :: getRt
36    public :: getDielect
37    public :: SimUsesPBC
38    public :: SimUsesLJ
39 +  public :: SimUsesCharges
40    public :: SimUsesDipoles
41    public :: SimUsesSticky
42    public :: SimUsesRF
# Line 54 | Line 45 | module simulation
45    public :: SimRequiresPrepairCalc
46    public :: SimRequiresPostpairCalc
47    public :: SimUsesDirectionalAtoms
57
58  interface getBox
59     module procedure getBox_3d
60     module procedure getBox_1d
61  end interface
48    
63  interface setBox
64     module procedure setBox_3d
65     module procedure setBox_1d
66  end interface
67  
49   contains
50    
51 <  subroutine SimulationSetup(setThisSim, nComponents, c_idents, &
51 >  subroutine SimulationSetup(setThisSim, CnGlobal, CnLocal, c_idents, &
52         CnLocalExcludes, CexcludesLocal, CnGlobalExcludes, CexcludesGlobal, &
53 <       CmolMembership, &
53 >       CmolMembership, mfact, ngroup, groupList, groupStart, &
54         status)    
55  
56      type (simtype) :: setThisSim
57 <    integer, intent(inout) :: nComponents
58 <    integer, dimension(nComponents),intent(inout) :: c_idents
57 >    integer, intent(inout) :: CnGlobal, CnLocal
58 >    integer, dimension(CnLocal),intent(inout) :: c_idents
59  
60      integer :: CnLocalExcludes
61      integer, dimension(2,CnLocalExcludes), intent(in) :: CexcludesLocal
62      integer :: CnGlobalExcludes
63      integer, dimension(CnGlobalExcludes), intent(in) :: CexcludesGlobal
64 <    integer, dimension(nComponents),intent(in) :: CmolMembership
64 >    integer, dimension(CnGlobal),intent(in) :: CmolMembership
65      !!  Result status, success = 0, status = -1
66      integer, intent(out) :: status
67      integer :: i, me, thisStat, alloc_stat, myNode
68 +
69 +    !! mass factors used for molecular cutoffs
70 +    real ( kind = dp ), dimension(3,nLocal) :: mfact
71 +    integer, intent(in):: ngroup
72 +    integer, dimension(nLocal),intent(in) :: groupList
73 +    integer, dimension(ngroup),intent(in) :: groupStart
74 +
75   #ifdef IS_MPI
76      integer, allocatable, dimension(:) :: c_idents_Row
77      integer, allocatable, dimension(:) :: c_idents_Col
# Line 95 | Line 83 | contains
83      status = 0
84  
85      ! copy C struct into fortran type
86 +
87 +    nLocal = CnLocal
88 +    nGlobal = CnGlobal
89 +
90      thisSim = setThisSim
99    natoms = nComponents
100    rcut2 = thisSim%rcut * thisSim%rcut
101    rcut6 = rcut2 * rcut2 * rcut2
102    rlist2 = thisSim%rlist * thisSim%rlist
103    box = thisSim%box
91  
92      nExcludes_Global = CnGlobalExcludes
93      nExcludes_Local = CnLocalExcludes
94  
95 <    call InitializeForceGlobals(natoms, thisStat)
95 >    call InitializeForceGlobals(nLocal, thisStat)
96      if (thisStat /= 0) then
97         write(default_error,*) "SimSetup: InitializeForceGlobals error"
98         status = -1
# Line 163 | Line 150 | contains
150         deallocate(c_idents_Row)
151      endif
152      
153 < #else
154 <    do i = 1, nComponents
153 > #endif
154 >
155 > ! We build the local atid's for both mpi and nonmpi
156 >    do i = 1, nLocal
157        
158         me = getFirstMatchingElement(atypes, "c_ident", c_idents(i))
159         atid(i) = me
160    
161      enddo
173 #endif
162  
163  
164  
165 +
166      do i = 1, nExcludes_Local
167         excludesLocal(1,i) = CexcludesLocal(1,i)
168         excludesLocal(2,i) = CexcludesLocal(2,i)
# Line 183 | Line 172 | contains
172         excludesGlobal(i) = CexcludesGlobal(i)
173      enddo
174  
175 <    do i = 1, nComponents
175 >    do i = 1, nGlobal
176         molMemberShipList(i) = CmolMembership(i)
177 <       ! write(0,*) 'molMembershipList(',i,') = ', molMemberShipList(i)
189 <    enddo
177 >     enddo
178  
179      if (status == 0) simulation_setup_complete = .true.
180      
181    end subroutine SimulationSetup
182    
183 <  subroutine setBox_3d(new_box_size)
184 <    real(kind=dp), dimension(3) :: new_box_size
183 >  subroutine setBox(cHmat, cHmatInv, cBoxIsOrthorhombic)
184 >    real(kind=dp), dimension(3,3) :: cHmat, cHmatInv
185 >    integer :: cBoxIsOrthorhombic
186      integer :: smallest, status, i
187 <
188 <    thisSim%box = new_box_size
189 <    box = thisSim%box
190 <
187 >    
188 >    Hmat = cHmat
189 >    HmatInv = cHmatInv
190 >    if (cBoxIsOrthorhombic .eq. 0 ) then
191 >       boxIsOrthorhombic = .false.
192 >    else
193 >       boxIsOrthorhombic = .true.
194 >    endif
195 >    
196      return    
197 <  end subroutine setBox_3d
197 >  end subroutine setBox
198  
205  subroutine setBox_1d(dim, new_box_size)
206    integer :: dim, status
207    real(kind=dp) :: new_box_size
208    thisSim%box(dim) = new_box_size
209    box(dim) = thisSim%box(dim)
210  end subroutine setBox_1d
211
212  subroutine setRcut(new_rcut, status)
213    real(kind = dp) :: new_rcut
214    integer :: myStatus, status
215    thisSim%rcut = new_rcut
216    rcut2 = thisSim%rcut * thisSim%rcut
217    rcut6 = rcut2 * rcut2 * rcut2
218    status = 0
219    return
220  end subroutine setRcut
221
222  function getBox_3d() result(thisBox)
223    real( kind = dp ), dimension(3) :: thisBox
224    thisBox = thisSim%box
225  end function getBox_3d
226  
227  function getBox_1d(dim) result(thisBox)
228    integer, intent(in) :: dim
229    real( kind = dp ) :: thisBox
230    
231    thisBox = thisSim%box(dim)
232  end function getBox_1d
233    
234  subroutine getRcut(thisrcut,rc2,rc6,status)
235    real( kind = dp ), intent(out) :: thisrcut
236    real( kind = dp ), intent(out), optional :: rc2
237    real( kind = dp ), intent(out), optional :: rc6
238    integer, optional :: status
239
240    if (present(status)) status = 0
241    
242    if (.not.simulation_setup_complete ) then
243       if (present(status)) status = -1
244       return
245    end if
246    
247    thisrcut = thisSim%rcut
248    if(present(rc2)) rc2 = rcut2
249    if(present(rc6)) rc6 = rcut6
250  end subroutine getRcut
251  
252  subroutine getRlist(thisrlist,rl2,status)
253    real( kind = dp ), intent(out) :: thisrlist
254    real( kind = dp ), intent(out), optional :: rl2
255
256    integer, optional :: status
257
258    if (present(status)) status = 0
259
260    if (.not.simulation_setup_complete ) then
261       if (present(status)) status = -1
262       return
263    end if
264    
265    thisrlist = thisSim%rlist
266    if(present(rl2)) rl2 = rlist2
267  end subroutine getRlist
268
269  function getRrf() result(rrf)
270    real( kind = dp ) :: rrf
271    rrf = thisSim%rrf
272    write(*,*) 'getRrf = ', rrf, thisSim%rrf
273  end function getRrf
274  
275  function getRt() result(rt)
276    real( kind = dp ) :: rt
277    rt = thisSim%rt
278  end function getRt
279
199    function getDielect() result(dielect)
200      real( kind = dp ) :: dielect
201      dielect = thisSim%dielect
# Line 297 | Line 216 | contains
216      doesit = thisSim%SIM_uses_sticky
217    end function SimUsesSticky
218  
219 +  function SimUsesCharges() result(doesit)
220 +    logical :: doesit
221 +    doesit = thisSim%SIM_uses_charges
222 +  end function SimUsesCharges
223 +
224    function SimUsesDipoles() result(doesit)
225      logical :: doesit
226      doesit = thisSim%SIM_uses_dipoles
# Line 353 | Line 277 | contains
277         return
278      endif
279  
280 <    allocate(molMembershipList(getNlocal()), stat=alloc_stat)
280 >    allocate(molMembershipList(nGlobal), stat=alloc_stat)
281      if (alloc_stat /= 0 ) then
282         thisStat = -1
283         return
# Line 371 | Line 295 | contains
295  
296    end subroutine FreeSimGlobals
297  
298 <  pure function getNlocal() result(nlocal)
299 <    integer :: nlocal
300 <    nlocal = natoms
298 >  pure function getNlocal() result(n)
299 >    integer :: n
300 >    n = nLocal
301    end function getNlocal
302  
303    

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines