1. Fixed merge conflicts

[unres.git] / source / unres / src_CSA_DiL / parmread.F

diff --git a/source/unres/src_CSA_DiL/parmread.F b/source/unres/src_CSA_DiL/parmread.F
index e58af2f..595a399 100644 (file)
--- a/source/unres/src_CSA_DiL/parmread.F
+++ b/source/unres/src_CSA_DiL/parmread.F
@@ -543,11 +543,12 @@ c      &v2(k,-i,-j,iblock),v2(k,i,j,iblock)
          do j=1,ntortyp
             write (iout,*) 'ityp',i,' jtyp',j
             write (iout,*) 'Fourier constants'
-            do k=1,nterm(i,j)
-             write (iout,'(2(1pe15.5))') v1(k,i,j),v2(k,i,j)
+            do k=1,nterm(i,j,iblock)
+             write (iout,'(2(1pe15.5))') v1(k,i,j,iblock),
+     &         v2(k,i,j,iblock)
             enddo
             write (iout,*) 'Lorenz constants'
-            do k=1,nlor(i,j)
+            do k=1,nlor(i,j,iblock)
              write (iout,'(3(1pe15.5))') 
      &         vlor1(k,i,j),vlor2(k,i,j),vlor3(k,i,j)
             enddo