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 569 by mmeineke, Tue Jul 1 21:33:45 2003 UTC vs.
Revision 747 by gezelter, Fri Sep 5 21:28:52 2003 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  
# Line 27 | Line 27 | module simulation
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
30    real(kind=dp), public, dimension(3,3), save :: Hmat, HmatInv
31 <  logical, save :: boxIsOrthorhombic
31 >  logical, public, save :: boxIsOrthorhombic
32    
33    public :: SimulationSetup
34    public :: getNlocal
35    public :: setBox
39  public :: setRcut
40  public :: getRcut
41  public :: getRlist
42  public :: getRrf
43  public :: getRt
36    public :: getDielect
37    public :: SimUsesPBC
38    public :: SimUsesLJ
# Line 88 | Line 80 | contains
80      nGlobal = CnGlobal
81  
82      thisSim = setThisSim
91    rcut2 = thisSim%rcut * thisSim%rcut
92    rcut6 = rcut2 * rcut2 * rcut2
93    rlist2 = thisSim%rlist * thisSim%rlist
94    box = thisSim%box
83  
84      nExcludes_Global = CnGlobalExcludes
85      nExcludes_Local = CnLocalExcludes
# Line 154 | Line 142 | contains
142         deallocate(c_idents_Row)
143      endif
144      
145 < #else
145 > #endif
146 >
147 > ! We build the local atid's for both mpi and nonmpi
148      do i = 1, nLocal
149        
150         me = getFirstMatchingElement(atypes, "c_ident", c_idents(i))
151         atid(i) = me
152    
153      enddo
164 #endif
154  
155  
156  
157 +
158      do i = 1, nExcludes_Local
159         excludesLocal(1,i) = CexcludesLocal(1,i)
160         excludesLocal(2,i) = CexcludesLocal(2,i)
# Line 183 | Line 173 | contains
173    end subroutine SimulationSetup
174    
175    subroutine setBox(cHmat, cHmatInv, cBoxIsOrthorhombic)
176 <    real(kind=dp), dimension(3,3) :: cHmat, cHamtInv
176 >    real(kind=dp), dimension(3,3) :: cHmat, cHmatInv
177      integer :: cBoxIsOrthorhombic
178      integer :: smallest, status, i
179 <
179 >    
180      Hmat = cHmat
181      HmatInv = cHmatInv
182 <    if(cBoxisOrthorhombic .eq. 0 )then
182 >    if (cBoxIsOrthorhombic .eq. 0 ) then
183         boxIsOrthorhombic = .false.
184 <    else boxIsOrthorhombic = .true.
184 >    else
185 >       boxIsOrthorhombic = .true.
186      endif
187      
197
188      return    
189    end subroutine setBox
200
201  subroutine setRcut(new_rcut, status)
202    real(kind = dp) :: new_rcut
203    integer :: myStatus, status
204    thisSim%rcut = new_rcut
205    rcut2 = thisSim%rcut * thisSim%rcut
206    rcut6 = rcut2 * rcut2 * rcut2
207    status = 0
208    return
209  end subroutine setRcut
210    
211  subroutine getRcut(thisrcut,rc2,rc6,status)
212    real( kind = dp ), intent(out) :: thisrcut
213    real( kind = dp ), intent(out), optional :: rc2
214    real( kind = dp ), intent(out), optional :: rc6
215    integer, optional :: status
190  
217    if (present(status)) status = 0
218    
219    if (.not.simulation_setup_complete ) then
220       if (present(status)) status = -1
221       return
222    end if
223    
224    thisrcut = thisSim%rcut
225    if(present(rc2)) rc2 = rcut2
226    if(present(rc6)) rc6 = rcut6
227  end subroutine getRcut
228  
229  subroutine getRlist(thisrlist,rl2,status)
230    real( kind = dp ), intent(out) :: thisrlist
231    real( kind = dp ), intent(out), optional :: rl2
232
233    integer, optional :: status
234
235    if (present(status)) status = 0
236
237    if (.not.simulation_setup_complete ) then
238       if (present(status)) status = -1
239       return
240    end if
241    
242    thisrlist = thisSim%rlist
243    if(present(rl2)) rl2 = rlist2
244  end subroutine getRlist
245
246  function getRrf() result(rrf)
247    real( kind = dp ) :: rrf
248    rrf = thisSim%rrf
249    write(*,*) 'getRrf = ', rrf, thisSim%rrf
250  end function getRrf
251  
252  function getRt() result(rt)
253    real( kind = dp ) :: rt
254    rt = thisSim%rt
255  end function getRt
256
191    function getDielect() result(dielect)
192      real( kind = dp ) :: dielect
193      dielect = thisSim%dielect

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines