Changeset bd2278d for metropolis.f


Ignore:
Timestamp:
09/05/08 11:49:42 (16 years ago)
Author:
baerbaer <baerbaer@…>
Branches:
master
Children:
fafe4d6
Parents:
2ebb8b6
Message:

Reformatting comments and continuation marks.

Fortran 90 and higher use ! to mark comments no matter where they are in the
code. The only valid continuation marker is &.
I also added the SMMP.kdevelop.filelist to the repository to make it easier
to use kdevelop.

git-svn-id: svn+ssh://svn.berlios.de/svnroot/repos/smmp/trunk@12 26dc1dd8-5c4e-0410-9ffe-d298b4865968

File:
1 edited

Legend:

Unmodified
Added
Removed
  • metropolis.f

    r2ebb8b6 rbd2278d  
    1 c **************************************************************
    2 c
    3 c This file contains the subroutines:  metropolis
    4 c
    5 c Copyright 2003-2005  Frank Eisenmenger, U.H.E. Hansmann,
    6 c                      Shura Hayryan, Chin-Ku
    7 c Copyright 2007       Frank Eisenmenger, U.H.E. Hansmann,
    8 c                      Jan H. Meinke, Sandipan Mohanty
    9 c
    10 c **************************************************************
     1! **************************************************************
     2!
     3! This file contains the subroutines:  metropolis
     4!
     5! Copyright 2003-2005  Frank Eisenmenger, U.H.E. Hansmann,
     6!                      Shura Hayryan, Chin-Ku
     7! Copyright 2007       Frank Eisenmenger, U.H.E. Hansmann,
     8!                      Jan H. Meinke, Sandipan Mohanty
     9!
     10! **************************************************************
    1111
    1212
    1313      subroutine metropolis(eol1,acz,dummy)
    14 C
    15 C SUBROUTINE FOR METROPOLIS UPDATE OF CONFIGURATIONS
    16 C
    17 C CALLS: energy,addang,grnd,dummy (function provided as argument)
    18 C
     14!
     15! SUBROUTINE FOR METROPOLIS UPDATE OF CONFIGURATIONS
     16!
     17! CALLS: energy,addang,grnd,dummy (function provided as argument)
     18!
    1919      include 'INCL.H'
    2020      include 'INCP.H'
     
    2525      integer updtch1, updtch2,bgs
    2626      double precision vrol(mxvr), gbol
    27 cf2py intent(in, out) eol
    28 cf2py intent(in, out) acz
     27!f2py intent(in, out) eol
     28!f2py intent(in, out) acz
    2929      eol = energy()
    30 c     external rand
     30!     external rand
    3131      do nsw=1,nvr
    32 c Loop over dihedrals
    33 c
     32! Loop over dihedrals
     33!
    3434         iupstate=0
    3535         iupt=1
     
    5454            iupstate=bgs(eol,dummy)
    5555         else
    56 c           Simple twist of
    57 c           Get Proposal configuration
     56!           Simple twist of
     57!           Get Proposal configuration
    5858            vrol=vlvr!(jv) 
    5959            dv=axvr(jv)*(grnd()-0.5)
    6060            vlvr(jv)=addang(vrol(jv),dv)
    61 c
    62 c           Get dummy of proposal configuration
    63 c
     61!
     62!           Get dummy of proposal configuration
     63!
    6464            enw = energy()
    65 c
     65!
    6666            delta =  dummy(enw) - dummy(eol)
    67 c           ___________________________ check acceptance criteria
     67!           ___________________________ check acceptance criteria
    6868            if (delta.le.0.0d0) then
    6969               eol=enw 
     
    9090      end do
    9191
    92 c Updates on relative position of different molecules when there are many     
     92! Updates on relative position of different molecules when there are many     
    9393      if (ntlml.gt.1) then
    9494         do iml=1, ntlml
     
    104104                  endif
    105105               endif
    106 c     
    107 c              Get dummy of proposal configuration
    108 c     
     106!     
     107!              Get dummy of proposal configuration
     108!     
    109109               enw = energy()
    110 c
     110!
    111111               delta =  dummy(enw) - dummy(eol)
    112 c     
    113 c              ____________________________ check acceptance criteria
    114 c     
     112!     
     113!              ____________________________ check acceptance criteria
     114!     
    115115               if (delta.le.0.0d0) then
    116116                  eol=enw
     
    138138                  gbpr(i, iml) = (grnd()-0.5) * pi2
    139139               endif
    140 c     
    141 c              Get dummy of proposal configuration
    142 c     
     140!     
     141!              Get dummy of proposal configuration
     142!     
    143143               enw = energy()
    144 c     
     144!     
    145145               delta =  dummy(enw) - dummy(eol)
    146 c     
    147 c              ____________________________ check acceptance criteria
    148 c     
     146!     
     147!              ____________________________ check acceptance criteria
     148!     
    149149               if (delta.le.0.0d0) then
    150150                  eol=enw
     
    166166         enddo
    167167      endif
    168 c     
    169 c     Re-calculate energy
    170 c     
     168!     
     169!     Re-calculate energy
     170!     
    171171      enw = energy()
    172172      if(abs(eol-enw).gt.0.000001)  then
     
    176176         endif
    177177      endif
    178 c     
     178!     
    179179      eol1 = eol
    180180      return
    181 c     
     181!     
    182182      end
    183183     
Note: See TracChangeset for help on using the changeset viewer.