From: Adam Kazimierz Sieradzan Date: Tue, 4 Dec 2012 07:37:57 +0000 (-0500) Subject: Merge branch 'adasko' of mmka.chem.univ.gda.pl:unres into adasko X-Git-Url: http://mmka.chem.univ.gda.pl/gitweb/?a=commitdiff_plain;h=1aed1ed3eb41e349bca7b3d64061b84cbf97d885;hp=7dc82d8a7130c9c454bf83d72e13d0418f72f650;p=unres.git Merge branch 'adasko' of mmka.chem.univ.gda.pl:unres into adasko --- diff --git a/source/wham/src-M/include_unres/COMMON.INTERACT b/source/wham/src-M/include_unres/COMMON.INTERACT index d4a58b5..650af0d 100644 --- a/source/wham/src-M/include_unres/COMMON.INTERACT +++ b/source/wham/src-M/include_unres/COMMON.INTERACT @@ -17,7 +17,7 @@ C 12/1/95 Array EPS included in the COMMON block. & rs0(ntyp,ntyp),chi(ntyp,ntyp),chip(ntyp),chip0(ntyp),alp(ntyp), & sigma0(ntyp),sigii(ntyp),rr0(ntyp),r0(ntyp,ntyp),r0e(ntyp,ntyp), & r0d(ntyp,2),rpp(2,2),epp(2,2),elpp6(2,2),elpp3(2,2), - & eps_scp(20,2),rscp(20,2),eps_orig(ntyp,ntyp) + & eps_scp(ntyp,2),rscp(ntyp,2),eps_orig(ntyp,ntyp) c 12/5/03 modified 09/18/03 Bond stretching parameters. double precision vbldp0,vbldsc0,akp,aksc,abond0,distchainmax integer nbondterm diff --git a/source/wham/src-M/include_unres/COMMON.SCROT b/source/wham/src-M/include_unres/COMMON.SCROT index 2da7b8f..a352775 100644 --- a/source/wham/src-M/include_unres/COMMON.SCROT +++ b/source/wham/src-M/include_unres/COMMON.SCROT @@ -1,3 +1,3 @@ C Parameters of the SC rotamers (local) term double precision sc_parmin - common/scrot/sc_parmin(maxsccoef,20) + common/scrot/sc_parmin(maxsccoef,ntyp)