X-Git-Url: http://mmka.chem.univ.gda.pl/gitweb/?a=blobdiff_plain;f=source%2Funres%2Fsrc_MD%2FssMD.F;h=dc205be062b48b311c8b0f35511fbdf5b5486104;hb=a85b75f9133ef906b3f50aff389f5d97ae8e8d1c;hp=b425056adbdfff89cb0f20b35f8aa2a4ab0d2d1e;hpb=73df986c46d3d16b8e54b6fe5c807d91be796974;p=unres.git diff --git a/source/unres/src_MD/ssMD.F b/source/unres/src_MD/ssMD.F index b425056..dc205be 100644 --- a/source/unres/src_MD/ssMD.F +++ b/source/unres/src_MD/ssMD.F @@ -400,10 +400,10 @@ c-------END SECOND METHOD, CONTINUOUS SECOND DERIVATIVE if (havebond) then #ifndef CLUST #ifndef WHAM - if (dyn_ssbond_ij(i,j).eq.1.0d300) then - write(iout,'(a15,f12.2,f8.1,2i5)') - & "SSBOND_E_FORM",totT,t_bath,i,j - endif +c if (dyn_ssbond_ij(i,j).eq.1.0d300) then +c write(iout,'(a15,f12.2,f8.1,2i5)') +c & "SSBOND_E_FORM",totT,t_bath,i,j +c endif #endif #endif dyn_ssbond_ij(i,j)=eij @@ -411,8 +411,8 @@ c-------END SECOND METHOD, CONTINUOUS SECOND DERIVATIVE dyn_ssbond_ij(i,j)=1.0d300 #ifndef CLUST #ifndef WHAM - write(iout,'(a15,f12.2,f8.1,2i5)') - & "SSBOND_E_BREAK",totT,t_bath,i,j +c write(iout,'(a15,f12.2,f8.1,2i5)') +c & "SSBOND_E_BREAK",totT,t_bath,i,j #endif #endif endif @@ -449,10 +449,15 @@ c-------END TESTING CODE & +(eom12*(dc_norm(k,nres+i)-om12*dc_norm(k,nres+j)) & +eom2*(erij(k)-om2*dc_norm(k,nres+j)))*dscj_inv enddo - do k=i,j-1 - do l=1,3 - gvdwc(l,k)=gvdwc(l,k)+gg(l) - enddo +cgrad do k=i,j-1 +cgrad do l=1,3 +cgrad gvdwc(l,k)=gvdwc(l,k)+gg(l) +cgrad enddo +cgrad enddo + + do l=1,3 + gvdwc(l,i)=gvdwc(l,i)-gg(l) + gvdwc(l,j)=gvdwc(l,j)+gg(l) enddo return @@ -578,13 +583,13 @@ cmc write(iout,*)"NEWNSS ",newnss,(newihpb(i),newjhpb(i),i=1,newnss) do i=1,nss found=.false. do j=1,newnss - if (ihpb(i).eq.newihpb(j) .and. - & jhpb(i).eq.newjhpb(j)) found=.true. + if (idssb(i).eq.newihpb(j) .and. + & jdssb(i).eq.newjhpb(j)) found=.true. enddo #ifndef CLUST #ifndef WHAM if (.not.found) write(iout,'(a15,f12.2,f8.1,2i5)') - & "SSBOND_BREAK",totT,t_bath,ihpb(i),jhpb(i) + & "SSBOND_BREAK",totT,t_bath,idssb(i),jdssb(i) #endif #endif enddo @@ -592,8 +597,8 @@ cmc write(iout,*)"NEWNSS ",newnss,(newihpb(i),newjhpb(i),i=1,newnss) do i=1,newnss found=.false. do j=1,nss - if (newihpb(i).eq.ihpb(j) .and. - & newjhpb(i).eq.jhpb(j)) found=.true. + if (newihpb(i).eq.idssb(j) .and. + & newjhpb(i).eq.jdssb(j)) found=.true. enddo #ifndef CLUST #ifndef WHAM @@ -603,27 +608,10 @@ cmc write(iout,*)"NEWNSS ",newnss,(newihpb(i),newjhpb(i),i=1,newnss) #endif enddo - if (diff.gt.0) then - do i=1,diff - ihpb(nhpb+i)=ihpb(nss+i) - jhpb(nhpb+i)=jhpb(nss+i) - forcon(nhpb+i)=forcon(nss+i) - dhpb(nhpb+i)=dhpb(nss+i) - enddo - else if (diff.lt.0) then - do i=diff,-1 - ihpb(nss+i)=ihpb(nhpb+i) - jhpb(nss+i)=jhpb(nhpb+i) - forcon(nss+i)=forcon(nhpb+i) - dhpb(nss+i)=dhpb(nhpb+i) - enddo - endif - - nhpb=nhpb+diff nss=newnss do i=1,nss - ihpb(i)=newihpb(i) - jhpb(i)=newjhpb(i) + idssb(i)=newihpb(i) + jdssb(i)=newjhpb(i) enddo return