Added src_MD-M-newcorr (Adasko's source) and src-NEWSC of WHAM (with Momo's SCSC...

[unres.git] / source / wham / src-NEWSC / DIMENSIONS.ZSCOPT

diff --git a/source/wham/src-NEWSC/DIMENSIONS.ZSCOPT b/source/wham/src-NEWSC/DIMENSIONS.ZSCOPT
index 689173b..9469850 100644 (file)
--- a/source/wham/src-NEWSC/DIMENSIONS.ZSCOPT
+++ b/source/wham/src-NEWSC/DIMENSIONS.ZSCOPT
@@ -3,7 +3,11 @@
 c Maximum number of structures in the database, energy components, proteins,
 c and structural classes
 c#ifdef JUBL
+<<<<<<< HEAD
       parameter (maxstr=2000000,max_ene=21,maxprot=7,maxclass=5000)
+=======
+      parameter (maxstr=200000,max_ene=21,maxprot=7,maxclass=5000)
+>>>>>>> e183793... Added src_MD-M-newcorr (Adasko's source) and src-NEWSC of WHAM (with Momo's SCSC potentials)
       parameter (maxclass1=10)
 c Maximum number of structures to be dealt with by one processor
       parameter (maxstr_proc=20000)