Fixed Makefiles, handle all force fields thru appropriate options

[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 17b2165..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'
-c      include 'COMMON.CSA'
+      include 'COMMON.CSA'
       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 
+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
@@ -472,6 +475,11 @@ c              call gen_side(iti,theta(i+1),alph(i),omeg(i),fail)
           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
@@ -800,9 +808,6 @@ c            call gen_rand_conf(itmp,*31)
 
       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