X-Git-Url: http://mmka.chem.univ.gda.pl/gitweb/?a=blobdiff_plain;f=source%2Funres%2Fsrc_MD%2Freadrtns.F;h=887e89fd80401ac26255e6f14e70fc7918c3a85a;hb=26591bffd0d706caeed1e3b49f76215dc2411363;hp=418def476306972ebee8b45bed35ef5dfcc46c9c;hpb=20b9694fa7a216e4396722fb449b55dbc448f727;p=unres.git diff --git a/source/unres/src_MD/readrtns.F b/source/unres/src_MD/readrtns.F index 418def4..887e89f 100644 --- a/source/unres/src_MD/readrtns.F +++ b/source/unres/src_MD/readrtns.F @@ -2719,15 +2719,16 @@ 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, ii_in_use(maxdim) + integer ki, i, j, k, l, ii_in_use(maxdim),i_tmp,idomain_tmp logical lprn /.true./ integer ilen external ilen c c FP - Nov. 2014 Temporary specifications for new vars c - double precision rescore_tmp,x12,y12,z12 + double precision rescore_tmp,x12,y12,z12,rescore2_tmp double precision, dimension (max_template,maxres) :: rescore + double precision, dimension (max_template,maxres) :: rescore2 character*24 pdbfile,tpl_k_rescore c ----------------------------------------------------------------- c Reading multiple PDB ref structures and calculation of retraints @@ -2745,6 +2746,7 @@ c Alternative: reading from input call reada(controlcard,'DIST_CUT',dist_cut,5.0d0) ! for diff ways of calc sigma call readi(controlcard,"HOMOL_NSET",homol_nset,1) + read2sigma=(index(controlcard,'READ2SIGMA').gt.0) if (homol_nset.gt.1)then call card_concat(controlcard) read(controlcard,*) (waga_homology(i),i=1,homol_nset) @@ -2772,17 +2774,14 @@ c lim_theta=0 lim_xx=0 c -c Reading HM global scores (prob not required) + write(iout,*) 'nnt=',nnt,'nct=',nct c -c open (4,file="HMscore") -c do k=1,constr_homology -c read (4,*,end=521) hmscore_tmp -c hmscore(k)=hmscore_tmp ! Another transformation can be used -c write(*,*) "Model", k, ":", hmscore(k) -c enddo -c521 continue + do i = nnt,nct + do k=1,constr_homology + idomain(k,i)=0 + enddo + enddo -c write(iout,*) "waga_theta",waga_theta,"waga_d",waga_d ii=0 do i = nnt,nct-2 do j=i+2,nct @@ -2814,13 +2813,13 @@ c write(kic2,'(bz,i2.2)') k tpl_k_rescore="template"//kic2//".sco" -c tpl_k_sigma_odl="template"//kic2//".sigma_odl" -c tpl_k_sigma_dih="template"//kic2//".sigma_dih" -c tpl_k_sigma_theta="template"//kic2//".sigma_theta" -c tpl_k_sigma_d="template"//kic2//".sigma_d" unres_pdb=.false. - call readpdb + if (read2sigma) then + call readpdb_template(k) + else + call readpdb + endif c c Distance restraints c @@ -2837,36 +2836,30 @@ c From read_dist_constr (commented out 25/11/2014 <-> res sim) c c write(iout,*) "tpl_k_rescore - ",tpl_k_rescore open (ientin,file=tpl_k_rescore,status='old') - do irec=1,maxdim ! loop for reading res sim - if (irec.eq.1) then - rescore(k,irec)=0.0d0 - goto 1301 - endif - read (ientin,*,end=1401) rescore_tmp + if (nnt.gt.1) rescore(k,1)=0.0d0 + do irec=nnt,maxdim ! loop for reading res sim + if (read2sigma) then + read (ientin,*,end=1401) i_tmp,rescore2_tmp,rescore_tmp, + & idomain_tmp + i_tmp=i_tmp+nnt-1 + idomain(k,i_tmp)=idomain_tmp + rescore(k,i_tmp)=0.5d0*(rescore_tmp+0.5d0) + rescore2(k,i_tmp)=0.5d0*(rescore2_tmp+0.5d0) + else + idomain(k,irec)=1 + read (ientin,*,end=1401) rescore_tmp + c rescore(k,irec)=rescore_tmp+1.0d0 ! to avoid 0 values - rescore(k,irec)=0.5d0*(rescore_tmp+0.5d0) ! alt transf to reduce scores + rescore(k,irec)=0.5d0*(rescore_tmp+0.5d0) ! alt transf to reduce scores c write(iout,*) "rescore(",k,irec,") =",rescore(k,irec) - 1301 continue + endif enddo 1401 continue - close (ientin) -c open (ientin,file=tpl_k_sigma_odl,status='old') -c do irec=1,maxdim ! loop for reading sigma_odl -c read (ientin,*,end=1401) i, j, -c & sigma_odl_temp(i+nnt-1,j+nnt-1,k) ! new variable (?) -c sigma_odl_temp(j+nnt-1,i+nnt-1,k)= ! which purpose? -c & sigma_odl_temp(i+nnt-1,j+nnt-1,k) -c enddo -c 1401 continue -c close (ientin) + close (ientin) if (waga_dist.ne.0.0d0) then ii=0 - do i = nnt,nct-2 ! right? without parallel. - do j=i+2,nct ! right? -c do i = 1,nres ! alternative for bounds as used to set initial values in orig. read_constr_homology -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 + do i = nnt,nct-2 + do j=i+2,nct if (idomain(k,i).eq.idomain(k,j).and.idomain(k,i).ne.0) then @@ -2887,39 +2880,34 @@ c z12=c(3,i)-c(3,j) distal=dsqrt(x12*x12+y12*y12+z12*z12) odl(k,ii)=distal -c -c odl(k,ii)=dist(i,j) -c write (iout,*) "dist(",i,j,") =",dist(i,j) -c write (iout,*) "distal = ",distal -c write (iout,*) "odl(",k,ii,") =",odl(k,ii) -c write(iout,*) "rescore(",k,i,") =",rescore(k,i), -c & "rescore(",k,j,") =",rescore(k,j) -c -c Calculation of sigma from res sim -c -c if (odl(k,ii).le.6.0d0) then -c sigma_odl(k,ii)=hmscore(k)*rescore(k,i)*rescore(k,j) -c Other functional forms possible depending on odl(k,ii), eg. -c - if (odl(k,ii).le.dist_cut) then - 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 + if (read2sigma) then + sigma_odl(k,ii)=0 + do ik=i,j + sigma_odl(k,ii)=sigma_odl(k,ii)+rescore2(k,ik) + enddo + sigma_odl(k,ii)=sigma_odl(k,ii)/(j-i+1) + if (odl(k,ii).gt.dist_cut) sigma_odl(k,ii) = + & sigma_odl(k,ii)*dexp(0.5d0*(odl(k,ii)/dist_cut)**2-0.5d0) + else + if (odl(k,ii).le.dist_cut) then + 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 + 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 + 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 - + endif + endif c Following expr replaced by a positive exp argument c sigma_odl(k,ii)=(rescore(k,i)+rescore(k,j))* c & dexp(-0.5d0*(odl(k,ii)/dist_cut)**2) c sigma_odl(k,ii)=hmscore(k)*rescore(k,i)*rescore(k,j)* c & dexp(-0.5d0*(odl(k,ii)/dist_cut)**2) - endif c sigma_odl(k,ii)=1.0d0/(sigma_odl(k,ii)*sigma_odl(k,ii)) ! rescore ~ error c sigma_odl(k,ii)=sigma_odl(k,ii)*sigma_odl(k,ii) @@ -2931,10 +2919,7 @@ c & sigma_odl_temp(i,j,k) ! not inverse because of us 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 @@ -2950,10 +2935,11 @@ c & sigma_dih(k,i+nnt-1) c enddo c1402 continue c close (ientin) - do i = nnt+3,nct ! right? without parallel. -c do i=1,nres ! alternative for bounds acc to readpdb? -c do i=1,nres-3 ! alternative for bounds as used to set initial values in orig. read_constr_homology -c do i=idihconstr_start_homo,idihconstr_end_homo ! with FG parallel. + do i = nnt+3,nct + if (idomain(k,i).eq.0) then + sigma_dih(k,i)=0.0 + cycle + endif dih(k,i)=phiref(i) ! right? c read (ientin,*) sigma_dih(k,i) ! original variant c write (iout,*) "dih(",k,i,") =",dih(k,i) @@ -2963,8 +2949,8 @@ c & "rescore(",k,i-2,") =",rescore(k,i-2), c & "rescore(",k,i-3,") =",rescore(k,i-3) sigma_dih(k,i)=rescore(k,i)+rescore(k,i-1)+ - & rescore(k,i-2)+rescore(k,i-3) ! right expression ? -c + & rescore(k,i-2)+rescore(k,i-3) + if (read2sigma) sigma_dih(k,i)=sigma_dih(k,i)/4.0 c write (iout,*) "Raw sigmas for dihedral angle restraints" c write (iout,'(i5,10(2f8.2,4x))') i,sigma_dih(k,i) c sigma_dih(k,i)=hmscore(k)*rescore(k,i)*rescore(k,i-1)* @@ -2989,6 +2975,10 @@ c close (ientin) do i = nnt+2,nct ! right? without parallel. c do i = i=1,nres ! alternative for bounds acc to readpdb? c do i=ithet_start,ithet_end ! with FG parallel. + if (idomain(k,i).eq.0) then + sigma_theta(k,i)=0.0 + cycle + endif thetatpl(k,i)=thetaref(i) c write (iout,*) "thetatpl(",k,i,") =",thetatpl(k,i) c write(iout,*) "rescore(",k,i,") =",rescore(k,i), @@ -2996,7 +2986,8 @@ c & "rescore(",k,i-1,") =",rescore(k,i-1), c & "rescore(",k,i-2,") =",rescore(k,i-2) c read (ientin,*) sigma_theta(k,i) ! 1st variant sigma_theta(k,i)=rescore(k,i)+rescore(k,i-1)+ - & rescore(k,i-2) ! right expression ? + & rescore(k,i-2) + if (read2sigma) sigma_theta(k,i)=sigma_theta(k,i)/3.0 sigma_theta(k,i)=1.0d0/(sigma_theta(k,i)*sigma_theta(k,i)) c sigma_theta(k,i)=hmscore(k)*rescore(k,i)*rescore(k,i-1)* @@ -3014,12 +3005,15 @@ c sigma_d(k,i+nnt-1)=sigma_d(k,i+nnt-1)* ! not inverse because of use c & sigma_d(k,i+nnt-1) c enddo c1404 continue - close (ientin) do i = nnt,nct ! right? without parallel. c do i=2,nres-1 ! alternative for bounds acc to readpdb? c do i=loc_start,loc_end ! with FG parallel. - if (itype(i).eq.10) goto 1 ! right? + if (itype(i).eq.10) cycle + if (idomain(k,i).eq.0 ) then + sigma_d(k,i)=0.0 + cycle + endif xxtpl(k,i)=xxref(i) yytpl(k,i)=yyref(i) zztpl(k,i)=zzref(i) @@ -3034,11 +3028,9 @@ c sigma_d(k,i)=hmscore(k)*rescore(k,i) ! right expression ? c sigma_d(k,i)=sigma_d(k,i)*sigma_d(k,i) 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 c c remove distance restraints not used in any model from the list