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
/
DIMENSIONS.FREE
diff --git
a/source/wham/src-NEWSC/DIMENSIONS.FREE
b/source/wham/src-NEWSC/DIMENSIONS.FREE
index
a2eb4e5
..
01fdea6
100644
(file)
--- a/
source/wham/src-NEWSC/DIMENSIONS.FREE
+++ b/
source/wham/src-NEWSC/DIMENSIONS.FREE
@@
-2,7
+2,11
@@
integer MaxQ,MaxQ1
integer MaxR,MaxT_h
integer MaxSlice
integer MaxQ,MaxQ1
integer MaxR,MaxT_h
integer MaxSlice
+<<<<<<< HEAD
parameter (Max_Parm=128)
parameter (Max_Parm=128)
+=======
+ parameter (Max_Parm=1)
+>>>>>>> e183793... Added src_MD-M-newcorr (Adasko's source) and src-NEWSC of WHAM (with Momo's SCSC potentials)
parameter (MaxQ=4,MaxQ1=MaxQ+2)
parameter(MaxR=1,MaxT_h=32)
parameter(MaxSlice=40)
parameter (MaxQ=4,MaxQ1=MaxQ+2)
parameter(MaxR=1,MaxT_h=32)
parameter(MaxSlice=40)