X-Git-Url: http://mmka.chem.univ.gda.pl/gitweb/?a=blobdiff_plain;f=source%2Fwham%2Fsrc-M%2Fwham_calc1.F;fp=source%2Fwham%2Fsrc-M%2Fwham_calc1.F;h=1d272356e0c4295c831042668764573039cb7c6d;hb=db42f9cbdaea4ee6f84576bb04ff30631cdf1e62;hp=eff98da4b3a91e4394d20c7113b66677db5ad1d2;hpb=8e66a1b2571905b1e328a33072e0e42a6bc0f829;p=unres.git

diff --git a/source/wham/src-M/wham_calc1.F b/source/wham/src-M/wham_calc1.F
index eff98da..1d27235 100644
--- a/source/wham/src-M/wham_calc1.F
+++ b/source/wham/src-M/wham_calc1.F
@@ -1,4 +1,4 @@
-      subroutine WHAM_CALC(islice,*)
+	      subroutine WHAM_CALC(islice,*)
 ! Weighed Histogram Analysis Method (WHAM) code
 ! Written by A. Liwo based on the work of Kumar et al., 
 ! J.Comput.Chem., 13, 1011 (1992)
@@ -36,6 +36,7 @@ c      parameter (MaxHdim=200000)
       include "COMMON.SBRIDGE"
       include "COMMON.PROT"
       include "COMMON.ENEPS"
+      include "COMMON.SHIELD"
       integer MaxPoint,MaxPointProc
       parameter (MaxPoint=MaxStr,
      & MaxPointProc=MaxStr_Proc)
@@ -113,6 +114,7 @@ c      parameter (MaxHdim=200000)
       do t=0,MaxN
         htot(t)=0
       enddo
+#define DEBUG
 #ifdef MPI
       do i=1,scount(me1)
 #else
@@ -820,7 +822,7 @@ C     &            +ftprim(6)*evdw_t
      &            ftprim(2)*wel_loc*eel_loc+ftprim(2)*wtor_d*etors_d+
      &            ftprim(1)*wsccor*esccor
             ebis=ftbis(1)*wsc*(evdw+ft(6)*evdw_t)
-     &            +ftbis(1)**wscp*evdw2+
+     &            +ftbis(1)*wscp*evdw2+
      &            ftbis(1)*welec*ees
      &            +ftbis(1)*wvdwpp*evdw
      &            +ftbis(1)*wtor*etors+
@@ -1284,5 +1286,5 @@ C     &            +ftprim(6)*evdw_t
 #endif
 
       return
-
+#undef DEBUG
       end