projects
/
unres.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Added src_MD-M-newcorr (Adasko's source) and src-NEWSC of WHAM (with Momo's SCSC...
[unres.git]
/
source
/
wham
/
src-NEWSC
/
geomout.F
diff --git
a/source/wham/src-NEWSC/geomout.F
b/source/wham/src-NEWSC/geomout.F
index
9506eed
..
da70f1b
100644
(file)
--- a/
source/wham/src-NEWSC/geomout.F
+++ b/
source/wham/src-NEWSC/geomout.F
@@
-42,6
+42,10
@@
do i=1,nss
write (ipdb,30) ica(ihpb(i))+1,ica(jhpb(i))+1
enddo
do i=1,nss
write (ipdb,30) ica(ihpb(i))+1,ica(jhpb(i))+1
enddo
+<<<<<<< HEAD
+=======
+ write (ipdb,'(a)') "END"
+>>>>>>> e183793... Added src_MD-M-newcorr (Adasko's source) and src-NEWSC of WHAM (with Momo's SCSC potentials)
10 FORMAT ('ATOM',I7,' CA ',A3,I6,4X,3F8.3)
20 FORMAT ('ATOM',I7,' CB ',A3,I6,4X,3F8.3)
30 FORMAT ('CONECT',8I5)
10 FORMAT ('ATOM',I7,' CA ',A3,I6,4X,3F8.3)
20 FORMAT ('ATOM',I7,' CB ',A3,I6,4X,3F8.3)
30 FORMAT ('CONECT',8I5)