Added wham, cluster for NEWCORR

[unres.git] / source / unres / src_MD-M-newcorr / parmread.F

diff --git a/source/unres/src_MD-M-newcorr/parmread.F b/source/unres/src_MD-M-newcorr/parmread.F
index 03efdb2..54345a5 100644 (file)
--- a/source/unres/src_MD-M-newcorr/parmread.F
+++ b/source/unres/src_MD-M-newcorr/parmread.F
@@ -352,6 +352,7 @@ C Control printout of the coefficients of virtual-bond-angle potentials
 C
       if (lprint) then
         write (iout,'(//a)') 'Parameter of virtual-bond-angle potential'
+        do iblock=1,2
         do i=1,nthetyp+1
           do j=1,nthetyp+1
             do k=1,nthetyp+1
@@ -385,6 +386,7 @@ C
             enddo
           enddo
         enddo
+        enddo ! iblock
       enddo
       call flush(iout)
       endif
@@ -652,6 +654,7 @@ c      &v2(k,-i,-j,iblock),v2(k,i,j,iblock)
       close (itorp)
       if (lprint) then
         write (iout,'(/a/)') 'Torsional constants:'
+        do iblock=1,2
         do i=1,ntortyp
           do j=1,ntortyp
             write (iout,*) 'ityp',i,' jtyp',j
@@ -667,6 +670,7 @@ c      &v2(k,-i,-j,iblock),v2(k,i,j,iblock)
             enddo
           enddo
         enddo
+        enddo
       endif
 
 C
@@ -887,7 +891,8 @@ cc maxinter is maximum interaction sites
             write (iout,*) 'ityp',i,' jtyp',j
             write (iout,*) 'Fourier constants'
             do k=1,nterm_sccor(i,j)
-      write (iout,'(2(1pe15.5))') v1sccor(k,l,i,j),v2sccor(k,l,i,j)
+      write (iout,'(2(1pe15.5))') (v1sccor(k,l,i,j),v2sccor(k,l,i,j),
+     &   l=1,maxinter)
             enddo
             write (iout,*) 'Lorenz constants'
             do k=1,nlor_sccor(i,j)
@@ -1010,10 +1015,14 @@ c      lprint=.true.
       if (lprint) then
       do i=1,nloctyp
         write (iout,*) 'Type',i
-        write (iout,*) 'B1'
-        write(iout,*) B1(1,i),B1(2,i)
-        write (iout,*) 'B2'
-        write(iout,*) B2(1,i),B2(2,i)
+        write (iout,*) 'BNEW1(1)'
+        write (iout,*) (BNEW1(ii,1,i),ii=1,3)
+        write (iout,*) 'BNEW1(2)'
+        write (iout,*) BNEW1(1,2,i)
+        write (iout,*) 'BNEW2(1)'
+        write (iout,*) (BNEW2(ii,1,i),ii=1,3)
+        write (iout,*) 'BNEW2(2)'
+        write (iout,*) BNEW2(1,2,i)
         write (iout,*) 'CC'
         do j=1,2
           write (iout,'(2f10.5)') CC(j,1,i),CC(j,2,i)
@@ -1075,7 +1084,7 @@ C
      & ', exponents are ',expon,2*expon 
       goto (10,20,30,30,40) ipot
 C----------------------- LJ potential ---------------------------------
-   10 read (isidep,*,end=116,err=116)((eps(i,j),j=i,ntyp),i=1,ntyp),
+   10 read (isidep,*,end=117,err=117)((eps(i,j),j=i,ntyp),i=1,ntyp),
      &   (sigma0(i),i=1,ntyp)
       if (lprint) then
        write (iout,'(/a/)') 'Parameters of the LJ potential:'
@@ -1087,7 +1096,7 @@ C----------------------- LJ potential ---------------------------------
       endif
       goto 50
 C----------------------- LJK potential --------------------------------
-   20 read (isidep,*,end=116,err=116)((eps(i,j),j=i,ntyp),i=1,ntyp),
+   20 read (isidep,*,end=117,err=117)((eps(i,j),j=i,ntyp),i=1,ntyp),
      &  (sigma0(i),i=1,ntyp),(rr0(i),i=1,ntyp)
       if (lprint) then
        write (iout,'(/a/)') 'Parameters of the LJK potential:'
@@ -1101,12 +1110,12 @@ C----------------------- LJK potential --------------------------------
       goto 50
 C---------------------- GB or BP potential -----------------------------
    30 do i=1,ntyp
-       read (isidep,*,end=116,err=116)(eps(i,j),j=i,ntyp)
+       read (isidep,*,end=117,err=117)(eps(i,j),j=i,ntyp)
       enddo
-      read (isidep,*,end=116,err=116)(sigma0(i),i=1,ntyp)
-      read (isidep,*,end=116,err=116)(sigii(i),i=1,ntyp)
-      read (isidep,*,end=116,err=116)(chip(i),i=1,ntyp)
-      read (isidep,*,end=116,err=116)(alp(i),i=1,ntyp)
+      read (isidep,*,end=117,err=117)(sigma0(i),i=1,ntyp)
+      read (isidep,*,end=117,err=117)(sigii(i),i=1,ntyp)
+      read (isidep,*,end=117,err=117)(chip(i),i=1,ntyp)
+      read (isidep,*,end=117,err=117)(alp(i),i=1,ntyp)
 C For the GB potential convert sigma'**2 into chi'
       if (ipot.eq.4) then
        do i=1,ntyp
@@ -1125,7 +1134,7 @@ C For the GB potential convert sigma'**2 into chi'
       endif
       goto 50
 C--------------------- GBV potential -----------------------------------
-   40 read (isidep,*,end=116,err=116)((eps(i,j),j=i,ntyp),i=1,ntyp),
+   40 read (isidep,*,end=117,err=117)((eps(i,j),j=i,ntyp),i=1,ntyp),
      &  (sigma0(i),i=1,ntyp),(rr0(i),i=1,ntyp),(sigii(i),i=1,ntyp),
      &  (chip(i),i=1,ntyp),(alp(i),i=1,ntyp)
       if (lprint) then