X-Git-Url: http://mmka.chem.univ.gda.pl/gitweb/?a=blobdiff_plain;f=source%2Fwham%2Fsrc-NEWSC%2FDIMENSIONS.ZSCOPT;fp=source%2Fwham%2Fsrc-NEWSC%2FDIMENSIONS.ZSCOPT;h=9469850ff19fdf04fadb9933c09849b2077d067d;hb=e74a1da46f47c86b0c46679481b757c425642977;hp=689173bec1bd4e6547c84a2cf1e72573eb328294;hpb=d0bc9ab44e8f75f5cb92a01cda9daba97791e379;p=unres.git

diff --git a/source/wham/src-NEWSC/DIMENSIONS.ZSCOPT b/source/wham/src-NEWSC/DIMENSIONS.ZSCOPT
index 689173b..9469850 100644
--- 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)