*******> update.13 Author: Charles Lin Date: March 18th 2018 Programs: pmemd.cuda Description: 1.) Fixes a memory issue when running Center of Mass restraints 2.) Fixes a minor variable declaration issue with NMC and NMD for mcwat ------------------------------------------------------------------------------- src/pmemd/src/mdin_ctrl_dat.F90 | 6 ++---- src/pmemd/src/nmr_calls.F90 | 8 ++++++++ 2 files changed, 10 insertions(+), 4 deletions(-) diff --git src/pmemd/src/mdin_ctrl_dat.F90 src/pmemd/src/mdin_ctrl_dat.F90 index 838025b..b4315a2 100644 --- src/pmemd/src/mdin_ctrl_dat.F90 +++ src/pmemd/src/mdin_ctrl_dat.F90 @@ -456,11 +456,9 @@ subroutine init_mdin_ctrl_dat(remd_method) mcverbosity=0 ! mcverbosity is a debug flag for mcwat mcwat=0 ! mcwat controls the Monte Carlo based water movement function. (set 1 to run) nmd=0 - mcint=0 ! mcint - interval for mcwat monte carlo moves. + mcint=0 ! old variable for nmd, interval for mcwat monte carlo moves. nmc=0 - mcrescyc=1 ! mcrescyc - controls number of mc moves per mcint - this is max attempts. If t gets - ! an acceptance in less than mcrescyc it will break the loop and use that - ! acceptance. + mcrescyc=0 ! old variable for nmc, controls number of mc moves per nmd/mcint mcwatmaxdif=100.0d0 ! mcwatmaxdif sets maximum difference for acceptance in kcal/mol mcboxshift=10.0d0 nsnb = 25 diff --git src/pmemd/src/nmr_calls.F90 src/pmemd/src/nmr_calls.F90 index f881a27..fb36b8d 100644 --- src/pmemd/src/nmr_calls.F90 +++ src/pmemd/src/nmr_calls.F90 @@ -1107,7 +1107,11 @@ subroutine restal(iscop1, in, ichgwt, nmrnum, itimav, iout, ierr, numgrp) numgrp = numgrp + 1 do ig = 2, maxigr if (igr1(ig) .eq. 0) goto 32 +#ifdef CUDA + numgrp = numgrp + 1 +#else if (igr1(ig) .ne. igr1(ig - 1) + 1) numgrp = numgrp + 1 +#endif end do end if @@ -1117,7 +1121,11 @@ subroutine restal(iscop1, in, ichgwt, nmrnum, itimav, iout, ierr, numgrp) numgrp = numgrp + 1 do ig = 2, maxigr if (igr2(ig) .eq. 0) goto 34 +#ifdef CUDA + numgrp = numgrp + 1 +#else if (igr2(ig) .ne. igr2(ig - 1) + 1) numgrp = numgrp + 1 +#endif end do end if