X-Git-Url: http://mmka.chem.univ.gda.pl/gitweb/?a=blobdiff_plain;f=source%2Fcluster%2Fwham%2Fsrc%2Finitialize_p.F;h=67643165ab5c59650e05a71d562589c4dd543d85;hb=d66ce5a811ab8e4704d5dabec2b6c41526288d83;hp=3f0e04b8692a459e0b2a97b93ea3158c430cc1b5;hpb=357148eb01c1ea7e5cfd362d34f1e1ab61c8f2a8;p=unres.git diff --git a/source/cluster/wham/src/initialize_p.F b/source/cluster/wham/src/initialize_p.F index 3f0e04b..6764316 100644 --- a/source/cluster/wham/src/initialize_p.F +++ b/source/cluster/wham/src/initialize_p.F @@ -58,6 +58,7 @@ C ibond=28 isccor=29 jrms=30 + ientin=38 C C Set default weights of the energy terms. C @@ -236,7 +237,7 @@ c------------------------------------------------------------------------- & "WHOMOLOGY","WDFAD","WDFAT","WDFAN","WDFAB"," "," "/ data nprint_ene /23/ data print_order /1,2,3,17,11,12,13,14,4,5,6,7,8,9,10,16,15,18,19, - & 20,21,22,23,24,25/ + & 20,21,22,23,24,25,0,0/ end c--------------------------------------------------------------------------- subroutine init_int_table @@ -347,7 +348,7 @@ cd write (iout,*) 'i=',i,' scheck=',scheck,' jj=',jj nint_gr(i)=1 istart(i,1)=i+1 iend(i,1)=nct - ind_scint=int_scint+nct-i + ind_scint=ind_scint+nct-i #endif endif #ifdef MPL @@ -589,10 +590,10 @@ c include 'COMMON.SETUP' & " lim_dih",lim_dih #ifdef MPL call int_bounds(lim_odl,link_start_homo,link_end_homo) - call int_bounds(lim_dih-nnt+1,idihconstr_start_homo, + call int_bounds(lim_dih,idihconstr_start_homo, & idihconstr_end_homo) - idihconstr_start_homo=idihconstr_start_homo+nnt-1 - idihconstr_end_homo=idihconstr_end_homo+nnt-1 + idihconstr_start_homo=idihconstr_start_homo+nnt-1+3 + idihconstr_end_homo=idihconstr_end_homo+nnt-1+3 if (me.eq.king .or. .not. out1file) & write (iout,*) 'Processor',fg_rank,' CG group',kolor, & ' absolute rank',MyRank, @@ -603,8 +604,8 @@ c include 'COMMON.SETUP' #else link_start_homo=1 link_end_homo=lim_odl - idihconstr_start_homo=nnt - idihconstr_end_homo=lim_dih + idihconstr_start_homo=nnt+3 + idihconstr_end_homo=lim_dih+nnt-1+3 write (iout,*) & ' lim_odl',lim_odl,' link_start=',link_start_homo, & ' link_end',link_end_homo,' lim_dih',lim_dih,