hdiff output

r31721/mc.F 2017-01-21 10:36:13.010250000 +0000 r31720/mc.F 2017-01-21 10:36:13.278250000 +0000
827:                ENDIF827:                ENDIF
828: 828: 
829: !829: !
830: ! csw34> Coordinates are saved so that moves can be undone830: ! csw34> Coordinates are saved so that moves can be undone
831: !831: !
832:                SAVECOORDS(1:3*NATOMS)=COORDS(1:3*NATOMS,JP)832:                SAVECOORDS(1:3*NATOMS)=COORDS(1:3*NATOMS,JP)
833: ! csw34> If you want to look at the effect of moves, you can dump out833: ! csw34> If you want to look at the effect of moves, you can dump out
834: ! the structure BEFORE the move here.834: ! the structure BEFORE the move here.
835: !                 CALL A9DUMPPDB(COORDS(:,JP),"beforemove")835: !                 CALL A9DUMPPDB(COORDS(:,JP),"beforemove")
836: !                 CALL CHARMMDUMP(COORDS(:,JP),'beforemove')836: !                 CALL CHARMMDUMP(COORDS(:,JP),'beforemove')
837:        IF (MACROIONT.AND..NOT.SANDBOXT) THEN837:             IF (MACROIONT.AND..NOT.SANDBOXT) THEN
838:         CALL MACROION_MOVES(J1,COORDS(:,JP),movableatomlist,nmovableatoms,ligmovet,blockmovet,nblocks,atomsinblock,STEP(JP))838:              CALL MACROION_MOVES(J1,COORDS(:,JP),movableatomlist,nmovableatoms,ligmovet,blockmovet,
839:        ELSE839:      1                           nblocks,atomsinblock,STEP(JP))
 840:             ELSE
840: !841: !
841: ! UNIVERSAL STEP TAKING842: ! UNIVERSAL STEP TAKING
842: !843: !
843: 844: 
844: ! csw34> Rigid body EXPAND moves845: ! csw34> Rigid body EXPAND moves
845:                      IF (RIGIDINIT.AND.EXPANDRIGIDT.AND.DOEXPANDRIGID) THEN846:                      IF (RIGIDINIT.AND.EXPANDRIGIDT.AND.DOEXPANDRIGID) THEN
846:                         CALL GENRIGID_EXPAND(COORDS(:,JP), EXPANDFACTOR) 847:                         CALL GENRIGID_EXPAND(COORDS(:,JP), EXPANDFACTOR) 
847:                      ENDIF848:                      ENDIF
848: ! csw34> Rigid body rotation moves849: ! csw34> Rigid body rotation moves
849:                      IF (RIGIDINIT.AND.ROTATERIGIDT.AND.DOROTATERIGID) THEN850:                      IF (RIGIDINIT.AND.ROTATERIGIDT.AND.DOROTATERIGID) THEN
1127:                      IF (LOCALSAMPLET) THEN1128:                      IF (LOCALSAMPLET) THEN
1128:                         CALL A9DISTCHECK(COORDS(:,JP),DISTOK)1129:                         CALL A9DISTCHECK(COORDS(:,JP),DISTOK)
1129:                         IF (.NOT.DISTOK) COORDS(:,JP)=SAVECOORDS(:)1130:                         IF (.NOT.DISTOK) COORDS(:,JP)=SAVECOORDS(:)
1130:                      ELSE1131:                      ELSE
1131:                         DISTOK=.TRUE.1132:                         DISTOK=.TRUE.
1132:                      ENDIF1133:                      ENDIF
1133:                   ENDDO1134:                   ENDDO
1134: ! AMBER12 step taking1135: ! AMBER12 step taking
1135: ! with macroion model1136: ! with macroion model
1136:                ELSE IF (AMBER12T.AND.MACROIONT) THEN1137:                ELSE IF (AMBER12T.AND.MACROIONT) THEN
1137:        IF (MACROIONT) THEN1138:                 IF (MACROIONT) THEN
1138:         CALL MACROION_MOVES(J1,COORDS(:,JP),movableatomlist,nmovableatoms,ligmovet,blockmovet,nblocks,atomsinblock,STEP(JP))1139:                  CALL MACROION_MOVES(J1,COORDS(:,JP),movableatomlist,nmovableatoms,ligmovet,blockmovet,
1139:        END IF1140:      1                                  nblocks,atomsinblock,STEP(JP))
 1141:                 END IF
1140: ! normal AMBER12 step taking (without MACROION model)              1142: ! normal AMBER12 step taking (without MACROION model)              
1141:                ELSE IF (AMBER12T.AND..NOT.MACROIONT) THEN1143:                ELSE IF (AMBER12T.AND..NOT.MACROIONT) THEN
1142: ! Do group rotation moves1144: ! Do group rotation moves
1143:                   CALL CARTESIAN_SPHERE(COORDS(:,JP), STEP(JP))1145:                   CALL CARTESIAN_SPHERE(COORDS(:,JP), STEP(JP))
1144:                   IF (GROUPROTT.AND.DOGROUPROT) CALL GROUPROTSTEP(JP)1146:                   IF (GROUPROTT.AND.DOGROUPROT) CALL GROUPROTSTEP(JP)
1145:                   IF (DIHEDRALROTT.AND.DODIHEDRALROT) CALL DIHEDRALROTSTEP(DUMMY1,JP,DUMMY2,DUMMY3)1147:                   IF (DIHEDRALROTT.AND.DODIHEDRALROT) CALL DIHEDRALROTSTEP(DUMMY1,JP,DUMMY2,DUMMY3)
1146:                   IF (ROTAMER_MOVET) CALL ROTAMER_STEP(COORDS(:, JP))1148:                   IF (ROTAMER_MOVET) CALL ROTAMER_STEP(COORDS(:, JP))
1147: ! jdf43> MWFILM1149: ! jdf43> MWFILM
1148:                ELSE IF ((MWFILMT).AND.(PERIODIC)) THEN1150:                ELSE IF ((MWFILMT).AND.(PERIODIC)) THEN
1149:                   CALL MWSTEP(COORDS,JP,NPAR,NATOMS,STEP(JP),BOXLX,BOXLY,BOXLZ,LAT)1151:                   CALL MWSTEP(COORDS,JP,NPAR,NATOMS,STEP(JP),BOXLX,BOXLY,BOXLZ,LAT)


legend
Lines Added 
Lines changed
 Lines Removed

hdiff - version: 2.1.0