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 490 by gezelter, Fri Apr 11 15:16:59 2003 UTC vs.
Revision 1150 by gezelter, Fri May 7 21:35:05 2004 UTC

# Line 6 | Line 6 | module simulation
6    use force_globals
7    use vector_class
8    use atype_module
9 +  use switcheroo
10   #ifdef IS_MPI
11    use mpiSimulation
12   #endif
# Line 15 | Line 16 | module simulation
16  
17   #define __FORTRAN90
18   #include "fSimulation.h"
19 + #include "fSwitchingFunction.h"
20  
21 <  type (simtype), public :: thisSim
21 >  type (simtype), public, save :: thisSim
22  
23    logical, save :: simulation_setup_complete = .false.
24  
25 <  integer, public, save :: natoms
25 >  integer, public, save :: nLocal, nGlobal
26 >  integer, public, save :: nGroup, nGroupGlobal
27    integer, public, save :: nExcludes_Global = 0
28    integer, public, save :: nExcludes_Local = 0
29    integer, allocatable, dimension(:,:), public :: excludesLocal
30    integer, allocatable, dimension(:), public :: excludesGlobal
31    integer, allocatable, dimension(:), public :: molMembershipList
32 +  integer, allocatable, dimension(:), public :: groupList
33 +  integer, allocatable, dimension(:), public :: groupStart
34 +  real(kind=dp), allocatable, dimension(:), public :: mfact
35  
36 <  real(kind=dp), save :: rcut2 = 0.0_DP
37 <  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 <
36 >  real(kind=dp), public, dimension(3,3), save :: Hmat, HmatInv
37 >  logical, public, save :: boxIsOrthorhombic
38    
39    public :: SimulationSetup
40    public :: getNlocal
41    public :: setBox
39 –  public :: setBox_3d
40 –  public :: getBox
41 –  public :: setRcut
42 –  public :: getRcut
43 –  public :: getRlist
44 –  public :: getRrf
45 –  public :: getRt
42    public :: getDielect
43    public :: SimUsesPBC
44    public :: SimUsesLJ
45 +  public :: SimUsesCharges
46    public :: SimUsesDipoles
47    public :: SimUsesSticky
48    public :: SimUsesRF
# Line 54 | Line 51 | module simulation
51    public :: SimRequiresPrepairCalc
52    public :: SimRequiresPostpairCalc
53    public :: SimUsesDirectionalAtoms
57 –
58 –  interface getBox
59 –     module procedure getBox_3d
60 –     module procedure getBox_1d
61 –  end interface
54    
63 –  interface setBox
64 –     module procedure setBox_3d
65 –     module procedure setBox_1d
66 –  end interface
67 –  
55   contains
56    
57 <  subroutine SimulationSetup(setThisSim, nGlobal, nLocal, c_idents, &
57 >  subroutine SimulationSetup(setThisSim, CnGlobal, CnLocal, c_idents, &
58         CnLocalExcludes, CexcludesLocal, CnGlobalExcludes, CexcludesGlobal, &
59 <       CmolMembership, &
59 >       CmolMembership, Cmfact, CnGroup, CgroupList, CgroupStart, &
60         status)    
61  
62      type (simtype) :: setThisSim
63 <    integer, intent(inout) :: nGlobal, nLocal
64 <    integer, dimension(nLocal),intent(inout) :: c_idents
63 >    integer, intent(inout) :: CnGlobal, CnLocal
64 >    integer, dimension(CnLocal),intent(inout) :: c_idents
65  
66      integer :: CnLocalExcludes
67      integer, dimension(2,CnLocalExcludes), intent(in) :: CexcludesLocal
68      integer :: CnGlobalExcludes
69      integer, dimension(CnGlobalExcludes), intent(in) :: CexcludesGlobal
70 <    integer, dimension(nGlobal),intent(in) :: CmolMembership
70 >    integer, dimension(CnGlobal),intent(in) :: CmolMembership
71      !!  Result status, success = 0, status = -1
72      integer, intent(out) :: status
73      integer :: i, me, thisStat, alloc_stat, myNode
74 +    integer :: gStart, gEnd, groupSize, biggestGroupSize, ia
75 +
76 +    !! mass factors used for molecular cutoffs
77 +    real ( kind = dp ), dimension(CnLocal) :: Cmfact
78 +    integer, intent(in):: CnGroup
79 +    integer, dimension(CnLocal),intent(in) :: CgroupList
80 +    integer, dimension(CnGroup),intent(in) :: CgroupStart
81 +
82   #ifdef IS_MPI
83      integer, allocatable, dimension(:) :: c_idents_Row
84      integer, allocatable, dimension(:) :: c_idents_Col
# Line 95 | Line 90 | contains
90      status = 0
91  
92      ! copy C struct into fortran type
93 +
94 +    nLocal = CnLocal
95 +    nGlobal = CnGlobal
96 +    nGroup = CnGroup
97 +
98      thisSim = setThisSim
99 –    natoms = nLocal
100 –    rcut2 = thisSim%rcut * thisSim%rcut
101 –    rcut6 = rcut2 * rcut2 * rcut2
102 –    rlist2 = thisSim%rlist * thisSim%rlist
103 –    box = thisSim%box
99  
100      nExcludes_Global = CnGlobalExcludes
101      nExcludes_Local = CnLocalExcludes
102  
103 <    call InitializeForceGlobals(natoms, thisStat)
103 >    call InitializeForceGlobals(nLocal, thisStat)
104      if (thisStat /= 0) then
105         write(default_error,*) "SimSetup: InitializeForceGlobals error"
106         status = -1
# Line 163 | Line 158 | contains
158         deallocate(c_idents_Row)
159      endif
160      
161 < #else
161 > #endif
162 >
163 > ! We build the local atid's for both mpi and nonmpi
164      do i = 1, nLocal
165        
166         me = getFirstMatchingElement(atypes, "c_ident", c_idents(i))
167         atid(i) = me
168    
169      enddo
173 – #endif
170  
175 –
176 –
171      do i = 1, nExcludes_Local
172         excludesLocal(1,i) = CexcludesLocal(1,i)
173         excludesLocal(2,i) = CexcludesLocal(2,i)
# Line 185 | Line 179 | contains
179  
180      do i = 1, nGlobal
181         molMemberShipList(i) = CmolMembership(i)
188 –       ! write(0,*) 'molMembershipList(',i,') = ', molMemberShipList(i)
182      enddo
183 +    
184 +    biggestGroupSize = 0
185 +    do i = 1, nGroup
186 +       groupStart(i) = CgroupStart(i)
187 +       groupSize = 0
188 +       gStart = groupStart(i)      
189 +       if (i .eq. nGroup) then
190 +          gEnd = nLocal
191 +       else
192 +          gEnd = CgroupStart(i+1) - 1
193 +       endif
194 +       do ia = gStart, gEnd
195 +          groupList(ia) = CgroupList(ia)
196 +          groupSize = groupSize + 1
197 +       enddo
198 +       if (groupSize .gt. biggestGroupSize) biggestGroupSize = groupSize      
199 +    enddo
200 +    groupStart(nGroup+1) = nLocal+1
201  
202 +    do i = 1, nLocal
203 +       mfact(i) = Cmfact(i)
204 +    enddo    
205 +    
206      if (status == 0) simulation_setup_complete = .true.
207      
208    end subroutine SimulationSetup
209    
210 <  subroutine setBox_3d(new_box_size)
211 <    real(kind=dp), dimension(3) :: new_box_size
210 >  subroutine setBox(cHmat, cHmatInv, cBoxIsOrthorhombic)
211 >    real(kind=dp), dimension(3,3) :: cHmat, cHmatInv
212 >    integer :: cBoxIsOrthorhombic
213      integer :: smallest, status, i
214 <
215 <    thisSim%box = new_box_size
216 <    box = thisSim%box
217 <
214 >    
215 >    Hmat = cHmat
216 >    HmatInv = cHmatInv
217 >    if (cBoxIsOrthorhombic .eq. 0 ) then
218 >       boxIsOrthorhombic = .false.
219 >    else
220 >       boxIsOrthorhombic = .true.
221 >    endif
222 >    
223      return    
224 <  end subroutine setBox_3d
204 <
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
224 >  end subroutine setBox
225  
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 –
226    function getDielect() result(dielect)
227      real( kind = dp ) :: dielect
228      dielect = thisSim%dielect
# Line 297 | Line 243 | contains
243      doesit = thisSim%SIM_uses_sticky
244    end function SimUsesSticky
245  
246 +  function SimUsesCharges() result(doesit)
247 +    logical :: doesit
248 +    doesit = thisSim%SIM_uses_charges
249 +  end function SimUsesCharges
250 +
251    function SimUsesDipoles() result(doesit)
252      logical :: doesit
253      doesit = thisSim%SIM_uses_dipoles
# Line 353 | Line 304 | contains
304         return
305      endif
306  
307 <    allocate(molMembershipList(getNlocal()), stat=alloc_stat)
307 >    allocate(molMembershipList(nGlobal), stat=alloc_stat)
308      if (alloc_stat /= 0 ) then
309         thisStat = -1
310         return
311      endif
312 +
313 +    allocate(groupStart(nGroup+1), stat=alloc_stat)
314 +    if (alloc_stat /= 0 ) then
315 +       thisStat = -1
316 +       return
317 +    endif
318 +
319 +    allocate(groupList(nLocal), stat=alloc_stat)
320 +    if (alloc_stat /= 0 ) then
321 +       thisStat = -1
322 +       return
323 +    endif
324 +
325 +    allocate(mfact(nLocal), stat=alloc_stat)
326 +    if (alloc_stat /= 0 ) then
327 +       thisStat = -1
328 +       return
329 +    endif
330      
331    end subroutine InitializeSimGlobals
332    
# Line 365 | Line 334 | contains
334      
335      !We free in the opposite order in which we allocate in.
336  
337 +    if (allocated(mfact)) deallocate(mfact)
338 +    if (allocated(groupList)) deallocate(groupList)    
339 +    if (allocated(groupStart)) deallocate(groupStart)    
340      if (allocated(molMembershipList)) deallocate(molMembershipList)    
341      if (allocated(excludesGlobal)) deallocate(excludesGlobal)
342      if (allocated(excludesLocal)) deallocate(excludesLocal)
343 <
343 >    
344    end subroutine FreeSimGlobals
345 <
346 <  pure function getNlocal() result(nlocal)
347 <    integer :: nlocal
348 <    nlocal = natoms
345 >  
346 >  pure function getNlocal() result(n)
347 >    integer :: n
348 >    n = nLocal
349    end function getNlocal
378 –
350    
351 +  
352   end module simulation

Diff Legend

– Removed lines
+ Added lines
< Changed lines
> Changed lines