X-Git-Url: http://mmka.chem.univ.gda.pl/gitweb/?a=blobdiff_plain;f=source%2Funres%2Fsrc_CSA%2Freadrtns_csa.F;h=df144f4e7531dfe7012acc09c8b51f93bd4b67f7;hb=04b2c04745dd6c50732302647d5af2aca8ca3878;hp=c67d045e1cb2c5ae7104a0fcf5418d64bcd40e0b;hpb=a45ce81aae2c857c30b821e39e45a7a08356de4d;p=unres.git

diff --git a/source/unres/src_CSA/readrtns_csa.F b/source/unres/src_CSA/readrtns_csa.F
index c67d045..df144f4 100644
--- a/source/unres/src_CSA/readrtns_csa.F
+++ b/source/unres/src_CSA/readrtns_csa.F
@@ -287,10 +287,10 @@ C Read weights of the subsequent energy terms.
        call reada(weightcard,'WANG',wang,1.0D0)
        call reada(weightcard,'WSCLOC',wscloc,1.0D0)
 C     Juyong
-       call reada(weightcard,'WDFAD',wdfa_dist,1.0d0)
-       call reada(weightcard,'WDFAT',wdfa_tor,1.0d0)
-       call reada(weightcard,'WDFAN',wdfa_nei,1.0d0)
-       call reada(weightcard,'WDFAB',wdfa_beta,1.0d0)
+       call reada(weightcard,'WDFAD',wdfa_dist,0.0d0)
+       call reada(weightcard,'WDFAT',wdfa_tor,0.0d0)
+       call reada(weightcard,'WDFAN',wdfa_nei,0.0d0)
+       call reada(weightcard,'WDFAB',wdfa_beta,0.0d0)
 C       
        call reada(weightcard,'SCAL14',scal14,0.4D0)
        call reada(weightcard,'SCALSCP',scalscp,1.0d0)
@@ -577,10 +577,13 @@ C     Juyong:READ read_info
 C     READ fragment information!!
 C     both routines should be in dfa.F file!!
 
-      call init_dfa_vars
-      print*, 'init_dfa_vars finished!'
-      call read_dfa_info
-      print*, 'read_dfa_info finished!'
+      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
+       call init_dfa_vars
+       print*, 'init_dfa_vars finished!'
+       call read_dfa_info
+       print*, 'read_dfa_info finished!'
+      endif
 C
 C
 
@@ -1131,6 +1134,9 @@ c!bankt
       call readi(mcmcard,'NCONF_IN',nconf_in,0)
       call reada(mcmcard,'RDIH_BIAS',rdih_bias,0.5d0)
       write (iout,*) "NCONF_IN",nconf_in
+      tm_score=(index(mcmcard,'TMSCORE').gt.0)
+      if (tm_score) write (iout,*) "Using TM_Score instead of DIFF",
+     &      " for torsional angles" 
       return
       end