projects
/
unres.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Added src_MD-M-newcorr (Adasko's source) and src-NEWSC of WHAM (with Momo's SCSC...
[unres.git]
/
source
/
wham
/
src-NEWSC
/
wham_calc1.F
diff --git
a/source/wham/src-NEWSC/wham_calc1.F
b/source/wham/src-NEWSC/wham_calc1.F
index
a6044cd
..
9dd2cdf
100644
(file)
--- 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)
parameter (MaxBinRms=100,MaxBinRgy=100)
integer MaxHdim
c parameter (MaxHdim=200000)
+<<<<<<< HEAD
parameter (MaxHdim=200)
integer maxinde
parameter (maxinde=200)
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"
#ifdef MPI
include "mpif.h"
include "COMMON.MPI"
@@
-95,6
+101,11
@@
c parameter (MaxHdim=200000)
integer ilen
external ilen
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",
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
#endif
return
+<<<<<<< HEAD
+=======
+>>>>>>> e183793... Added src_MD-M-newcorr (Adasko's source) and src-NEWSC of WHAM (with Momo's SCSC potentials)
end
end