Merge branch 'homology' of mmka.chem.univ.gda.pl:unres into homology
authorFelipe Pineda <pideca@hotmail.com>
Fri, 20 Feb 2015 10:23:07 +0000 (11:23 +0100)
committerFelipe Pineda <pideca@hotmail.com>
Fri, 20 Feb 2015 10:23:07 +0000 (11:23 +0100)
Conflicts:
bin/unres/MD/unres_ifort_MPICH_E0LL2Y.exe
source/unres/src_MD/COMMON.CONTROL
source/unres/src_MD/cinfo.f
source/unres/src_MD/energy_p_new_barrier.F
source/unres/src_MD/readrtns.F

1  2 
source/unres/src_MD/COMMON.CONTROL
source/unres/src_MD/cinfo.f
source/unres/src_MD/energy_p_new_barrier.F
source/unres/src_MD/readrtns.F

@@@ -1,6 -1,6 +1,7 @@@
        integer modecalc,iscode,indpdb,indback,indphi,iranconf,icheckgrad,
-      & inprint,i2ndstr,mucadyn,constr_dist,constr_homology
+      & inprint,i2ndstr,mucadyn,constr_dist,constr_homology,homol_nset
 -      real*8 waga_dist, waga_angle
++      real*8 waga_dist1,waga_angle1
 +      real*8 waga_dist, waga_angle, waga_theta, waga_d, dist_cut
        logical minim,refstr,pdbref,outpdb,outmol2,overlapsc,energy_dec,
       &                 sideadd,lsecondary,read_cart,unres_pdb,
       &                 vdisulf,searchsc,lmuca,dccart,extconf,out1file,
@@@ -10,6 -10,7 +11,8 @@@
       & overlapsc,energy_dec,sideadd,lsecondary,read_cart,unres_pdb
       & ,vdisulf,searchsc,lmuca,dccart,mucadyn,extconf,out1file,
       & constr_dist,gnorm_check,gradout,split_ene,constr_homology,
-      & waga_dist, waga_angle, waga_theta, waga_d, dist_cut
++     & waga_dist, waga_angle, waga_theta, waga_d, dist_cut,
+      & homol_nset
 -      common /homol/ waga_dist(maxprocs/20), waga_angle(maxprocs/20)
++     common /homol/ waga_dist1(maxprocs/20), waga_angle1(maxprocs/20)
  C... minim = .true. means DO minimization.
  C... energy_dec = .true. means print energy decomposition matrix
@@@ -1,11 -1,11 +1,11 @@@
  C DO NOT EDIT THIS FILE - IT HAS BEEN GENERATED BY COMPINFO.C
- C 3 2 304
 -C 3 2 204
++C 3 2 305
        subroutine cinfo
        include 'COMMON.IOUNITS'
        write(iout,*)'++++ Compile info ++++'
-       write(iout,*)'Version 3.2 build 304'
-       write(iout,*)'compiled Thu Feb  5 13:01:33 2015'
 -      write(iout,*)'Version 3.2 build 204'
 -      write(iout,*)'compiled Fri Nov 14 14:02:15 2014'
 -      write(iout,*)'compiled by czarek@piasek4'
++      write(iout,*)'Version 3.2 build 305'
++      write(iout,*)'compiled Tue Feb 17 15:20:55 2015'
 +      write(iout,*)'compiled by felipe@piasek4'
        write(iout,*)'OS name:    Linux '
        write(iout,*)'OS release: 3.2.0-70-generic '
        write(iout,*)'OS version:',
@@@ -6067,8 -6037,7 +6070,12 @@@ c      write(iout,*) "constr_homology="
  c      write(iout,*) i, j, k, "TEST K"
           enddo
  
 -         grad_odl3=sum_sgodl/(sum_godl*dij)
++       if (homol_nset.gt.1)then
++         grad_odl3=waga_dist1(iset)*sum_sgodl/(sum_godl*dij)
++       else
 +         grad_odl3=waga_dist*sum_sgodl/(sum_godl*dij)
++       endif
 +c        grad_odl3=sum_sgodl/(sum_godl*dij)
  
  
  c      write(iout,*) i, j, k, distance(i,j,k), "W GRADIENCIE2"
@@@ -6158,14 -6101,12 +6165,18 @@@ c Gradien
  c ----------------------------------------------------------------------
  
          sum_gdih=kat2
 -        sum_sgdih=0.0
 +        sum_sgdih=0.0d0
          do k=1,constr_homology
 -          sgdih=-gdih(k)*dih_diff(k)*sigma_dih(k,i)*waga_angle(iset)
 +          sgdih=-gdih(k)*dih_diff(k)*sigma_dih(k,i)  ! waga_angle rmvd
 +c         sgdih=-gdih(k)*dih_diff(k)*sigma_dih(k,i)*waga_angle
            sum_sgdih=sum_sgdih+sgdih
          enddo
 -        grad_dih3=sum_sgdih/sum_gdih
 +c       grad_dih3=sum_sgdih/sum_gdih
