projects
/
unres.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fized same buffer issue in gather and gatherv in wham and cluster and a minor issue...
[unres.git]
/
source
/
unres
/
src_MD
/
energy_p_new_barrier.F
diff --git
a/source/unres/src_MD/energy_p_new_barrier.F
b/source/unres/src_MD/energy_p_new_barrier.F
index
3ef05a4
..
47583a4
100644
(file)
--- a/
source/unres/src_MD/energy_p_new_barrier.F
+++ b/
source/unres/src_MD/energy_p_new_barrier.F
@@
-3023,9
+3023,9
@@
C
C Loop over i,i+2 and i,i+3 pairs of the peptide groups
C
do i=iturn3_start,iturn3_end
C Loop over i,i+2 and i,i+3 pairs of the peptide groups
C
do i=iturn3_start,iturn3_end
- if (itype(i).eq.21 .or. itype(i+1).eq.21
- & .or. itype(i+2).eq.21 .or. itype(i+3).eq.21.or.itype(i+4).eq.21)
- & cycle
+C if (itype(i).eq.21 .or. itype(i+1).eq.21
+C & .or. itype(i+2).eq.21 .or. itype(i+3).eq.21.or.itype(i+4).eq.21)
+C & cycle
dxi=dc(1,i)
dyi=dc(2,i)
dzi=dc(3,i)
dxi=dc(1,i)
dyi=dc(2,i)
dzi=dc(3,i)
@@
-3041,10
+3041,10
@@
C
num_cont_hb(i)=num_conti
enddo
do i=iturn4_start,iturn4_end
num_cont_hb(i)=num_conti
enddo
do i=iturn4_start,iturn4_end
- if (itype(i).eq.21 .or. itype(i+1).eq.21
- & .or. itype(i+2).eq.21 .or. itype(i+3).eq.21.or.itype(i+4).eq.21
- & .or. itype(i+5).eq.21)
- & cycle
+C if (itype(i).eq.21 .or. itype(i+1).eq.21
+C & .or. itype(i+2).eq.21 .or. itype(i+3).eq.21.or.itype(i+4).eq.21
+C & .or. itype(i+5).eq.21)
+C & cycle
dxi=dc(1,i)
dyi=dc(2,i)
dzi=dc(3,i)
dxi=dc(1,i)
dyi=dc(2,i)
dzi=dc(3,i)
@@
-3063,8
+3063,8
@@
c
c Loop over all pairs of interacting peptide groups except i,i+2 and i,i+3
c
do i=iatel_s,iatel_e
c Loop over all pairs of interacting peptide groups except i,i+2 and i,i+3
c
do i=iatel_s,iatel_e
- if (itype(i).eq.21 .or. itype(i+1).eq.21
- &.or.itype(i+2)) cycle
+C if (itype(i).eq.21 .or. itype(i+1).eq.21
+C &.or.itype(i+2)) cycle
dxi=dc(1,i)
dyi=dc(2,i)
dzi=dc(3,i)
dxi=dc(1,i)
dyi=dc(2,i)
dzi=dc(3,i)
@@
-3077,8
+3077,8
@@
c
c write (iout,*) 'i',i,' ielstart',ielstart(i),' ielend',ielend(i)
num_conti=num_cont_hb(i)
do j=ielstart(i),ielend(i)
c write (iout,*) 'i',i,' ielstart',ielstart(i),' ielend',ielend(i)
num_conti=num_cont_hb(i)
do j=ielstart(i),ielend(i)
- if (itype(j).eq.21 .or. itype(j+1).eq.21
- &.or.itype(j+2)) cycle
+C if (itype(j).eq.21 .or. itype(j+1).eq.21
+C &.or.itype(j+2)) cycle
call eelecij(i,j,ees,evdw1,eel_loc)
enddo ! j
num_cont_hb(i)=num_conti
call eelecij(i,j,ees,evdw1,eel_loc)
enddo ! j
num_cont_hb(i)=num_conti
@@
-4942,11
+4942,9
@@
C if (i.gt.3) then
enddo
enddo
10 continue
enddo
enddo
10 continue
-c lprn1=.true.
if (lprn1) write (iout,'(a4,i2,3f8.1,9h ethetai ,f10.5)')
& 'ebe', i,theta(i)*rad2deg,phii*rad2deg,
& phii1*rad2deg,ethetai
if (lprn1) write (iout,'(a4,i2,3f8.1,9h ethetai ,f10.5)')
& 'ebe', i,theta(i)*rad2deg,phii*rad2deg,
& phii1*rad2deg,ethetai
-c lprn1=.false.
etheta=etheta+ethetai
if (i.gt.3) gloc(i-3,icg)=gloc(i-3,icg)+wang*dephii
if (i.lt.nres) gloc(i-2,icg)=gloc(i-2,icg)+wang*dephii1
etheta=etheta+ethetai
if (i.gt.3) gloc(i-3,icg)=gloc(i-3,icg)+wang*dephii
if (i.lt.nres) gloc(i-2,icg)=gloc(i-2,icg)+wang*dephii1
@@
-5984,7
+5982,8
@@
cc Omicron is flat angle depending on the value of first digit
c(see comment below)
C print *,i,tauangle(1,i)
c(see comment below)
C print *,i,tauangle(1,i)
- do intertyp=1,3 !intertyp
+c do intertyp=1,3 !intertyp
+ do intertyp=2,2 !intertyp
cc Added 09 May 2012 (Adasko)
cc Intertyp means interaction type of backbone mainchain correlation:
c 1 = SC...Ca...Ca...Ca
cc Added 09 May 2012 (Adasko)
cc Intertyp means interaction type of backbone mainchain correlation:
c 1 = SC...Ca...Ca...Ca
@@
-6022,7
+6021,8
@@
c &gloc_sc(intertyp,i-3,icg)
enddo !intertyp
enddo
c do i=1,nres
enddo !intertyp
enddo
c do i=1,nres
-c write (iout,*) "W@T@F", gloc_sc(1,i,icg),gloc(i,icg)
+c write (iout,*) "W@T@F", gloc_sc(1,i,icg),gloc_sc(2,i,icg),
+c & gloc_sc(3,i,icg)
c enddo
return
end
c enddo
return
end