X-Git-Url: http://mmka.chem.univ.gda.pl/gitweb/?a=blobdiff_plain;f=source%2Fcluster%2Fwham%2Fsrc%2Finitialize_p.F;h=2f93a3502038b605921b47fd70f2dd585b46ef1c;hb=84bd5165b1f28ca095851e740cbcc1ff2a6be29c;hp=37e0bf9c10e7ea2030a63f561885a7a065b73f56;hpb=e7fd0c7782f6f624b41009800df8e3d5e0e9add5;p=unres.git

diff --git a/source/cluster/wham/src/initialize_p.F b/source/cluster/wham/src/initialize_p.F
index 37e0bf9..2f93a35 100644
--- a/source/cluster/wham/src/initialize_p.F
+++ b/source/cluster/wham/src/initialize_p.F
@@ -100,9 +100,13 @@ C
 	sigii(i)=0.0D0
 	rr0(i)=0.0D0
 	a0thet(i)=0.0D0
-	do j=1,2
-	  athet(j,i)=0.0D0
-	  bthet(j,i)=0.0D0
+        do j=1,2
+         do ichir1=-1,1
+          do ichir2=-1,1
+          athet(j,i,ichir1,ichir2)=0.0D0
+          bthet(j,i,ichir1,ichir2)=0.0D0
+          enddo
+         enddo
         enddo
 	do j=0,3
 	  polthet(j,i)=0.0D0
@@ -128,15 +132,37 @@ C
       enddo
       nlob(ntyp1)=0
       dsc(ntyp1)=0.0D0
-      do i=1,maxtor
+      do i=-maxtor,maxtor
 	itortyp(i)=0
-	do j=1,maxtor
-	  do k=1,maxterm
-	    v1(k,j,i)=0.0D0
-	    v2(k,j,i)=0.0D0
-          enddo
+       do iblock=1,2
+        do j=-maxtor,maxtor
+          do k=1,maxterm
+            v1(k,j,i,iblock)=0.0D0
+            v2(k,j,i,iblock)=0.0D0
+           enddo
+         enddo
         enddo
       enddo
+      do iblock=1,2
+       do i=-maxtor,maxtor
+        do j=-maxtor,maxtor
+         do k=-maxtor,maxtor
+          do l=1,maxtermd_1
+            v1c(1,l,i,j,k,iblock)=0.0D0
+            v1s(1,l,i,j,k,iblock)=0.0D0
+            v1c(2,l,i,j,k,iblock)=0.0D0
+            v1s(2,l,i,j,k,iblock)=0.0D0
+          enddo !l
+          do l=1,maxtermd_2
+           do m=1,maxtermd_2
+            v2c(m,l,i,j,k,iblock)=0.0D0
+            v2s(m,l,i,j,k,iblock)=0.0D0
+           enddo !m
+          enddo !l
+        enddo !k
+       enddo !j
+      enddo !i
+      enddo !iblock
       do i=1,maxres
 	itype(i)=0
 	itel(i)=0
@@ -155,6 +181,9 @@ C Initialize the bridge arrays
 	ihpb(i)=0
 	jhpb(i)=0
       enddo
+      do i=1,maxres
+        dyn_ss_mask(i)=.false.
+      enddo
 C
 C Initialize timing.
 C
@@ -214,9 +243,13 @@ c-------------------------------------------------------------------------
       include 'COMMON.NAMES'
       include 'COMMON.FFIELD'
       data restyp /
+     &'DD' ,'DPR','DLY','DAR','DHI','DAS','DGL','DSG','DGN','DSN','DTH',
+     &'DYY','DAL','DTY','DTR','DVA','DLE','DIL','DPN','MED','DCY','ZER',
      &'CYS','MET','PHE','ILE','LEU','VAL','TRP','TYR','ALA','GLY','THR',
      &'SER','GLN','ASN','GLU','ASP','HIS','ARG','LYS','PRO','D'/
       data onelet /
+     &'z','p','k','r','h','d','e','n','q','s','t','g',
+     &'a','y','w','v','l','i','f','m','c','x',
      &'C','M','F','I','L','V','W','Y','A','G','T',
      &'S','Q','N','E','D','H','R','K','P','X'/
       data potname /'LJ','LJK','BP','GB','GBV'/
@@ -291,6 +324,7 @@ cd   &   (ihpb(i),jhpb(i),i=1,nss)
         do ii=1,nss
           if (ihpb(ii).eq.i+nres) then
             scheck=.true.
+            if (dyn_ss) go to 10
             jj=jhpb(ii)-nres
             goto 10
           endif