-         grad_dih3=waga_angle*sum_sgdih/sum_gdih
++        if (homol_nset.gt.1)then
++         grad_dih3=waga_angle1(iset)*sum_sgdih/sum_gdih
++        else
++         grad_dih3=waga_angle*sum_sgdih/sum_gdih
++        endif
  
  c      write(iout,*)i,k,gdih,sgdih,beta(i+1,i+2,i+3,i+4),grad_dih3
  ccc      write(iout,747) "GRAD_KAT_1", i, nphi, icg, grad_dih3,
@@@ -6435,19 -6122,9 +6446,24 @@@ c Total energy from homology restraint
  #ifdef DEBUG
        write (iout,*) "odleg",odleg," kat",kat
  #endif
 -      ehomology_constr=odleg+kat
 +c
 +c Addition of energy of theta angle and SC local geom over constr_homologs ref strs
 +c
 +c     ehomology_constr=odleg+kat
-       ehomology_constr=waga_dist*odleg+waga_angle*kat+waga_theta*Eval
++      if (homol_nset.gt.1)then
++       ehomology_constr=waga_dist1(iset)*odleg+waga_angle1(iset)*kat+waga_theta*Eval
++     &              +waga_d*Erot     
++      else
++       ehomology_constr=waga_dist*odleg+waga_angle*kat+waga_theta*Eval
 +     &              +waga_d*Erot
++      endif
 +c     write (iout,*) "odleg",odleg," kat",kat," Uconst_back",Uconst_back
 +c     write (iout,*) "ehomology_constr",ehomology_constr
 +c     ehomology_constr=odleg+kat+Uconst_back
        return
 -
 +c
 +c FP 01/15 end
 +c
    748 format(a8,f12.3,a6,f12.3,a7,f12.3)
    747 format(a12,i4,i4,i4,f8.3,f8.3)
    746 format(a12,i4,i4,i4,f8.3,f8.3,f8.3)
