X-Git-Url: http://mmka.chem.univ.gda.pl/gitweb/?a=blobdiff_plain;f=source%2Fwham%2Fsrc-NEWSC%2Fwham_calc1.F;fp=source%2Fwham%2Fsrc-NEWSC%2Fwham_calc1.F;h=9dd2cdf6b4dd620d7ce640732cf168cc7d1cae1d;hb=e74a1da46f47c86b0c46679481b757c425642977;hp=a6044cd58e50c0cba2842aabd70a718d175b3366;hpb=d0bc9ab44e8f75f5cb92a01cda9daba97791e379;p=unres.git

diff --git a/source/wham/src-NEWSC/wham_calc1.F b/source/wham/src-NEWSC/wham_calc1.F
index a6044cd..9dd2cdf 100644
--- a/source/wham/src-NEWSC/wham_calc1.F
+++ b/source/wham/src-NEWSC/wham_calc1.F
@@ -18,9 +18,15 @@
       parameter (MaxBinRms=100,MaxBinRgy=100)
       integer MaxHdim
 c      parameter (MaxHdim=200000)
+<<<<<<< HEAD
       parameter (MaxHdim=200)
       integer maxinde
       parameter (maxinde=200)
+=======
+      parameter (MaxHdim=100)
+      integer maxinde
+      parameter (maxinde=100)
+>>>>>>> e183793... Added src_MD-M-newcorr (Adasko's source) and src-NEWSC of WHAM (with Momo's SCSC potentials)
 #ifdef MPI
       include "mpif.h"
       include "COMMON.MPI"
@@ -95,6 +101,11 @@ c      parameter (MaxHdim=200000)
       integer ilen
       external ilen
  
+<<<<<<< HEAD
+=======
+      write (iout,*) "Enter WHAM_calc"
+      call flush(iout)
+>>>>>>> e183793... Added src_MD-M-newcorr (Adasko's source) and src-NEWSC of WHAM (with Momo's SCSC potentials)
       write(licz2,'(bz,i2.2)') islice
       nbin1 = 1.0d0/delta
       write (iout,'(//80(1h-)/"Solving WHAM equations for slice",
@@ -1449,5 +1460,8 @@ c            write (iout,*) ib," PotEmin",potEmin
 #endif
 
       return
+<<<<<<< HEAD
 
+=======
+>>>>>>> e183793... Added src_MD-M-newcorr (Adasko's source) and src-NEWSC of WHAM (with Momo's SCSC potentials)
       end