projects
/
unres.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Zmiana w wham-m dla pola Yi
[unres.git]
/
source
/
wham
/
src-M
/
parmread.F
diff --git
a/source/wham/src-M/parmread.F
b/source/wham/src-M/parmread.F
index
b2b64d5
..
84f725c
100644
(file)
--- a/
source/wham/src-M/parmread.F
+++ b/
source/wham/src-M/parmread.F
@@
-295,6
+295,7
@@
C
C Read the parameters of Utheta determined from ab initio surfaces
C Kozlowska et al., J. Phys.: Condens. Matter 19 (2007) 285203
C
C Read the parameters of Utheta determined from ab initio surfaces
C Kozlowska et al., J. Phys.: Condens. Matter 19 (2007) 285203
C
+ write (iout,*) "tu dochodze"
read (ithep,*) nthetyp,ntheterm,ntheterm2,
& ntheterm3,nsingle,ndouble
nntheterm=max0(ntheterm,ntheterm2,ntheterm3)
read (ithep,*) nthetyp,ntheterm,ntheterm2,
& ntheterm3,nsingle,ndouble
nntheterm=max0(ntheterm,ntheterm2,ntheterm3)
@@
-302,6
+303,7
@@
C
do i=-ntyp1,-1
ithetyp(i)=-ithetyp(-i)
enddo
do i=-ntyp1,-1
ithetyp(i)=-ithetyp(-i)
enddo
+ write (iout,*) "tu dochodze"
do iblock=1,2
do i=-maxthetyp,maxthetyp
do j=-maxthetyp,maxthetyp
do iblock=1,2
do i=-maxthetyp,maxthetyp
do j=-maxthetyp,maxthetyp
@@
-420,14
+422,14
@@
C
write (iout,'(//a,10x,a)') " l","a[l]"
write (iout,'(i2,1pe15.5)') 0,aa0thet(i,j,k,iblock)
write (iout,'(i2,1pe15.5)')
write (iout,'(//a,10x,a)') " l","a[l]"
write (iout,'(i2,1pe15.5)') 0,aa0thet(i,j,k,iblock)
write (iout,'(i2,1pe15.5)')
- & (l,aathet(l,i,j,k),l=1,ntheterm)
+ & (l,aathet(l,i,j,k,iblock),l=1,ntheterm)
do l=1,ntheterm2
write (iout,'(//2h m,4(9x,a,3h[m,i1,1h]))')
& "b",l,"c",l,"d",l,"e",l
do m=1,nsingle
write (iout,'(i2,4(1pe15.5))') m,
do l=1,ntheterm2
write (iout,'(//2h m,4(9x,a,3h[m,i1,1h]))')
& "b",l,"c",l,"d",l,"e",l
do m=1,nsingle
write (iout,'(i2,4(1pe15.5))') m,
- & bbthet(m,l,i,j,k),ccthet(m,l,i,j,k,iblock),
- & ddthet(m,l,i,j,k),eethet(m,l,i,j,k,iblock)
+ & bbthet(m,l,i,j,k,iblock),ccthet(m,l,i,j,k,iblock),
+ & ddthet(m,l,i,j,k,iblock),eethet(m,l,i,j,k,iblock)
enddo
enddo
do l=1,ntheterm3
enddo
enddo
do l=1,ntheterm3