zmiany 20 na typ w src_md-M

diff --git a/source/unres/src_MD-M/parmread.F b/source/unres/src_MD-M/parmread.F
index 0693c75..9e1614b 100644 (file)
--- a/source/unres/src_MD-M/parmread.F
+++ b/source/unres/src_MD-M/parmread.F
@@ -605,8 +605,8 @@ C 5/21/07 (AL) Read coefficients of the backbone-local sidechain-local
 C         correlation energies.
 C
       read (isccor,*,end=119,err=119) nterm_sccor
-      do i=1,20
-       do j=1,20
+      do i=1,ntyp
+       do j=1,ntyp
           read (isccor,'(a)')
          do k=1,nterm_sccor
            read (isccor,*,end=119,err=119) kk,v1sccor(k,i,j),
@@ -617,8 +617,8 @@ C
       close (isccor)
       if (lprint) then
        write (iout,'(/a/)') 'Torsional constants of SCCORR:'
-       do i=1,20
-         do j=1,20
+       do i=1,ntyp
+         do j=1,ntyp
             write (iout,*) 'ityp',i,' jtyp',j
             do k=1,nterm_sccor
              write (iout,'(2(1pe15.5))') v1sccor(k,i,j),v2sccor(k,i,j)
@@ -930,7 +930,7 @@ c           augm(i,j)=0.5D0**(2*expon)*aa(i,j)
 C
 C Define the SC-p interaction constants (hard-coded; old style)
 C
-      do i=1,20
+      do i=1,ntyp
 C "Soft" SC-p repulsion (causes helices to be too flat, but facilitates
 C helix formation)
 c       aad(i,1)=0.3D0*4.0D0**12
@@ -968,7 +968,7 @@ C
 
       if (lprint) then
         write (iout,*) "Parameters of SC-p interactions:"
-        do i=1,20
+        do i=1,ntyp
           write (iout,'(4f8.3,4e12.4)') eps_scp(i,1),rscp(i,1),
      &     eps_scp(i,2),rscp(i,2),aad(i,1),bad(i,1),aad(i,2),bad(i,2)
         enddo

diff --git a/source/unres/src_MD-M/readrtns_CSA.F b/source/unres/src_MD-M/readrtns_CSA.F
index 70bacea..7ac0669 100644 (file)
--- a/source/unres/src_MD-M/readrtns_CSA.F
+++ b/source/unres/src_MD-M/readrtns_CSA.F
@@ -638,7 +638,7 @@ C 12/1/95 Added weight for the multi-body term WCORR
      &  'General scaling factor of SC-p interactions:',scalscp
       endif
       r0_corr=cutoff_corr-delt_corr
-      do i=1,20
+      do i=1,ntyp
         aad(i,1)=scalscp*aad(i,1)
         aad(i,2)=scalscp*aad(i,2)
         bad(i,1)=scalscp*bad(i,1)