projects
/
unres.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'devel' of mmka.chem.univ.gda.pl:unres into devel
[unres.git]
/
source
/
unres
/
src_MD
/
parmread.F
diff --git
a/source/unres/src_MD/parmread.F
b/source/unres/src_MD/parmread.F
index
be1a193
..
4729ca5
100644
(file)
--- a/
source/unres/src_MD/parmread.F
+++ b/
source/unres/src_MD/parmread.F
@@
-562,15
+562,17
@@
C
c write (iout,*) 'ntortyp',ntortyp
maxinter=3
cc maxinter is maximum interaction sites
c write (iout,*) 'ntortyp',ntortyp
maxinter=3
cc maxinter is maximum interaction sites
- do l=1,maxinter
+ do l=1,maxinter
do i=1,nsccortyp
do j=1,nsccortyp
read (isccor,*,end=113,err=113) nterm_sccor(i,j),nlor_sccor(i,j)
v0ijsccor=0.0d0
si=-1.0d0
do i=1,nsccortyp
do j=1,nsccortyp
read (isccor,*,end=113,err=113) nterm_sccor(i,j),nlor_sccor(i,j)
v0ijsccor=0.0d0
si=-1.0d0
+
do k=1,nterm_sccor(i,j)
do k=1,nterm_sccor(i,j)
- read (isccor,*,end=113,err=113) kk,v1sccor(k,i,j),v2sccor(k,i,j)
- v0ijsccor=v0ijsccor+si*v1sccor(k,i,j)
+ read (isccor,*,end=113,err=113) kk,v1sccor(k,l,i,j)
+ & ,v2sccor(k,l,i,j)
+ v0ijsccor=v0ijsccor+si*v1sccor(k,l,i,j)
si=-si
enddo
do k=1,nlor_sccor(i,j)
si=-si
enddo
do k=1,nlor_sccor(i,j)
@@
-592,7
+594,7
@@
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,*) 'ityp',i,' jtyp',j
write (iout,*) 'Fourier constants'
do k=1,nterm_sccor(i,j)
- write (iout,'(2(1pe15.5))') v1sccor(k,i,j),v2sccor(k,i,j)
+ write (iout,'(2(1pe15.5))') v1sccor(k,l,i,j),v2sccor(k,l,i,j)
enddo
write (iout,*) 'Lorenz constants'
do k=1,nlor_sccor(i,j)
enddo
write (iout,*) 'Lorenz constants'
do k=1,nlor_sccor(i,j)