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 482 by chuckv, Tue Apr 8 22:38:43 2003 UTC vs.
Revision 1138 by gezelter, Wed Apr 28 21:39:22 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
48 <
58 <  interface getBox
59 <     module procedure getBox_3d
60 <     module procedure getBox_1d
61 <  end interface
48 >  public :: SimUsesMolecularCutoffs
49    
63  interface setBox
64     module procedure setBox_3d
65     module procedure setBox_1d
66  end interface
67  
50   contains
51    
52 <  subroutine SimulationSetup(setThisSim, nComponents, c_idents, &
53 <       CnLocalExcludes, CexcludesLocal, CnGlobalExcludes, CexcludesGlobal, CmolMembership, &
52 >  subroutine SimulationSetup(setThisSim, CnGlobal, CnLocal, c_idents, &
53 >       CnLocalExcludes, CexcludesLocal, CnGlobalExcludes, CexcludesGlobal, &
54 >       CmolMembership, &
55         status)    
56  
57      type (simtype) :: setThisSim
58 <    integer, intent(inout) :: nComponents
59 <    integer, dimension(nComponents),intent(inout) :: c_idents
58 >    integer, intent(inout) :: CnGlobal, CnLocal
59 >    integer, dimension(CnLocal),intent(inout) :: c_idents
60  
61      integer :: CnLocalExcludes
62      integer, dimension(2,CnLocalExcludes), intent(in) :: CexcludesLocal
63      integer :: CnGlobalExcludes
64      integer, dimension(CnGlobalExcludes), intent(in) :: CexcludesGlobal
65 <    integer, dimension(nComponents),intent(in) :: CmolMembership
65 >    integer, dimension(CnGlobal),intent(in) :: CmolMembership
66      !!  Result status, success = 0, status = -1
67      integer, intent(out) :: status
68      integer :: i, me, thisStat, alloc_stat, myNode
# Line 94 | Line 77 | contains
77      status = 0
78  
79      ! copy C struct into fortran type
80 +
81 +    nLocal = CnLocal
82 +    nGlobal = CnGlobal
83 +
84      thisSim = setThisSim
98    natoms = nComponents
99    rcut2 = thisSim%rcut * thisSim%rcut
100    rcut6 = rcut2 * rcut2 * rcut2
101    rlist2 = thisSim%rlist * thisSim%rlist
102    box = thisSim%box
85  
86      nExcludes_Global = CnGlobalExcludes
87      nExcludes_Local = CnLocalExcludes
88  
89 <    call InitializeForceGlobals(natoms, thisStat)
89 >    call InitializeForceGlobals(nLocal, thisStat)
90      if (thisStat /= 0) then
91         write(default_error,*) "SimSetup: InitializeForceGlobals error"
92         status = -1
# Line 162 | Line 144 | contains
144         deallocate(c_idents_Row)
145      endif
146      
147 < #else
148 <    do i = 1, nComponents
147 > #endif
148 >
149 > ! We build the local atid's for both mpi and nonmpi
150 >    do i = 1, nLocal
151        
152         me = getFirstMatchingElement(atypes, "c_ident", c_idents(i))
153         atid(i) = me
154    
155      enddo
172 #endif
156  
157  
158  
159 +
160      do i = 1, nExcludes_Local
161         excludesLocal(1,i) = CexcludesLocal(1,i)
162         excludesLocal(2,i) = CexcludesLocal(2,i)
# Line 182 | Line 166 | contains
166         excludesGlobal(i) = CexcludesGlobal(i)
167      enddo
168  
169 <    molMemberShipList = CmolMembership
169 >    do i = 1, nGlobal
170 >       molMemberShipList(i) = CmolMembership(i)
171 >     enddo
172  
173      if (status == 0) simulation_setup_complete = .true.
174      
175    end subroutine SimulationSetup
176    
177 <  subroutine setBox_3d(new_box_size)
178 <    real(kind=dp), dimension(3) :: new_box_size
177 >  subroutine setBox(cHmat, cHmatInv, cBoxIsOrthorhombic)
178 >    real(kind=dp), dimension(3,3) :: cHmat, cHmatInv
179 >    integer :: cBoxIsOrthorhombic
180      integer :: smallest, status, i
181 <
182 <    thisSim%box = new_box_size
183 <    box = thisSim%box
184 <
181 >    
182 >    Hmat = cHmat
183 >    HmatInv = cHmatInv
184 >    if (cBoxIsOrthorhombic .eq. 0 ) then
185 >       boxIsOrthorhombic = .false.
186 >    else
187 >       boxIsOrthorhombic = .true.
188 >    endif
189 >    
190      return    
191 <  end subroutine setBox_3d
200 <
201 <  subroutine setBox_1d(dim, new_box_size)
202 <    integer :: dim, status
203 <    real(kind=dp) :: new_box_size
204 <    thisSim%box(dim) = new_box_size
205 <    box(dim) = thisSim%box(dim)
206 <  end subroutine setBox_1d
207 <
208 <  subroutine setRcut(new_rcut, status)
209 <    real(kind = dp) :: new_rcut
210 <    integer :: myStatus, status
211 <    thisSim%rcut = new_rcut
212 <    rcut2 = thisSim%rcut * thisSim%rcut
213 <    rcut6 = rcut2 * rcut2 * rcut2
214 <    status = 0
215 <    return
216 <  end subroutine setRcut
191 >  end subroutine setBox
192  
218  function getBox_3d() result(thisBox)
219    real( kind = dp ), dimension(3) :: thisBox
220    thisBox = thisSim%box
221  end function getBox_3d
222  
223  function getBox_1d(dim) result(thisBox)
224    integer, intent(in) :: dim
225    real( kind = dp ) :: thisBox
226    
227    thisBox = thisSim%box(dim)
228  end function getBox_1d
229    
230  subroutine getRcut(thisrcut,rc2,rc6,status)
231    real( kind = dp ), intent(out) :: thisrcut
232    real( kind = dp ), intent(out), optional :: rc2
233    real( kind = dp ), intent(out), optional :: rc6
234    integer, optional :: status
235
236    if (present(status)) status = 0
237    
238    if (.not.simulation_setup_complete ) then
239       if (present(status)) status = -1
240       return
241    end if
242    
243    thisrcut = thisSim%rcut
244    if(present(rc2)) rc2 = rcut2
245    if(present(rc6)) rc6 = rcut6
246  end subroutine getRcut
247  
248  subroutine getRlist(thisrlist,rl2,status)
249    real( kind = dp ), intent(out) :: thisrlist
250    real( kind = dp ), intent(out), optional :: rl2
251
252    integer, optional :: status
253
254    if (present(status)) status = 0
255
256    if (.not.simulation_setup_complete ) then
257       if (present(status)) status = -1
258       return
259    end if
260    
261    thisrlist = thisSim%rlist
262    if(present(rl2)) rl2 = rlist2
263  end subroutine getRlist
264
265  function getRrf() result(rrf)
266    real( kind = dp ) :: rrf
267    rrf = thisSim%rrf
268    write(*,*) 'getRrf = ', rrf, thisSim%rrf
269  end function getRrf
270  
271  function getRt() result(rt)
272    real( kind = dp ) :: rt
273    rt = thisSim%rt
274  end function getRt
275
193    function getDielect() result(dielect)
194      real( kind = dp ) :: dielect
195      dielect = thisSim%dielect
# Line 293 | Line 210 | contains
210      doesit = thisSim%SIM_uses_sticky
211    end function SimUsesSticky
212  
213 +  function SimUsesCharges() result(doesit)
214 +    logical :: doesit
215 +    doesit = thisSim%SIM_uses_charges
216 +  end function SimUsesCharges
217 +
218    function SimUsesDipoles() result(doesit)
219      logical :: doesit
220      doesit = thisSim%SIM_uses_dipoles
# Line 319 | Line 241 | contains
241           thisSim%SIM_uses_GB .or. thisSim%SIM_uses_RF
242    end function SimUsesDirectionalAtoms
243  
244 +  function SimUsesMolecularCutoffs() result(doesit)
245 +    logical :: doesit
246 +    doesit = thisSim%SIM_uses_molecular_cutoffs
247 +  end function SimUsesMolecularCutoffs
248 +
249    function SimRequiresPrepairCalc() result(doesit)
250      logical :: doesit
251      doesit = thisSim%SIM_uses_EAM
# Line 349 | Line 276 | contains
276         return
277      endif
278  
279 <    allocate(molMembershipList(getNlocal()), stat=alloc_stat)
279 >    allocate(molMembershipList(nGlobal), stat=alloc_stat)
280      if (alloc_stat /= 0 ) then
281         thisStat = -1
282         return
# Line 360 | Line 287 | contains
287    subroutine FreeSimGlobals()
288      
289      !We free in the opposite order in which we allocate in.
290 <    
290 >
291 >    if (allocated(molMembershipList)) deallocate(molMembershipList)    
292      if (allocated(excludesGlobal)) deallocate(excludesGlobal)
293      if (allocated(excludesLocal)) deallocate(excludesLocal)
294 <    if (allocated(molMembershipList)) deallocate(molMembershipList)
294 >
295    end subroutine FreeSimGlobals
296  
297 <  pure function getNlocal() result(nlocal)
298 <    integer :: nlocal
299 <    nlocal = natoms
297 >  pure function getNlocal() result(n)
298 >    integer :: n
299 >    n = nLocal
300    end function getNlocal
301  
302    

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines