CONSTR_HOMOL in mutlichain, debug and output cleaning

[unres.git] / source / wham / src / molread_zs.F

diff --git a/source/wham/src/molread_zs.F b/source/wham/src/molread_zs.F
index 60d8e0e..a736e9c 100644 (file)
--- a/source/wham/src/molread_zs.F
+++ b/source/wham/src/molread_zs.F
@@ -509,6 +509,7 @@ c    &    sigma_odl_temp(maxres,maxres,max_template)
       character*500 controlcard
       integer ki, i, j, k, l
       logical lprn /.true./
+      logical unres_pdb
 c
 c     FP - Nov. 2014 Temporary specifications for new vars
 c
@@ -690,9 +691,13 @@ c
               sigma_odl(k,ii)=rescore(k,i)+rescore(k,j) ! other exprs possible
 c             sigma_odl(k,ii)=hmscore(k)*rescore(k,i)*rescore(k,j)
             else
-              sigma_odl(k,ii)=(rescore(k,i)+rescore(k,j))* ! sigma ~ rescore ~ error 
+#ifdef OLDSIGMA
+              sigma_odl(k,ii)=(rescore(k,i)+rescore(k,j))* ! sigma ~ rescore ~ error
+     &                      dexp(0.5d0*(odl(k,ii)/dist_cut)**2)
+#else
+              sigma_odl(k,ii)=(rescore(k,i)+rescore(k,j))* ! sigma ~ rescore ~ error
      &                      dexp(0.5d0*(odl(k,ii)/dist_cut)**2-0.5d0)
-
+#endif
 c   Following expr replaced by a positive exp argument
 c             sigma_odl(k,ii)=(rescore(k,i)+rescore(k,j))*
 c    &                      dexp(-0.5d0*(odl(k,ii)/dist_cut)**2)