@@@ -2643,292 -2640,101 +2646,313 @@@ c    &    sigma_odl_temp(maxres,maxres,
        character*2 kic2
        character*24 model_ki_dist, model_ki_angle
        character*500 controlcard
 -      character*3200 controlcard1
        integer ki, i, j, k, l
        logical lprn /.true./
 -
 +c
 +c     FP - Nov. 2014 Temporary specifications for new vars
 +c
 +      double precision rescore_tmp,x12,y12,z12
 +      double precision, dimension (max_template,maxres) :: rescore
 +      character*24 pdbfile,tpl_k_rescore
 +c -----------------------------------------------------------------
 +c Reading multiple PDB ref structures and calculation of retraints
 +c not using pre-computed ones stored in files model_ki_{dist,angle}
 +c FP (Nov., 2014)
 +c -----------------------------------------------------------------
 +c
 +c
 +c Alternative: reading from input
        call card_concat(controlcard)
 +      call reada(controlcard,"HOMOL_DIST",waga_dist,1.0d0)
 +      call reada(controlcard,"HOMOL_ANGLE",waga_angle,1.0d0)
 +      call reada(controlcard,"HOMOL_THETA",waga_theta,1.0d0) ! new
 +      call reada(controlcard,"HOMOL_SCD",waga_d,1.0d0) ! new
 +      call reada(controlcard,'DIST_CUT',dist_cut,5.0d0) ! for diff ways of calc sigma
 + 
+       call readi(controlcard,"HOMOL_NSET",homol_nset,1)       
+       if (homol_nset.gt.1)then
+          call card_concat(controlcard)
 -         read(controlcard,*) (waga_dist(i),i=1,homol_nset) 
++         read(controlcard,*) (waga_dist1(i),i=1,homol_nset) 
+          call card_concat(controlcard)
 -         read(controlcard,*) (waga_angle(i),i=1,homol_nset) 
++         read(controlcard,*) (waga_angle1(i),i=1,homol_nset) 
+          write(iout,*) "iset distance_weight angle_weight"
+          do i=1,homol_nset
 -           write(iout,*) i,waga_dist(i),waga_angle(i)
++           write(iout,*) i,waga_dist1(i),waga_angle1(i)
+          enddo
+          iset=mod(kolor,homol_nset)+1
+       else
+        iset=1
 -       call reada(controlcard,"HOMOL_DIST",waga_dist(1),1.0d0)
 -       call reada(controlcard,"HOMOL_ANGLE",waga_angle(1),1.0d0)
++c       call reada(controlcard,"HOMOL_DIST",waga_dist(1),1.0d0)
++c       call reada(controlcard,"HOMOL_ANGLE",waga_angle(1),1.0d0)
+       endif
+       write (iout,*) "nnt",nnt," nct",nct
+       call flush(iout)
++
++
        lim_odl=0
        lim_dih=0
 -      do i=1,nres
 -        do j=i+2,nres
 -          do ki=1,constr_homology
 -            sigma_odl_temp(i,j,ki)=0.0d0
 -            odl_temp(i,j,ki)=0.0d0
 +c
 +c  New
 +c
 +      lim_theta=0
 +      lim_xx=0
 +c
 +c  Reading HM global scores (prob not required)
 +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
 +
 +c     write(iout,*) "waga_theta",waga_theta,"waga_d",waga_d
 +      do k=1,constr_homology
 +
 +        read(inp,'(a)') pdbfile
 +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))
 +        open(ipdbin,file=pdbfile,status='old',err=33)
 +        goto 34
 +  33    write (iout,'(a)') 'Error opening PDB file.'
 +        stop
 +  34    continue
 +c        print *,'Begin reading pdb data'
 +c
 +c Files containing res sim or local scores (former containing sigmas)
 +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"
 +
 +        call readpdb
 +c
 +c     Distance restraints
 +c
 +c          ... --> odl(k,ii)
 +C Copy the coordinates from reference coordinates (?)
 +        do i=1,2*nres
 +          do j=1,3
 +            c(j,i)=cref(j,i)
 +c           write (iout,*) "c(",j,i,") =",c(j,i)
            enddo
          enddo
 -      enddo
 -      do i=1,nres-3
 -        do ki=1,constr_homology
 -          dih(ki,i)=0.0d0
 -          sigma_dih(ki,i)=0.0d0
 -        enddo
 -      enddo
 -      do ki=1,constr_homology
 -          write(kic2,'(i2)') ki
 -          if (ki.le.9) kic2="0"//kic2(2:2)
 +c
 +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
 +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
 +c           write(iout,*) "rescore(",k,irec,") =",rescore(k,irec)
 + 1301     continue
 +          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)
 +        if (waga_dist.gt.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
 +              ii=ii+1
 +c             write (iout,*) "k",k
 +c             write (iout,*) "i",i," j",j," constr_homology",
 +c    &                       constr_homology
 +              ires_homo(ii)=i
 +              jres_homo(ii)=j
 +c
 +c Attempt to replace dist(i,j) by its definition in ...
 +c
 +              x12=c(1,i)-c(1,j)
 +              y12=c(2,i)-c(2,j)
 +              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
 +              sigma_odl(k,ii)=(rescore(k,i)+rescore(k,j))* ! sigma ~ rescore ~ error 
 +     &                      dexp(0.5d0*(odl(k,ii)/dist_cut)**2)
  
 -          model_ki_dist="model"//kic2//".dist"
 -          model_ki_angle="model"//kic2//".angle"
 -        open (ientin,file=model_ki_dist,status='old')
 -        do irec=1,maxdim !petla do czytania wiezow na odleglosc
 -          read (ientin,*,end=1401) i, j, odl_temp(i+nnt-1,j+nnt-1,ki),
 -     &       sigma_odl_temp(i+nnt-1,j+nnt-1,ki)
 -          odl_temp(j+nnt-1,i+nnt-1,ki)=odl_temp(i+nnt-1,j+nnt-1,ki)
 -          sigma_odl_temp(j+nnt-1,i+nnt-1,ki)=
 -     &     sigma_odl_temp(i+nnt-1,j+nnt-1,ki)
 -        enddo
 - 1401 continue
 -        close (ientin)
 -        open (ientin,file=model_ki_angle,status='old')
 -        do irec=1,maxres-3 !petla do czytania wiezow na katy torsyjne
 -          read (ientin,*,end=1402) i, j, k,l,dih(ki,i+nnt-1),
 -     &      sigma_dih(ki,i+nnt-1)
 -          if (i+nnt-1.gt.lim_dih) lim_dih=i+nnt-1
 -          sigma_dih(ki,i+nnt-1)=1.0d0/sigma_dih(ki,i+nnt-1)**2
 -        enddo
 - 1402 continue
 -        close (ientin)
 -      enddo
 -      ii=0
 -      write (iout,*) "nnt",nnt," nct",nct
 -      do i=nnt,nct-2
 -        do j=i+2,nct
 -          ki=1
 -c          write (iout,*) "i",i," j",j," constr_homology",constr_homology
 -          do while (ki.le.constr_homology .and.
 -     &        sigma_odl_temp(i,j,ki).le.0.0d0)
 -c            write (iout,*) "ki",ki," sigma_odl",sigma_odl_temp(i,j,ki)
 -            ki=ki+1
 +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)
 +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
 +            enddo
 +c           read (ientin,*) sigma_odl(k,ii) ! 1st variant
            enddo
 -c          write (iout,*) "ki",ki
 -          if (ki.gt.constr_homology) cycle
 -          ii=ii+1
 -          ires_homo(ii)=i
 -          jres_homo(ii)=j
 -          do ki=1,constr_homology
 -            odl(ki,ii)=odl_temp(i,j,ki)
 -            sigma_odl(ki,ii)=1.0d0/sigma_odl_temp(i,j,ki)**2
 -          enddo      
 -        enddo
 +c         lim_odl=ii
 +c         if (constr_homology.gt.0) call homology_partition
 +        endif
 +c
 +c     Theta, dihedral and SC retraints
 +c
 +        if (waga_angle.gt.0.0d0) then
 +c         open (ientin,file=tpl_k_sigma_dih,status='old')
 +c         do irec=1,maxres-3 ! loop for reading sigma_dih
 +c            read (ientin,*,end=1402) i,j,ki,l,sigma_dih(k,i+nnt-1) ! j,ki,l what for?
 +c            if (i+nnt-1.gt.lim_dih) lim_dih=i+nnt-1 ! right?
 +c            sigma_dih(k,i+nnt-1)=sigma_dih(k,i+nnt-1)* ! not inverse because of use of res. similarity
 +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.
 +            dih(k,i)=phiref(i) ! right?
 +c           read (ientin,*) sigma_dih(k,i) ! original variant
 +c             write (iout,*) "dih(",k,i,") =",dih(k,i)
 +c             write(iout,*) "rescore(",k,i,") =",rescore(k,i),
 +c    &                      "rescore(",k,i-1,") =",rescore(k,i-1),
 +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
 +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)*
 +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
 +        endif
 +
 +        if (waga_theta.gt.0.0d0) then
 +c         open (ientin,file=tpl_k_sigma_theta,status='old')
 +c         do irec=1,maxres-2 ! loop for reading sigma_theta, right bounds?
 +c            read (ientin,*,end=1403) i,j,ki,sigma_theta(k,i+nnt-1) ! j,ki what for?
 +c            sigma_theta(k,i+nnt-1)=sigma_theta(k,i+nnt-1)* ! not inverse because of use of res. similarity
 +c    &                              sigma_theta(k,i+nnt-1)
 +c         enddo
 +c1403   continue
 +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.
 +             thetatpl(k,i)=thetaref(i)
 +c            write (iout,*) "thetatpl(",k,i,") =",thetatpl(k,i)
 +c            write(iout,*)  "rescore(",k,i,") =",rescore(k,i),
 +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 ?
 +             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)*
 +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
 +
 +        if (waga_d.gt.0.0d0) then
 +c       open (ientin,file=tpl_k_sigma_d,status='old')
 +c         do irec=1,maxres-1 ! loop for reading sigma_theta, right bounds?
 +c            read (ientin,*,end=1404) i,j,sigma_d(k,i+nnt-1) ! j,ki what for?
 +c            sigma_d(k,i+nnt-1)=sigma_d(k,i+nnt-1)* ! not inverse because of use of res. similarity
 +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?
 +               xxtpl(k,i)=xxref(i)
 +               yytpl(k,i)=yyref(i)
 +               zztpl(k,i)=zzref(i)
 +c              write (iout,*) "xxtpl(",k,i,") =",xxtpl(k,i)
 +c              write (iout,*) "yytpl(",k,i,") =",yytpl(k,i)
 +c              write (iout,*) "zztpl(",k,i,") =",zztpl(k,i)
 +c              write(iout,*)  "rescore(",k,i,") =",rescore(k,i)
 +               sigma_d(k,i)=rescore(k,i) !  right expression ?
 +               sigma_d(k,i)=1.0d0/(sigma_d(k,i)*sigma_d(k,i))
 +
 +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
 +        endif
 +        close(ientin)
        enddo
 -      lim_odl=ii
 +      if (waga_dist.gt.0.0d0) lim_odl=ii
        if (constr_homology.gt.0) call homology_partition
 +      if (constr_homology.gt.0) call init_int_table
 +      write (iout,*) "homology_partition: lim_theta= ",lim_theta,
 +     & "lim_xx=",lim_xx
 +c     write (iout,*) "ithet_start =",ithet_start,"ithet_end =",ithet_end
 +c     write (iout,*) "loc_start =",loc_start,"loc_end =",loc_end
 +c
  c Print restraints
 +c
        if (.not.lprn) return
 +      write(iout,*) "waga_theta",waga_theta,"waga_d",waga_d
        write (iout,*) "Distance restraints from templates"
        do ii=1,lim_odl
 -        write(iout,'(3i5,10(2f8.2,4x))') ii,ires_homo(ii),jres_homo(ii),
 +       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)
        enddo
        write (iout,*) "Dihedral angle restraints from templates"