projects
/
unres.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
update
[unres.git]
/
source
/
unres
/
src_CSA
/
readrtns_csa.F
diff --git
a/source/unres/src_CSA/readrtns_csa.F
b/source/unres/src_CSA/readrtns_csa.F
index
6e222d4
..
e88a67e
100644
(file)
--- a/
source/unres/src_CSA/readrtns_csa.F
+++ b/
source/unres/src_CSA/readrtns_csa.F
@@
-73,7
+73,7
@@
c include 'COMMON.THREAD'
include 'COMMON.MCM'
c include 'COMMON.MAP'
include 'COMMON.HEADER'
include 'COMMON.MCM'
c include 'COMMON.MAP'
include 'COMMON.HEADER'
-c include 'COMMON.CSA'
+ include 'COMMON.CSA'
include 'COMMON.CHAIN'
c include 'COMMON.MUCA'
c include 'COMMON.MD'
include 'COMMON.CHAIN'
c include 'COMMON.MUCA'
c include 'COMMON.MD'
@@
-455,6
+455,9
@@
c print *,'Finished reading pdb data'
call contact(.false.,ncont_ref,icont_ref,co)
if (sideadd) then
call contact(.false.,ncont_ref,icont_ref,co)
if (sideadd) then
+C Following 2 lines for diagnostics; comment out if not needed
+ write (iout,*) "Before sideadd"
+ call intout
if(me.eq.king.or..not.out1file)
& write(iout,*)'Adding sidechains'
maxsi=1000
if(me.eq.king.or..not.out1file)
& write(iout,*)'Adding sidechains'
maxsi=1000
@@
-472,6
+475,11
@@
c call gen_side(iti,theta(i+1),alph(i),omeg(i),fail)
endif
enddo
endif
endif
enddo
endif
+C 10/03/12 Adam: Recalculate coordinates with new side chain positions
+ call chainbuild
+C Following 2 lines for diagnostics; comment out if not needed
+ write (iout,*) "After sideadd"
+ call intout
endif
if (indpdb.eq.0) then
endif
if (indpdb.eq.0) then
@@
-577,13
+585,8
@@
C Juyong:READ read_info
C READ fragment information!!
C both routines should be in dfa.F file!!
C READ fragment information!!
C both routines should be in dfa.F file!!
-<<<<<<< HEAD
if (.not. (wdfa_dist.eq.0.0 .and. wdfa_tor.eq.0.0 .and.
& wdfa_nei.eq.0.0 .and. wdfa_beta.eq.0.0)) then
if (.not. (wdfa_dist.eq.0.0 .and. wdfa_tor.eq.0.0 .and.
& wdfa_nei.eq.0.0 .and. wdfa_beta.eq.0.0)) then
-=======
- if (.not. (wdfa_dist.eq.0.0 .and. wdfa_tor.eq.0.0
- & .and. wdfa_nei.eq.0.0 .and. wdfa_beta.eq.0.0)) then
->>>>>>> adam
call init_dfa_vars
print*, 'init_dfa_vars finished!'
call read_dfa_info
call init_dfa_vars
print*, 'init_dfa_vars finished!'
call read_dfa_info
@@
-805,9
+808,6
@@
c call gen_rand_conf(itmp,*31)
endif
C Generate distance constraints, if the PDB structure is to be regularized.
endif
C Generate distance constraints, if the PDB structure is to be regularized.
- if (nthread.gt.0) then
- call read_threadbase
- endif
call setup_var
if (me.eq.king .or. .not. out1file)
& call intout
call setup_var
if (me.eq.king .or. .not. out1file)
& call intout