X-Git-Url: http://mmka.chem.univ.gda.pl/gitweb/?a=blobdiff_plain;ds=sidebyside;f=source%2Funres%2Fsrc_MD%2Freadrtns.F;h=418def476306972ebee8b45bed35ef5dfcc46c9c;hb=20b9694fa7a216e4396722fb449b55dbc448f727;hp=700db390a67612a62ee1936693bce2d05b017513;hpb=09087fef23592a51ad0d09815c3fc5f10e352a7b;p=unres.git diff --git a/source/unres/src_MD/readrtns.F b/source/unres/src_MD/readrtns.F index 700db39..418def4 100644 --- a/source/unres/src_MD/readrtns.F +++ b/source/unres/src_MD/readrtns.F @@ -1087,6 +1087,7 @@ C Juyong:READ read_info C READ fragment information!! C both routines should be in dfa.F file!! +#ifdef DFA if (.not. (wdfa_dist.eq.0.0 .and. wdfa_tor.eq.0.0 .and. & wdfa_nei.eq.0.0 .and. wdfa_beta.eq.0.0)) then call init_dfa_vars @@ -1094,6 +1095,7 @@ C both routines should be in dfa.F file!! call read_dfa_info print*, 'read_dfa_info finished!' endif +#endif C if (pdbref) then if(me.eq.king.or..not.out1file) @@ -2717,8 +2719,10 @@ c & sigma_odl_temp(maxres,maxres,max_template) character*2 kic2 character*24 model_ki_dist, model_ki_angle character*500 controlcard - integer ki, i, j, k, l + integer ki, i, j, k, l, ii_in_use(maxdim) logical lprn /.true./ + integer ilen + external ilen c c FP - Nov. 2014 Temporary specifications for new vars c @@ -2779,6 +2783,14 @@ c enddo c521 continue c write(iout,*) "waga_theta",waga_theta,"waga_d",waga_d + ii=0 + do i = nnt,nct-2 + do j=i+2,nct + ii=ii+1 + ii_in_use(ii)=0 + enddo + enddo + do k=1,constr_homology read(inp,'(a)') pdbfile @@ -2786,9 +2798,12 @@ c Next stament causes error upon compilation (?) c if(me.eq.king.or. .not. out1file) c write (iout,'(2a)') 'PDB data will be read from file ', c & pdbfile(:ilen(pdbfile)) + write (iout,'(a,5x,a)') 'HOMOL: Opening PDB file', + & pdbfile(:ilen(pdbfile)) open(ipdbin,file=pdbfile,status='old',err=33) goto 34 - 33 write (iout,'(a)') 'Error opening PDB file.' + 33 write (iout,'(a,5x,a)') 'Error opening PDB file', + & pdbfile(:ilen(pdbfile)) stop 34 continue c print *,'Begin reading pdb data' @@ -2852,7 +2867,13 @@ c do i = 1,nres ! alternative for bounds as used to set initial values i c do j=i+2,nres ! ibid c do i = nnt,nct-2 ! alternative for bounds as used to assign dist restraints in orig. read_constr_homology (s. above) c do j=i+2,nct ! ibid + + if (idomain(k,i).eq.idomain(k,j).and.idomain(k,i).ne.0) then + ii=ii+1 + ii_in_use(ii)=1 + l_homo(k,ii)=.true. + c write (iout,*) "k",k c write (iout,*) "i",i," j",j," constr_homology", c & constr_homology @@ -2884,8 +2905,13 @@ c sigma_odl(k,ii)=rescore(k,i)+rescore(k,j) ! other exprs possible c sigma_odl(k,ii)=hmscore(k)*rescore(k,i)*rescore(k,j) else +#ifdef OLDSIGMA + sigma_odl(k,ii)=(rescore(k,i)+rescore(k,j))* ! sigma ~ rescore ~ error + & dexp(0.5d0*(odl(k,ii)/dist_cut)**2) +#else sigma_odl(k,ii)=(rescore(k,i)+rescore(k,j))* ! sigma ~ rescore ~ error & dexp(0.5d0*(odl(k,ii)/dist_cut)**2-0.5d0) +#endif c Following expr replaced by a positive exp argument c sigma_odl(k,ii)=(rescore(k,i)+rescore(k,j))* @@ -2900,11 +2926,16 @@ c sigma_odl(k,ii)=sigma_odl(k,ii)*sigma_odl(k,ii) c c sigma_odl(k,ii)=sigma_odl_temp(i,j,k)* ! new var read from file (?) c & sigma_odl_temp(i,j,k) ! not inverse because of use of res. similarity + else + ii=ii+1 + l_homo(k,ii)=.false. + endif enddo c read (ientin,*) sigma_odl(k,ii) ! 1st variant enddo c lim_odl=ii c if (constr_homology.gt.0) call homology_partition + lim_odl=ii endif c c Theta, dihedral and SC retraints @@ -2941,9 +2972,8 @@ c rescore(k,i-2)*rescore(k,i-3) ! right expression ? c Instead of res sim other local measure of b/b str reliability possible sigma_dih(k,i)=1.0d0/(sigma_dih(k,i)*sigma_dih(k,i)) c sigma_dih(k,i)=sigma_dih(k,i)*sigma_dih(k,i) - if (i-nnt-2.gt.lim_dih) lim_dih=i-nnt-2 ! right? -c if (i+nnt-1.gt.lim_dih) lim_dih=i+nnt-1 ! original when readin i from file enddo + lim_dih=nct-nnt-2 endif if (waga_theta.gt.0.0d0) then @@ -2972,9 +3002,9 @@ c read (ientin,*) sigma_theta(k,i) ! 1st variant c sigma_theta(k,i)=hmscore(k)*rescore(k,i)*rescore(k,i-1)* c rescore(k,i-2) ! right expression ? c sigma_theta(k,i)=sigma_theta(k,i)*sigma_theta(k,i) - if (i-nnt-1.gt.lim_theta) lim_theta=i-nnt-1 ! right? enddo endif + lim_theta=nct-nnt-1 if (waga_d.gt.0.0d0) then c open (ientin,file=tpl_k_sigma_d,status='old') @@ -3006,10 +3036,36 @@ c read (ientin,*) sigma_d(k,i) ! 1st variant if (i-nnt+1.gt.lim_xx) lim_xx=i-nnt+1 ! right? 1 continue enddo + lim_xx=nct-nnt+1 endif close(ientin) enddo - if (waga_dist.ne.0.0d0) lim_odl=ii +c +c remove distance restraints not used in any model from the list +c shift data in all arrays +c + if (waga_dist.ne.0.0d0) then + ii=0 + do i=nnt,nct-2 + do j=i+2,nct + ii=ii+1 + if (ii_in_use(ii).eq.0) then + do ki=ii,lim_odl-1 + ires_homo(ki)=ires_homo(ki+1) + jres_homo(ki)=jres_homo(ki+1) + ii_in_use(ki)=ii_in_use(ki+1) + do k=1,constr_homology + odl(k,ki)=odl(k,ki+1) + sigma_odl(k,ki)=sigma_odl(k,ki+1) + l_homo(k,ki)=l_homo(k,ki+1) + enddo + enddo + ii=ii-1 + lim_odl=lim_odl-1 + endif + enddo + enddo + endif if (constr_homology.gt.0) call homology_partition if (constr_homology.gt.0) call init_int_table cd write (iout,*) "homology_partition: lim_theta= ",lim_theta, @@ -3024,8 +3080,10 @@ cd write(iout,*) "waga_theta",waga_theta,"waga_d",waga_d if(me.eq.king .or. .not. out1file .and. fg_rank.eq.0) then write (iout,*) "Distance restraints from templates" do ii=1,lim_odl - write(iout,'(3i5,10(2f16.2,4x))') ii,ires_homo(ii),jres_homo(ii), - & (odl(ki,ii),1.0d0/dsqrt(sigma_odl(ki,ii)),ki=1,constr_homology) + write(iout,'(3i5,10(2f8.2,1x,l1,4x))') + & ii,ires_homo(ii),jres_homo(ii), + & (odl(ki,ii),1.0d0/dsqrt(sigma_odl(ki,ii)),l_homo(ki,ii), + & ki=1,constr_homology) enddo write (iout,*) "Dihedral angle restraints from templates" do i=nnt+3,lim_dih